Release 3.0.8

[pinch] / default.nix

diff --git a/default.nix b/default.nix
index faf474248c04430906781810f187ff5df6dfec96..5608be6b5e7a58d2825e065e21c4df7f556c1900 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -22,11 +22,11 @@ let
   git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }:
     buildPythonPackage rec {
       pname = "git-cache";
   git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }:
     buildPythonPackage rec {
       pname = "git-cache";

-      version = "1.2.1";
+      version = "1.4.1";

       src = fetchgit {
       src = fetchgit {

-        url = "https://scottworley.com/git-cache.git";
+        url = "https://git.scottworley.com/pub/git/git-cache";

         rev = "v${version}";
         rev = "v${version}";

-        sha256 = "16yh75176pnbzf48ak7q8lpfpr6digi130i5drxs6k2y9nf7g1jz";
+        sha256 = "0ml1myhmd9mw1z5bwni9fhvx7h9dknhmqq4nyci9n5lvrhbmcdc9";

       };
       propagatedBuildInputs = [ backoff ];
       checkInputs = [ git mypy ];
       };
       propagatedBuildInputs = [ backoff ];
       checkInputs = [ git mypy ];


@@ -34,14 +34,18 @@ let
       checkPhase = "./test.sh";
     };
 
       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";
   buildPythonPackage rec {
     pname = "pinch";

-    version = "3.0.3-pre";
+    version = "3.0.8";

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

+    buildInputs = [ makeWrapper ];

     propagatedBuildInputs = [ git-cache ];
     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";
   }) {
     doCheck = true;
     checkPhase = "./test.sh";
   }) {


@@ -52,4 +56,5 @@ in pkgs.python3Packages.callPackage
             pkgs.python3Packages.backoff or (pkgs.python3Packages.callPackage
               backoff-fallback { });
         });
             pkgs.python3Packages.backoff or (pkgs.python3Packages.callPackage
               backoff-fallback { });
         });

+    nix_2_3 = pkgs.nix_2_3 or pkgs.nix;

   }
   }