From d4645efac056f348be418aaa3fc4f4e731617329 Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Tue, 26 Jul 2022 16:51:50 +0200
Subject: [PATCH] pdm: 1.14.0 -> 2.1.2

Co-Authored-By: Martin Weinelt <hexa@darmstadt.ccc.de>
---
 .../package-management/pdm/check-update.patch | 12 -------
 pkgs/tools/package-management/pdm/default.nix | 35 ++++++++-----------
 2 files changed, 14 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/tools/package-management/pdm/check-update.patch

diff --git a/pkgs/tools/package-management/pdm/check-update.patch b/pkgs/tools/package-management/pdm/check-update.patch
deleted file mode 100644
index 9bc216177e5b..000000000000
--- a/pkgs/tools/package-management/pdm/check-update.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/conftest.py b/tests/conftest.py
-index d310d36..e15d398 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -252,6 +252,7 @@ def project_no_init(tmp_path, mocker):
-     old_config_map = Config._config_map.copy()
-     tmp_path.joinpath("caches").mkdir(parents=True)
-     p.global_config["cache_dir"] = tmp_path.joinpath("caches").as_posix()
-+    p.global_config["check_update"] = False
-     do_use(p, getattr(sys, "_base_executable", sys.executable))
-     with temp_environ():
-         os.environ.pop("VIRTUAL_ENV", None)
diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix
index 7458262b168a..29a39cf96614 100644
--- a/pkgs/tools/package-management/pdm/default.nix
+++ b/pkgs/tools/package-management/pdm/default.nix
@@ -24,28 +24,19 @@ in
 with python.pkgs;
 buildPythonApplication rec {
   pname = "pdm";
-  version = "1.14.0";
+  version = "2.1.2";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ZUbcuIRutSoHW5egCpwCKca2IZCgQsRAd72ueDzGySI=";
+    hash = "sha256-U8aXskq3PdIVXNhUTZ7TVRza4dexZoheHO1GO0aGneo=";
   };
 
-  # this patch allows us to run additional tests that invoke pdm, which checks
-  # itself for an update on every invocation by default, drammatically slowing
-  # down test runs inside the sandbox
-  #
-  # the patch is necessary because the fixture is creating a project and
-  # doesn't appear to respect the settings in `$HOME`; possibly a bug upstream
-  patches = [
-    ./check-update.patch
-  ];
-
   propagatedBuildInputs = [
     blinker
-    click
+    cachecontrol
+    certifi
     findpython
     installer
     packaging
@@ -54,12 +45,17 @@ buildPythonApplication rec {
     pip
     platformdirs
     python-dotenv
-    pythonfinder
+    requests-toolbelt
     resolvelib
+    rich
     shellingham
     tomli
     tomlkit
-  ] ++ lib.optionals (pythonOlder "3.8") [
+    unearth
+    virtualenv
+  ]
+  ++ cachecontrol.optional-dependencies.filecache
+  ++ lib.optionals (pythonOlder "3.8") [
     importlib-metadata
     typing-extensions
   ];
@@ -79,14 +75,11 @@ buildPythonApplication rec {
   '';
 
   disabledTests = [
-    # sys.executable and expected executable are different
-    "test_set_non_exist_python_path"
+    # fails to locate setuptools (maybe upstream bug)
+    "test_convert_setup_py_project"
     # pythonfinder isn't aware of nix's python infrastructure
-    "test_auto_isolate_site_packages"
     "test_use_wrapper_python"
-    "test_find_python_in_path"
-    # calls pip install and exits != 0
-    "test_pre_and_post_hooks"
+    "test_use_invalid_wrapper_python"
   ];
 
   meta = with lib; {