From 6c771046dbddf522d27ca7709acf68f65cadef69 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 29 Jan 2022 13:59:59 +0100 Subject: [PATCH] git: 2.35.0 -> 2.35.1 From the release notes [0]: > Git 2.35 shipped with a regression that broke use of "rebase" and > "stash" in a secondary worktree. This maintenance release ought to > fix it. [0]: https://github.com/git/git/blob/v2.35.1/Documentation/RelNotes/2.35.1.txt --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 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 f768a3348c89..13da857b790e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.35.0"; + version = "2.35.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1j4g8qmc6ninpl0ixblpvs7871cbxmnznsg5xk75fs12fns7grj7"; + sha256 = "100h37cpw49pmlpf6lcpm1xi578gllf6y9in60h5mxj3cj754s6p"; }; outputs = [ "out" ] ++ lib.optional withManual "doc";