From 4c3c3358dfbbd554ad346d668ac57642f4b7f239 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:26:59 +0900 Subject: [PATCH 1/2] python312Packages.wadllib: 1.3.9 -> 2.0.0 --- pkgs/development/python-modules/wadllib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wadllib/default.nix b/pkgs/development/python-modules/wadllib/default.nix index 3021d3506f12..b22fa5615c97 100644 --- a/pkgs/development/python-modules/wadllib/default.nix +++ b/pkgs/development/python-modules/wadllib/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "wadllib"; - version = "1.3.9"; + version = "2.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wL4oM4myKP/ZPNru+44HDyLd98tcd+SMaMOWD98lmEQ="; + sha256 = "sha256-HtuvI+T6NP6nDJs4C6oqE5sQhq5InrzMxLO2X8lzdCc="; }; propagatedBuildInputs = [ From fb643493e8104164e27ba85a46ad704d4e770ecc Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 23:54:53 +0900 Subject: [PATCH 2/2] python312Packages.wadllib: refactor --- .../python-modules/wadllib/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/wadllib/default.nix b/pkgs/development/python-modules/wadllib/default.nix index b22fa5615c97..f5bbaddb6c34 100644 --- a/pkgs/development/python-modules/wadllib/default.nix +++ b/pkgs/development/python-modules/wadllib/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy3k, setuptools, lazr-uri, }: @@ -10,24 +9,28 @@ buildPythonPackage rec { pname = "wadllib"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-HtuvI+T6NP6nDJs4C6oqE5sQhq5InrzMxLO2X8lzdCc="; + hash = "sha256-HtuvI+T6NP6nDJs4C6oqE5sQhq5InrzMxLO2X8lzdCc="; }; - propagatedBuildInputs = [ - setuptools + build-system = [ setuptools ]; + + dependencies = [ lazr-uri ]; - doCheck = isPy3k; + pythonImportsCheck = [ "wadllib" ]; + + # pypi tarball has no tests + doCheck = false; meta = with lib; { description = "Navigate HTTP resources using WADL files as guides"; homepage = "https://launchpad.net/wadllib"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = [ ]; }; }