diff options
author | K900 <me@0upti.me> | 2024-05-01 09:37:47 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2024-05-01 09:37:47 +0300 |
commit | a9c7210d0b6d3b17f3b060c5f979f7e88ec94a97 (patch) | |
tree | ef03637bff6d8215cc904425c8b59499174c90ad /pkgs/tools/package-management | |
parent | 09b96cbb7ac9489b9e7e6546bced869b90744344 (diff) | |
parent | 28496bb2c5a6f90329a00e41c3787eec2b6be1b4 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/pdm/default.nix | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 2d252819dc02a..523d610a9575d 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -1,6 +1,5 @@ { lib , python3 -, fetchFromGitHub , fetchPypi , nix-update-script , runtimeShell @@ -8,39 +7,18 @@ , testers , pdm }: -let - python = python3.override { - # override resolvelib due to - # 1. pdm requiring a later version of resolvelib - # 2. Ansible being packaged as a library - # 3. Ansible being unable to upgrade to a later version of resolvelib - # see here for more details: https://github.com/NixOS/nixpkgs/pull/155380/files#r786255738 - packageOverrides = self: super: { - resolvelib = super.resolvelib.overridePythonAttrs rec { - version = "1.0.1"; - src = fetchFromGitHub { - owner = "sarugaku"; - repo = "resolvelib"; - rev = "/refs/tags/${version}"; - hash = "sha256-oxyPn3aFPOyx/2aP7Eg2ThtPbyzrFT1JzWqy6GqNbzM="; - }; - }; - }; - self = python; - }; -in -with python.pkgs; +with python3.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.13.2"; + version = "2.15.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-4oK/HK8KCD/A+16JrW9518V5/1LHu1juhYfqPVu54Uo="; + hash = "sha256-HJzQScEBZjOiPvkuwfx4LaiuB0MULvM/r31Ihy+HSzk="; }; nativeBuildInputs = [ @@ -127,6 +105,8 @@ buildPythonApplication rec { # touches the network "test_find_candidates_from_find_links" + "test_lock_all_with_excluded_groups" + "test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV" ]; __darwinAllowLocalNetworking = true; |