Commit graph

502 commits

Author SHA1 Message Date
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
Peter Simons 40ad185891 git: update to version 1.8.3.2 2013-07-08 14:04:51 +02:00
Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
Peter Simons e533af98e4 git-annex: enable web-related features 2013-07-03 18:48:12 +02:00
Peter Simons 4b75f5a2ae haskell-git-annex: update to version 4.20130627 2013-07-01 12:11:01 +02:00
Mathijs Kwik cbf48a8cd1 upgrade to texinfo5 for some packages 2013-07-01 07:52:14 +02:00
Peter Simons 01bc9204e0 git-annex: fix installation of git-annex-shell 2013-06-22 15:41:37 +02:00
Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +02:00
Domen Kozar 1a23f715f4 tig: built for linux 2013-06-18 22:42:12 +02:00
Peter Simons 6b1ebeccf2 Merge branch 'master' into stdenv-updates.
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
2013-06-11 12:11:25 +02:00
Evgeny Egorochkin 9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Peter Simons 7b21e19a82 git-annex: generate build instructions with cabal2nix 2013-06-03 22:09:34 +02:00
Evgeny Egorochkin 6609df220b Merge pull request #584 from bjornfor/cgit
cgit: new package
2013-06-02 14:13:05 -07:00
Bjørn Forsman 4ecd9cdb14 cgit: new package
cgit is a web frontend for git repositories - it is a CGI program to use
with your favourite webserver. Add the latest version, 0.9.2.
2013-06-02 18:25:54 +02:00
Peter Simons 5718931dd3 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-06-01 11:48:21 +02:00
Peter Simons 6fadcc2d69 git-annex: disable building of the web application to fix the build in the presence of yesod 1.2 2013-05-30 12:33:40 +02:00
Peter Simons e7975c0d33 git-annex: update to version 4.20130521 2013-05-30 12:33:40 +02:00
Peter Simons 728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Bjørn Forsman 05bb66ce20 Add myself as maintainer for several packages
And set missing meta.platforms for the packages I've added earlier.
2013-05-20 20:28:15 +02:00
Eelco Dolstra b9013993db git: Update to 1.8.2.3 2013-05-14 11:53:28 +02:00
Gergely Risko 972b1a7d50 Download git-annex from github instead of git.kitenet.net
git.kitenet.net doesn't allow snapshot downloads anymore, the url
just returns 403 Forbidden.
2013-05-13 18:19:41 +02:00
Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04:00
Peter Simons 7b868bbff4 git-annex: update to version 4.20130501 2013-05-03 11:38:58 +02:00
Eelco Dolstra f2aaed44aa git: Properly use symlinks instead of hard links
Git's Makefile has a NO_INSTALL_HARDLINKS flag to produce symlinks
instead of hard links.  However, it still produces hard links between
$out/bin and $out/libexec, hence the patch.

Also, update Git to 1.8.2.1.
2013-04-22 15:55:01 +02:00
Eelco Dolstra 6ee8bca8ee Revert "git: fix build on FreeBSD"
This reverts commit ab98d72fad, which
caused the size of the Git package in the store to increase from 18
MiB to 190 MiB.
2013-04-22 15:26:26 +02:00
Peter Simons 2ffd0b6dac Merge changes from branch 'origin/master' into stdenv-updates. 2013-04-20 22:19:39 +02:00
Bjørn Forsman 88f1e643e3 git: fix gitweb.cgi runtime dependency on gzip
gitweb.cgi uses gzip for creating "snapshots". Without this patch it
doesn't work.
2013-04-19 22:32:51 +02:00
Peter Simons 4914e63a89 Merge changes from branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/icu/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-04-19 11:48:11 +02:00
Peter Simons 0911fe7f3c haskell-github-backup: update to version 1.20130414 2013-04-14 23:06:17 +02:00
Peter Simons 7a69341994 git-annex: drop obsolete dependency on testpack 2013-04-14 21:19:09 +02:00
Peter Simons 0b4e664a24 git-annex: update to version 4.20130405 2013-04-13 00:13:22 +02:00
Peter Simons 62e37492b9 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-04 00:51:30 +02:00
Bjørn Forsman e21c53c211 tig: enable bash completion
Copy the bash completion script that comes with tig to
$out/etc/bash_completion.d/.

