When becoming other users, cd to / with pushd, not sudo -D

[auto-upgrade-with-pinch] / overlays / polite-merge.nix

diff --git a/overlays/polite-merge.nix b/overlays/polite-merge.nix
index b1cf565886772225ad08cf8c7ed0235a5bc521bf..2d21b5dc10f5f626fe154e70c65469c336cfbe85 100644 (file)
--- a/overlays/polite-merge.nix
+++ b/overlays/polite-merge.nix
@@ -5,14 +5,14 @@ self: super: {
     self.callPackage ({ fetchgit, git, stdenv, }:
       stdenv.mkDerivation rec {
         pname = "polite-merge";
-        version = "2.0";
+        version = "2.4.1";
         src = fetchgit {
-          url = "https://scottworley.com/polite-merge.git";
-          rev = version;
-          sha256 = "0dds7pf60aqm7r4g13q1bhfbzmi478c2zy2ddj5zgq0rp2kwfaba";
+          url = "https://git.scottworley.com/pub/git/polite-merge";
+          rev = "v${version}";
+          hash = "sha256-WtxDKKc3/IkLahVnrbfBXj6DoX1Rbu0qrIZK7D4Z7hY=";
         };
         postUnpack = "patchShebangs .";
-        checkInputs = [ git ];
+        nativeCheckInputs = [ git ];
         doCheck = true;
         preInstall = "export prefix";
       }) { };