Links & feature comparison with require.nix, niv, flakes

[pinch] / default.nix

diff --git a/default.nix b/default.nix
index 942ef10e60fd866634fbd59e724ab203b7489710..56f47deebc7b86acddafed2e53a553e3bd9350ab 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,11 +1,32 @@
-{ pkgs ? import <nixpkgs> { } }:
-pkgs.python3Packages.callPackage
-({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, }:
+{ pkgs ? import <nixpkgs> { }, lint ? false }:
+
+let
+  git-cache-fallback = { buildPythonPackage, fetchgit, git, mypy, }:
+    buildPythonPackage rec {
+      pname = "git-cache";
+      version = "1.0.0";
+      src = fetchgit {
+        url = "https://scottworley.com/git-cache.git";
+        rev = "v${version}";
+        sha256 = "06mzjc424988n2s1h25x2bi3mxbk2pnba31zkjljgw4cgw2p9036";
+      };
+      checkInputs = [ git mypy ];
+      doCheck = true;
+      checkPhase = "./test.sh";
+    };
+
+in pkgs.python3Packages.callPackage
+({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, git-cache, }:

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

-    version = "1.3";
+    version = "3.0.1-pre";

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

-    checkInputs = [ nix git autopep8 mypy pylint ];
+    propagatedBuildInputs = [ git-cache ];
+    checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];

     doCheck = true;
     checkPhase = "./test.sh";
     doCheck = true;
     checkPhase = "./test.sh";

-  }) { }
+  }) {
+    git-cache =
+      pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage
+        git-cache-fallback { });
+  }