Note: to enable bash completion in NixOS, set
environment.enableBashCompletion = true;
2013-04-01 18:37:52 +02:00
Peter Simons 0823aea0a6 Merge branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/libxslt/default.nix

Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
2013-03-25 13:43:45 +01:00
Peter Simons ab98d72fad git: fix build on FreeBSD
Our hard-linking code depended on md5sum, which FreeBSD doesn't have in its
system environment. To avoid that impure dependency, the hard-linking is now
done with the 'hardlink' utility from Nixpkgs.
2013-03-25 12:47:39 +01:00
Peter Simons 73c610e1d6 git: update to version 1.8.2 2013-03-22 02:11:38 +01:00
Peter Simons 22fb1ad99e Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-21 09:23:54 +01:00
Peter Simons d28d3f37a8 topgit: fix build on FreeBSD
The BSD unices have a version of install(1) that doesn't support the -D flag. Grr.
2013-03-20 11:43:43 +01:00
Peter Simons 51e64392ea git-annex: update to version 4.20130314 2013-03-20 10:15:06 +01:00
Peter Simons a1a7448e5b topgit: update to version 0.9 2013-03-20 09:50:06 +01:00
Danny Wilson d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos
Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
Sander van der Burg 23c78e41db git: Adding -lgcc_s on darwin causes the build to fail, so we disable it for that platform 2013-03-14 14:57:40 +01:00
Peter Simons 4c9ebb62d4 git: link binaries with libgcc_s.so to ensure pthread_cancel() works 2013-03-09 23:57:57 +01:00
Peter Simons 4f697db7dd haskell-github-backup: update to version 1.20120314 2013-03-02 17:07:43 +01:00
Danny Wilson ecba7e947e Update Git to 1.8.1.3 and fix build on Illumos. 2013-02-28 20:04:06 +01:00
Peter Simons 329b33c59c git-annex: clean up build expression 2013-02-28 13:04:15 +01:00
Peter Simons e23be1b2ef git-annex: update to version 4.20130227 2013-02-28 11:31:44 +01:00
Peter Simons 80dc8df25d haskell-github-backup: update to version 1.20120314 2013-02-27 12:00:52 +01:00
Peter Simons 8f1c029e33 haskell-github-backup: add version 1.20120627 2013-02-25 15:25:54 +01:00
Peter Simons 8f1756e2d4 git: update to version 1.8.1.3 2013-02-25 02:12:42 +01:00
Peter Simons eb5ebb6063 network-protocol-xmpp: fix spelling of the attribute name 2013-02-22 16:14:27 +01:00
Peter Simons b076ab94d6 git-annex: update to version 3.20130216 2013-02-18 11:20:46 +01:00
Lluís Batlle i Rossell 8a9ba8c382 git: adding an option not to build the manual
asciidoc+xsltproc take hours to run
2013-01-28 21:24:52 +01:00
Peter Simons 490085a811 git-annex: update to version 3.20130107 2013-01-09 16:54:31 +01:00
Peter Simons 70b6b15215 git-annex: update to version 3.20130102 2013-01-04 19:24:09 +01:00
Peter Simons cb329d1cd2 git: update to version 1.8.1 2013-01-04 19:24:04 +01:00
Peter Simons 918b26a59e git-annex: update to version 3.20121211 2012-12-15 11:44:13 +01:00
aszlig f1c80cf20c
git-and-tools/hub: New package, version 1.10.3.
This is a small wrapper of Git, which integrates some GitHub specific features,
especially stuff like merging or sending pull requests or attaching commits to
an issue.

I'm not quite familiar with the Nix integration of Ruby, so let's hope that I'm
not doing something horrible here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
Peter Simons 3261d1d4aa git-annex: update to version 3.20121127 2012-12-03 16:12:04 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Peter Simons 8effc542b4 git-annex: update to 3.20121126 2012-11-27 13:46:27 +01:00
Peter Simons 62f8d24e56 git: update to 1.8.0.1 2012-11-27 13:46:12 +01:00
Peter Simons 03abf1abbc git-annex: switch build to GHC 7.4.2 2012-11-21 17:40:56 +01:00
Peter Simons 9ada368ef8 git-annex: update to version 3.20121112-161-gb27d9eb to fix build errors with current version of yesod 2012-11-21 12:30:54 +01:00
Rok Garbas d999c3f6ec tig: typo 2012-11-17 02:20:07 +01:00
Rok Garbas a64b34a43e tig: update to 1.1 2012-11-17 02:13:25 +01:00
Peter Simons 84c6f6f88e git-annex: update to version 3.20121112 2012-11-15 12:50:17 +01:00
Peter Simons 4ab06e5c24 Fix git-annex build.
git-annex depends on 'testpack', which doesn't compile with Haskell
Platform 2012.4.0.0. The testpack library appears to be unmaintained, so
there is probably no quick solution for this issue. For the time being,
we compile git-annex with GHC 7.4.1.
2012-11-06 18:34:54 +01:00
Paolo Capriotti 6ac427d391 Update git-annex to 3.20121017 2012-11-05 13:59:08 +00:00
David Guibert b963624867 update git to 1.8.0 2012-10-24 16:33:42 +02:00
Peter Simons 58f3e47166 git: update to version 1.7.12.4 2012-10-19 10:08:07 +02:00
Peter Simons c90a15a604 git-annex: update to version 3.20121010 2012-10-15 20:17:33 +02:00
Eelco Dolstra 7dd3236c81 git: Update to 1.7.12.2 2012-10-02 12:34:38 -04:00
Peter Simons 625e2e45f7 git: update to version 1.7.12.1 2012-09-24 13:28:31 +02:00
aszlig 9ff9d85ef6
darcs-to-git: Remove propagatedBuildInputs.
I missed this while checking the commit diffs before my last push. And it really
doesn't make sense to propagate ruby all the way up to whatever in the universe
may depend on this package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-17 06:35:49 +02:00
aszlig 98b7228c06
darcs-to-git: New package from upstream Git.
This consists of just one single ruby script, which runs shell commands assuming
that the current PATH has all dependencies set up correctly. Unfortunately, this
somewhat breaks functional purity as the command won't work correctly in
environments that do not contain git, darcs or diffutils.

