1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 19:15:39 +00:00
Commit graph

272 commits

Author SHA1 Message Date
Will Dietz 6d1955e0c4 Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0"
This reverts commit 2624f90796, reversing
changes made to 37aab4cbb5.

See:
https://github.com/NixOS/nixpkgs/pull/42376#issuecomment-399789096

Basically this breaks at least some users of fetchgit,
so let's revert this until this is sorted out.
2018-06-24 22:36:50 -05:00
Will Dietz 26f24fe09a git: indicate when last tested to "still" fail, for checking updates 2018-06-22 10:10:20 -05:00
Will Dietz 1190af39b9 git: disable failing completion test as well 2018-06-22 10:02:57 -05:00
Will Dietz 4136cb5ba9 git: disable "editor with a space" tests due to fails
Need to investigate.
2018-06-22 10:00:42 -05:00
Will Dietz e65e6cad23 git: disable working-tree-encoding tests on musl
Makes assumptions about BOM.
2018-06-22 09:56:20 -05:00
Will Dietz 5f27396e8f git: remove symlinks-in-bin patch 2018-06-22 09:15:54 -05:00
Will Dietz 18231121f4 git: 2.17.1 -> 2.18.0 2018-06-22 09:12:06 -05:00
Matthew Bauer fc048073e6 git: remove object file from closure
This file pulls in some big dependencies that are unneeded (like
clang).
2018-06-21 19:47:10 -04:00
Tim Steinbach 9db1f486e1
git: 2.17.0 -> 2.17.1 2018-05-29 21:33:43 -04:00
Will Dietz 481ca44771 git: disable failing test w/musl for now
I'm working to resolve this but it will take some time
(patches sent to upstream musl, maybe to git afterwards)
and for now this blocks quite a lot.

If that doesn't work out we can explore options such as
always using GNU libiconv with musl.
2018-05-03 15:20:38 -05:00
Guillaume Maudoux 6dda53ad22 git: add install checks
(cherry picked from commit f57873f674)
2018-04-24 20:26:54 -05:00
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 260194193c 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 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