pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #300953 from natsukium/pdm/update

pdm: 2.12.4 -> 2.13.2; python311Packages.unearth: 0.14.0 -> 0.15.1; python311Packages.pbs-installer: init at 2024.4.1

authored by OTABI Tomoya and committed by GitHub 8a35fec8 45acd0ad

+79 -22
unified split
+50
pkgs/development/python-modules/pbs-installer/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , pythonOlder 5 + , pdm-backend 6 + , httpx 7 + , zstandard 8 + }: 9 + 10 + buildPythonPackage rec { 11 + pname = "pbs-installer"; 12 + version = "2024.4.1"; 13 + pyproject = true; 14 + 15 + disabled = pythonOlder "3.8"; 16 + 17 + src = fetchFromGitHub { 18 + owner = "frostming"; 19 + repo = "pbs-installer"; 20 + rev = version; 21 + hash = "sha256-0LuajPD/sM0LoyRoCkGJ9medUcWNEPqvY76GgK2rIac="; 22 + }; 23 + 24 + build-system = [ 25 + pdm-backend 26 + ]; 27 + 28 + optional-dependencies = { 29 + all = optional-dependencies.install ++ optional-dependencies.download; 30 + download = [ 31 + httpx 32 + ]; 33 + install = [ 34 + zstandard 35 + ]; 36 + }; 37 + 38 + pythonImportsCheck = [ "pbs_installer" ]; 39 + 40 + # upstream has no test 41 + doCheck = false; 42 + 43 + meta = with lib; { 44 + description = "Installer for Python Build Standalone"; 45 + homepage = "https://github.com/frostming/pbs-installer"; 46 + changelog = "https://github.com/frostming/pbs-installer/releases/tag/${version}"; 47 + license = licenses.mit; 48 + maintainers = with maintainers; [ ]; 49 + }; 50 + }
+9 -8
pkgs/development/python-modules/unearth/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchPypi 4 4 , pythonOlder 5 - , cached-property 6 5 , packaging 7 6 , pdm-backend 8 - , requests 7 + , httpx 9 8 , flask 10 9 , pytest-httpserver 10 + , pytest-mock 11 11 , pytestCheckHook 12 12 , requests-wsgi-adapter 13 13 , trustme ··· 15 15 16 16 buildPythonPackage rec { 17 17 pname = "unearth"; 18 - version = "0.14.0"; 19 - format = "pyproject"; 18 + version = "0.15.1"; 19 + pyproject = true; 20 20 21 21 disabled = pythonOlder "3.8"; 22 22 23 23 src = fetchPypi { 24 24 inherit pname version; 25 - hash = "sha256-883fuUrA+GX7z5ZCMVVu9xgwEDecALASBVF6UMeKGG0="; 25 + hash = "sha256-hj3rMznA1lpb4NCtLGfUbV9XSnmOdO8FUr8R0pijCrs="; 26 26 }; 27 27 28 - nativeBuildInputs = [ 28 + build-system = [ 29 29 pdm-backend 30 30 ]; 31 31 32 - propagatedBuildInputs = [ 32 + dependencies = [ 33 33 packaging 34 - requests 34 + httpx 35 35 ]; 36 36 37 37 __darwinAllowLocalNetworking = true; ··· 39 39 nativeCheckInputs = [ 40 40 flask 41 41 pytest-httpserver 42 + pytest-mock 42 43 pytestCheckHook 43 44 requests-wsgi-adapter 44 45 trustme
+18 -14
pkgs/tools/package-management/pdm/default.nix
··· 1 1 { lib 2 - , stdenv 3 2 , python3 4 3 , fetchFromGitHub 5 - , fetchpatch 6 4 , fetchPypi 7 5 , nix-update-script 8 6 , runtimeShell ··· 35 33 with python.pkgs; 36 34 buildPythonApplication rec { 37 35 pname = "pdm"; 38 - version = "2.12.4"; 36 + version = "2.13.2"; 39 37 pyproject = true; 40 38 41 39 disabled = pythonOlder "3.8"; 42 40 43 41 src = fetchPypi { 44 42 inherit pname version; 45 - hash = "sha256-0Eh3Ni+Vz5/8HSw4uFH2k3BuSSiEDkiYauV22tV0FJY="; 43 + hash = "sha256-4oK/HK8KCD/A+16JrW9518V5/1LHu1juhYfqPVu54Uo="; 46 44 }; 47 45 48 46 nativeBuildInputs = [ 49 - pdm-backend 50 47 installShellFiles 51 48 ]; 52 49 53 - propagatedBuildInputs = [ 50 + build-system = [ 51 + pdm-backend 52 + ]; 53 + 54 + dependencies = [ 54 55 blinker 55 - certifi 56 - cachecontrol 57 56 dep-logic 57 + filelock 58 58 findpython 59 + hishel 60 + httpx 59 61 installer 62 + msgpack 60 63 packaging 64 + pbs-installer 61 65 platformdirs 62 66 pyproject-hooks 63 67 python-dotenv 64 - requests-toolbelt 65 68 resolvelib 66 69 rich 67 70 shellingham 68 71 tomlkit 69 72 unearth 70 73 virtualenv 71 - ] 72 - ++ cachecontrol.optional-dependencies.filecache 74 + ] ++ httpx.optional-dependencies.socks 75 + ++ pbs-installer.optional-dependencies.install 73 76 ++ lib.optionals (pythonOlder "3.11") [ 74 77 tomli 75 78 ] ··· 100 103 nativeCheckInputs = [ 101 104 pytestCheckHook 102 105 pytest-mock 103 - pytest-rerunfailures 104 106 pytest-xdist 105 107 pytest-httpserver 106 108 ] ++ lib.optional stdenv.isLinux first; ··· 120 122 "test_convert_setup_py_project" 121 123 # pythonfinder isn't aware of nix's python infrastructure 122 124 "test_use_wrapper_python" 123 - "test_use_invalid_wrapper_python" 125 + 126 + # touches the network 127 + "test_find_candidates_from_find_links" 124 128 ]; 125 129 126 130 __darwinAllowLocalNetworking = true; ··· 134 138 meta = with lib; { 135 139 homepage = "https://pdm-project.org"; 136 140 changelog = "https://github.com/pdm-project/pdm/releases/tag/${version}"; 137 - description = "A modern Python package manager with PEP 582 support"; 141 + description = "A modern Python package and dependency manager supporting the latest PEP standards"; 138 142 license = licenses.mit; 139 143 maintainers = with maintainers; [ cpcloud ]; 140 144 mainProgram = "pdm";
+2
pkgs/top-level/python-packages.nix
··· 9432 9432 9433 9433 pbr = callPackage ../development/python-modules/pbr { }; 9434 9434 9435 + pbs-installer = callPackage ../development/python-modules/pbs-installer { }; 9436 + 9435 9437 pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); 9436 9438 9437 9439 pcapy-ng = callPackage ../development/python-modules/pcapy-ng {