pyrox.dev / nixpkgs
lol
fork atom

git: 2.47.2 -> 2.48.1 (#372784)

authored by Sandro and committed by GitHub dbabb64d cf0fa36d

+20 -15
unified split
+16 -11
pkgs/applications/version-management/git/default.nix
··· 30 assert svnSupport -> perlSupport; 31 32 let 33 - version = "2.47.2"; 34 svn = subversionClient.override { perlBindings = perlSupport; }; 35 gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; 36 in ··· 43 44 src = fetchurl { 45 url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; 46 - hash = "sha256-sZJovmtvFVa0ep3YNCcuFn06dXQM3NKDzzgS7f/jkw8="; 47 }; 48 49 outputs = [ "out" ] ++ lib.optional withManual "doc"; ··· 138 ]; 139 140 141 - postBuild = '' 142 - make -C contrib/subtree 143 - '' + (lib.optionalString perlSupport '' 144 make -C contrib/diff-highlight 145 - '') + (lib.optionalString osxkeychainSupport '' 146 make -C contrib/credential/osxkeychain 147 - '') + (lib.optionalString withLibsecret '' 148 make -C contrib/credential/libsecret 149 - ''); 150 151 152 ## Install ··· 156 157 installFlags = [ "NO_INSTALL_HARDLINKS=1" ]; 158 159 - preInstall = (lib.optionalString osxkeychainSupport '' 160 mkdir -p $out/bin 161 ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/ 162 rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o 163 - '') + (lib.optionalString withLibsecret '' 164 mkdir -p $out/bin 165 ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/ 166 rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o 167 - ''); 168 169 postInstall = 170 ''
··· 30 assert svnSupport -> perlSupport; 31 32 let 33 + version = "2.48.1"; 34 svn = subversionClient.override { perlBindings = perlSupport; }; 35 gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; 36 in ··· 43 44 src = fetchurl { 45 url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; 46 + hash = "sha256-HF1UX13B61HpXSxQ2Y/fiLGja6H6MOmuXVOFxgJPgq0="; 47 }; 48 49 outputs = [ "out" ] ++ lib.optional withManual "doc"; ··· 138 ]; 139 140 141 + postBuild = lib.optionalString withManual '' 142 + # Need to build the main Git documentation before building the 143 + # contrib/subtree documentation, as the latter depends on the 144 + # asciidoc.conf file created by the former. 145 + make -C Documentation 146 + '' + '' 147 + make -C contrib/subtree all ${lib.optionalString withManual "doc"} 148 + '' + lib.optionalString perlSupport '' 149 make -C contrib/diff-highlight 150 + '' + lib.optionalString osxkeychainSupport '' 151 make -C contrib/credential/osxkeychain 152 + '' + lib.optionalString withLibsecret '' 153 make -C contrib/credential/libsecret 154 + ''; 155 156 157 ## Install ··· 161 162 installFlags = [ "NO_INSTALL_HARDLINKS=1" ]; 163 164 + preInstall = lib.optionalString osxkeychainSupport '' 165 mkdir -p $out/bin 166 ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/ 167 rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o 168 + '' + lib.optionalString withLibsecret '' 169 mkdir -p $out/bin 170 ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/ 171 rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o 172 + ''; 173 174 postInstall = 175 ''
+4 -4
pkgs/build-support/fetchgit/tests.nix
··· 33 name = "leave-git-nix-source"; 34 url = "https://github.com/NixOS/nix"; 35 rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; 36 - sha256 = "sha256-zZxDxqaeWvuWuzwPizBLR7d59zP24+zqnWllNICenko="; 37 leaveDotGit = true; 38 }; 39 ··· 49 name = "submodule-leave-git-source"; 50 url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; 51 rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; 52 - sha256 = "sha256-+uXIClcRJ4S1rdgx2Oyww+Jv4h1VXp8tfeh9lb07Fhk="; 53 leaveDotGit = true; 54 fetchSubmodules = true; 55 }; ··· 58 name = "submodule-deep-source"; 59 url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; 60 rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; 61 - sha256 = "sha256-LL7uhXQk3N3DcvBBxwjmfVx55tTXCGQ19T91tknopzw="; 62 deepClone = true; 63 fetchSubmodules = true; 64 }; ··· 67 name = "submodule-leave-git-deep-source"; 68 url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; 69 rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; 70 - sha256 = "sha256-LL7uhXQk3N3DcvBBxwjmfVx55tTXCGQ19T91tknopzw="; 71 deepClone = true; 72 leaveDotGit = true; 73 fetchSubmodules = true;
··· 33 name = "leave-git-nix-source"; 34 url = "https://github.com/NixOS/nix"; 35 rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; 36 + sha256 = "sha256-3YYVIeaeu6zO7bBkZxF+1d5VS0K2GHYEZwChB3tPJ4s="; 37 leaveDotGit = true; 38 }; 39 ··· 49 name = "submodule-leave-git-source"; 50 url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; 51 rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; 52 + sha256 = "sha256-0pwleO/m4Iws3BF9ewyWbYMcGfEJLS3BYzWfDSYtXs8="; 53 leaveDotGit = true; 54 fetchSubmodules = true; 55 }; ··· 58 name = "submodule-deep-source"; 59 url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; 60 rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; 61 + sha256 = "sha256-eRHOwolRZDJS/5zk88e7SdoO7nKKtjDXMLVsyFPFgk8="; 62 deepClone = true; 63 fetchSubmodules = true; 64 }; ··· 67 name = "submodule-leave-git-deep-source"; 68 url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; 69 rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; 70 + sha256 = "sha256-eRHOwolRZDJS/5zk88e7SdoO7nKKtjDXMLVsyFPFgk8="; 71 deepClone = true; 72 leaveDotGit = true; 73 fetchSubmodules = true;