# HG changeset patch # User Milka Kuzminski # Date 2021-01-26 14:07:10 # Node ID f5cb50bb7356fe574dd803dfd026c0a578638214 # Parent 3308e88901599b6f29c500d668f00ada85da4561 core: bumped git to 2.30.0 diff --git a/pkgs/overlays.nix b/pkgs/overlays.nix --- a/pkgs/overlays.nix +++ b/pkgs/overlays.nix @@ -1,11 +1,18 @@ self: super: { # bump GIT version - git = super.lib.overrideDerivation super.git (oldAttrs: { - name = "git-2.27.0"; + git = + let + gitWithoutPerl = super.git.override { + #perlSupport = false; + }; + in + super.lib.overrideDerivation gitWithoutPerl (oldAttrs: { + + name = "git-2.30.0"; src = self.fetchurl { - url = "https://www.kernel.org/pub/software/scm/git/git-2.27.0.tar.xz"; - sha256 = "1ybk39ylvs32lywq7ra4l2kdr5izc80r9461hwfnw8pssxs9gjkk"; + url = "https://www.kernel.org/pub/software/scm/git/git-2.30.0.tar.xz"; + sha256 = "06ad6dylgla34k9am7d5z8y3rryc8ln3ibq5z0d74rcm20hm0wsm"; }; # patches come from: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/version-management/git-and-tools/git @@ -17,6 +24,11 @@ self: super: { ./patches/git/installCheck-path.patch ]; + #preInstallCheck = oldAttrs.preInstallCheck + '' + # disable_test t4129-apply-samemode + # disable_test t5324-split-commit-graph + #''; + }); libgit2rc = super.lib.overrideDerivation super.libgit2 (oldAttrs: {