Commit graph

997 commits

Author SHA1 Message Date
koral 5d0cc81d08 git: 2.3.1 -> 2.3.2
(cherry picked from commit 50933385c5)
2015-03-10 13:20:02 +01:00
koral a0da8638d6 git: 2.3.0 -> 2.3.1
(cherry picked from commit 36c1a8a6c7)
2015-03-10 13:19:41 +01:00
Luca Bruno 68d23e2134 Merge branch 'meld'. Closes #6595 2015-03-01 12:54:13 +01:00
Luca Bruno c40cb390f8 meld: fix gsettings schemas and remove LD_LIBARY_PATH 2015-03-01 12:51:36 +01:00
Thomas Tuegel 4ef3c64d2e vsch: fetch release tarballs, not git revisions
We only update at releases anyway, so it doesn't really make sense to
use fetchgit. Plus, it makes monitor.nixos.org useless because we're
inevitably behind master.
2015-02-25 16:14:36 -06:00
Nikolay Amiantov c6e0178d40 gitlab: fix checksum 2015-02-18 19:25:13 +03:00
Dan Peebles a78d164b1e Minor fixes for git on darwin (libiconv and Security dependencies) 2015-02-17 22:30:59 -05:00
Shea Levy 2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Marco Maggesi 07bac418d2 Update fossil to version 1.30 2015-02-15 15:34:29 +01:00
Eric Seidel e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Peter Simons ad1417ed0e git: update to version 2.3.0 2015-02-06 13:59:57 +01:00
Edward O'Callaghan e7ecb78aab version-management/gitolite: Bump version 3.6.1 -> 3.6.2
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-01-29 23:45:50 +11:00
lethalman 2140080b08 Merge pull request #5750 from rycee/issue/5741
Wrap 'tig' command to add with git to PATH.
2015-01-28 14:52:45 +01:00
Peter Simons b5ed72ceec rcs: update from 5.9.3 to 5.9.4 2015-01-27 14:04:54 +01:00
Charles Strahan cb395eaadb gitlab-shell: fix evaluation 2015-01-25 16:28:20 -05:00
Charles Strahan 6eaa419920 gitlab: fix evaluation 2015-01-25 16:28:18 -05:00
Vladimír Čunát 45a34f65fe meld: drop gnome2.scrollkeeper (no longer used)
Also indent the overlong lines in the expression.
2015-01-25 08:59:05 +01:00
Edward Tjörnhammar 770e73ee6e Merge pull request #5893 from qknight/meld_upgrade
meld: bump to 3.12.3 (latest) version
2015-01-23 13:06:54 +01:00
Peter Simons 7149878010 git-annex: switch attribute over to haskell-ng package set some more 2015-01-22 23:29:09 +01:00
Peter Simons 5adc98cc50 git-annex: switch attribute over to haskell-ng package set, which is more up-to-date 2015-01-22 23:25:40 +01:00
Charles Strahan 8085f088cb ruby: exorcise the last few remaining rubyPackages 2015-01-21 22:23:37 -05:00
Joachim Schiele b8c2f466ba meld: bump to 3.12.3 (latest) version 2015-01-21 22:02:20 +01:00
Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
muflax 98556ef150 git-remote-hg: fix compatibility with mercurial 3.2
Close #5458.
2015-01-20 15:49:59 +01:00
Robert Helgesson db01e50f6a Wrap 'tig' command to add with git to PATH.
This ensures that git is added as a run-time dependency of tig and
allows tig to find the git command even if git is not installed in the
user environment. Fixes #5741.
2015-01-13 23:12:35 +01:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
aszlig 947a4c582e
hub: Fix build with chrooted Nix.
The build script is a shell script which has a shebang using
/usr/bin/env, which isn't available in a chrooted Nix daemon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-12 03:05:40 +01:00
Arseniy Seroka 269568b7ea Merge pull request #5565 from kirelagin/hub
gitAndTools.hub: Update to 2.x
2015-01-10 10:42:19 +03:00
William A. Kennington III c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
Eelco Dolstra 0b8ac6b791 mercurial: Update to 3.2.4 2015-01-06 14:29:22 +01:00
Peter Simons d8c600c129 haskell-git-annex: update to version 5.20141231 2015-01-05 18:39:18 +01:00
Kirill Elagin 4b84049bd3 gitAndTools.hub: Update to 2.x 2015-01-04 02:28:38 +03:00
John Wiegley eba9d0d8fa subversion: Add several compiler definitions for Darwin 2015-01-03 07:53:06 -05:00
John Wiegley 58ae62b9fa hub: add git as a dependency of the expression 2015-01-03 07:53:01 -05:00
Charles Strahan 94dd4b9721 ruby: WIP 2014-12-30 21:05:00 -05:00
Arseniy Seroka c087c456af Merge pull request #5510 from k0ral/fast-export
fast-export: update to last revision from upstream
2014-12-31 01:19:42 +03:00
koral 10b3d1ad7b fast-export: update to last revision from upstream 2014-12-30 14:54:12 +01:00
Domen Kožar 6dc71c19b0 Merge pull request #5480 from lostdj/ltp/upstream-master/smartgit653
SmartGitHg: update from 6.0.6 to 6.5.3.
2014-12-30 03:47:14 +01:00
Tobias Geerinckx-Rice c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
Thomas Tuegel e5e6931088 vcsh: add ttuegel as maintainer 2014-12-28 09:00:49 -06:00
Thomas Tuegel a1860dab81 vcsh: bump version to 1.20141026 2014-12-28 09:00:38 -06:00
lostdj cf8a716baa SmartGitHg: update from 6.0.6 to 6.5.3. 2014-12-27 11:28:38 +03:00
Peter Simons 8298636254 haskell-git-annex: update to version 5.20141219 2014-12-25 11:05:49 +01:00
Pascal Wittmann f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Tom 7800270ae4 [SECURITY] Update git to 2.1.4
This fixes CVE-2014-9390

http://article.gmane.org/gmane.linux.kernel/1853266
2014-12-19 14:05:04 +00:00
Eelco Dolstra cb5433b8de mercurial: Update to 3.2.2 2014-12-18 14:11:10 +01:00
Eelco Dolstra 49282dd1af subversion: Update to 1.8.11 2014-12-18 14:11:10 +01:00
Domen Kožar ba5fad6dfa Merge pull request #5323 from offlinehacker/gitlab_i686_fix
gitlab: fix i686-linux build and module
2014-12-14 09:48:44 +01:00
Jaka Hudoklin 90683792aa gitlab: fix i686-linux build and module
It turns out that installing therubytracer, with dependency on old v8, even
when using source libv8 version is problematic.
(see
http://stackoverflow.com/questions/21666379/problems-installing-gitlab-on-odroid-v8-lib-not-available).

But wait, rails does not even need therubytracer, just any kind of javascript
server side execution framework like nodejs. Well just use that, as also
suggested from different internet sources (look link above), it works just
fine.
2014-12-14 02:24:12 +01:00