fallback git-cache 1.4.1 -> 1.4.2

[pinch] / default.nix

diff --git a/default.nix b/default.nix
index 3209685a0cdc7fb17244ca945fe34383b3ec9163..31a63986b2376a9705e80980c08ff92b38f03c76 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,11 +1,39 @@
 { pkgs ? import <nixpkgs> { }, lint ? false }:
 { pkgs ? import <nixpkgs> { }, lint ? false }:

-pkgs.python3Packages.callPackage
-({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, }:
+
+let
+
+  git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }:
+    buildPythonPackage rec {
+      pname = "git-cache";
+      version = "1.4.2";
+      src = fetchgit {
+        url = "https://git.scottworley.com/pub/git/git-cache";
+        rev = "v${version}";
+        hash = "sha256-Z9daNCmjzaVdeG3mITRWdNM+ewUEcKy5N4/Xpdotsg0=";
+      };
+      propagatedBuildInputs = [ backoff ];
+      checkInputs = [ git mypy ];
+      doCheck = true;
+      checkPhase = "./test.sh";
+    };
+
+in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git
+  , autopep8, makeWrapper, mypy, pylint, git-cache, }:

   buildPythonPackage rec {
     pname = "pinch";
   buildPythonPackage rec {
     pname = "pinch";

-    version = "2.0.0-pre";
+    version = "3.0.10-pre";

     src = lib.cleanSource ./.;
     src = lib.cleanSource ./.;

-    checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
+    buildInputs = [ makeWrapper ];
+    propagatedBuildInputs = [ git-cache ];
+    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";
     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;
+  }