diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-04-16 16:59:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-04-16 16:59:53 +0200 |
| commit | 9d77dc28d2d97f1b73968461d586b86d788b92c1 (patch) | |
| tree | f7bbeafd33289d9032c61244062367f1ce565a57 /pkgs/applications/version-management/git-and-tools | |
| parent | 3d8e43691731037672c36129cbecb2fe43ffad7e (diff) | |
| parent | fbd29dcbe7ec7dc0e77082fc1c649189c1f3b2e6 (diff) | |
| download | nixlib-9d77dc28d2d97f1b73968461d586b86d788b92c1.tar nixlib-9d77dc28d2d97f1b73968461d586b86d788b92c1.tar.gz nixlib-9d77dc28d2d97f1b73968461d586b86d788b92c1.tar.bz2 nixlib-9d77dc28d2d97f1b73968461d586b86d788b92c1.tar.lz nixlib-9d77dc28d2d97f1b73968461d586b86d788b92c1.tar.xz nixlib-9d77dc28d2d97f1b73968461d586b86d788b92c1.tar.zst nixlib-9d77dc28d2d97f1b73968461d586b86d788b92c1.zip | |
Merge #85263: git: 2.25.1 -> 2.26.1 (into staging-next)
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 6169c2d0296b..ef6ebbe6813b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.25.1"; + version = "2.26.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; + sha256 = "0s03ix9j1h0yychkh1l1cgpr1l9lwzn3rprl08rk8ii5ix02i0l8"; }; outputs = [ "out" ]; @@ -189,7 +189,7 @@ stdenv.mkDerivation { ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend '' + stdenv.lib.optionalString perlSupport '' # wrap perl commands - makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/git-credential-netrc \ + makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" wrapProgram $out/libexec/git-core/git-cvsimport \ --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" |