During the patchPhase we replace all those dependencies directly in the ruby
source code, rather than creating a wrapper. Afterwards we run a checkPhase
which not only checks whether we caught all the dependencies (PATH=) but also
checks if the conversion has been done correctly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-17 06:08:04 +02:00
Peter Simons 14da2bf31b git: update to version 1.7.12 2012-09-06 18:13:45 +02:00
Peter Simons 33bf9644cf git-annex: update to version 3.20120825 2012-09-06 18:13:44 +02:00
Dmitry Malikov b125ef36b6 Bump gitAndTools/tig from 0.16 to 1.0 2012-08-08 00:51:25 +02:00
Eelco Dolstra f901b6d38d git: Update to 1.7.11.4 2012-08-06 15:27:28 -04:00
David Guibert 3b0d9374a4 git-annex: update to 3.20120629 2012-06-29 21:09:52 +02:00
David Guibert a97e27fc82 git-annex: update to 3.20120624 2012-06-29 21:09:52 +02:00
Eelco Dolstra 94812c9dd3 git: Fix the "notSupported" scripts for "git send-email" and "git gui" 2012-06-21 15:25:02 -04:00
Eelco Dolstra 9365981409 git: Updated to 1.7.11 2012-06-21 15:23:29 -04:00
Peter Simons a3224ededc git-and-tools: fixed build in the presence of QuickCheck 2.5
svn path=/nixpkgs/trunk/; revision=34553
2012-06-18 18:16:23 +00:00
Peter Simons 2a60c221d1 git-annex: updated to version 3.20120614
svn path=/nixpkgs/trunk/; revision=34518
2012-06-15 15:33:47 +00:00
Peter Simons 330ea0887f git-annex: added openssh to build inputs so that the configure phase enables support for SSH connection caching
svn path=/nixpkgs/trunk/; revision=34386
2012-06-08 14:02:28 +00:00
Peter Simons 87d25896c1 git-annex: updated to version 3.20120605
svn path=/nixpkgs/trunk/; revision=34385
2012-06-08 14:02:21 +00:00
Eelco Dolstra 104bd01e1d * Git 1.7.10.4.
svn path=/nixpkgs/trunk/; revision=34349
2012-06-04 15:54:57 +00:00
Peter Simons ac64ba04bd git-annex: updated to version 3.20120522
svn path=/nixpkgs/trunk/; revision=34213
2012-05-22 19:46:37 +00:00
Eelco Dolstra 5e7f049fc9 * svn2git-kde 1.0.5.
svn path=/nixpkgs/trunk/; revision=34169
2012-05-18 15:01:54 +00:00
Eelco Dolstra 7c1612d6f2 * svn2git -> svn2git-kde to distinguish it from the other svn2git.
svn path=/nixpkgs/trunk/; revision=34071
2012-05-12 19:45:55 +00:00
Peter Simons e0bd67afd7 git-annex: updated to version 3.20120430
svn path=/nixpkgs/trunk/; revision=33970
2012-05-02 09:25:28 +00:00
Peter Simons 4fc0e49bdd git-annex: updated to version 3.20120418
svn path=/nixpkgs/trunk/; revision=33856
2012-04-20 11:35:20 +00:00
Nicolas Pierron 7a4cf21350 Add git-bz nix expression.
svn path=/nixpkgs/trunk/; revision=33801
2012-04-15 23:48:16 +00:00
Nicolas Pierron 7b7dd238fc Add dulwich (git filesystem in python).
Add bugz (command line tool for bugzilla)
Add gitBz (bugzilla in git)

