fallback git-cache 1.4.1 -> 1.4.2

[pinch] / default.nix

diff --git a/default.nix b/default.nix
index 56f47deebc7b86acddafed2e53a553e3bd9350ab..31a63986b2376a9705e80980c08ff92b38f03c76 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,32 +1,39 @@
 { pkgs ? import <nixpkgs> { }, lint ? false }:
 
 let
-  git-cache-fallback = { buildPythonPackage, fetchgit, git, mypy, }:
+
+  git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }:
     buildPythonPackage rec {
       pname = "git-cache";
-      version = "1.0.0";
+      version = "1.4.2";
       src = fetchgit {
-        url = "https://scottworley.com/git-cache.git";
+        url = "https://git.scottworley.com/pub/git/git-cache";
         rev = "v${version}";
-        sha256 = "06mzjc424988n2s1h25x2bi3mxbk2pnba31zkjljgw4cgw2p9036";
+        hash = "sha256-Z9daNCmjzaVdeG3mITRWdNM+ewUEcKy5N4/Xpdotsg0=";
       };
+      propagatedBuildInputs = [ backoff ];
       checkInputs = [ git mypy ];
       doCheck = true;
       checkPhase = "./test.sh";
     };
 
-in pkgs.python3Packages.callPackage
-({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, git-cache, }:
+in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git
+  , autopep8, makeWrapper, mypy, pylint, git-cache, }:
   buildPythonPackage rec {
     pname = "pinch";
-    version = "3.0.1-pre";
+    version = "3.0.10-pre";
     src = lib.cleanSource ./.;
+    buildInputs = [ makeWrapper ];
     propagatedBuildInputs = [ git-cache ];
-    checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
+    checkInputs = [ nix_2_3 git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
+    postInstall = ''
+      wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
+    '';
     doCheck = true;
     checkPhase = "./test.sh";
   }) {
     git-cache =
       pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage
         git-cache-fallback { });
+    nix_2_3 = pkgs.nix_2_3 or pkgs.nix;
   }