Commit graph

290 commits

Author SHA1 Message Date
Guillaume Maudoux 2ddba49f59 git: fix perl libs path 2018-04-11 17:54:08 +02:00
Guillaume Maudoux ad076ff7ce git: 2.16.3 -> 2.17.0 2018-04-11 17:54:08 +02:00
Will Dietz 260194193c git: 2.16.2 -> 2.16.3 2018-04-11 17:54:08 +02:00
Frederik Rietdijk ee6894ca12 Merge staging into master 2018-04-11 14:55:52 +02:00
Peter Simons e4fd05449e git: revert "2.16.2 -> 2.17.0"
This reverts commit 5d65b4ebeb, because it broke
git-add. See https://github.com/NixOS/nixpkgs/pull/38636#issuecomment-380182555
for details.
2018-04-11 09:51:06 +02:00
Frederik Rietdijk 0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Guillaume Maudoux 5d65b4ebeb git: 2.16.2 -> 2.17.0 2018-04-09 10:02:57 +02:00
Tim Steinbach 2bb28e1f01
Revert "git: 2.16.3 -> 2.17.0"
This reverts commit 3bd496faa8.
2018-04-04 08:35:19 -04:00
Tim Steinbach 3bd496faa8
git: 2.16.3 -> 2.17.0 2018-04-03 18:16:27 -04:00
Will Dietz 2b29239eff
Revert "git: 2.16.3 -> 2.17.0" 2018-04-03 07:52:38 -05:00
Will Dietz dee77f7e43 git: 2.16.3 -> 2.17.0 2018-04-02 16:40:08 -05:00
Will Dietz dcaea58eb7 git: 2.16.2 -> 2.16.3 2018-03-22 18:29:11 -05:00
Tuomas Tynkkynen b34274d363 git: 2.16.1 -> 2.16.2 2018-02-19 05:34:03 +02:00
Will Dietz f2aae45514 git: Disable use of <sys/poll.h> on musl, disable gettext 2018-02-13 09:44:47 -06:00
Tuomas Tynkkynen 630a26ac0b git: 2.16.0 -> 2.16.1 2018-01-22 10:57:00 +02:00
Tim Steinbach b5be5ef364
git: 2.15.1 -> 2.16.0 2018-01-18 09:13:17 -05:00
Tuomas Tynkkynen e36e23acd5 git: 2.15.0 -> 2.15.1 2017-12-03 01:50:42 +02:00
Florian Klink e4bf9e4fef git: honor $PATH for sendmail used in git-send-email command
git-send-email will now search $PATH for a sendmail binary, instead of
the (previously fixed) list of paths.
2017-11-18 09:37:05 +01:00
Dan Peebles 94fc7214ce git: remove custom sandbox profile (not allowed by modern Nix anymore) 2017-11-08 22:23:07 -05:00
Tim Steinbach 7fd58b57b1
git: 2.14.3 -> 2.15.0 2017-10-30 09:04:23 -04:00
Tim Steinbach 124e462455
git: 2.14.2 -> 2.14.3 2017-10-23 08:46:15 -04:00
Mathieu Boespflug f795d78d86 git: Properly wrap Git commands that are implemented in Perl. (#30001)
Some Git commands are implemented as Perl scripts. Some of these
scripts use Perl modules from CPAN. Without wrapping these programs to
set `GITPERLLIB`, these programs would not be fully functional because
some Perl libraries are found to be missing at runtime.

Fixes #29996
2017-10-02 14:25:12 +01:00
Tim Steinbach 5a2a35aef3
git: 2.14.1 -> 2.14.2 2017-09-26 08:50:00 -04:00
Vladimír Čunát aea7216cf8
Merge #27962: git: pcre1 -> pcre2
Except for gitMinimal, as pcre1 is in closure anyway so using pcre2
increases the size by ~1.4 MB.
2017-08-27 16:22:11 +02:00
Frederik Rietdijk 13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https
Update homepage attributes: http -> https
2017-08-13 21:53:20 +02:00
Silvan Mosberger 4a0efc9c4f
git: 2.14.0 -> 2.14.1
The new version contains a security fix for CVE-2017-1000117

More information regarding this update can be found here:
http://marc.info/?l=git&m=150238802328673&w=2
2017-08-11 02:17:35 +02:00
mimadrid 95bbe17a04
git: add pcre2 support 2017-08-07 14:55:30 +02:00
mimadrid dc74b1a86d
git: 2.13.4 -> 2.14.0 2017-08-04 23:58:45 +02:00
mimadrid 09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
Tim Steinbach ae73a1704a
git: 2.13.3 -> 2.13.4 2017-08-01 18:41:14 -04:00
Tim Steinbach eb5263a9f1
git: 2.13.2 -> 2.13.3 2017-07-13 08:45:43 -04:00
Alexander Schmolck 2c1097a83b git: add missing deps for filter-branch etc (#27221)
Several git commands are implemented as shell scripts that run awk, sed, grep
and perl. There is some existing patching in the postinstall for perl to rewrite
it to an absolute reference to pkgs.perl, but several other packages are both
missing as a dependency and have no rewrite logic.

In particular git filter-branch depends on sed and grep.

Additionally, the perl logic also seds git-am, which is now a binary not a shell
script anymore (see <github.com/git/git/blob/master/builtin/am.c>), so this part
was obsolete.

I tested this by grepping all shell scripts for the relevant commands and then
comparing the diffs of the new version to what is produced in master. All
changes in the scripts seem good to me.
2017-07-11 17:00:17 +01:00
Tim Steinbach 1a25495b63
git: 2.13.1 -> 2.13.2 2017-06-25 21:13:23 -04:00
Tim Steinbach 385ba07615
git: 2.13.0 -> 2.13.1 2017-06-05 09:10:26 -04:00
Tim Steinbach ce8662e693
git: 2.12.2 -> 2.13.0 2017-05-09 21:57:24 -04:00
Tim Steinbach 10725a6329
git: 2.12.0 -> 2.12.2 2017-03-25 10:25:54 -04:00
Guillaume Maudoux 525a663174 curl, git: Fix curl default CA, let git use it
Improve patching of curl to use NIX_SSL_CERT_FILE as default CA
Remove patches from git, as git uses curl and passes its environment
variables to curl.
2017-03-22 11:22:53 +01:00
Tim Steinbach 7611525c00
git: 2.11.1 -> 2.12.0 2017-02-26 16:18:42 -05:00
Tim Steinbach c1e7832591
git: 2.11.0 -> 2.11.1 2017-02-03 18:54:35 -05:00
Tim Steinbach f1a0cadaec
git: 2.10.2 -> 2.11.0 2016-11-29 18:37:24 -05:00
Alex Dunn 80bff0b459 git: link git-credential-netrc into $out/bin 2016-11-19 13:36:30 -08:00
Tim Steinbach ef4a335be4
git: 2.10.1 -> 2.10.2 2016-11-15 18:05:02 -05:00
dipinhora 641a1e433a git: enable credential-osxkeychain for darwin 2016-10-11 15:25:08 -04:00
Frederik Rietdijk 2fb5289d83 git: 2.10.0 -> 2.10.1 2016-10-05 10:37:09 +02:00
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
William A. Kennington III d7b917e612 git: 2.4.5 -> 2.4.6 2015-07-16 20:07:17 -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 7fd80890c7 git: 2.4.2 -> 2.4.4 2015-06-18 21:24:46 -07:00
koral 5a64cc1dc8 git: 2.4.1 -> 2.4.2 2015-06-10 16:22:23 +00:00