svn path=/nixpkgs/trunk/; revision=33800
2012-04-15 23:48:11 +00:00
Peter Simons 4292793d40 git-annex: updated to version 3.20120406
svn path=/nixpkgs/trunk/; revision=33669
2012-04-08 10:48:14 +00:00
Peter Simons 799722afde git-annex: updated to version 3.20120405
svn path=/nixpkgs/trunk/; revision=33638
2012-04-05 23:11:00 +00:00
Rob Vermaas a1d87e58c1 re-add overwritten svn2git (used/developed by kde people)
svn path=/nixpkgs/trunk/; revision=33567
2012-04-04 15:30:29 +00:00
Eelco Dolstra ebae9a9fd7 * Git 1.7.9.5.
svn path=/nixpkgs/trunk/; revision=33553
2012-04-03 11:07:50 +00:00
Eelco Dolstra 512357f875 * Remove a wildly outdated Git version that shouldn't have been in
Nixpkgs in the first place.

svn path=/nixpkgs/trunk/; revision=33272
2012-03-19 18:24:53 +00:00
Peter Simons 46f9f71439 git: updated to version 1.7.9.4
svn path=/nixpkgs/trunk/; revision=33145
2012-03-16 09:47:34 +00:00
Peter Simons 6ff954a5e8 git-annex: updated to version 3.20120315
svn path=/nixpkgs/trunk/; revision=33116
2012-03-15 18:07:49 +00:00
Peter Simons f5219b23a4 git-annex: updated to version 3.20120309
The test suite failure introduced recently has been fixed.

svn path=/nixpkgs/trunk/; revision=33014
2012-03-12 14:06:11 +00:00
Eelco Dolstra 3c56e571af * Final sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
2012-03-06 11:34:11 +00:00
Peter Simons 88d14c0e29 git-annex: updated to version 3.20120230
Note that the latest version of git-annex must be compiled with GHC 7.4.1 or
later, because it takes advantage of some freaky file name encoding guessing
features that are absent in older versions of the base library.

svn path=/nixpkgs/trunk/; revision=32819
2012-03-06 11:24:20 +00:00
Shea Levy ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Peter Simons 0660134750 git: updated to version 1.7.9.2
svn path=/nixpkgs/trunk/; revision=32528
2012-02-23 22:31:09 +00:00
Eelco Dolstra e64443baf1 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
2012-02-21 23:29:21 +00:00
Eelco Dolstra 45fed14272 * Revert r32435. We'll be doing a stdenv merge in a few days, so
let's put it in there rather than having the Nth near-complete
  rebuild of the trunk in a few days.

svn path=/nixpkgs/trunk/; revision=32436
2012-02-20 18:59:43 +00:00
Yury G. Kudryashov 5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Eelco Dolstra e4ee3e2c9b * svn2git updated to 2.2.0.
svn path=/nixpkgs/trunk/; revision=32108
2012-02-07 12:22:48 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Peter Simons 6e4f0b6365 git-annex: updated to version 3.20120123
svn path=/nixpkgs/trunk/; revision=31836
2012-01-25 16:07:52 +00:00
Peter Simons f8eee42a66 git-annex: updated to version 3.20120116
svn path=/nixpkgs/trunk/; revision=31757
2012-01-21 14:32:42 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Peter Simons 7ccde05271 git-annex: cosmetic change for the meta.license attribute
svn path=/nixpkgs/trunk/; revision=31572
2012-01-15 11:44:08 +00:00
Peter Simons 97e815a9af git-annex: bumped to version 3.20120113
svn path=/nixpkgs/trunk/; revision=31569
2012-01-15 11:43:57 +00:00
Peter Simons bae5b8dabb git-annex: updated to version 3.20120106
svn path=/nixpkgs/trunk/; revision=31509
2012-01-13 09:27:08 +00:00
Peter Simons 38f6d36e91 git-annex: updated to version 3.20111231
svn path=/nixpkgs/trunk/; revision=31212
2012-01-02 14:51:26 +00:00
Peter Simons 1817b55a7f git: updated to version 1.7.8
svn path=/nixpkgs/trunk/; revision=30805
2011-12-09 11:44:42 +00:00
Eelco Dolstra acd7288678 * Proper version number.
svn path=/nixpkgs/trunk/; revision=30784
2011-12-06 21:16:20 +00:00
Eelco Dolstra 3aedd3770f * Get svn2git to work.
svn path=/nixpkgs/trunk/; revision=30778
2011-12-06 15:41:16 +00:00
Peter Simons 3357437461 git-annex: updated to version 3.20111203
svn path=/nixpkgs/trunk/; revision=30762
2011-12-05 16:23:05 +00:00
Peter Simons 42757e653a Temporarily keep monad-control 0.2.0.3 until a new version of git-annex comes out that supports the current version.
svn path=/nixpkgs/trunk/; revision=30761
2011-12-05 16:23:02 +00:00
Peter Simons 1193eabfa1 git-annex: updated to version 3.20111122
svn path=/nixpkgs/trunk/; revision=30538
2011-11-23 09:21:20 +00:00
Peter Simons 1c0ae7e8ed git: updated to version 1.7.7.3
svn path=/nixpkgs/trunk/; revision=30476
2011-11-18 18:37:20 +00:00
Peter Simons 9dcb5da174 git-annex: updated to version 3.20111107
svn path=/nixpkgs/trunk/; revision=30337
2011-11-08 16:59:30 +00:00
Peter Simons a0cf7c24e1 git-annex: updated to version 3.20111025
svn path=/nixpkgs/trunk/; revision=30241
2011-11-05 00:03:44 +00:00
Nicolas Pierron 87bf637319 Mercurial: Give access to ssl and curses python packages for
fast-export and crecord.

