philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge pull request #126211 from adisbladis/poetry2nix-1_17_1 

poetry2nix: 1.17.0 -> 1.17.1
master
adisbladis 2021-06-08 10:34:14 -05:00 committed by GitHub
parent 9898da5f2d 428c0e107f
commit 9432d84152
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/poetry2nix/poetry2nix/default.nix
View File

@ -5,7 +5,7 @@
}:
let
# Poetry2nix version
version = "1.17.0";
version = "1.17.1";
inherit (poetryLib) isCompatible readTOML moduleName;
@ -209,12 +209,12 @@ lib.makeScope pkgs.newScope (self: {
poetry-core = if __isBootstrap then null else poetryPkg.passthru.python.pkgs.poetry-core;
poetry = if __isBootstrap then null else poetryPkg;
# The canonical name is setuptools-scm
setuptools-scm = super.setuptools-scm;
__toPluginAble = toPluginAble self;
inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook wheelUnpackHook;
} // lib.optionalAttrs (! super ? setuptools-scm) {
# The canonical name is setuptools-scm
setuptools-scm = super.setuptools_scm;
}
)
# Null out any filtered packages, we don't want python.pkgs from nixpkgs

2
pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
View File

@ -89,7 +89,7 @@ pythonPackages.callPackage
# Prevent infinite recursion
skipSetupToolsSCM = [
"setuptools-scm"
"setuptools_scm"
"setuptools-scm"
"toml" # Toml is an extra for setuptools-scm
];

6
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
View File

@ -598,7 +598,7 @@ self: super:
lxml = super.lxml.overridePythonAttrs (
old: {
nativeBuildInputs = with pkgs; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ];
nativeBuildInputs = with pkgs; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ];
buildInputs = with pkgs; (old.buildInputs or [ ]) ++ [ libxml2 libxslt ];
}
);
@ -636,6 +636,10 @@ self: super:
cat > setup.cfg <<EOF
[libs]
system_freetype = True
'' + lib.optionalString stdenv.isDarwin ''
# LTO not working in darwin stdenv, see NixOS/nixpkgs/pull/19312
enable_lto = false
'' + ''
EOF
'';