Merge pull request #203893 from adisbladis/poetry2nix-1_37_0

poetry2nix: 1.36.0 -> 1.37.0
This commit is contained in:
adisbladis 2022-12-01 22:57:01 +13:00 committed by GitHub
commit 2466d13645
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 345 additions and 19 deletions

View file

@ -5,7 +5,7 @@
}:
let
# Poetry2nix version
version = "1.36.0";
version = "1.37.0";
inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet;

View file

@ -41,6 +41,7 @@ pythonPackages.callPackage
in
builtins.filter (f: matchesVersion f.file && hasSupportedExtension f.file && isCompatibleEgg f.file) files;
toPath = s: pwd + "/${s}";
isLocked = lib.length fileCandidates > 0;
isSource = source != null;
isGit = isSource && source.type == "git";
isUrl = isSource && source.type == "url";
@ -107,7 +108,7 @@ pythonPackages.callPackage
nativeBuildInputs = [
hooks.poetry2nixFixupHook
]
++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook
++ lib.optional (isLocked && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook
++ lib.optionals (format == "wheel") [
hooks.wheelUnpackHook
pythonPackages.pipInstallHook
@ -120,7 +121,7 @@ pythonPackages.callPackage
];
buildInputs = (
lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg
lib.optional (isLocked) (getManyLinuxDeps fileInfo.name).pkg
++ lib.optional isDirectory buildSystemPkgs
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) pythonPackages.setuptools
);

View file