svn path=/nixpkgs/trunk/; revision=29972
2011-10-22 15:41:20 +00:00
Peter Simons 9016346fbd git: updated to version 1.7.7
svn path=/nixpkgs/trunk/; revision=29965
2011-10-21 16:50:36 +00:00
Peter Simons e98852cefd git-annex: updated to version 3.20111011
svn path=/nixpkgs/trunk/; revision=29964
2011-10-21 16:34:38 +00:00
Peter Simons 19769280f6 git-subtree: updated to version 0.4-2-g2793ee6
svn path=/nixpkgs/trunk/; revision=29333
2011-09-18 14:56:46 +00:00
Peter Simons 7b8f4ec540 git-annex: updated to version 3.20110915
svn path=/nixpkgs/trunk/; revision=29331
2011-09-18 08:28:29 +00:00
Peter Simons 8d0794f5e2 stgit: disable the test suite for the time being
There are failures, but it's unclear whether those are caused by assumptions
about the build environment or whether they signify real problems in the
software.

svn path=/nixpkgs/trunk/; revision=29295
2011-09-15 12:47:49 +00:00
Peter Simons cd3e9099e9 stgit: updated to version 0.15
svn path=/nixpkgs/trunk/; revision=29294
2011-09-15 11:04:00 +00:00
Yury G. Kudryashov fcec1593b8 git doesn't need subversion server
svn path=/nixpkgs/trunk/; revision=29102
2011-09-07 22:52:52 +00:00
Peter Simons 2c0eddaeaa git-annex: updated to version 3.20110902
svn path=/nixpkgs/trunk/; revision=28996
2011-09-03 13:17:36 +00:00
Peter Simons c0fb177ce9 git-annex: pass an older version of QuickCheck to fix build failure of the test suite
svn path=/nixpkgs/trunk/; revision=28829
2011-08-26 10:51:47 +00:00
Peter Simons 1972e6f6dc git-annex: updated to version 3.20110819
svn path=/nixpkgs/trunk/; revision=28771
2011-08-23 08:52:06 +00:00
Peter Simons 1c79ecc5af git2cl: added meta data for the package and updated the build to take
advantage of stdenv features such as automatic updating of the shebang
path to perl, etc.

svn path=/nixpkgs/trunk/; revision=28768
2011-08-23 08:44:59 +00:00
David Guibert 19b376cc41 git-subtree: 0.3 -> 0.4
svn path=/nixpkgs/trunk/; revision=28760
2011-08-22 20:26:15 +00:00
Peter Simons c13f967ed5 Replaced the obsolete 'haskellPlatforms' attribute with the platforms exported by GHC.
svn path=/nixpkgs/trunk/; revision=28418
2011-08-09 09:54:50 +00:00
Peter Simons efe5ab73b1 git: fixed impure path to perl in git-am and git-submodule
svn path=/nixpkgs/trunk/; revision=27859
2011-07-20 22:56:31 +00:00
Peter Simons ff91dbdb35 git-annex: the latest version depends on the monad-control package
svn path=/nixpkgs/trunk/; revision=27839
2011-07-20 12:13:07 +00:00
Peter Simons f61f66f46d git-annex: updated to version 3.20110719
svn path=/nixpkgs/trunk/; revision=27836
2011-07-20 10:16:35 +00:00
Peter Simons ffe01e880d git-annex: build only on platforms that support Haskell
svn path=/nixpkgs/trunk/; revision=27792
2011-07-14 21:54:53 +00:00
Peter Simons 68957344fa git-annex: updated to version 3.20110707
svn path=/nixpkgs/trunk/; revision=27775
2011-07-14 12:22:26 +00:00
Peter Simons 4e5cc9b965 git: removed 'lowPri' wrapper around gitFull
Packages that need git as build-time or run-time dependency typically refer to
the attribute 'git', which is the expression with the least possible set of
features.

