From e7194085b737f0b0ba557c5fd748c9cb24cb6d80 Mon Sep 17 00:00:00 2001 From: nicoo Date: Thu, 1 Aug 2024 15:34:53 +0000 Subject: [PATCH 1/3] =?UTF-8?q?python3.bork:=208.0.0=20=E2=86=92=209.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/bork/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index c0404e566de6..ea3269df5fb6 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -4,19 +4,20 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, build, coloredlogs, + importlib-metadata, packaging, pip, - readme-renderer, toml, - twine, + urllib3, }: buildPythonPackage rec { pname = "bork"; - version = "8.0.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "duckinator"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BDwVhKmZ/F8CvpT6dEI5moQZx8wHy1TwdOl889XogEo="; + hash = "sha256-YqvtOwd00TXD4I3fIQolvjHnjREvQgbdrEO9Z96v1Kk="; }; build-system = [ @@ -32,11 +33,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "build" "packaging" - "readme-renderer" - "twine" - "wheel" ]; dependencies = [ @@ -44,9 +41,10 @@ buildPythonPackage rec { coloredlogs packaging pip - readme-renderer - twine - ] ++ lib.optionals (pythonOlder "3.11") [ toml ]; + urllib3 + ] ++ lib.optionals (pythonOlder "3.11") [ toml ] + ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] + ; pythonImportsCheck = [ "bork" From 21bc814ab5a58eed47dc1a53dc3a9c117332024a Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 2 Aug 2024 11:17:33 +0000 Subject: [PATCH 2/3] bork: add missing `meta.license` attribute --- pkgs/development/python-modules/bork/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index ea3269df5fb6..1647096d031e 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -65,6 +65,7 @@ buildPythonPackage rec { description = "Python build and release management tool"; mainProgram = "bork"; homepage = "https://github.com/duckinator/bork"; + license = licenses.mit; maintainers = with maintainers; [ nicoo ]; platforms = platforms.all; }; From 85afc2222066b16bcaa425309e07a052cad70a84 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 2 Aug 2024 11:27:28 +0000 Subject: [PATCH 3/3] python3.bork: use python's default `meta.platforms` `platforms.all` is not technically correct, as CPython itself is not useable on all the platforms defined in nixpkgs. --- pkgs/development/python-modules/bork/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index 1647096d031e..44a8564558e9 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -67,6 +67,5 @@ buildPythonPackage rec { homepage = "https://github.com/duckinator/bork"; license = licenses.mit; maintainers = with maintainers; [ nicoo ]; - platforms = platforms.all; }; }