about summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorOTABI Tomoya <tomoya.otabi@gmail.com>2024-05-01 00:11:31 +0900
committerGitHub <noreply@github.com>2024-05-01 00:11:31 +0900
commit2d16ba12deaf6f9f66ba04a28f8de0ccacfe5642 (patch)
treec7be824b9cd7a505cbea99c3900cf6cfca707f94 /pkgs/tools/package-management
parentc001eaf4891d0c4f5a5392a07b2a5efa8dedf57c (diff)
parente164307585118d280c21f08aa84d5447a3d0a3d6 (diff)
Merge pull request #253239 from natsukium/resolvelib/update
python311Packages.resolvelib: 0.5.5 -> 1.0.1
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/pdm/default.nix24
1 files changed, 1 insertions, 23 deletions
diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix
index 74212e52086f6..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,29 +7,8 @@
 , 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.15.1";