When becoming other users, cd to /

[auto-upgrade-with-pinch] / overlays / pinch.nix

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 5a2eaff1d436810637133a2c94d0921f29deae5c..8e9633f89cf6a5c9f0cebc6046a51102253b39fb 100644 (file)
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,22 +1,17 @@
 self: super:
 let
 self: super:
 let

-  checkInputsAreNative = self.lib.hasInfix "nativeCheckInputs"
-    (builtins.readFile <nixpkgs/doc/stdenv/stdenv.chapter.md>);
-  checkInputsName =
-    if checkInputsAreNative then "nativeCheckInputs" else "checkInputs";
-

   fallback-git-cache = self.python3Packages.callPackage
     ({ buildPythonPackage, fetchgit, git, backoff, mypy, }:
       buildPythonPackage rec {
         pname = "git-cache";
   fallback-git-cache = self.python3Packages.callPackage
     ({ buildPythonPackage, fetchgit, git, backoff, mypy, }:
       buildPythonPackage rec {
         pname = "git-cache";

-        version = "1.4.3";
+        version = "1.5.0";

         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-Qr62bGdlFFkzYTl6ot34UiOJxbP1Eeelx2OEd96vrqI=";
+          hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";

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

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

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


@@ -25,15 +20,15 @@ let
     ({ buildPythonPackage, fetchgit, nix_2_3, git, makeWrapper, mypy, git-cache, }:
       buildPythonPackage rec {
         pname = "pinch";
     ({ buildPythonPackage, fetchgit, nix_2_3, git, makeWrapper, mypy, git-cache, }:
       buildPythonPackage rec {
         pname = "pinch";

-        version = "3.0.13";
+        version = "3.1.0";

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

-          hash = "sha256-GGl16qDinNWe7qVnkfFJWNZiLb71sLZTHQ04a9g/26k=";
+          hash = "sha256-qwbYDSGE6p1YU3AnOatXNoTUc284D1xPQs/tRS++VOM=";

         };
         buildInputs = [ makeWrapper ];
         propagatedBuildInputs = [ git-cache ];
         };
         buildInputs = [ makeWrapper ];
         propagatedBuildInputs = [ git-cache ];

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

         postInstall = ''
           wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
         '';
         postInstall = ''
           wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
         '';