BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

poetry: don't use poetry2nix

Browse source
This commit is contained in:
Robert Schütz 2022-12-20 08:50:14 -08:00
parent 3b3114f45d
commit 17c15cc3ff
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/tools/poetry2nix/poetry2nix/default.nix
View file

@ -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 != { };

5
pkgs/top-level/all-packages.nix
View file

@ -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;
};