Merge pull request #198184 from adisbladis/poetry2nix-1_36_0 (fbb418e8) · Commits · nix / nixpkgs

pkgs/development/tools/poetry2nix/poetry2nix/default.nix

+6 −9

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		}:
		let
		# Poetry2nix version
		version = "1.35.0";
		version = "1.36.0";

		inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet;

		@@ -202,7 +202,7 @@ lib.makeScope pkgs.newScope (self: {
		sourceSpec = (
		(normalizePackageSet pyProject.tool.poetry.dependencies or { }).${normalizedName}
		or (normalizePackageSet pyProject.tool.poetry.dev-dependencies or { }).${normalizedName}
		or (normalizePackageSet pyProject.tool.poetry.group.dev.dependencies { }).${normalizedName} # Poetry 1.2.0+
		or (normalizePackageSet pyProject.tool.poetry.group.dev.dependencies or { }).${normalizedName} # Poetry 1.2.0+
		or { }
		);
		}
		@@ -223,9 +223,6 @@ lib.makeScope pkgs.newScope (self: {
		[
		(
		self: super:
		let
		hooks = self.callPackage ./hooks { };
		in
		{
		mkPoetryDep = self.callPackage ./mk-poetry-dep.nix {
		inherit lib python poetryLib evalPep508;
		@@ -236,8 +233,6 @@ lib.makeScope pkgs.newScope (self: {
		poetry = poetryPkg;

		__toPluginAble = toPluginAble self;

		inherit (hooks) pipBuildHook removePathDependenciesHook removeGitDependenciesHook poetry2nixFixupHook wheelUnpackHook;
		} // lib.optionalAttrs (! super ? setuptools-scm) {
		# The canonical name is setuptools-scm
		setuptools-scm = super.setuptools_scm;
		@@ -375,6 +370,8 @@ lib.makeScope pkgs.newScope (self: {
		};
		py = poetryPython.python;

		hooks = py.pkgs.callPackage ./hooks { };

		inherit (poetryPython) pyProject;
		specialAttrs = [
		"overrides"
		@@ -391,8 +388,8 @@ lib.makeScope pkgs.newScope (self: {
		app = py.pkgs.buildPythonPackage (
		passedAttrs // inputAttrs // {
		nativeBuildInputs = inputAttrs.nativeBuildInputs ++ [
		py.pkgs.removePathDependenciesHook
		py.pkgs.removeGitDependenciesHook
		hooks.removePathDependenciesHook
		hooks.removeGitDependenciesHook
		];
		} // {
		pname = normalizePackageName pyProject.tool.poetry.name;

pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix

+7 −5

Original line number	Diff line number	Diff line
		@@ -89,6 +89,8 @@ pythonPackages.callPackage
		};

		format = if isDirectory \|\| isGit \|\| isUrl then "pyproject" else fileInfo.format;

		hooks = python.pkgs.callPackage ./hooks { };
		in
		buildPythonPackage {
		pname = normalizePackageName name;
		@@ -103,18 +105,18 @@ pythonPackages.callPackage
		dontStrip = format == "wheel";

		nativeBuildInputs = [
		pythonPackages.poetry2nixFixupHook
		hooks.poetry2nixFixupHook
		]
		++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook
		++ lib.optionals (format == "wheel") [
		pythonPackages.wheelUnpackHook
		hooks.wheelUnpackHook
		pythonPackages.pipInstallHook
		pythonPackages.setuptools
		]
		++ lib.optionals (format == "pyproject") [
		pythonPackages.removePathDependenciesHook
		pythonPackages.removeGitDependenciesHook
		pythonPackages.pipBuildHook
		hooks.removePathDependenciesHook
		hooks.removeGitDependenciesHook
		hooks.pipBuildHook
		];

		buildInputs = (

pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json

+43 −0

Original line number	Diff line number	Diff line
		@@ -1093,6 +1093,9 @@
		"asynctest": [
		"setuptools"
		],
		"asyncua": [
		"setuptools"
		],
		"asyncwhois": [
		"setuptools"
		],
		@@ -1702,6 +1705,9 @@
		"setuptools",
		"setuptools-scm"
		],
		"backports-zoneinfo": [
		"setuptools"
		],
		"bagit": [
		"setuptools",
		"setuptools-scm"
		@@ -3695,6 +3701,9 @@
		"django-cleanup": [
		"setuptools"
		],
		"django-cockroachdb": [
		"setuptools"
		],
		"django-colorful": [
		"setuptools"
		],
		@@ -4745,6 +4754,9 @@
		"fasttext": [
		"setuptools"
		],
		"faust-streaming": [
		"setuptools"
		],
		"favicon": [
		"setuptools"
		],
		@@ -8348,6 +8360,10 @@
		"setuptools"
		],
		"mkdocs": [
		{
		"buildSystem": "hatchling",
		"from": "1.4.1"
		},
		"setuptools"
		],
		"mkdocs-autorefs": [
		@@ -8456,6 +8472,9 @@
		"mockupdb": [
		"setuptools"
		],
		"mode-streaming": [
		"setuptools"
		],
		"moderngl": [
		"setuptools"
		],
		@@ -10597,6 +10616,9 @@
		"psycopg2": [
		"setuptools"
		],
		"psycopg2-binary": [
		"setuptools"
		],
		"psycopg2cffi": [
		"setuptools"
		],
		@@ -11418,6 +11440,9 @@
		"setuptools",
		"setuptools-scm"
		],
		"pygltflib": [
		"setuptools"
		],
		"pygmars": [
		"setuptools",
		"setuptools-scm"
		@@ -13372,6 +13397,9 @@
		"python-sat": [
		"setuptools"
		],
		"python-schema-registry-client": [
		"setuptools"
		],
		"python-simple-hipchat": [
		"setuptools"
		],
		@@ -14532,6 +14560,9 @@
		"s3-credentials": [
		"setuptools"
		],
		"s3cmd": [
		"setuptools"
		],
		"s3fs": [
		"setuptools"
		],
		@@ -14690,6 +14721,9 @@
		"scikit-optimize": [
		"setuptools"
		],
		"scikit-spatial": [
		"poetry"
		],
		"scikit-survival": [
		"cython",
		"setuptools",
		@@ -14718,6 +14752,9 @@
		"scmrepo": [
		"setuptools"
		],
		"scooby": [
		"setuptools"
		],
		"scour": [
		"setuptools"
		],
		@@ -15890,6 +15927,9 @@
		"svgwrite": [
		"setuptools"
		],
		"svix-ksuid": [
		"setuptools"
		],
		"swagger-spec-validator": [
		"setuptools"
		],
		@@ -17610,6 +17650,9 @@
		"wsgitools": [
		"setuptools"
		],
		"wslink": [
		"setuptools"
		],
		"wsnsimpy": [
		"setuptools"
		],

pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix

+7 −6

Original line number	Diff line number	Diff line
		@@ -385,7 +385,7 @@ lib.composeManyExtensions [
		(
		old: {
		nativeBuildInputs = (old.nativeBuildInputs or [ ])
		++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ]
		++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ]
		++ lib.optional (!self.isPyPy) pyBuildPackages.cffi
		++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel)
		(with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
		@@ -1061,9 +1061,9 @@ lib.composeManyExtensions [

		buildInputs = old.buildInputs or [ ] ++ [
		pkgs.which
		] ++ lib.optionals enableGhostscript [
		] ++ lib.optional enableGhostscript [
		pkgs.ghostscript
		] ++ lib.optionals stdenv.isDarwin [
		] ++ lib.optional stdenv.isDarwin [
		Cocoa
		];

		@@ -1080,7 +1080,7 @@ lib.composeManyExtensions [

		nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
		pkg-config
		] ++ lib.optionals (lib.versionAtLeast super.matplotlib.version "3.5.0") [
		] ++ lib.optional (lib.versionAtLeast super.matplotlib.version "3.5.0") [
		self.setuptools-scm
		self.setuptools-scm-git-archive
		];
		@@ -2030,7 +2030,8 @@ lib.composeManyExtensions [
		if old.format != "wheel" then {
		nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++
		[ pkgs.gfortran ] ++
		lib.optionals (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ];
		lib.optional (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ] ++
		lib.optional (lib.versionAtLeast super.scipy.version "1.9.0") [ self.meson-python pkg-config ];
		propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pybind11 ];
		setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
		enableParallelBuilding = true;
		@@ -2039,7 +2040,7 @@ lib.composeManyExtensions [
		sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
		export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
		'';
		preBuild = ''
		preBuild = lib.optional (lib.versionOlder super.scipy.version "1.9.0") ''
		ln -s ${self.numpy.cfg} site.cfg
		'';
		} else old