@ -167,6 +167,9 @@
"aio-georss-gdacs": [
"setuptools"
],
"aio-pika": [
"setuptools"
],
"aioairq": [
"setuptools"
],
@ -444,6 +447,9 @@
"poetry-core",
"setuptools"
],
"aiormq": [
"setuptools"
],
"aiorpcx": [
"setuptools"
],
@ -900,6 +906,9 @@
"arpeggio": [
"setuptools"
],
"arpy": [
"setuptools"
],
"arrayqueues": [
"setuptools"
],
@ -1031,6 +1040,9 @@
"astunparse": [
"setuptools"
],
"async-cache": [
"setuptools"
],
"async-dns": [
"poetry-core",
"setuptools"
@ -2003,6 +2015,9 @@
"setuptools",
"setuptools-scm"
],
"blue": [
"setuptools"
],
"bluemaestro-ble": [
"poetry-core",
"setuptools"
@ -2081,7 +2096,8 @@
"setuptools"
],
"botocore-stubs": [
"poetry-core"
"poetry-core",
"setuptools"
],
"bottle": [
"setuptools"
@ -2778,6 +2794,9 @@
"cmdline": [
"setuptools"
],
"cmdstanpy": [
"setuptools"
],
"cmigemo": [
"setuptools"
],
@ -2840,6 +2859,10 @@
"setuptools"
],
"colorama": [
{
"buildSystem": "hatchling",
"from": "0.4.6"
},
"setuptools"
],
"colorcet": [
@ -2917,6 +2940,9 @@
"conda": [
"setuptools"
],
"config-formatter": [
"setuptools"
],
"configargparse": [
"setuptools"
],
@ -2936,6 +2962,10 @@
"configshell": [
"setuptools"
],
"configupdater": [
"setuptools",
"setuptools-scm"
],
"confluent-kafka": [
"setuptools"
],
@ -3082,6 +3112,9 @@
"credstash": [
"setuptools"
],
"crispy-bootstrap5": [
"setuptools"
],
"criticality-score": [
"setuptools"
],
@ -3401,11 +3434,15 @@
"dbutils": [
"setuptools"
],
"ddsketch": [
"setuptools"
],
"ddt": [
"setuptools"
],
"ddtrace": [
"cython"
"cython",
"setuptools"
],
"deal": [
"flit-core",
@ -3704,6 +3741,9 @@
"django-cockroachdb": [
"setuptools"
],
"django-colorfield": [
"setuptools"
],
"django-colorful": [
"setuptools"
],
@ -3723,6 +3763,9 @@
"django-cors-headers": [
"setuptools"
],
"django-crispy-forms": [
"setuptools"
],
"django-cryptography": [
"setuptools"
],
@ -3751,6 +3794,9 @@
"django-filter": [
"setuptools"
],
"django-floppyforms": [
"setuptools"
],
"django-formtools": [
"setuptools",
"setuptools-scm"
@ -3776,6 +3822,9 @@
"django-hijack": [
"setuptools"
],
"django-htmx": [
"setuptools"
],
"django-ipware": [
"setuptools"
],
@ -3807,6 +3856,9 @@
"django-multiselectfield": [
"setuptools"
],
"django-nested-admin": [
"setuptools"
],
"django-nose": [
"setuptools"
],
@ -3906,6 +3958,9 @@
"django-treebeard": [
"setuptools"
],
"django-types": [
"poetry-core"
],
"django-versatileimagefield": [
"setuptools"
],
@ -3941,6 +3996,12 @@
"setuptools",
"setuptools-scm"
],
"djangorestframework-stubs": [
"setuptools"
],
"djangorestframework-types": [
"poetry"
],
"djmail": [
"setuptools"
],
@ -4439,6 +4500,9 @@
"env-canada": [
"setuptools"
],
"envier": [
"setuptools"
],
"environmental-override": [
"setuptools"
],
@ -4566,7 +4630,9 @@
],
"exceptiongroup": [
"flit-core",
"flit-scm",
"flitBuildHook",
"flit-scm",
"setuptools"
],
"exchangelib": [
@ -4794,6 +4860,7 @@
"setuptools"
],
"fido2": [
"poetry-core",
"setuptools"
],
"fields": [
@ -4816,6 +4883,9 @@
"setuptools",
"setuptools-scm"
],
"filemagic": [
"setuptools"
],
"filetype": [
"setuptools"
],
@ -5563,6 +5633,12 @@
"github3-py": [
"setuptools"
],
"gitlint": [
"setuptools"
],
"gitlint-core": [
"setuptools"
],
"gitpython": [
"setuptools"
],
@ -6368,7 +6444,18 @@
"setuptools"
],
"httpx": [
"setuptools"
{
"buildSystem": "hatch-fancy-pypi-readme",
"from": "0.23.1"
},
{
"buildSystem": "hatchling",
"from": "0.23.1"
},
{
"buildSystem": "setuptools",
"until": "0.23.1"
}
],
"httpx-auth": [
"setuptools"
@ -7252,7 +7339,14 @@
"setuptools"
],
"jupyter-server": [
"setuptools"
{
"buildSystem": "setuptools",
"until": "1.21.0"
},
{
"buildSystem": "jupyter-packaging",
"from": "1.21.0"
}
],
"jupyter-server-mathjax": [
"jupyter-packaging",
@ -7320,6 +7414,9 @@
"poetry-core",
"setuptools"
],
"justpy": [
"flit-core"
],
"jwcrypto": [
"setuptools"
],
@ -7416,6 +7513,9 @@
"setuptools",
"setuptools-scm"
],
"keyring-pass": [
"poetry-core"
],
"keyrings-alt": [
"setuptools",
"setuptools-scm"
@ -7506,6 +7606,9 @@
"poetry-core",
"setuptools"
],
"language-formatters-pre-commit-hooks": [
"setuptools"
],
"lark": [
"setuptools"
],
@ -7613,6 +7716,9 @@
"libasyncns": [
"setuptools"
],
"libclang": [
"setuptools"
],
"libcloud": [
"setuptools"
],
@ -7793,6 +7899,9 @@
"lmdb": [
"setuptools"
],
"lmfit": [
"setuptools"
],
"lml": [
"setuptools"
],
@ -7901,6 +8010,9 @@
"luhn": [
"setuptools"
],
"lunarcalendar": [
"setuptools"
],
"lupa": [
"cython",
"setuptools"
@ -7993,15 +8105,15 @@
"malduck": [
"setuptools"
],
"manage-fastapi": [
"poetry"
],
"managesieve": [
"setuptools"
],
"manhole": [
"setuptools"
],
"manage-fastapi": [
"poetry"
],
"manimpango": [
"cython",
"setuptools"
@ -8287,6 +8399,9 @@
"migen": [
"setuptools"
],
"migra": [
"poetry-core"
],
"mike": [
"setuptools"
],
@ -8353,6 +8468,9 @@
"mitogen": [
"setuptools"
],
"mixer": [
"setuptools"
],
"mizani": [
"setuptools"
],
@ -8400,6 +8518,10 @@
"setuptools"
],
"mkdocs-material-extensions": [
{
"buildSystem": "hatchling",
"from": "1.1"
},
"setuptools"
],
"mkdocs-minify": [
@ -8638,9 +8760,15 @@
"multi-key-dict": [
"setuptools"
],
"multiaddr": [
"setuptools"
],
"multidict": [
"setuptools"
],
"multihash": [
"setuptools"
],
"multimethod": [
"setuptools"
],
@ -8720,6 +8848,9 @@
"mypy": [
"setuptools"
],
"mypy-boto3-batch": [
"setuptools"
],
"mypy-boto3-builder": [
"poetry-core",
"setuptools"
@ -8730,9 +8861,27 @@
"mypy-boto3-cognito-idp": [
"setuptools"
],
"mypy-boto3-dynamodb": [
"setuptools"
],
"mypy-boto3-events": [
"setuptools"
],
"mypy-boto3-lambda": [
"setuptools"
],
"mypy-boto3-s3": [
"setuptools"
],
"mypy-boto3-s3control": [
"setuptools"
],
"mypy-boto3-sns": [
"setuptools"
],
"mypy-boto3-sqs": [
"setuptools"
],
"mypy-extensions": [
"setuptools"
],
@ -8999,6 +9148,9 @@
"nibabel": [
"setuptools"
],
"nicegui": [
"poetry-core"
],
"niko-home-control": [
"setuptools"
],
@ -9116,7 +9268,14 @@
],
"notebook-shim": [
"jupyter-packaging",
"setuptools"
{
"buildSystem": "setuptools",
"until": "0.2.0"
},
{
"buildSystem": "hatchling",
"from": "0.2.0"
}
],
"notedown": [
"setuptools"
@ -10301,6 +10460,9 @@
"plyvel": [
"setuptools"
],
"pmdarima": [
"setuptools"
],
"pmsensor": [
"setuptools"
],
@ -11153,10 +11315,10 @@
"pydenticon": [
"setuptools"
],
"pydeps": [
"pydeprecate": [
"setuptools"
],
"pydeprecate": [
"pydeps": [
"setuptools"
],
"pydes": [
@ -11198,6 +11360,9 @@
"pydot": [
"setuptools"
],
"pydpkg": [
"poetry"
],
"pydrive2": [
"setuptools"
],
@ -12251,6 +12416,9 @@
"pyramid-multiauth": [
"setuptools"
],
"pyramid-openapi3": [
"poetry"
],
"pyreadability": [
"setuptools"
],
@ -13285,6 +13453,9 @@
"python-mnist": [
"setuptools"
],
"python-monkey-business": [
"setuptools"
],
"python-mpv-jsonipc": [
"setuptools"
],
@ -13566,6 +13737,9 @@
"pytomorrowio": [
"setuptools"
],
"pytoolconfig": [
"pdm-pep517"
],
"pytools": [
"setuptools"
],
@ -14675,6 +14849,9 @@
"schema-salad": [
"setuptools"
],
"schemainspect": [
"setuptools"
],
"schiene": [
"setuptools"
],
@ -14976,6 +15153,9 @@
"shamir-mnemonic": [
"setuptools"
],
"shap": [
"setuptools"
],
"shapely": [
"cython",
"setuptools"
@ -14989,6 +15169,9 @@
"sharkiqpy": [
"setuptools"
],
"shellcheck-py": [
"setuptools"
],
"shellescape": [
"setuptools"
],
@ -15199,6 +15382,9 @@
"slugid": [
"setuptools"
],
"slumber": [
"setuptools"
],
"sly": [
"setuptools"
],
@ -15640,6 +15826,9 @@
"sqlalchemy-utils": [
"setuptools"
],
"sqlbag": [
"setuptools"
],
"sqlglot": [
"setuptools"
],
@ -15718,7 +15907,8 @@
"setuptools"
],
"starlette": [
"setuptools"
"setuptools",
"hatchling"
],
"starline": [
"setuptools"
@ -15740,6 +15930,9 @@
"statsd": [
"setuptools"
],
"statsforecast": [
"setuptools"
],
"statsmodels": [
"cython",
"setuptools"
@ -15828,7 +16021,10 @@
],
"structlog": [
"flitBuildHook",
"setuptools"
"setuptools",
"hatchling",
"hatch-fancy-pypi-readme",
"hatch-vcs"
],
"structlog-sentry": [
"poetry-core"
@ -16037,6 +16233,9 @@
"taxi": [
"setuptools"
],
"tbats": [
"setuptools"
],
"tblib": [
"setuptools"
],
@ -16626,6 +16825,9 @@
"trio-websocket": [
"setuptools"
],
"troposphere": [
"setuptools"
],
"trueskill": [
"setuptools"
],
@ -16663,6 +16865,9 @@
"flitBuildHook",
"setuptools"
],
"tusker": [
"poetry"
],
"tuya-iot-py-sdk": [
"setuptools"
],
@ -16777,9 +16982,27 @@
"flit-core",
"setuptools"
],
"types-aiobotocore": [
"setuptools"
],
"types-aiobotocore-cloudformation": [
"setuptools"
],
"types-aiobotocore-ec2": [
"setuptools"
],
"types-aiobotocore-elbv2": [
"setuptools"
],
"types-aiobotocore-ssm": [
"setuptools"
],
"types-awscrt": [
"poetry-core"
],
"types-cachetools": [
"setuptools"
],
"types-colorama": [
"setuptools"
],
@ -16813,6 +17036,9 @@
"types-jsonschema": [
"setuptools"
],
"types-markdown": [
"setuptools"
],
"types-protobuf": [
"setuptools"
],
@ -17948,6 +18174,9 @@
"yubico-client": [
"setuptools"
],
"yubikey-manager": [
"poetry-core"
],
"yutto": [
"poetry-core",
"setuptools"

View file

@ -203,6 +203,7 @@ lib.composeManyExtensions [
let
getCargoHash = version: {
"4.0.0" = "sha256-HvfRLyUhlXVuvxWrtSDKx3rMKJbjvuiMcDY6g+pYFS0=";
"4.0.1" = "sha256-lDWX69YENZFMu7pyBmavUZaalGvFqbHSHfkwkzmDQaY=";
}.${version} or (
lib.warn "Unknown bcrypt version: '${version}'. Please update getCargoHash." lib.fakeHash
);
@ -309,6 +310,18 @@ lib.composeManyExtensions [
)
);
cmdstanpy = super.cmdstanpy.overridePythonAttrs (
old: {
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cmdstan ];
patchPhase = ''
substituteInPlace cmdstanpy/model.py \
--replace 'cmd = [make]' \
'cmd = ["${pkgs.cmdstan}/bin/stan"]'
'';
CMDSTAN = "${pkgs.cmdstan}";
}
);
contourpy = super.contourpy.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.pybind11 ];
@ -370,6 +383,8 @@ lib.composeManyExtensions [
"37.0.2" = "sha256-qvrxvneoBXjP96AnUPyrtfmCnZo+IriHR5HbtWQ5Gk8=";
"37.0.4" = "sha256-f8r6QclTwkgK20CNe9i65ZOqvSUeDc4Emv6BFBhh1hI";
"38.0.1" = "sha256-o8l13fnfEUvUdDasq3LxSPArozRHKVsZfQg9DNR6M6Q=";
"38.0.3" = "sha256-lzHLW1N4hZj+nn08NZiPVM/X+SEcIsuZDjEOy0OOkSc=";
"38.0.4" = "sha256-BN0kOblUwgHj5QBf52RY2Jx0nBn03lwoN1O5PEohbwY=";
}.${version} or (
lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash
);
@ -420,6 +435,10 @@ lib.composeManyExtensions [
'';
});
darts = super.darts.override {
preferWheel = true;
};
datadog-lambda = super.datadog-lambda.overridePythonAttrs (old: {
postPatch = ''
substituteInPlace setup.py --replace "setuptools==" "setuptools>="
@ -1201,7 +1220,9 @@ lib.composeManyExtensions [
buildInputs = (old.buildInputs or [ ]) ++ [
self.types-typed-ast
self.types-setuptools
];
]
++ lib.optional (lib.strings.versionAtLeast old.version "0.990") self.types-psutil
;
# Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled
# version is also the default in the wheels on Pypi that include binaries.
# is64bit: unfortunately the build would exhaust all possible memory on i686-linux.
@ -1303,10 +1324,26 @@ lib.composeManyExtensions [
);
open3d = super.open3d.overridePythonAttrs (old: {
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.ipywidgets ];
buildInputs = (old.buildInputs or [ ]) ++ [
pkgs.udev
pkgs.libusb1
];
] ++ (if lib.versionAtLeast super.open3d.version "0.16.0" then [
pkgs.mesa
(
pkgs.symlinkJoin {
name = "llvm-with-ubuntu-compatible-symlink";
paths = [
pkgs.llvm_10.lib
(pkgs.runCommand "llvm-ubuntu-compatible-symlink" { }
''
mkdir -p "$out/lib/";
ln -s "${pkgs.llvm_10.lib}/lib/libLLVM-10.so" "$out/lib/libLLVM-10.so.1"
''
)
];
})
] else [ ]);
# TODO(Sem Mulder): Add overridable flags for CUDA/PyTorch/Tensorflow support.
autoPatchelfIgnoreMissingDeps = true;
});
@ -1357,6 +1394,7 @@ lib.composeManyExtensions [
"3.7.2" = "sha256-2U37IhftNYjH7sV7Nh51YpR/WjmPmmzX/aGuHsFgwf4=";
"3.7.9" = "sha256-QHzAhjHgm4XLxY2zUdnIsd/WWMI7dJLQQAvTXC+2asQ=";
"3.8.0" = "sha256-8k0DetamwLqkdcg8V/D2J5ja6IJSLi50CE+ZjFa7Hdc=";
"3.8.1" = "sha256-QXguyDxQHW9Fd3Nhmi5JzSxZQuk3HGPhhh/RGuOTZNY=";
}.${version} or (
lib.warn "Unknown orjson version: '${version}'. Please update getCargoHash." lib.fakeHash
);
@ -1508,6 +1546,12 @@ lib.composeManyExtensions [
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
});
prophet = super.prophet.overridePythonAttrs (old: {
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cmdstan self.cmdstanpy ];
PROPHET_REPACKAGE_CMDSTAN = "false";
CMDSTAN = "${pkgs.cmdstan}";
});
psycopg2 = super.psycopg2.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ])
@ -1754,6 +1798,34 @@ lib.composeManyExtensions [
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.swig ];
});
pyscard = super.pyscard.overridePythonAttrs (old:
# see https://github.com/NixOS/nixpkgs/blob/93568862a610dc1469dc40b15c1096a9357698ac/pkgs/development/python-modules/pyscard/default.nix
let
inherit (pkgs) PCSC pcsclite;
withApplePCSC = stdenv.isDarwin;
in
{
postPatch =
if withApplePCSC then ''
substituteInPlace smartcard/scard/winscarddll.c \
--replace "/System/Library/Frameworks/PCSC.framework/PCSC" \
"${PCSC}/Library/Frameworks/PCSC.framework/PCSC"
'' else ''
substituteInPlace smartcard/scard/winscarddll.c \
--replace "libpcsclite.so.1" \
"${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
'';
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ (
if withApplePCSC then [ PCSC ] else [ pcsclite ]
);
NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC)
"-I ${lib.getDev pcsclite}/include/PCSC";
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
pkgs.swig
];
}
);
pytaglib = super.pytaglib.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.taglib ];
});
@ -1782,6 +1854,16 @@ lib.composeManyExtensions [
}
);
pytorch-lightning = super.pytorch-lightning.override {
unpackPhase = ''
# $src remains a gzipped tarball otherwise.
mkdir -p tmp
tar xvf $src --directory=tmp
mv tmp/pytorch-lightning*/* .
rm -rf tmp
'';
};
pyqt5 =
let
qt5 = selectQt5 super.pyqt5.version;
@ -2181,6 +2263,12 @@ lib.composeManyExtensions [
}
);
tensorflow-macos = super.tensorflow-macos.overridePythonAttrs (
old: {
postInstall = self.tensorflow.postInstall;
}
);
tensorpack = super.tensorpack.overridePythonAttrs (
old: {
postPatch = ''
@ -2311,6 +2399,7 @@ lib.composeManyExtensions [
let
# Watchfiles does not include Cargo.lock in tarball released on PyPi for versions up to 0.17.0
getRepoHash = version: {
"0.18.0" = "sha256-biGGn0YAUbSO1hCJ4kU0ZWlqlXl/HRrBS3iIA3myRI8=";
"0.17.0" = "1swpf265h9qq30cx55iy6jjirba3wml16wzb68k527ynrxr7hvqx";
"0.16.1" = "1ss6gzcr6js2d2sddgz1p52gyiwpqmgrxm8r6wim7gnm4wvhav8a";
"0.15.0" = "14k3avrj7v794kk4mk2xggn40a4s0zg8iq8wmyyyrf7va6hz29hf";
@ -2330,6 +2419,13 @@ lib.composeManyExtensions [
rev = "v${old.version}";
inherit sha256;
};
patchPhase = builtins.concatStringsSep "\n" [
(old.patchPhase or "")
''
substituteInPlace "Cargo.lock" --replace 'version = "0.0.0"' 'version = "${old.version}"'
substituteInPlace "Cargo.toml" --replace 'version = "0.0.0"' 'version = "${old.version}"'
''
];
cargoDeps = pkgs.rustPlatform.importCargoLock {
lockFile = "${src.out}/Cargo.lock";
};

View file

@ -34,8 +34,8 @@ poetry2nix.mkPoetryApplication {
mkdir -p "$out/share/bash-completion/completions"
"$out/bin/poetry" completions bash > "$out/share/bash-completion/completions/poetry"
mkdir -p "$out/share/zsh/vendor-completions"
"$out/bin/poetry" completions zsh > "$out/share/zsh/vendor-completions/_poetry"
mkdir -p "$out/share/zsh/site-functions"
"$out/bin/poetry" completions zsh > "$out/share/zsh/site-functions/_poetry"
mkdir -p "$out/share/fish/vendor_completions.d"
"$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish"
'';