alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
143785 commits 217 branches 121 tags 4.5 GiB
Commit graph

256 commits

Author SHA1 Message Date
Vladimír Čunát e740b565cf Merge master into stdenv-updates 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
 2013-12-29 10:01:22 +01:00
Nixpkgs Monitor 8fa0f4debf gitAndTools.git: update from 1.8.5.1 to 1.8.5.2 2013-12-18 18:18:28 +02: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
Eelco Dolstra e597d102d8 git: Update to 1.8.4.3 2013-11-14 15:29:58 +01:00
Peter Simons ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Eelco Dolstra 51c1d2d597 git: Update to 1.8.4 2013-09-30 17:19:06 +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
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 40ad185891 git: update to version 1.8.3.2 2013-07-08 14:04:51 +02:00
Peter Simons 728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Eelco Dolstra b9013993db git: Update to 1.8.2.3 2013-05-14 11:53:28 +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
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 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
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
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 8f1756e2d4 git: update to version 1.8.1.3 2013-02-25 02:12:42 +01:00
Lluís Batlle i Rossell 7bfd3fd5c8 git: adding an option not to build the manual 
asciidoc+xsltproc take hours to run
 2013-01-29 20:17:34 +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 cb329d1cd2 git: update to version 1.8.1 2013-01-04 19:24:04 +01:00
Peter Simons 62f8d24e56 git: update to 1.8.0.1 2012-11-27 13:46:12 +01: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
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
Peter Simons 14da2bf31b git: update to version 1.7.12 2012-09-06 18:13:45 +02:00
Eelco Dolstra f901b6d38d git: Update to 1.7.11.4 2012-08-06 15:27:28 -04: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
Eelco Dolstra 104bd01e1d * Git 1.7.10.4. 
svn path=/nixpkgs/trunk/; revision=34349
 2012-06-04 15:54:57 +00:00
Eelco Dolstra ebae9a9fd7 * Git 1.7.9.5. 
svn path=/nixpkgs/trunk/; revision=33553
 2012-04-03 11:07:50 +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
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 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 1817b55a7f git: updated to version 1.7.8 
svn path=/nixpkgs/trunk/; revision=30805
 2011-12-09 11:44:42 +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 9016346fbd git: updated to version 1.7.7 
svn path=/nixpkgs/trunk/; revision=29965
 2011-10-21 16:50:36 +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 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 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 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 165f8efdfd git: updated to version 1.7.4.4 
svn path=/nixpkgs/trunk/; revision=26738
 2011-04-07 12:46:58 +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
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 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
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
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 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 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
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 7af927d96b Improve git-svn support 
svn path=/nixpkgs/trunk/; revision=20925
 2010-04-02 07:17:11 +00:00
Peter Simons 9c9620b334 pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.0.3 
svn path=/nixpkgs/trunk/; revision=20776
 2010-03-23 09:34:58 +00:00
Peter Simons f92867651f pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.0.2 
svn path=/nixpkgs/trunk/; revision=20649
 2010-03-16 12:13:32 +00:00
Marc Weber b2c15d8c37 git-1.7: Python is optional 
svn path=/nixpkgs/trunk/; revision=20603
 2010-03-13 06:07:44 +00:00
Peter Simons c7e5f6a80b pkgs/applications/version-management/git-and-tools/git: version 1.7.0 needs Python 
svn path=/nixpkgs/trunk/; revision=20096
 2010-02-18 12:08:39 +00:00
Peter Simons 6a48baead3 pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.0 
svn path=/nixpkgs/trunk/; revision=20083
 2010-02-18 00:28:24 +00:00
Peter Simons 200c07d817 pkgs/applications/version-management/git-and-tools/git: added myself to the list of maintainers 
svn path=/nixpkgs/trunk/; revision=20082
 2010-02-18 00:28:15 +00:00
Marc Weber edc1d89a45 update git-1.6.6.2 
svn path=/nixpkgs/trunk/; revision=19983
 2010-02-13 17:39:25 +00:00