Users, however, who run "nix-env -i git", don't want that version, because it
lacks support for SVN, for sending e-mail, and it doesn't include the GUI. In
other words, users want gitFull by default, which is what this change
accomplishes.

svn path=/nixpkgs/trunk/; revision=27748
2011-07-13 10:46:17 +00:00
Peter Simons 9edc2574dd git-annex: the build system uses 'which' to determine whether ikiwiki is installed
svn path=/nixpkgs/trunk/; revision=27747
2011-07-13 10:41:10 +00:00
Peter Simons e4353b1f65 git: install contrib code included in the distribution
TODO: byte-compile emacs modules

svn path=/nixpkgs/trunk/; revision=27665
2011-07-07 23:48:38 +00:00
Peter Simons 2fee0ecef9 git: updated to version 1.7.6
svn path=/nixpkgs/trunk/; revision=27664
2011-07-07 23:48:34 +00:00
Peter Simons 21373bc49b git-annex: enable the documentation build
svn path=/nixpkgs/trunk/; revision=27663
2011-07-07 23:48:30 +00:00
Peter Simons 39f2346b1b git-annex: cosmetic changes in the meta section
svn path=/nixpkgs/trunk/; revision=27662
2011-07-07 23:48:26 +00:00
Peter Simons 0ec6325b87 git-annex: updated to version 3.20110705
svn path=/nixpkgs/trunk/; revision=27661
2011-07-07 23:48:22 +00:00
Rob Vermaas 7a7581d220 left over commit
svn path=/nixpkgs/trunk/; revision=27197
2011-05-09 14:59:58 +00:00
Peter Simons 9b4e1f6f53 git: updated to version 1.7.5.1
svn path=/nixpkgs/trunk/; revision=27169
2011-05-06 07:35:06 +00:00
Peter Simons e88567a0db git-annex: added missing dataenc dependency
svn path=/nixpkgs/trunk/; revision=27144
2011-05-04 13:21:26 +00:00
Rob Vermaas 2ff77d4134 fixed hash
svn path=/nixpkgs/trunk/; revision=27137
2011-05-04 10:14:02 +00:00
Rob Vermaas c34fdd226e oops, wrote git2svn in stead of svn2git
svn path=/nixpkgs/trunk/; revision=27136
2011-05-04 10:11:30 +00:00
Rob Vermaas 02b871de50 add svn2git
svn path=/nixpkgs/trunk/; revision=27135
2011-05-04 10:07:56 +00:00
Peter Simons 59dae8edf4 git-annex: added missing SHA dependency
svn path=/nixpkgs/trunk/; revision=27131
2011-05-04 09:45:22 +00:00
Peter Simons fb10d3399d git-annex: updated to version 0.20110427
The most current one is 0.20110503, but the corresponding tarball isn't
available for download yet.

svn path=/nixpkgs/trunk/; revision=27130
2011-05-04 09:26:45 +00:00
Peter Simons 1ca832be87 git-and-tools: dropped support for getConfig -- use override instead!
See my earlier commit that dropped getConfig support from subversion.

svn path=/nixpkgs/trunk/; revision=26829
2011-04-13 17:53:39 +00:00
Peter Simons 864a75d725 gitFull: modify the name of the expression to make it distinct
This also means adding a lowPrio wrapper, because without it nix-env
would prefer the "-full" expression over the normal one.

Maybe that's desirable, even?

