diff --git a/default.nix b/default.nix index 3a410b1..73d56e6 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,5 @@ { pkgs ? import { } , lib ? pkgs.lib -, poetry ? null , poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; } }: let diff --git a/flake.nix b/flake.nix index 333a111..f2688c9 100644 --- a/flake.nix +++ b/flake.nix @@ -19,8 +19,8 @@ } // (flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; - poetry = pkgs.callPackage ./pkgs/poetry { python = pkgs.python3; }; - poetry2nix = import ./default.nix { inherit pkgs poetry; }; + poetry2nix = import ./default.nix { inherit pkgs; }; + poetry = pkgs.callPackage ./pkgs/poetry { python = pkgs.python3; inherit poetry2nix; }; in rec { packages = { diff --git a/overlay.nix b/overlay.nix index 9d58206..b8c48c1 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,6 +1,6 @@ final: prev: { - poetry2nix = import ./default.nix { pkgs = final; poetry = final.poetry; }; + poetry2nix = import ./default.nix { pkgs = final; }; poetry = prev.callPackage ./pkgs/poetry { python = final.python3; }; diff --git a/tests/default.nix b/tests/default.nix index 17aafbe..320fba3 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -13,7 +13,7 @@ in }: let poetry = pkgs.callPackage ../pkgs/poetry { python = pkgs.python3; inherit poetry2nix; }; - poetry2nix = import ./.. { inherit pkgs; inherit poetry; }; + poetry2nix = import ./.. { inherit pkgs; }; poetryLib = import ../lib.nix { inherit pkgs; lib = pkgs.lib; stdenv = pkgs.stdenv; }; pep425 = pkgs.callPackage ../pep425.nix { inherit poetryLib; python = pkgs.python3; }; pep425PythonOldest = pkgs.callPackage ../pep425.nix { inherit poetryLib; python = pkgs.python38; };