Ludovic Courtès 5143789a4d git: Remove extra `meta.license' tag. 
svn path=/nixpkgs/trunk/; revision=19527
 2010-01-18 16:49:19 +00:00
Ludovic Courtès 88646b77e1 git: Augment meta' so that gitFull' gets built by Hydra. 
svn path=/nixpkgs/trunk/; revision=19526
 2010-01-18 16:07:48 +00:00
Peter Simons 24c117f98d pkgs/applications/version-management/git-and-tools/git: updated to version 1.6.5.6 
svn path=/nixpkgs/trunk/; revision=18917
 2009-12-13 13:47:10 +00:00
Marc Weber 362f811a7a Revert "git: allow applying patches by config" 
This reverts commit rev 18897
I should have used overrideDerivation.

svn path=/nixpkgs/trunk/; revision=18911
 2009-12-12 18:10:26 +00:00
Marc Weber 0ceae8f6d1 git: allow applying patches by config 
svn path=/nixpkgs/trunk/; revision=18897
 2009-12-11 13:58:31 +00:00
Peter Simons 89b59e3fbc applications/version-management/git-and-tools/git: update to version 1.6.5.5 
svn path=/nixpkgs/trunk/; revision=18847
 2009-12-08 20:35:51 +00:00
Peter Simons b06c0d1a1d pkgs/applications/version-management/git-and-tools/default.nix: use docbook dtd 4.5 
Ensure that the 4.5 DTD required by asciidoc is available.

svn path=/nixpkgs/trunk/; revision=18078
 2009-11-03 15:57:31 +00:00
Peter Simons d330b000fc Updated git to version 1.6.5.2. 
svn path=/nixpkgs/trunk/; revision=18018
 2009-10-29 12:06:04 +00:00
Peter Simons 4cf582c570 pkgs/applications/version-management/git-and-tools/git/default.nix: dropped 'set -x' from builder script 
svn path=/nixpkgs/trunk/; revision=17903
 2009-10-20 14:08:58 +00:00
Peter Simons 2139d48872 pkgs/applications/version-management/git-and-tools/git/default.nix: updated to version 1.6.5.1 
svn path=/nixpkgs/trunk/; revision=17902
 2009-10-20 14:08:53 +00:00
Peter Simons ad7eebbad1 Revert "optionally apply git glob patch to default git" 
Please submit patches *upstream*.

svn path=/nixpkgs/trunk/; revision=17466
 2009-09-28 12:56:46 +00:00
Marc Weber 48865a4aa6 symlink duplicate git executables to bring down $out to 13MB (was > 100MB) 
svn path=/nixpkgs/trunk/; revision=17458
 2009-09-26 23:33:11 +00:00
Marc Weber c641935190 optionally apply git glob patch to default git 
svn path=/nixpkgs/trunk/; revision=17456
 2009-09-26 23:33:05 +00:00
Peter Simons 8472f948a8 Updated git to version 1.6.4.4. 
svn path=/nixpkgs/trunk/; revision=17235
 2009-09-17 21:03:06 +00:00
Peter Simons bba3090136 Updated git to version 1.6.4.2. 
svn path=/nixpkgs/trunk/; revision=16994
 2009-09-09 11:26:53 +00:00
Peter Simons 5e7f7822f8 Updated git to version 1.6.3.3. 
The fill-paragraph patch is obsolete; it's now part of the distribution.

svn path=/nixpkgs/trunk/; revision=16148
 2009-07-02 15:41:58 +00:00
Eelco Dolstra 7ec61219db * lib/site_perl -> lib/perl5/site_perl. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15258
 2009-04-22 23:04:18 +00:00
Peter Simons 9cab85dd63 git: updated from 1.6.0.4 to 1.6.1.3 
svn path=/nixpkgs/trunk/; revision=14259
 2009-02-26 10:54:52 +00:00
Peter Simons 6febac4529 git.el: added fill-paragraph patch 
The patch makes Emacs recognize "--- log message follows this line ---"
as a paragraph separator. It's going to be part of the distribution in
the foreseeable future.

svn path=/nixpkgs/trunk/; revision=14258
 2009-02-26 10:54:44 +00:00
Marc Weber 0ad62a0edb adding gitAttr 
now containing qgit, stgit, topGit, hg2git
updating gitGit (git dev version), adding qgit-git (dev version)

svn path=/nixpkgs/trunk/; revision=13816
 2009-01-20 22:15:42 +00:00
Renamed from pkgs/applications/version-management/git/default.nix (Browse further)