From 34e6a88d27ceb6e0d81d5bd3b30063a4b3a4841c Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 11 Jan 2025 16:28:15 +0900 Subject: [PATCH 1/6] python312Packages.lazr-uri: 1.0.6 -> 1.0.7 Changelog: https://git.launchpad.net/lazr.uri/tree/NEWS.rst --- .../python-modules/lazr-uri/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/lazr-uri/default.nix b/pkgs/development/python-modules/lazr-uri/default.nix index f714fa9ccd49..34f63c921fb0 100644 --- a/pkgs/development/python-modules/lazr-uri/default.nix +++ b/pkgs/development/python-modules/lazr-uri/default.nix @@ -1,28 +1,37 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, setuptools, + pytestCheckHook, }: buildPythonPackage rec { - pname = "lazr.uri"; - version = "1.0.6"; - - disabled = isPy27; # namespace is broken for python2 + pname = "lazr-uri"; + version = "1.0.7"; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "5026853fcbf6f91d5a6b11ea7860a641fe27b36d4172c731f4aa16b900cf8464"; + pname = "lazr_uri"; + inherit version; + hash = "sha256-7Qz28zPkUBFHUq+xzgwpnDasSxCQY+tQNUxPh/glo+4="; }; - propagatedBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - meta = with lib; { + dependencies = [ setuptools ]; + + pythonImportsCheck = [ "lazr.uri" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonNamespaces = [ "lazr" ]; + + meta = { description = "Self-contained, easily reusable library for parsing, manipulating"; homepage = "https://launchpad.net/lazr.uri"; - license = licenses.lgpl3; + changelog = "https://git.launchpad.net/lazr.uri/tree/NEWS.rst?h=${version}"; + license = lib.licenses.lgpl3Only; maintainers = [ ]; }; } From 66fb680612ab37bd933ae0822aa6c0db38970ff8 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 11 Jan 2025 16:35:16 +0900 Subject: [PATCH 2/6] python312Packages.lazr-delegates: 2.1.0 -> 2.1.1 Changelog: https://git.launchpad.net/lazr.delegates/tree/NEWS.rst?h=2.1.1 --- pkgs/development/python-modules/lazr/delegates.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix index 1ebec55d7d16..22e8de879666 100644 --- a/pkgs/development/python-modules/lazr/delegates.nix +++ b/pkgs/development/python-modules/lazr/delegates.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "lazr-delegates"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; src = fetchPypi { - pname = "lazr.delegates"; + pname = "lazr_delegates"; inherit version; - hash = "sha256-UNT7iHK5UuV6SOEmEOVQ+jBm7rV8bGx1tqUUJBi6wZw="; + hash = "sha256-rs6yYW5Rtz8yf78SxOwrfXZwy4IL1eT2hRIV+3lsAtw="; }; nativeBuildInputs = [ setuptools ]; From 07d8df17c43a6784a329db433a909fbd4777cb41 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 11 Jan 2025 16:36:24 +0900 Subject: [PATCH 3/6] python312Packages.lazr-delegates: refactor --- .../{lazr/delegates.nix => lazr-delegates/default.nix} | 8 ++++---- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/python-modules/{lazr/delegates.nix => lazr-delegates/default.nix} (82%) diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr-delegates/default.nix similarity index 82% rename from pkgs/development/python-modules/lazr/delegates.nix rename to pkgs/development/python-modules/lazr-delegates/default.nix index 22e8de879666..a2a922b8ddf2 100644 --- a/pkgs/development/python-modules/lazr/delegates.nix +++ b/pkgs/development/python-modules/lazr-delegates/default.nix @@ -18,9 +18,9 @@ buildPythonPackage rec { hash = "sha256-rs6yYW5Rtz8yf78SxOwrfXZwy4IL1eT2hRIV+3lsAtw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ zope-interface ]; + dependencies = [ zope-interface ]; pythonImportsCheck = [ "lazr.delegates" ]; @@ -28,10 +28,10 @@ buildPythonPackage rec { pythonNamespaces = [ "lazr" ]; - meta = with lib; { + meta = { description = "Easily write objects that delegate behavior"; homepage = "https://launchpad.net/lazr.delegates"; changelog = "https://git.launchpad.net/lazr.delegates/tree/NEWS.rst?h=${version}"; - license = licenses.lgpl3Only; + license = lib.licenses.lgpl3Only; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abe85e67370d..6401fa0b5ef3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7151,7 +7151,7 @@ self: super: with self; { lazr-config = callPackage ../development/python-modules/lazr/config.nix { }; - lazr-delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; + lazr-delegates = callPackage ../development/python-modules/lazr-delegates { }; lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { }; From 098e54e1d109c2bdab0a2f39443195deab9f3c07 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 11 Jan 2025 16:50:29 +0900 Subject: [PATCH 4/6] python312Packages.lazr-config: 3.0 -> 3.1 Changelog: https://git.launchpad.net/lazr.config/tree/NEWS.rst --- pkgs/development/python-modules/lazr/config.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index 1b5520b79b35..5530bf290155 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr/config.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchgit, setuptools, lazr-delegates, zope-interface, @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "lazr-config"; - version = "3.0"; + version = "3.1"; pyproject = true; - src = fetchPypi { - pname = "lazr.config"; - inherit version; - hash = "sha256-oU5PbMCa68HUCxdhWK6g7uIlLBQAO40O8LMcfFFMNkQ="; + src = fetchgit { + url = "https://git.launchpad.net/lazr.config"; + rev = "3c659114e8e947fbd46954336f5577351d786de9"; + hash = "sha256-eYJY4JRoqTMG4j1jyiYrI8xEKdJ+wQYVVU/6OqVIodk="; }; nativeBuildInputs = [ setuptools ]; From 3521f95be7428d87b577cd0d6c451829507f5027 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 11 Jan 2025 16:52:30 +0900 Subject: [PATCH 5/6] python312Packages.lazr-config: refactor --- .../{lazr/config.nix => lazr-config/default.nix} | 8 ++++---- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/python-modules/{lazr/config.nix => lazr-config/default.nix} (88%) diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr-config/default.nix similarity index 88% rename from pkgs/development/python-modules/lazr/config.nix rename to pkgs/development/python-modules/lazr-config/default.nix index 5530bf290155..acde7d6b1c34 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr-config/default.nix @@ -19,9 +19,9 @@ buildPythonPackage rec { hash = "sha256-eYJY4JRoqTMG4j1jyiYrI8xEKdJ+wQYVVU/6OqVIodk="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ lazr-delegates zope-interface ]; @@ -38,10 +38,10 @@ buildPythonPackage rec { pythonNamespaces = [ "lazr" ]; - meta = with lib; { + meta = { description = "Create configuration schemas, and process and validate configurations"; homepage = "https://launchpad.net/lazr.config"; changelog = "https://git.launchpad.net/lazr.config/tree/NEWS.rst?h=${version}"; - license = licenses.lgpl3Only; + license = lib.licenses.lgpl3Only; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6401fa0b5ef3..de8b25b2ab39 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7149,7 +7149,7 @@ self: super: with self; { layoutparser = callPackage ../development/python-modules/layoutparser { }; - lazr-config = callPackage ../development/python-modules/lazr/config.nix { }; + lazr-config = callPackage ../development/python-modules/lazr-config { }; lazr-delegates = callPackage ../development/python-modules/lazr-delegates { }; From 6a552b0065b25b80bde58eee12cea1c4a42f22a1 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 11 Jan 2025 16:20:07 +0900 Subject: [PATCH 6/6] python312Packages.lazr-restfulclient: modernize --- .../lazr-restfulclient/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/lazr-restfulclient/default.nix b/pkgs/development/python-modules/lazr-restfulclient/default.nix index e6f1e9f208ff..cd0b2508a4b5 100644 --- a/pkgs/development/python-modules/lazr-restfulclient/default.nix +++ b/pkgs/development/python-modules/lazr-restfulclient/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, distro, httplib2, @@ -16,17 +15,19 @@ }: buildPythonPackage rec { - pname = "lazr.restfulclient"; + pname = "lazr-restfulclient"; version = "0.14.6"; - - disabled = isPy27; # namespace is broken for python2 + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "lazr.restfulclient"; + inherit version; hash = "sha256-Q/EqHTlIRjsUYgOMR7Qp3LXkLgun8uFlEbArpdKt/9s="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ distro httplib2 oauthlib @@ -46,10 +47,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "lazr.restfulclient" ]; - meta = with lib; { + pythonNamespaces = [ "lazr" ]; + + meta = { description = "Programmable client library that takes advantage of the commonalities among"; homepage = "https://launchpad.net/lazr.restfulclient"; - license = licenses.lgpl3; + changelog = "https://git.launchpad.net/lazr.restfulclient/tree/NEWS.rst?h=${version}"; + license = lib.licenses.lgpl3Plus; maintainers = [ ]; }; }