Commit graph

307 commits

Author SHA1 Message Date
Peter Simons
45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Peter Simons
903e36a74c git-annex: fix build some more 2013-12-14 22:05:17 +01:00
Peter Simons
e706edb8ee git-annex: disable test suite in this version to fix the build 2013-12-14 21:34:34 +01:00
Peter Simons
f449007ade haskell-git-annex: update to version 5.20131213 2013-12-14 15:19:27 +01:00
Peter Simons
2bc29e4e6d Merge branch 'master' into stdenv-updates. 2013-12-10 22:29:20 +01:00
Peter Simons
c0fc46516d haskell-github-backup: update to version 1.20131203 2013-12-10 20:41:36 +01:00
Peter Simons
486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Moritz Ulrich
b4f93af3c9
Update git and related tools to latest releases.
Git     -> 1.8.5.1
stgit   -> 0.16
svn2git -> 2.2.2

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-09 00:15:25 +00:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Peter Simons
d555031aa8 haskell-git-annex: update to version 5.20131130 2013-12-02 16:25:34 +01:00
Peter Simons
5644003632 haskell-git-annex: update to version 5.20131120 2013-11-26 21:09:18 +01:00
Eelco Dolstra
e597d102d8 git: Update to 1.8.4.3 2013-11-14 15:29:58 +01:00
Peter Simons
75ec0b31f8 haskell-git-annex: update to version 4.20131106 2013-11-11 14:39:57 +01:00
Peter Simons
d72afe2f1b haskell-github-backup: update to version 1.20131101 2013-11-11 14:39:51 +01:00
Bjørn Forsman
b8e890539e tig: small expression cleanup
* Add a bit of whitespace to make it easier on the eyes
* Shorten the description (and remove package name)
2013-11-09 19:13:35 +01:00
Bjørn Forsman
9b6fb1ebd5 tig: bump 1.1 -> 1.2.1
XML_CATALOG_FILES is needed to be able to build the asciidoc
documentation/manpages in this new version.
2013-11-09 19:06:09 +01:00
Peter Simons
576058fe0e haskell-git-annex: update to version 4.20131101 2013-11-01 17:42:08 +01:00
Mathijs Kwik
609f8dc04b Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Jaka Hudoklin
11fd5db060 Add gitflow
A collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model
2013-10-30 11:37:57 +01:00
Peter Simons
c05bf33b77 haskell-git-annex: update to version 4.20131024 2013-10-27 19:07:14 +01:00
Peter Simons
6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Peter Simons
b224e751c0 haskell-github-backup: update to version 1.20131006 2013-10-10 20:56:33 +02:00
Peter Simons
85ecc3f176 haskell-git-annex: update to version 4.20131002 2013-10-03 21:29:51 +02:00
Peter Simons
da17bd1352 git-annex: make sure the man page is installed 2013-10-03 17:16:19 +02:00
Peter Simons
ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Peter Simons
eaa38dd941 haskell-git-annex: update to version 4.20130927 2013-10-02 22:33:41 +02:00
Eelco Dolstra
51c1d2d597 git: Update to 1.8.4 2013-09-30 17:19:06 +02:00
Moritz Ulrich
fd67fcb314 Fix chroot-build of fast-export & pinpoint revision to current HEAD.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-29 00:25:31 +02:00
Peter Simons
9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Peter Simons
117176fd26 git-annex: patch to fix build with recent versions of 'dns' library 2013-09-18 18:09:17 +02:00
Peter Simons
24366adf19 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-14 15:28:40 +02:00
Peter Simons
e541f509ca git-annex: update to version 4.20130909 2013-09-11 19:59:33 +02:00
Peter Simons
3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Peter Simons
532cf20cbc haskell-git-annex: update to version 4.20130827 2013-08-30 10:53:02 +02:00
Peter Simons
98fcc2f746 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-08-30 10:45:11 +02:00
aszlig
efa748a166
git-and-tools/hub: Update to version 1.10.6.
This now uses fetchurl instead of fetchgit to speed up fetching.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-27 04:39:33 +02:00
Peter Simons
9ac8ea937c Merge branch 'origin/master' into stdenv-updates. 2013-08-26 12:21:23 +02:00
Peter Simons
1392922727 haskell-git-annex: update to version 4.20130815 2013-08-18 18:49:10 +02:00
Peter Simons
0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons
76244ac2e2 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Joachim Schiele
12f7c0666a qgit version bump from 2.3 to 2.5 2013-08-11 14:35:23 +00:00
Peter Simons
60a6e6802f haskell-git-annex: update to version 4.20130802 2013-08-05 10:56:30 +02:00
Eelco Dolstra
65ad55c425 git-subtree: Remove
This package is obsolete because it's now part of git (see
https://github.com/apenwarr/git-subtree/blob/master/THIS-REPO-IS-OBSOLETE).
2013-08-01 16:37:36 +02:00
Eelco Dolstra
80a82a2858 git: Install git-subtree 2013-08-01 16:36:54 +02:00
Eelco Dolstra
4ec1f8b68a git: Update to 1.8.3.4 2013-08-01 16:26:02 +02:00
Peter Simons
522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates.
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
Domen Kožar
ae7adcb6e4 git: find global configs in /etc/ instead of /etc 2013-07-29 23:40:54 +02:00
Peter Simons
49335abfd2 haskell-git-annex: update to version 4.20130723 2013-07-26 19:40:47 +02:00
Peter Simons
70835adb28 haskell-git-annex: update to version 4.20130709 2013-07-10 10:29:22 +02:00