svn path=/nixpkgs/trunk/; revision=26828
2011-04-13 17:53:33 +00:00
Peter Simons 60974e9e87 all-packages.nix: added low-priority 'gitSVN' expression, a variant of git with SVN support (but no GUI)
svn path=/nixpkgs/trunk/; revision=26827
2011-04-13 17:53:26 +00:00
Peter Simons ec23e33d0c applications/version-management/git-and-tools/default.nix: cosmetic
svn path=/nixpkgs/trunk/; revision=26826
2011-04-13 17:53:20 +00:00
Peter Simons 3f609d2e35 git-annex: updated to version 0.20110401
svn path=/nixpkgs/trunk/; revision=26739
2011-04-07 12:47:17 +00:00
Peter Simons 165f8efdfd git: updated to version 1.7.4.4
svn path=/nixpkgs/trunk/; revision=26738
2011-04-07 12:46:58 +00:00
Peter Simons 32fea0d8b1 Cosmetic, no functional change intended.
svn path=/nixpkgs/trunk/; revision=26477
2011-03-23 21:05:08 +00:00
Peter Simons 4e6bc23b70 git-annex: patch unpure /usr/bin/perl path in mdwn2man script
svn path=/nixpkgs/trunk/; revision=26476
2011-03-23 21:05:01 +00:00
Peter Simons fd81655bfb topgit: avoid use of "install -D", which doesn't work on FreeBSD
svn path=/nixpkgs/trunk/; revision=26475
2011-03-23 20:32:12 +00:00
Peter Simons 789f14c0b7 git-annex: added initial version 0.20110320
svn path=/nixpkgs/trunk/; revision=26470
2011-03-23 15:57:53 +00:00
Peter Simons 07d14b9997 Cosmetic, no functional change intended.
svn path=/nixpkgs/trunk/; revision=26464
2011-03-23 10:24:26 +00:00
Peter Simons 3f7ea10694 topgit: updated to version 0.8-45-gd279e29
svn path=/nixpkgs/trunk/; revision=26463
2011-03-23 10:24:22 +00:00
David Guibert ecf72a5720 git: 1.7.4 -> 1.7.4.1
svn path=/nixpkgs/trunk/; revision=26107
2011-02-24 22:19:37 +00:00
Peter Simons 4262167be0 pkgs/applications/version-management/git-and-tools/git: fixed git gui module
Patch Tcl/Tk scripts to invoke 'wish' using the complete executable path to
ensure that the proper version is being used.

svn path=/nixpkgs/trunk/; revision=25755
2011-02-02 11:16:57 +00:00
David Guibert b67c47cb3f git: 1.7.3.5 -> 1.7.4
svn path=/nixpkgs/trunk/; revision=25732
2011-01-31 09:42:37 +00:00
Peter Simons e6e6f033ec pkgs/applications/version-management/git-and-tools/git: cosmetic changes to improve consistency
No functional change is intended.

svn path=/nixpkgs/trunk/; revision=25456
2011-01-07 11:04:09 +00:00
Peter Simons d0f409e009 pkgs/applications/version-management/git-and-tools/git: be verbose when creating symlinks
The postInstall hook replaces identical copies of the same files in $out with
symlinks. This patch changes the call to 'ln' to pass the '-v' flag so that we
can see in the build log which files were replaced.

svn path=/nixpkgs/trunk/; revision=25455
2011-01-07 11:04:04 +00:00
Peter Simons f989b670d6 pkgs/applications/version-management/git-and-tools/git: fixed the build to deal with names that contain whitespace
The "find -print | while read" loop failed to deal with paths that contain
whitespace. Instead, we now use a similar construct that's based on globbing.

svn path=/nixpkgs/trunk/; revision=25454
2011-01-07 11:03:57 +00:00
Peter Simons 167f185411 pkgs/applications/version-management/git-and-tools/git: fixed "git gui"
The git-gui module cannot be wrapped like gitk, because the Tcl implementation
uses the program's basename to determine stuff like the name of the Window it
opens, etc., and it cannot deal with a program name that contain a dot, like
".git-gui-wrapped" did.

Instead of wrapping git-gui, it's now patched to execute 'wish' with a complete
store path.

While I was at it, I also applied this solution to git-gui--askpass.

svn path=/nixpkgs/trunk/; revision=25453
2011-01-07 11:03:42 +00:00
Peter Simons 922bb7657c pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.3.5
svn path=/nixpkgs/trunk/; revision=25435
2011-01-06 10:04:21 +00:00
Lluís Batlle i Rossell 4c16325de0 I take out getPkgConfig. It looks to me as if it needed a solution, but noone took action.
I take action before much discussion.
For what I see:
- getPkgConfig problems are hard to track
- config.nix trying to forecast getPkgConfig behaviour looks me as a bad approach,
  and people should not trust such a config.nix unless they parsed the whole nixpkgs
  for tricky effects.
- It's not that hard to write config.nix in the style of getConfig
- Every now and then newcomers hit the "'git' is an attribute set while a boolean was expected".

Maybe this will disrupt nixes of some people, and that will be a background on what to discuss.


