Allow more specific invalid symlinks

[pinch] / default.nix

diff --git a/default.nix b/default.nix
index 7744281ae0afb0fe74fe58f1c1a7e62f1e583b66..9d4aa3336f5937fc63683ebb3123f3c0f0c35e53 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,18 +1,22 @@
 { pkgs ? import <nixpkgs> { }, lint ? false }:
 
 let
 { 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";
 
   git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }:
     buildPythonPackage rec {
       pname = "git-cache";

-      version = "1.4.2";
+      version = "1.4.3";

       src = fetchgit {
         url = "https://git.scottworley.com/pub/git/git-cache";
         rev = "v${version}";
       src = fetchgit {
         url = "https://git.scottworley.com/pub/git/git-cache";
         rev = "v${version}";

-        hash = "sha256-Z9daNCmjzaVdeG3mITRWdNM+ewUEcKy5N4/Xpdotsg0=";
+        hash = "sha256-Qr62bGdlFFkzYTl6ot34UiOJxbP1Eeelx2OEd96vrqI=";

       };
       propagatedBuildInputs = [ backoff ];
       };
       propagatedBuildInputs = [ backoff ];

-      checkInputs = [ git mypy ];
+      "${checkInputsName}" = [ git mypy ];

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


@@ -21,16 +25,23 @@ in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git
   , autopep8, makeWrapper, mypy, pylint, git-cache, }:
   buildPythonPackage rec {
     pname = "pinch";
   , autopep8, makeWrapper, mypy, pylint, git-cache, }:
   buildPythonPackage rec {
     pname = "pinch";

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

     src = lib.cleanSource ./.;
     buildInputs = [ makeWrapper ];
     propagatedBuildInputs = [ git-cache ];
     src = lib.cleanSource ./.;
     buildInputs = [ makeWrapper ];
     propagatedBuildInputs = [ git-cache ];

-    checkInputs = [ nix_2_3 git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
+    "${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";
     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 =
       pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage