Rely on nixpkgs' python3Packages.backoff

[git-cache] / default.nix

diff --git a/default.nix b/default.nix
index 5e67b4bd04e4f20b4c9e1ede630f2e05bfae46d1..9b932fb14518bd6f653300a76aa26b43e210fb2b 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,34 +1,13 @@
 { pkgs ? import <nixpkgs> { }, lint ? false }:
 
 { pkgs ? import <nixpkgs> { }, lint ? false }:
 

-let
-  # Remove this package definition after https://github.com/NixOS/nixpkgs/pull/93377 reaches stable
-  backoff-fallback = { lib, buildPythonPackage, fetchPypi }:
-    buildPythonPackage rec {
-      pname = "backoff";
-      version = "1.10.0";
-      src = fetchPypi {
-        inherit pname version;
-        sha256 = "190rdpfhpjvb6bjh99fhdkgfsfkjwky7nz7b0nn5ah67z8hs1yxq";
-      };
-      meta = with lib; {
-        description = "Function decoration for backoff and retry";
-        homepage = "https://github.com/litl/backoff";
-        license = licenses.mit;
-        maintainers = with maintainers; [ chkno ];
-      };
-    };
-
-in pkgs.python3Packages.callPackage
+pkgs.python3Packages.callPackage

 ({ lib, buildPythonPackage, nix, git, backoff, autopep8, mypy, pylint, }:
   buildPythonPackage rec {
     pname = "git-cache";
 ({ lib, buildPythonPackage, nix, git, backoff, autopep8, mypy, pylint, }:
   buildPythonPackage rec {
     pname = "git-cache";

-    version = "1.3.1";
+    version = "1.4.2-pre";

     src = lib.cleanSource ./.;
     propagatedBuildInputs = [ backoff ];
     checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
     doCheck = true;
     checkPhase = "./test.sh";
     src = lib.cleanSource ./.;
     propagatedBuildInputs = [ backoff ];
     checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
     doCheck = true;
     checkPhase = "./test.sh";

-  }) {
-    backoff = pkgs.python3Packages.backoff or (pkgs.python3Packages.callPackage
-      backoff-fallback { });
-  }
+  }) { }