Allow more specific invalid symlinks

[pinch] / default.nix

diff --git a/default.nix b/default.nix
index 942ef10e60fd866634fbd59e724ab203b7489710..9d4aa3336f5937fc63683ebb3123f3c0f0c35e53 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,11 +1,50 @@
-{ pkgs ? import <nixpkgs> { } }:
-pkgs.python3Packages.callPackage
-({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, }:
+{ pkgs ? import <nixpkgs> { }, lint ? false }:
+
+let
+  checkInputsAreNative = pkgs.lib.hasInfix "nativeCheckInputs"
+    (builtins.readFile <nixpkgs/doc/stdenv/stdenv.chapter.md>);
+  checkInputsName =
+    if checkInputsAreNative then "nativeCheckInputs" else "checkInputs";
+
+  git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }:
+    buildPythonPackage rec {
+      pname = "git-cache";
+      version = "1.4.3";
+      src = fetchgit {
+        url = "https://git.scottworley.com/pub/git/git-cache";
+        rev = "v${version}";
+        hash = "sha256-Qr62bGdlFFkzYTl6ot34UiOJxbP1Eeelx2OEd96vrqI=";
+      };
+      propagatedBuildInputs = [ backoff ];
+      "${checkInputsName}" = [ 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";
-    version = "1.3";
+    version = "3.0.14-pre";
     src = lib.cleanSource ./.;
-    checkInputs = [ nix git autopep8 mypy pylint ];
+    buildInputs = [ makeWrapper ];
+    propagatedBuildInputs = [ git-cache ];
+    "${checkInputsName}" = [ 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";
-  }) { }
+    meta = {
+      description = "A replacement for `nix-channel --update`";
+      homepage = "https://git.scottworley.com/pinch";
+      license = pkgs.lib.licenses.gpl3;
+      maintainers = with pkgs.lib.maintainers; [ chkno ];
+    };
+  }) {
+    git-cache =
+      pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage
+        git-cache-fallback { });
+    nix_2_3 = pkgs.nix_2_3 or pkgs.nix;
+  }