svn path=/nixpkgs/trunk/; revision=25314
2010-12-28 21:07:35 +00:00
Peter Simons 5b009db20e Updated Git to version 1.7.3.2.
svn path=/nixpkgs/trunk/; revision=24600
2010-11-05 11:45:16 +00:00
Peter Simons 2cc3847cd4 pkgs/applications/version-management/git-and-tools: updated topgit to version 0.8-32-g8b0f1f9
svn path=/nixpkgs/trunk/; revision=24487
2010-10-26 12:08:49 +00:00
Peter Simons c7756e473b pkgs/applications/version-management/git-and-tools: prefer fetchurl over fetchgit in topGit
svn path=/nixpkgs/trunk/; revision=24442
2010-10-23 22:39:53 +00:00
Peter Simons 4bdf53b0f1 pkgs/applications/version-management/git-and-tools: updated topgit to version 0.8-19-g9404aa1
svn path=/nixpkgs/trunk/; revision=23996
2010-09-30 13:27:24 +00:00
Peter Simons ff1a93282f pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.3.1
svn path=/nixpkgs/trunk/; revision=23995
2010-09-30 13:27:17 +00:00
Evgeny Egorochkin 8ec9590737 Git: fix an impurity: was taking grep from PATH.
svn path=/nixpkgs/trunk/; revision=23853
2010-09-18 12:45:04 +00:00
Yury G. Kudryashov 139de1ea2f Don't try to build Qt guis if qt is unsupported on the platform
svn path=/nixpkgs/trunk/; revision=23812
2010-09-15 18:52:07 +00:00
Peter Simons 9b8a491a73 pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.2.3
svn path=/nixpkgs/trunk/; revision=23695
2010-09-09 16:06:26 +00:00
Evgeny Egorochkin 919ae70e01 Make hydra compile QGit
svn path=/nixpkgs/trunk/; revision=23662
2010-09-07 09:54:11 +00:00
Lluís Batlle i Rossell 2ab5f25607 Updating 'tig' (for garbas@freenode)
svn path=/nixpkgs/trunk/; revision=23487
2010-08-28 14:10:49 +00:00
Peter Simons 1a6039cb45 Enable parallel building of gcc, glibc, gmp, mpfr, ncurses, coreutils, perl, python, git, and qt4.
If a build expressions has set "enableParallelBuilding = true", then the
generic builder may utilize more than one CPU core to build that particular
expression. This feature works out of the box for GNU Make. Expressions that
use other build drivers like Boost.Jam or SCons have to specify appropriate
flags such as "-j${NIX_BUILD_CORES}" themselves.

svn path=/nixpkgs/trunk/; revision=23042
2010-08-08 18:51:42 +00:00
Peter Simons dbef94575c pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.2.1
svn path=/nixpkgs/trunk/; revision=22960
2010-08-05 11:25:02 +00:00
Marc Weber 932899f3da Tk version number is now 8.5 but at several places TK_LIBRARY is set "${tk}/lib/tk8.4". As for Python, tk.libPrefix is introduced to match "tk8.5".
contributed by David Guibert
Signed-off-by: David Guibert <david.guibert@gmail.com>

svn path=/nixpkgs/trunk/; revision=22041
2010-05-28 10:57:50 +00:00
Peter Simons 5e4bf97212 pkgs/applications/version-management/git-and-tools: disable sendEmailSupport on Darwin in gitFull
The required perl libraries don't build on Darwin.

svn path=/nixpkgs/trunk/; revision=21872
2010-05-19 12:26:17 +00:00
Peter Simons 1fc724cc5c pkgs/applications/version-management/git-and-tools/git: build git on all platforms, not just Linux
svn path=/nixpkgs/trunk/; revision=21839
2010-05-18 14:41:18 +00:00
Peter Simons 39b2ec2488 Fix git-send-email.
git-send-email depends on Net::SMTP and Net::SMTP::SSL.  Make
sendEmailSupport a config for git, and bring these libraries.  Wrap
the send-email script, or replace with a not supported script.

svn path=/nixpkgs/trunk/; revision=21789
2010-05-15 10:38:28 +00:00
Peter Simons 67cf56d2a5 git-subtree: added the version 0.3.
svn path=/nixpkgs/trunk/; revision=21645
2010-05-07 14:01:39 +00:00
Peter Simons d21dc14966 pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.1
svn path=/nixpkgs/trunk/; revision=21604
2010-05-05 10:26:19 +00:00
Rob Vermaas 9e5ab46737 added git2cl script
svn path=/nixpkgs/trunk/; revision=21590
2010-05-04 10:06:50 +00:00
Peter Simons bf775b5cdc pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.0.5
svn path=/nixpkgs/trunk/; revision=21055
2010-04-13 09:55:19 +00:00
Peter Simons 2185e04b88 pkgs/applications/version-management/git-and-tools/git: bumped version to 1.7.0.4
svn path=/nixpkgs/trunk/; revision=21026
2010-04-12 11:21:29 +00:00
Yury G. Kudryashov b01b22892b Use override for gitFull
svn path=/nixpkgs/trunk/; revision=20927
2010-04-02 12:39:38 +00:00