about summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-11-09 06:01:11 +0000
committerGitHub <noreply@github.com>2023-11-09 06:01:11 +0000
commit4aad65bfdbc56be726873b09b4bbaa88448ecbba (patch)
tree52afb5cf285c4c4122657f7da7de2d5fcfbd9c15 /pkgs/tools/package-management
parente49468c2669c013e20e37ddb69cea65b5af8f687 (diff)
parenta0eb0aa889311cdaccd688cd88f23e2a8af61a0b (diff)
downloadnixlib-4aad65bfdbc56be726873b09b4bbaa88448ecbba.tar
nixlib-4aad65bfdbc56be726873b09b4bbaa88448ecbba.tar.gz
nixlib-4aad65bfdbc56be726873b09b4bbaa88448ecbba.tar.bz2
nixlib-4aad65bfdbc56be726873b09b4bbaa88448ecbba.tar.lz
nixlib-4aad65bfdbc56be726873b09b4bbaa88448ecbba.tar.xz
nixlib-4aad65bfdbc56be726873b09b4bbaa88448ecbba.tar.zst
nixlib-4aad65bfdbc56be726873b09b4bbaa88448ecbba.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/pdm/default.nix18
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix
index dff2375199e9..aabdf1724411 100644
--- a/pkgs/tools/package-management/pdm/default.nix
+++ b/pkgs/tools/package-management/pdm/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , python3
 , fetchFromGitHub
+, fetchpatch
 , fetchPypi
 , nix-update-script
 , runtimeShell
@@ -31,15 +32,25 @@ in
 with python.pkgs;
 buildPythonApplication rec {
   pname = "pdm";
-  version = "2.10.0";
+  version = "2.10.1";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ziJJWVr59hsJJqCJljLfSbHHESYegFak+uFLU/k9kZM=";
+    hash = "sha256-0WZTHGWfxJBZM1RlRN0uFs9kjCum2JjIISatakIReoE=";
   };
 
+  patches = [
+    # https://github.com/NixOS/nixpkgs/issues/265883
+    # https://github.com/pdm-project/pdm/pull/2379
+    (fetchpatch {
+      name = "fix-template-permission.patch";
+      url = "https://github.com/pdm-project/pdm/commit/f0efdcefe589bc58c28ccf6ce2d23cad9a81dccc.patch";
+      hash = "sha256-NnHDSz2N63JzSzh2t9a5f/QQWM6Hyd5Cn5JY2zem6Ac=";
+    })
+  ];
+
   nativeBuildInputs = [
     pdm-backend
   ];
@@ -101,10 +112,11 @@ buildPythonApplication rec {
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    homepage = "https://pdm.fming.dev";
+    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";
     license = licenses.mit;
     maintainers = with maintainers; [ cpcloud ];
+    mainProgram = "pdm";
   };
 }