Commit Graph

355 Commits

Author SHA1 Message Date
J Phani Mahesh
2b86ccbf32 git: 2.9.3 -> 2.10.0 2016-09-03 16:20:32 +05:30
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
mimadrid
7f3a4688f0
git: 2.9.2 -> 2.9.3 2016-08-18 21:13:00 +02:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
mimadrid
59caf069a4
git: 2.9.1 -> 2.9.2 2016-07-29 11:28:31 +02:00
Bjørn Forsman
e7ef33c50a git: fix gitweb.cgi breakage due to missing CGI.pm
CGI.pm was removed from Perl core in v5.22, breaking the gitweb.cgi
script and thus NixOS' services.lighttpd.gitweb. Nixpkgs switched to
Perl 5.22 with a85ba820a4 ("perl: Make 5.22 the default").

Fix it by bringing in the Perl CGI module (and dependency HTMLParser).
The closure size of "nix-build -A git" increase by 1 MiB, to 201 MiB.
2016-07-26 15:20:24 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
mimadrid
8c09317018
git: 2.9.0 -> 2.9.1 2016-07-13 15:43:49 +02:00
Alexey Lebedeff
420b3c37ef git: fix perl shebangs in contrib
There are a lot of scripts in contrib (e.g. `diff-highlight`) that
contain perl shebang line. But `patchShebangs` is unablle to fix this
without explicitly listing `perl` in `buildInputs`.
2016-06-16 23:47:56 +03:00
Nathan Zadoks
8d3df9f6c4 git: 2.8.3 -> 2.9.0 2016-06-15 10:56:29 -04:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Rok Garbas
800de8db21 git: 2.8.0 -> 2.8.3 2016-05-27 14:58:48 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
zimbatm
6cf44fed13 Merge pull request #15113 from rardiol/gitSVN
git: fix subversion bindings for multiple outputs
2016-05-01 10:10:31 +01:00
Ricardo Ardissone
e5a9d64787 git: fix subversion bindings for multiple outputs 2016-04-30 13:19:14 -03:00
Nathan Zadoks
9eced61d2a git: respect $SSL_CERT_FILE
This allows git to work on systems without
/etc/ssl/certs/ca-certificates.crt, such as OS X, instead of failing
with "error setting certificate verify locations".
2016-04-12 11:47:56 +02:00
Franz Pletz
2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
zimbatm
0592eb377e Merge pull request #14207 from zimbatm/git-and-ssh
git: add openssh as a runtime dependency
2016-03-30 10:23:55 +01:00
Robin Gloster
a4e65c3639 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-30 09:01:20 +00:00
Louis Taylor
69c6f7e20a git: 2.7.4 -> 2.8.0 2016-03-29 07:21:41 +01:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
zimbatm
6579acd015 git: add openssh as a runtime dependency
Fixes #1923
2016-03-26 14:39:57 +00:00
Yann Hodique
31c317e09e git: 2.7.3 -> 2.7.4 2016-03-18 18:07:33 -07:00
Peter Simons
abcf57a8db git: update from version 2.7.1 to 2.7.3 2016-03-16 21:35:55 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
zimbatm
428e12d23f Merge pull request #13154 from zimbatm/git-rebase-fix-v2
git: fixes references to gettext properly
2016-02-26 00:03:17 +00:00
Wout Mertens
677893f92b Merge pull request #13422 from k0ral/git
git: 2.7.0 -> 2.7.1
2016-02-24 15:09:28 +01:00
koral
c1504c5a94 git: 2.7.0 -> 2.7.1 2016-02-24 13:47:23 +01:00
zimbatm
11733b39b5 git: fixes references to gettext properly
A better implementation of 5273dbf530

Fixes https://github.com/NixOS/nixpkgs/issues/13150

