diff options
| author | James Ottaway <james.ottaway@stacktracehq.com> | 2020-04-15 14:09:12 +1000 |
|---|---|---|
| committer | James Ottaway <james.ottaway@stacktracehq.com> | 2020-04-15 14:23:52 +1000 |
| commit | fbd29dcbe7ec7dc0e77082fc1c649189c1f3b2e6 (patch) | |
| tree | da57f8f2b5d1765645b0187de2019ffa511f713d /pkgs/applications/version-management/git-and-tools/git/default.nix | |
| parent | 9910e46d8e3bfdd123c1541af97b9ae96f6c0b73 (diff) | |
| download | nixpkgs-fbd29dcbe7ec7dc0e77082fc1c649189c1f3b2e6.tar nixpkgs-fbd29dcbe7ec7dc0e77082fc1c649189c1f3b2e6.tar.gz nixpkgs-fbd29dcbe7ec7dc0e77082fc1c649189c1f3b2e6.tar.bz2 nixpkgs-fbd29dcbe7ec7dc0e77082fc1c649189c1f3b2e6.tar.lz nixpkgs-fbd29dcbe7ec7dc0e77082fc1c649189c1f3b2e6.tar.xz nixpkgs-fbd29dcbe7ec7dc0e77082fc1c649189c1f3b2e6.tar.zst nixpkgs-fbd29dcbe7ec7dc0e77082fc1c649189c1f3b2e6.zip | |
git: 2.25.1 -> 2.26.1
This version addresses CVE-2020-5260. See https://lore.kernel.org/lkml/xmqqy2qy7xn8.fsf@gitster.c.googlers.com/
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/git/default.nix')
| -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 6169c2d0296..ef6ebbe6813 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}" |