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 49d8d3b837f4841abf50a132624e520377518b1b..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";
     self.callPackage ({ fetchgit, git, stdenv, }:
       stdenv.mkDerivation rec {
         pname = "polite-merge";

-        version = "1.0";
+        version = "2.4.1";

         src = fetchgit {
         src = fetchgit {

-          url = "https://scottworley.com/polite-merge.git";
-          rev = version;
-          sha256 = "1q3iya5ifpcnmmvxhaphlvvq674yzwkgi3cyr6i3yflqks7zf81p";
+          url = "https://git.scottworley.com/pub/git/polite-merge";
+          rev = "v${version}";
+          hash = "sha256-WtxDKKc3/IkLahVnrbfBXj6DoX1Rbu0qrIZK7D4Z7hY=";

         };
         postUnpack = "patchShebangs .";
         };
         postUnpack = "patchShebangs .";

-        checkInputs = [ git ];
+        nativeCheckInputs = [ git ];

         doCheck = true;
         preInstall = "export prefix";
       }) { };
         doCheck = true;
         preInstall = "export prefix";
       }) { };