From 92236affa23a5a44ade5fa78e31c674a10b2ab94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 26 Aug 2023 09:43:42 -0700
Subject: [PATCH] poetry: 1.5.1 -> 1.6.1

Diff: https://github.com/python-poetry/poetry/compare/refs/tags/1.5.1...1.6.1

Changelog: https://github.com/python-poetry/poetry/blob/refs/tags/1.6.1/CHANGELOG.md
---
 .../package-management/poetry/default.nix     | 25 ++-----------------
 .../package-management/poetry/unwrapped.nix   | 22 ++++++++--------
 2 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix
index 62c4ac599697..0276b420ec7d 100644
--- a/pkgs/tools/package-management/poetry/default.nix
+++ b/pkgs/tools/package-management/poetry/default.nix
@@ -10,34 +10,13 @@ let
       poetry = self.callPackage ./unwrapped.nix { };
 
       # version overrides required by poetry and its plugins
-      cachecontrol = super.cachecontrol.overridePythonAttrs (old: rec {
-        version = "0.12.14";
-        format = "setuptools";
-        src = fetchFromGitHub {
-          owner = "ionrock";
-          repo = "cachecontrol";
-          rev = "v${version}";
-          hash = "sha256-BuBaKP7OAYoT+SPVhtE6l9U/KmN21OKTL6poV5a6+0c=";
-        };
-        nativeCheckInputs = old.nativeCheckInputs ++ [
-          self.lockfile
-        ];
-      });
-      keyring = super.keyring.overridePythonAttrs (old: rec {
-        version = "23.13.1";
-        src = fetchPypi {
-          inherit (old) pname;
-          inherit version;
-          hash = "sha256-ui4VqbNeIZCNCq9OCkesxS1q4zRE3w2itJ1BpG721ng=";
-        };
-      });
       poetry-core = super.poetry-core.overridePythonAttrs (old: rec {
-        version = "1.6.1";
+        version = "1.7.0";
         src = fetchFromGitHub {
           owner = "python-poetry";
           repo = "poetry-core";
           rev = version;
-          hash = "sha256-Gc22Y2T4uO39jiOqEUFeOfnVCbknuDjmzFPZgk2eY74=";
+          hash = "sha256-OfY2zc+5CgOrgbiPVnvMdT4h1S7Aek8S7iThl6azmsk=";
         };
         patches = [ ];
         nativeCheckInputs = old.nativeCheckInputs ++ [
diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix
index 839b1882aa05..dd1305501916 100644
--- a/pkgs/tools/package-management/poetry/unwrapped.nix
+++ b/pkgs/tools/package-management/poetry/unwrapped.nix
@@ -4,17 +4,15 @@
 , pythonOlder
 , fetchFromGitHub
 , installShellFiles
+, pythonRelaxDepsHook
 , build
 , cachecontrol
 , cleo
 , crashtest
 , dulwich
-, filelock
-, html5lib
 , installer
 , jsonschema
 , keyring
-, lockfile
 , packaging
 , pexpect
 , pkginfo
@@ -27,7 +25,6 @@
 , shellingham
 , tomlkit
 , trove-classifiers
-, urllib3
 , virtualenv
 , xattr
 , tomli
@@ -44,20 +41,26 @@
 
 buildPythonPackage rec {
   pname = "poetry";
-  version = "1.5.1";
+  version = "1.6.1";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-1zqfGzSI5RDACSNcz0tLA4VKMFwE5uD/YqOkgpzg2nQ=";
+    hash = "sha256-/OvYT4Vix1t5Yx/Tx0z3E9L9qJ4OdI4maQqUVl8H524=";
   };
 
   nativeBuildInputs = [
     installShellFiles
+    pythonRelaxDepsHook
+  ];
+
+  pythonRelaxDeps = [
+    # only pinned to avoid dependency on Rust
+    "jsonschema"
   ];
 
   propagatedBuildInputs = [
@@ -66,12 +69,9 @@ buildPythonPackage rec {
     cleo
     crashtest
     dulwich
-    filelock
-    html5lib
     installer
     jsonschema
     keyring
-    lockfile
     packaging
     pexpect
     pkginfo
@@ -84,7 +84,6 @@ buildPythonPackage rec {
     shellingham
     tomlkit
     trove-classifiers
-    urllib3
     virtualenv
   ] ++ lib.optionals (stdenv.isDarwin) [
     xattr
@@ -130,6 +129,7 @@ buildPythonPackage rec {
     "load"
     "vcs"
     "prereleases_if_they_are_compatible"
+    "test_builder_setup_generation_runs_with_pip_editable"
     "test_executor"
     # requires git history to work correctly
     "default_with_excluded_data"