New pylint likes f-strings

[pinch] / default.nix

diff --git a/default.nix b/default.nix
index 62798c154dc5150ad2ffbe7bfa36e35d6c22f9cf..a8f4de6348478ce7313cdeb7628b81ac46c49b10 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,32 +1,60 @@
 { pkgs ? import <nixpkgs> { }, lint ? false }:
 
 let
-  git-cache-fallback = { buildPythonPackage, fetchgit, git, mypy, }:
+
+  # Remove after https://github.com/NixOS/nixpkgs/pull/93377 reaches stable
+  backoff-fallback = { lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook
+    , poetry, pytest-asyncio, }:
+    buildPythonPackage rec {
+      pname = "backoff";
+      version = "1.10.0";
+      src = fetchFromGitHub {
+        owner = "litl";
+        repo = pname;
+        rev = "v${version}";
+        sha256 = "1jj0l6pjx747d2yyvnzd3qbm4qr73sq6cc56dhvd8wqfbp5279x0";
+      };
+      format = "pyproject";
+      nativeBuildInputs = [ poetry ];
+      checkInputs = [ pytestCheckHook pytest-asyncio ];
+    };
+
+  git-cache-fallback = { buildPythonPackage, fetchgit, git, backoff, mypy, }:
     buildPythonPackage rec {
       pname = "git-cache";
-      version = "1.0.0";
+      version = "1.4.1";
       src = fetchgit {
         url = "https://scottworley.com/git-cache.git";
         rev = "v${version}";
-        sha256 = "06mzjc424988n2s1h25x2bi3mxbk2pnba31zkjljgw4cgw2p9036";
+        sha256 = "0ml1myhmd9mw1z5bwni9fhvx7h9dknhmqq4nyci9n5lvrhbmcdc9";
       };
+      propagatedBuildInputs = [ backoff ];
       checkInputs = [ git mypy ];
       doCheck = true;
       checkPhase = "./test.sh";
     };
 
-in pkgs.python3Packages.callPackage
-({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, git-cache, }:
+in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix_2_3, git
+  , autopep8, makeWrapper, mypy, pylint, git-cache, }:
   buildPythonPackage rec {
     pname = "pinch";
-    version = "3.0.0";
+    version = "3.0.8-pre";
     src = lib.cleanSource ./.;
+    buildInputs = [ makeWrapper ];
     propagatedBuildInputs = [ git-cache ];
-    checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
+    checkInputs = [ 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";
   }) {
     git-cache =
       pkgs.python3Packages.git-cache or (pkgs.python3Packages.callPackage
-        git-cache-fallback { });
+        git-cache-fallback {
+          backoff =
+            pkgs.python3Packages.backoff or (pkgs.python3Packages.callPackage
+              backoff-fallback { });
+        });
+    nix_2_3 = pkgs.nix_2_3 or pkgs.nix;
   }