commit
9432d84152
|
@ -5,7 +5,7 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
# Poetry2nix version
|
# Poetry2nix version
|
||||||
version = "1.17.0";
|
version = "1.17.1";
|
||||||
|
|
||||||
inherit (poetryLib) isCompatible readTOML moduleName;
|
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-core = if __isBootstrap then null else poetryPkg.passthru.python.pkgs.poetry-core;
|
||||||
poetry = if __isBootstrap then null else poetryPkg;
|
poetry = if __isBootstrap then null else poetryPkg;
|
||||||
|
|
||||||
# The canonical name is setuptools-scm
|
|
||||||
setuptools-scm = super.setuptools-scm;
|
|
||||||
|
|
||||||
__toPluginAble = toPluginAble self;
|
__toPluginAble = toPluginAble self;
|
||||||
|
|
||||||
inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook wheelUnpackHook;
|
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
|
# Null out any filtered packages, we don't want python.pkgs from nixpkgs
|
||||||
|
|
|
@ -89,7 +89,7 @@ pythonPackages.callPackage
|
||||||
|
|
||||||
# Prevent infinite recursion
|
# Prevent infinite recursion
|
||||||
skipSetupToolsSCM = [
|
skipSetupToolsSCM = [
|
||||||
"setuptools-scm"
|
"setuptools_scm"
|
||||||
"setuptools-scm"
|
"setuptools-scm"
|
||||||
"toml" # Toml is an extra for setuptools-scm
|
"toml" # Toml is an extra for setuptools-scm
|
||||||
];
|
];
|
||||||
|
|
|
@ -598,7 +598,7 @@ self: super:
|
||||||
|
|
||||||
lxml = super.lxml.overridePythonAttrs (
|
lxml = super.lxml.overridePythonAttrs (
|
||||||
old: {
|
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 ];
|
buildInputs = with pkgs; (old.buildInputs or [ ]) ++ [ libxml2 libxslt ];
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
@ -636,6 +636,10 @@ self: super:
|
||||||
cat > setup.cfg <<EOF
|
cat > setup.cfg <<EOF
|
||||||
[libs]
|
[libs]
|
||||||
system_freetype = True
|
system_freetype = True
|
||||||
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
|
# LTO not working in darwin stdenv, see NixOS/nixpkgs/pull/19312
|
||||||
|
enable_lto = false
|
||||||
|
'' + ''
|
||||||
EOF
|
EOF
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue