mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-15 05:47:57 +00:00
poetry2nix 1.37.0 -> 1.38.0
This commit is contained in:
adisbladis
parent
317dde2ba4
commit
1fc77acd1d
@ -5,7 +5,7 @@
|
||||
}:
|
||||
let
|
||||
# Poetry2nix version
|
||||
version = "1.37.0";
|
||||
version = "1.38.0";
|
||||
|
||||
inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet;
|
||||
|
||||
@ -221,6 +221,16 @@ lib.makeScope pkgs.newScope (self: {
|
||||
getFunctorFn
|
||||
(
|
||||
[
|
||||
# Remove Python packages aliases with non-normalized names to avoid issues with infinite recursion (issue #750).
|
||||
(self: super: lib.attrsets.mapAttrs
|
||||
(
|
||||
name: value:
|
||||
if lib.isDerivation value && self.hasPythonModule value && (normalizePackageName name) != name
|
||||
then null
|
||||
else value
|
||||
)
|
||||
super)
|
||||
|
||||
(
|
||||
self: super:
|
||||
{
|
||||
|
||||
@ -1204,6 +1204,9 @@
|
||||
"autobahn": [
|
||||
"setuptools"
|
||||
],
|
||||
"autoflake": [
|
||||
"hatchling"
|
||||
],
|
||||
"autograd": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -1262,6 +1265,27 @@
|
||||
"poetry-core",
|
||||
"setuptools"
|
||||
],
|
||||
"aws-cdk-asset-awscli-v1": [
|
||||
"setuptools"
|
||||
],
|
||||
"aws-cdk-asset-kubectl-v20": [
|
||||
"setuptools"
|
||||
],
|
||||
"aws-cdk-asset-node-proxy-agent": [
|
||||
"setuptools"
|
||||
],
|
||||
"aws-cdk-asset-node-proxy-agent-v5": [
|
||||
"setuptools"
|
||||
],
|
||||
"aws-cdk-aws-batch-alpha": [
|
||||
"setuptools"
|
||||
],
|
||||
"aws-cdk-aws-lambda-python-alpha": [
|
||||
"setuptools"
|
||||
],
|
||||
"aws-cdk-lib": [
|
||||
"setuptools"
|
||||
],
|
||||
"aws-error-utils": [
|
||||
"poetry"
|
||||
],
|
||||
@ -1280,6 +1304,9 @@
|
||||
"awscli-cwlogs": [
|
||||
"setuptools"
|
||||
],
|
||||
"awscli-local": [
|
||||
"setuptools"
|
||||
],
|
||||
"awscrt": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -2995,6 +3022,9 @@
|
||||
"construct": [
|
||||
"setuptools"
|
||||
],
|
||||
"constructs": [
|
||||
"setuptools"
|
||||
],
|
||||
"consul": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -3707,6 +3737,9 @@
|
||||
"django-4": [
|
||||
"setuptools"
|
||||
],
|
||||
"django-admin-sortable2": [
|
||||
"setuptools"
|
||||
],
|
||||
"django-allauth": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -3763,6 +3796,9 @@
|
||||
"django-cors-headers": [
|
||||
"setuptools"
|
||||
],
|
||||
"django-countries": [
|
||||
"setuptools"
|
||||
],
|
||||
"django-crispy-forms": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -3850,6 +3886,9 @@
|
||||
"django-modelcluster": [
|
||||
"setuptools"
|
||||
],
|
||||
"django-modeltranslation": [
|
||||
"setuptools"
|
||||
],
|
||||
"django-mptt": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -4706,6 +4745,9 @@
|
||||
"fabric": [
|
||||
"setuptools"
|
||||
],
|
||||
"fabric2": [
|
||||
"setuptools"
|
||||
],
|
||||
"fabulous": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -7168,6 +7210,9 @@
|
||||
"pbr",
|
||||
"setuptools"
|
||||
],
|
||||
"jsii": [
|
||||
"setuptools"
|
||||
],
|
||||
"jsmin": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -8882,6 +8927,15 @@
|
||||
"mypy-boto3-sqs": [
|
||||
"setuptools"
|
||||
],
|
||||
"mypy-boto3-ssm": [
|
||||
"setuptools"
|
||||
],
|
||||
"mypy-boto3-stepfunctions": [
|
||||
"setuptools"
|
||||
],
|
||||
"mypy-boto3-sts": [
|
||||
"setuptools"
|
||||
],
|
||||
"mypy-extensions": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -8983,7 +9037,11 @@
|
||||
"setuptools"
|
||||
],
|
||||
"nbclient": [
|
||||
"setuptools"
|
||||
"setuptools",
|
||||
{
|
||||
"buildSystem": "hatchling",
|
||||
"from": "0.7.1"
|
||||
}
|
||||
],
|
||||
"nbconflux": [
|
||||
"setuptools"
|
||||
@ -9521,6 +9579,9 @@
|
||||
"openapi-core": [
|
||||
"setuptools"
|
||||
],
|
||||
"openapi-python-client": [
|
||||
"poetry-core"
|
||||
],
|
||||
"openapi-schema-validator": [
|
||||
"poetry-core",
|
||||
"setuptools"
|
||||
@ -12038,7 +12099,8 @@
|
||||
"setuptools"
|
||||
],
|
||||
"pymssql": [
|
||||
"cython"
|
||||
"cython",
|
||||
"setuptools"
|
||||
],
|
||||
"pymsteams": [
|
||||
"setuptools"
|
||||
@ -12771,6 +12833,9 @@
|
||||
"pyssim": [
|
||||
"setuptools"
|
||||
],
|
||||
"pystac": [
|
||||
"setuptools"
|
||||
],
|
||||
"pystache": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -12932,6 +12997,9 @@
|
||||
"setuptools",
|
||||
"setuptools-scm"
|
||||
],
|
||||
"pytest-docker": [
|
||||
"setuptools"
|
||||
],
|
||||
"pytest-doctestplus": [
|
||||
"setuptools",
|
||||
"setuptools-scm"
|
||||
@ -13640,6 +13708,9 @@
|
||||
"python-uinput": [
|
||||
"setuptools"
|
||||
],
|
||||
"python-ulid": [
|
||||
"setuptools"
|
||||
],
|
||||
"python-unshare": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -15995,6 +16066,9 @@
|
||||
"streamlabswater": [
|
||||
"setuptools"
|
||||
],
|
||||
"streamlink": [
|
||||
"setuptools"
|
||||
],
|
||||
"streamz": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -16702,6 +16776,9 @@
|
||||
"tornado": [
|
||||
"setuptools"
|
||||
],
|
||||
"tornado-utils": [
|
||||
"setuptools"
|
||||
],
|
||||
"torpy": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -16982,6 +17059,9 @@
|
||||
"flit-core",
|
||||
"setuptools"
|
||||
],
|
||||
"types-aioboto3": [
|
||||
"setuptools"
|
||||
],
|
||||
"types-aiobotocore": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -16994,6 +17074,9 @@
|
||||
"types-aiobotocore-elbv2": [
|
||||
"setuptools"
|
||||
],
|
||||
"types-aiobotocore-resourcegroupstaggingapi": [
|
||||
"setuptools"
|
||||
],
|
||||
"types-aiobotocore-ssm": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -17039,9 +17122,15 @@
|
||||
"types-markdown": [
|
||||
"setuptools"
|
||||
],
|
||||
"types-pkg-resources": [
|
||||
"setuptools"
|
||||
],
|
||||
"types-protobuf": [
|
||||
"setuptools"
|
||||
],
|
||||
"types-python-dateutil": [
|
||||
"setuptools"
|
||||
],
|
||||
"types-pytz": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -17060,6 +17149,9 @@
|
||||
"types-setuptools": [
|
||||
"setuptools"
|
||||
],
|
||||
"types-six": [
|
||||
"setuptools"
|
||||
],
|
||||
"types-tabulate": [
|
||||
"setuptools"
|
||||
],
|
||||
|
||||
@ -59,9 +59,6 @@ let
|
||||
|
||||
in
|
||||
lib.composeManyExtensions [
|
||||
# normalize all the names
|
||||
(self: super: poetryLib.normalizePackageSet super)
|
||||
|
||||
# NixOps
|
||||
(self: super:
|
||||
lib.mapAttrs (_: v: addBuildSystem { inherit self; drv = v; attr = "poetry"; }) (lib.filterAttrs (n: _: lib.strings.hasPrefix "nixops" n) super)
|
||||
@ -639,6 +636,7 @@ lib.composeManyExtensions [
|
||||
|
||||
fiona = super.fiona.overridePythonAttrs (
|
||||
old: {
|
||||
format = "setuptools";
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal ];
|
||||
nativeBuildInputs = [
|
||||
pkgs.gdal # for gdal-config
|
||||
@ -1395,6 +1393,7 @@ lib.composeManyExtensions [
|
||||
"3.7.9" = "sha256-QHzAhjHgm4XLxY2zUdnIsd/WWMI7dJLQQAvTXC+2asQ=";
|
||||
"3.8.0" = "sha256-8k0DetamwLqkdcg8V/D2J5ja6IJSLi50CE+ZjFa7Hdc=";
|
||||
"3.8.1" = "sha256-QXguyDxQHW9Fd3Nhmi5JzSxZQuk3HGPhhh/RGuOTZNY=";
|
||||
"3.8.3" = "sha256-oSZO4cN1sJKd0T7pYrKG63is8AZMKaLRZqj5UCVY/14=";
|
||||
}.${version} or (
|
||||
lib.warn "Unknown orjson version: '${version}'. Please update getCargoHash." lib.fakeHash
|
||||
);
|
||||
@ -1771,7 +1770,7 @@ lib.composeManyExtensions [
|
||||
|
||||
pymssql = super.pymssql.overridePythonAttrs (old: {
|
||||
buildInputs = (old.buildInputs or [ ])
|
||||
++ [ pkgs.openssl ];
|
||||
++ [ pkgs.openssl pkgs.libkrb5 ];
|
||||
propagatedBuildInputs = (old.propagatedBuildInputs or [ ])
|
||||
++ [ pkgs.freetds ];
|
||||
});
|
||||
@ -2399,6 +2398,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.1" = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4=";
|
||||
"0.18.0" = "sha256-biGGn0YAUbSO1hCJ4kU0ZWlqlXl/HRrBS3iIA3myRI8=";
|
||||
"0.17.0" = "1swpf265h9qq30cx55iy6jjirba3wml16wzb68k527ynrxr7hvqx";
|
||||
"0.16.1" = "1ss6gzcr6js2d2sddgz1p52gyiwpqmgrxm8r6wim7gnm4wvhav8a";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user