Add some syncs to reduce risk on machines that can power off unexpectedly

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

diff --git a/overlays/pinch.nix b/overlays/pinch.nix
index 37c2e7d079f7ea1816b53c59a815e09403f85c43..fe6fa3af10d24b974aa52c57a14d3942840b05c3 100644 (file)
--- a/overlays/pinch.nix
+++ b/overlays/pinch.nix
@@ -1,10 +1,5 @@
 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 {
   fallback-git-cache = self.python3Packages.callPackage
     ({ buildPythonPackage, fetchgit, git, backoff, mypy, }:
       buildPythonPackage rec {


@@ -16,27 +11,23 @@ let
           hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
         };
         propagatedBuildInputs = [ backoff ];
           hash = "sha256-g4TS/zX3e29Q3ThsCAX2wLLlYbi8fdux5uqAc+b/Oww=";
         };
         propagatedBuildInputs = [ backoff ];

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

         doCheck = true;
         checkPhase = "./test.sh";
       }) { };
 
   fallback-pinch = self.python3Packages.callPackage
         doCheck = true;
         checkPhase = "./test.sh";
       }) { };
 
   fallback-pinch = self.python3Packages.callPackage

-    ({ buildPythonPackage, fetchgit, nix_2_3, git, makeWrapper, mypy, git-cache, }:
+    ({ buildPythonPackage, fetchgit, nix, git, mypy, git-cache, }:

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

-        version = "3.1.0";
+        version = "3.3.1";

         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-qwbYDSGE6p1YU3AnOatXNoTUc284D1xPQs/tRS++VOM=";
+          hash = "sha256-fVlHwQX2o8GYZ/Oq5/m5v2L+KNpFoKWD8MbH4A3cV0s=";

         };
         };

-        buildInputs = [ makeWrapper ];

         propagatedBuildInputs = [ git-cache ];
         propagatedBuildInputs = [ git-cache ];

-        "${checkInputsName}" = [ nix_2_3 git mypy ];
-        postInstall = ''
-          wrapProgram "$out/bin/pinch" --prefix PATH : ${nix_2_3}/bin
-        '';
+        nativeCheckInputs = [ nix git mypy ];

         doCheck = true;
         checkPhase = "./test.sh";
       }) { git-cache = self.python3Packages.git-cache or fallback-git-cache; };
         doCheck = true;
         checkPhase = "./test.sh";
       }) { git-cache = self.python3Packages.git-cache or fallback-git-cache; };