From f70eeed925248406620f82483439cde89ce62767 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Mon, 30 Dec 2024 02:30:19 +0900
Subject: [PATCH 1/2] pdm: add misilelab to maintainers

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 maintainers/maintainer-list.nix | 6 ++++++
 pkgs/by-name/pd/pdm/package.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8bb8e723ac7e..67dcfc632d08 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14938,6 +14938,12 @@
     githubId = 54669781;
     keys = [ { fingerprint = "293B 93D8 A471 059F 85D7  16A6 5BA9 2099 D9BE 2DAA"; } ];
   };
+  misilelab = {
+    name = "misilelab";
+    email = "misileminecord@gmail.com";
+    github = "misilelab";
+    githubId = 74066467;
+  };
   mislavzanic = {
     email = "mislavzanic3@gmail.com";
     github = "mislavzanic";
diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix
index b8b43dc9f7f3..88b026cb4564 100644
--- a/pkgs/by-name/pd/pdm/package.nix
+++ b/pkgs/by-name/pd/pdm/package.nix
@@ -117,6 +117,7 @@ python3.pkgs.buildPythonApplication rec {
     maintainers = with maintainers; [
       cpcloud
       natsukium
+      misilelab
     ];
     mainProgram = "pdm";
   };

From 5306088e5d1dc6437c81866f4f15a23272564556 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Mon, 30 Dec 2024 02:30:48 +0900
Subject: [PATCH 2/2] pdm: 2.19.3 -> 2.22.1

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/pd/pdm/package.nix | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix
index 88b026cb4564..800e8f457e31 100644
--- a/pkgs/by-name/pd/pdm/package.nix
+++ b/pkgs/by-name/pd/pdm/package.nix
@@ -8,31 +8,45 @@
   pdm,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+let
+  python = python3.override {
+    self = python;
+    packageOverrides = _: super: {
+      resolvelib = super.resolvelib.overridePythonAttrs (old: rec {
+        version = "1.1.0";
+        src = old.src.override {
+          rev = version;
+          hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8=";
+        };
+      });
+    };
+  };
+in
+python.pkgs.buildPythonApplication rec {
   pname = "pdm";
-  version = "2.19.3";
+  version = "2.22.1";
   pyproject = true;
 
-  disabled = python3.pkgs.pythonOlder "3.8";
+  disabled = python.pkgs.pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "pdm-project";
     repo = "pdm";
     rev = "refs/tags/${version}";
-    hash = "sha256-xgwIPHlTtmgCNN4R6/BJsqmI9hbA0wFAiq4YCa+r/UM=";
+    hash = "sha256-khAS/OpuvZTJGh9/lIGtKONajIonCwc/M9D9lSwzFvw=";
   };
 
   pythonRelaxDeps = [ "hishel" ];
 
   nativeBuildInputs = [ installShellFiles ];
 
-  build-system = with python3.pkgs; [
+  build-system = with python.pkgs; [
     pdm-backend
     pdm-build-locked
   ];
 
   dependencies =
-    with python3.pkgs;
+    with python.pkgs;
     [
       blinker
       dep-logic
@@ -74,7 +88,7 @@ python3.pkgs.buildPythonApplication rec {
     unset PDM_LOG_DIR
   '';
 
-  nativeCheckInputs = with python3.pkgs; [
+  nativeCheckInputs = with python.pkgs; [
     first
     pytestCheckHook
     pytest-mock