The attached patch removes a whole swath of unnecessary runtime gettext
detection. It also adds gettext on the PATH so that git-rebase can find it.
2016-02-20 14:47:23 +00:00
Robin Gloster
bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Vladimír Čunát
e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
zimbatm
c38eb526d5 git: fix references to gettext in bash scripts
See #13047
2016-02-16 21:01:21 +00:00
Guillaume Maudoux
9f358f809d Configure a default trust store for openssl 2016-02-03 12:42:01 +01:00
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
somaticweb
2c4c9bee13 git: 2.6.4 -> 2.7.0
Also corrected the license, which is GPL2-only
2016-01-05 22:15:17 -08:00
janus
a472d836f6 FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep 2016-01-01 17:01:13 +00:00
koral
016e88b2d2 git: 2.6.3 -> 2.6.4 2015-12-19 17:37:37 +00:00
Jude Taylor
69e7f3bb74 switch to zero underscores for sandbox profiles; remove generateFrameworkProfile 2015-11-21 12:10:33 -08:00
Jude Taylor
a63346e33c use single underscore for sandboxProfile 2015-11-21 11:17:30 -08:00
Jude Taylor
df80090d09 use per-derivation sandbox profiles 2015-11-19 11:31:06 -08:00
William A. Kennington III
ebedbec72b git: 2.6.2 -> 2.6.3 2015-11-05 18:18:21 -08:00
William A. Kennington III
cc2f78573e git: 2.5.3 -> 2.6.2 2015-10-18 17:23:51 -07:00
William A. Kennington III
25dbb2d8bc git: 2.5.2 -> 2.5.3 2015-09-23 12:30:00 -07:00
William A. Kennington III
b127f88711 git: 2.5.1 -> 2.5.2 2015-09-13 20:09:19 -07:00
William A. Kennington III
6f19418b65 git: 2.5.0 -> 2.5.1 2015-08-31 10:27:07 -07:00
William A. Kennington III
0e947e00a0 git: 2.4.6 -> 2.5.0 2015-07-29 18:15:08 -07:00
Vladimír Čunát
9f37e91ec5 Merge master into staging
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
William A. Kennington III
d7b917e612 git: 2.4.5 -> 2.4.6 2015-07-16 20:07:17 -07:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Austin Seipp
d1221f46e9 nixpkgs: git 2.4.4 -> 2.4.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-09 01:33:46 -05:00
Austin Seipp
35ca7fae8e nixpkgs: git - link git-http-backend into $PATH
This makes it easier for tools (like Phabricator) to find
git-http-backend to enable HTTP(S) transport support.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-09 01:33:15 -05:00
William A. Kennington III
fe4f8903b4 Merge branch 'master.upstream' into staging.upstream 2015-06-18 22:37:00 -07:00
William A. Kennington III
7fd80890c7 git: 2.4.2 -> 2.4.4 2015-06-18 21:24:46 -07:00
Eelco Dolstra
4a57b07653 Merge remote-tracking branch 'origin/master' into staging 2015-06-11 00:18:24 +02:00
koral
5a64cc1dc8 git: 2.4.1 -> 2.4.2 2015-06-10 16:22:23 +00:00
William A. Kennington III
867d2c5c46 openssl: Remove References to OPENSSL_X509_CERT_FILE 2015-05-31 15:50:51 -07:00
William A. Kennington III
21247699ad git: 2.4.0 -> 2.4.1 2015-05-15 18:38:13 -07:00
koral
d40cf483cc git: 2.3.6 -> 2.4.0 2015-05-09 11:46:31 +00:00
koral
ffe6539c98 git: 2.3.5 -> 2.3.6 2015-04-25 23:07:02 +00:00
koral
d54b6c903d git: 2.3.4 -> 2.3.5 2015-04-03 10:57:36 +00:00
William A. Kennington III
940d381d73 git: 2.3.3 -> 2.3.4 2015-03-26 14:03:51 -07:00
koral
8797078695 git: 2.3.2 -> 2.3.3 2015-03-17 17:18:12 +00:00
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
Dan Peebles
a78d164b1e Minor fixes for git on darwin (libiconv and Security dependencies) 2015-02-17 22:30:59 -05:00
Peter Simons
ad1417ed0e git: update to version 2.3.0 2015-02-06 13:59:57 +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
Wout Mertens
272f2c365c git: Support $SSL_CERT_FILE 2014-11-26 00:29:37 +01:00
Vladimir Kirillov
1b9f756e4e git: do not do install-doc when !withManual 2014-11-12 17:36:17 +02:00
Linquize
23048155b7 git: Update to 2.1.3 2014-10-30 17:22:47 +01:00
Linquize
16494e0289 git: Update to 2.1.2 2014-10-03 23:13:38 +08:00
Domen Kožar
78e5e556cc Revert "fixes #1923"
This reverts commit 1849840aa3.

