polite-merge: 2.1 -> 2.3, required for git 2.28 -> 2.29

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

diff --git a/overlays/polite-merge.nix b/overlays/polite-merge.nix
index 94dbc4b6b7afaf7e4e077b1ecdfc3eb06a176adf..87abfd74e788e0d4b130138495bf41d88ffb8aae 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.1";
+        version = "2.3";

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

-          sha256 = "0dqx8r1ldiynnwrqrr4zhjdlh69xl9dblkrn03g6ym8chnbsxwak";
+          sha256 = "0777h8pyvpml91w7lkj41shb16vpk2sbazlng44488zk3i8alq18";

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