diff options
| author | Robert Schütz <nix@dotlambda.de> | 2022-12-20 08:50:14 -0800 |
|---|---|---|
| committer | Robert Schütz <nix@dotlambda.de> | 2023-01-07 10:31:02 -0800 |
| commit | 17c15cc3ff1e51f2c3621589e8e6cc9d33826ae5 (patch) | |
| tree | df16a34f6a686f95df1216f01b569b89cfe7264e | |
| parent | 3b3114f45d142b4265844abe0824b0c280bfbb5d (diff) | |
| download | nixpkgs-17c15cc3ff1e51f2c3621589e8e6cc9d33826ae5.tar nixpkgs-17c15cc3ff1e51f2c3621589e8e6cc9d33826ae5.tar.gz nixpkgs-17c15cc3ff1e51f2c3621589e8e6cc9d33826ae5.tar.bz2 nixpkgs-17c15cc3ff1e51f2c3621589e8e6cc9d33826ae5.tar.lz nixpkgs-17c15cc3ff1e51f2c3621589e8e6cc9d33826ae5.tar.xz nixpkgs-17c15cc3ff1e51f2c3621589e8e6cc9d33826ae5.tar.zst nixpkgs-17c15cc3ff1e51f2c3621589e8e6cc9d33826ae5.zip | |
poetry: don't use poetry2nix
| -rw-r--r-- | pkgs/development/tools/poetry2nix/poetry2nix/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 4de0b54ac1b..f52bf6c0c92 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -1,6 +1,5 @@ { pkgs ? import <nixpkgs> { } , lib ? pkgs.lib -, poetry ? null , poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; } }: let @@ -143,7 +142,7 @@ lib.makeScope pkgs.newScope (self: { }; getFunctorFn = fn: if builtins.typeOf fn == "set" then fn.__functor else fn; - poetryPkg = poetry.override { inherit python; }; + poetryPkg = pkgs.callPackage ./pkgs/poetry { inherit python; }; scripts = pyProject.tool.poetry.scripts or { }; hasScripts = scripts != { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7cf3dcc6e3..cc471b0bcbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16363,9 +16363,8 @@ with pkgs; pew = callPackage ../development/tools/pew {}; - poetry = callPackage ../development/tools/poetry2nix/poetry2nix/pkgs/poetry { - python = python3; - }; + poetry = with python3.pkgs; toPythonApplication poetry; + poetry2nix = callPackage ../development/tools/poetry2nix/poetry2nix { inherit pkgs lib; }; |