From 89a771454113792f72d55c728f65ae9c30e28321 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 2 Apr 2024 21:59:19 +0900 Subject: [PATCH 1/4] python311Packages.pbs-installer: init at 2024.4.1 --- .../python-modules/pbs-installer/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/pbs-installer/default.nix diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix new file mode 100644 index 000000000000..ab892b5260e7 --- /dev/null +++ b/pkgs/development/python-modules/pbs-installer/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pdm-backend +, httpx +, zstandard +}: + +buildPythonPackage rec { + pname = "pbs-installer"; + version = "2024.4.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "frostming"; + repo = "pbs-installer"; + rev = version; + hash = "sha256-0LuajPD/sM0LoyRoCkGJ9medUcWNEPqvY76GgK2rIac="; + }; + + build-system = [ + pdm-backend + ]; + + optional-dependencies = { + all = optional-dependencies.install ++ optional-dependencies.download; + download = [ + httpx + ]; + install = [ + zstandard + ]; + }; + + pythonImportsCheck = [ "pbs_installer" ]; + + # upstream has no test + doCheck = false; + + meta = with lib; { + description = "Installer for Python Build Standalone"; + homepage = "https://github.com/frostming/pbs-installer"; + changelog = "https://github.com/frostming/pbs-installer/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad629d03a366..ff9c07c12c26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9398,6 +9398,8 @@ self: super: with self; { pbr = callPackage ../development/python-modules/pbr { }; + pbs-installer = callPackage ../development/python-modules/pbs-installer { }; + pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); pcapy-ng = callPackage ../development/python-modules/pcapy-ng { From 6c5a089eb9d7e7a8df2622f1e94d936c2cc1f988 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 2 Apr 2024 21:40:37 +0900 Subject: [PATCH 2/4] python311Packages.unearth: 0.14.0 -> 0.15.1 Changelog: https://github.com/frostming/unearth/releases/tag/0.15.1 --- .../python-modules/unearth/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index 60307ca4051d..0527e90f2636 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -2,12 +2,12 @@ , buildPythonPackage , fetchPypi , pythonOlder -, cached-property , packaging , pdm-backend -, requests +, httpx , flask , pytest-httpserver +, pytest-mock , pytestCheckHook , requests-wsgi-adapter , trustme @@ -15,23 +15,23 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.14.0"; - format = "pyproject"; + version = "0.15.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-883fuUrA+GX7z5ZCMVVu9xgwEDecALASBVF6UMeKGG0="; + hash = "sha256-hj3rMznA1lpb4NCtLGfUbV9XSnmOdO8FUr8R0pijCrs="; }; - nativeBuildInputs = [ + build-system = [ pdm-backend ]; - propagatedBuildInputs = [ + dependencies = [ packaging - requests + httpx ]; __darwinAllowLocalNetworking = true; @@ -39,6 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ flask pytest-httpserver + pytest-mock pytestCheckHook requests-wsgi-adapter trustme From a579808735ce2c37c6297505db5f62b9e76d8bff Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 2 Apr 2024 21:35:37 +0900 Subject: [PATCH 3/4] pdm: 2.12.4 -> 2.13.2 Changelog: https://github.com/pdm-project/pdm/releases/tag/2.13.2 --- pkgs/tools/package-management/pdm/default.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 88ed0768b1d8..f22e33f7706f 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -1,8 +1,6 @@ { lib -, stdenv , python3 , fetchFromGitHub -, fetchpatch , fetchPypi , nix-update-script , runtimeShell @@ -35,41 +33,46 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.12.4"; + version = "2.13.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-0Eh3Ni+Vz5/8HSw4uFH2k3BuSSiEDkiYauV22tV0FJY="; + hash = "sha256-4oK/HK8KCD/A+16JrW9518V5/1LHu1juhYfqPVu54Uo="; }; nativeBuildInputs = [ - pdm-backend installShellFiles ]; - propagatedBuildInputs = [ + build-system = [ + pdm-backend + ]; + + dependencies = [ blinker - certifi - cachecontrol dep-logic + filelock findpython + hishel + httpx installer + msgpack packaging + pbs-installer platformdirs pyproject-hooks python-dotenv - requests-toolbelt resolvelib rich shellingham tomlkit unearth virtualenv - ] - ++ cachecontrol.optional-dependencies.filecache + ] ++ httpx.optional-dependencies.socks + ++ pbs-installer.optional-dependencies.install ++ lib.optionals (pythonOlder "3.11") [ tomli ] @@ -100,7 +103,6 @@ buildPythonApplication rec { nativeCheckInputs = [ pytestCheckHook pytest-mock - pytest-rerunfailures pytest-xdist pytest-httpserver ] ++ lib.optional stdenv.isLinux first; @@ -120,7 +122,9 @@ buildPythonApplication rec { "test_convert_setup_py_project" # pythonfinder isn't aware of nix's python infrastructure "test_use_wrapper_python" - "test_use_invalid_wrapper_python" + + # touches the network + "test_find_candidates_from_find_links" ]; __darwinAllowLocalNetworking = true; From 4417ae673de5370d1e139e1a14e0be79f6c23cbb Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 2 Apr 2024 22:31:42 +0900 Subject: [PATCH 4/4] pdm: update meta.description --- pkgs/tools/package-management/pdm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index f22e33f7706f..fd8539da9654 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -138,7 +138,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://pdm-project.org"; changelog = "https://github.com/pdm-project/pdm/releases/tag/${version}"; - description = "A modern Python package manager with PEP 582 support"; + description = "A modern Python package and dependency manager supporting the latest PEP standards"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; mainProgram = "pdm";