summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Granger-Brown <git@lukegb.com>2022-02-05 14:23:20 +0000
committerGitHub <noreply@github.com>2022-02-05 14:23:20 +0000
commit1b55bc5d4b5cb6b35d71e7fe22cae9558c312937 (patch)
tree2cf169241208ec6ab42ef513761ff8df88092b8b
parentMerge pull request #158155 from NixOS/backport-157744-to-release-21.11 (diff)
parentmercurial: backport fix for compat with 6.1 (diff)
downloadnixpkgs-1b55bc5d4b5cb6b35d71e7fe22cae9558c312937.tar.gz
Merge pull request #157885 from pacien/21.11-mercurial-5.9.3-patch-6d2ddea0721a
[21.11] mercurial: backport fix for compat with 6.1
-rw-r--r--pkgs/applications/version-management/mercurial/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index eea3e7afb774..5cd573c9063f 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -20,6 +20,13 @@ let
sha256 = "sha256-O0P2iXetD6dap/HlyPCoO6k1YhqyOWEpq7SY5W0b4I4=";
};
+ patches = [
+ (fetchpatch {
+ url = "https://www.mercurial-scm.org/repo/hg-stable/raw-rev/6d2ddea0721a";
+ sha256 = "sha256-yaD8iSCevpxKp6uCozA7vjMHvcV3al7yLJ79Qh1V+l0=";
+ })
+ ];
+
format = "other";
passthru = { inherit python; }; # pass it so that the same version can be used in hg2git