From e55003d29d70e696ed6a266d05e7effd47887499 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 14 Jan 2025 18:34:52 +0900 Subject: [PATCH 1/2] pipenv-poetry-migrate: move from python3Packages --- .../pi/pipenv-poetry-migrate/package.nix} | 18 +++++------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 6 insertions(+), 15 deletions(-) rename pkgs/{development/python-modules/pipenv-poetry-migrate/default.nix => by-name/pi/pipenv-poetry-migrate/package.nix} (73%) diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix similarity index 73% rename from pkgs/development/python-modules/pipenv-poetry-migrate/default.nix rename to pkgs/by-name/pi/pipenv-poetry-migrate/package.nix index 3a18abb09845..935d1d276e25 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix @@ -1,22 +1,14 @@ { lib, - buildPythonPackage, fetchFromGitHub, - pytestCheckHook, - pythonOlder, - poetry-core, - tomlkit, - typer, - setuptools, + python3Packages, }: -buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "pipenv-poetry-migrate"; version = "0.6.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "yhino"; repo = "pipenv-poetry-migrate"; @@ -24,15 +16,15 @@ buildPythonPackage rec { hash = "sha256-M31bOvKGUlkzfZRQAxTkxhX8m9cCzEvsNZdyIyipwGI="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ python3Packages.poetry-core ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ setuptools # for pkg_resources tomlkit typer ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; meta = with lib; { description = "This is simple migration script, migrate pipenv to poetry"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 63ce8623c688..ae38137c3be3 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -432,6 +432,7 @@ mapAliases ({ pdfx = throw "pdfx has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04 pep257 = pydocstyle; # added 2022-04-12 pillow-simd = throw "pillow-simd has been removed for lagging behind pillow upstream, which exposes it to various security issues."; # Added 2024-10-24 + pipenv-poetry-migrate = throw "pipenv-poetry-migrate was promoted to a top-level attribute"; # added 2025-01-14 pixelmatch = "pixelmatch has been removed as it was unmaintained"; # Added 2024-08-18 pkutils = throw "pkutils was removed as it was unused and is not applicable to modern Python build tools"; # added 2024-07-28 poetry = throw "poetry was promoted to a top-level attribute, use poetry-core to build Python packages"; # added 2023-01-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96b12495057e..aee3d5dc1241 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10413,8 +10413,6 @@ self: super: with self; { pipe = callPackage ../development/python-modules/pipe { }; - pipenv-poetry-migrate = callPackage ../development/python-modules/pipenv-poetry-migrate { }; - piper-phonemize = callPackage ../development/python-modules/piper-phonemize { onnxruntime-native = pkgs.onnxruntime; piper-phonemize-native = pkgs.piper-phonemize; From 3c9048889a3e573f3067989c246f203c43532bf9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 14 Jan 2025 18:37:38 +0900 Subject: [PATCH 2/2] pipenv-poetry-migrate: refactor --- pkgs/by-name/pi/pipenv-poetry-migrate/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix index 935d1d276e25..968d056898b9 100644 --- a/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix +++ b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "pipenv-poetry-migrate"; version = "0.6.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "yhino"; @@ -16,9 +16,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-M31bOvKGUlkzfZRQAxTkxhX8m9cCzEvsNZdyIyipwGI="; }; - nativeBuildInputs = [ python3Packages.poetry-core ]; + build-system = [ python3Packages.poetry-core ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ setuptools # for pkg_resources tomlkit typer @@ -26,12 +26,12 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ python3Packages.pytestCheckHook ]; - meta = with lib; { + meta = { description = "This is simple migration script, migrate pipenv to poetry"; mainProgram = "pipenv-poetry-migrate"; homepage = "https://github.com/yhino/pipenv-poetry-migrate"; changelog = "https://github.com/yhino/pipenv-poetry-migrate/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ gador ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ gador ]; }; }