Breaks git-annex
2014-09-09 12:11:53 +02:00
Domen Kožar
1849840aa3 fixes #1923 2014-09-08 21:19:14 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Rüdiger Sonderfeld
d809e775e8 git: Add git-prompt.sh to /etc/bash_completion.d.
This will make the git-prompt.sh features available to bash users when
completions are enabled.  It is done in this way in Debian/Ubuntu as well.
2014-08-19 16:34:51 +02:00
Linquize
1916bc0412 git: Update to 2.1.0 2014-08-17 06:18:38 +02:00
Linquize
4201db70ed git: Update to 2.0.2 2014-07-20 23:49:45 +08:00
Georges Dubus
bf1f2c6b1f git: Updated to 2.0.1 (close #3096) 2014-06-26 16:54:48 +02:00
Peter Simons
92082524a9 Revert "add OPENSSL_X509_CERT_FILE to the git command environment"
This reverts commit 88b5578a57 because of the
following issues:

 1) If $OPENSSL_X509_CERT_FILE is set in the current shell environment, then
    its value will overwrite any settings the user may have configured in
    http.sslCAInfo via git-config(1). If you are unaware of the wrapper, then
    this behavior is totally unexpected as $OPENSSL_X509_CERT_FILE is not
    supposed to have an effect on Git.

 2) The patch makes it impossible for Git users to use the $GIT_SSL_CAINFO
    environment variable as documented in git-config(1), because anything set
    there will be overwritten with the value of $OPENSSL_X509_CERT_FILE (which
    might be empty).

 3) The patch breaks other builds of packages that depend on Git, i.e.
    <http://hydra.nixos.org/build/11995872/nixlog/1/raw>.
2014-06-21 13:15:50 +02:00
Paul Woolcock
88b5578a57 add OPENSSL_X509_CERT_FILE to the git command environment 2014-06-16 21:55:43 -04:00
Eelco Dolstra
61befa0451 git: Update to 1.9.4 2014-05-31 09:47:21 +02:00
Linquize
10fa1bcf66 git: Update to 1.9.3 2014-05-15 16:15:09 +02:00
Eelco Dolstra
a1af25033a git send-email: Respect $OPENSSL_X509_CERT_FILE 2014-04-16 18:43:39 +02:00
John Wiegley
cfe42425c3 On Darwin, set NO_APPLE_COMMON_CRYPTO=1 for git builds 2014-04-14 14:53:15 -05:00
Linquize
ab12d10f87 git: Update to 1.9.2 2014-04-10 02:02:59 +02:00
Shea Levy
a68c12d35b git: Remove phony not-supported wrappers.
Fixes #1751
2014-04-05 18:39:53 -04:00
Linquize
4e385c272c git: Update to 1.9.1 2014-03-20 15:44:25 +01:00
Bjørn Forsman
534654e118 git: fix typos in comments 2014-02-15 12:05:44 +01:00
Linquize
68b3fd33a7 git: Update to 1.9.0 2014-02-15 11:19:38 +01:00
Linquize
5b41db9765 git: update to 1.8.5.4 (close #1714) 2014-02-09 10:06:22 +01:00
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
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
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
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
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
Marc Weber
5319704f80 removing old bleeding edge cruft replacing it by a niftier version using
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
2009-12-11 13:58:23 +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
aded9986c5 Re-added the description of this patch, which was accidentally
overwritten in my last commit.

svn path=/nixpkgs/trunk/; revision=16149
2009-07-02 17:05:55 +00:00