X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/bbc804af5ed161ec3aea729002bf6b0e57af4357..a084161200e7edcdb818651e8b23a0757507579e:/overlays/polite-merge.nix?ds=inline diff --git a/overlays/polite-merge.nix b/overlays/polite-merge.nix index bc73b15..85e80c5 100644 --- a/overlays/polite-merge.nix +++ b/overlays/polite-merge.nix @@ -1,20 +1,26 @@ self: super: { - polite-merge = if builtins.hasAttr "polite-merge" super then - super.polite-merge - else - self.callPackage ({ fetchgit, git, stdenv, }: - stdenv.mkDerivation rec { - pname = "polite-merge"; - version = "2.4"; - src = fetchgit { - url = "https://git.scottworley.com/pub/git/polite-merge"; - rev = version; - sha256 = "1p6ivaay3bk4vvqqic7g23xrhkkq8z19zhsaxkav8kk90s2bmmza"; - }; - postUnpack = "patchShebangs ."; - checkInputs = [ git ]; - doCheck = true; - preInstall = "export prefix"; - }) { }; + polite-merge = + if builtins.hasAttr "polite-merge" super then + super.polite-merge + else + self.callPackage ( + { + fetchgit, + git, + stdenv, + }: + stdenv.mkDerivation rec { + pname = "polite-merge"; + version = "2.4.2"; + src = fetchgit { + url = "https://git.scottworley.com/pub/git/polite-merge"; + rev = "v${version}"; + hash = "sha256-CUNKLCwIFwwVaA9opw9yql5AGej/ozQv8k1YR/cfV4I="; + }; + postUnpack = "patchShebangs ."; + nativeCheckInputs = [ git ]; + doCheck = true; + preInstall = "export prefix"; + } + ) { }; } -