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 c4a02a81ad3094c2b753b193cab679eda58fbebb..2d21b5dc10f5f626fe154e70c65469c336cfbe85 100644 (file)
--- a/overlays/polite-merge.nix
+++ b/overlays/polite-merge.nix
@@ -5,11 +5,11 @@ 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 = "2.4";
+        version = "2.4.1";

         src = fetchgit {
           url = "https://git.scottworley.com/pub/git/polite-merge";
         src = fetchgit {
           url = "https://git.scottworley.com/pub/git/polite-merge";

-          rev = version;
-          sha256 = "1p6ivaay3bk4vvqqic7g23xrhkkq8z19zhsaxkav8kk90s2bmmza";
+          rev = "v${version}";
+          hash = "sha256-WtxDKKc3/IkLahVnrbfBXj6DoX1Rbu0qrIZK7D4Z7hY=";

         };
         postUnpack = "patchShebangs .";
         nativeCheckInputs = [ git ];
         };
         postUnpack = "patchShebangs .";
         nativeCheckInputs = [ git ];