diff options
Diffstat (limited to 'pkgs/applications/version-management/git/default.nix')
-rw-r--r-- | pkgs/applications/version-management/git/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 8f57c97230fbd..d7e008d656fde 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.44.0"; + version = "2.45.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-41hzjctbXqNAzpAKABXAOuhugE5/9k5HqkYx3e5oHeM="; + hash = "sha256-5k00Co5ieuIs+4vMZRzKC0l88en99SNzVUT/SnMvEr8="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -121,7 +121,8 @@ stdenv.mkDerivation (finalAttrs: { # acceptable version. # # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 - ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"; + ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent" + ++ lib.optional (stdenv.hostPlatform.isFreeBSD && stdenv.hostPlatform != stdenv.buildPlatform) "uname_S=FreeBSD"; disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ stdenv.shellPackage @@ -374,6 +375,7 @@ stdenv.mkDerivation (finalAttrs: { }); buildbot-integration = nixosTests.buildbot; } // tests.fetchgit; + updateScript = ./update.sh; }; meta = { |