301 Commits

Author SHA1 Message Date
Will Dietz
97372a1104 git: 2.16.3 -> 2.17.0... again! 2018-04-24 20:19:22 -05:00
Will Dietz
f07f0c6009 Merge remote-tracking branch 'origin/master' into staging 2018-04-24 19:58:44 -05:00
Ben Gamari
b26ae506a9 git: Set PERL_PATH when building manual
Otherwise the build fails with the perplexing error

    make: *** No rule to make target 'cmd-list.made', needed by 'doc.dep'.  Stop.
    make: Leaving directory '/tmp/nix-build-git-2.16.3.drv-0/git-2.16.3/Documentation'

on NixOS (but not on Debian, where it succeeds, presumably since it picks up the
system perl).
2018-04-24 19:00:34 -04:00
Ben Gamari
d111a42772 git: Enable cross-compilation 2018-04-24 14:58:58 -04:00
Ben Gamari
2d397f1b76 git: Allow perl support to be disabled 2018-04-24 14:58:58 -04:00
Ben Gamari
432df5b1cf git: Fix USE_LIBPCRE2 configuration
Previously this was injected during install, causing the build system to rebuild
the entire package.
2018-04-24 14:58:58 -04:00
Ben Gamari
ae0a14d25d git: Refactor makeFlags using lib.optionals 2018-04-24 14:58:58 -04:00
Tuomas Tynkkynen
3c6e077301 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/development/tools/misc/binutils/default.nix
2018-04-22 22:31:30 +03:00
gnidorah
9029ed933c nixos/gitweb: add gitwebTheme option 2018-04-17 20:07:01 +03:00
Tuomas Tynkkynen
16b45ec3da Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/unix-tools.nix
2018-04-16 21:13:30 +03:00
Will Dietz
281775bb1a git: 2.16.2 -> 2.16.3
Cherry picked from 260194193c333a3d in staging as suggested by
https://github.com/NixOS/nixpkgs/pull/38763#issuecomment-380504142.
2018-04-12 08:55:31 +02:00
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 5d65b4ebeb6b2294654b3562fb15d7fa94751522, 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 3bd496faa884d045af23146ee7d3bdc04d133074.
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