From f5bdeee8163cd702fc4d5472f929f45a1de1982f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 7 Nov 2025 12:55:44 -0800
Subject: [PATCH] python3Packages.swh-storage: 3.1.0 -> 4.1.0

Diff: https://gitlab.softwareheritage.org/swh/devel/swh-storage/-/compare/v3.1.0...v4.1.0

Changelog: https://gitlab.softwareheritage.org/swh/devel/swh-storage/-/tags/v3.1.1
           https://gitlab.softwareheritage.org/swh/devel/swh-storage/-/tags/v3.1.2
           https://gitlab.softwareheritage.org/swh/devel/swh-storage/-/tags/v3.2.0
           https://gitlab.softwareheritage.org/swh/devel/swh-storage/-/tags/v3.3.0
           https://gitlab.softwareheritage.org/swh/devel/swh-storage/-/tags/v4.0.0
           https://gitlab.softwareheritage.org/swh/devel/swh-storage/-/tags/v4.1.0
---
 .../python-modules/swh-storage/default.nix     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/swh-storage/default.nix b/pkgs/development/python-modules/swh-storage/default.nix
index 74e312d07606..dcf09bf27cf4 100644
--- a/pkgs/development/python-modules/swh-storage/default.nix
+++ b/pkgs/development/python-modules/swh-storage/default.nix
@@ -12,6 +12,8 @@
   iso8601,
   mypy-extensions,
   psycopg,
+  psycopg-pool,
+  pyasyncore,
   redis,
   tenacity,
   swh-core,
@@ -30,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "swh-storage";
-  version = "3.1.0";
+  version = "4.1.0";
   pyproject = true;
 
   src = fetchFromGitLab {
@@ -39,7 +41,7 @@ buildPythonPackage rec {
     owner = "devel";
     repo = "swh-storage";
     tag = "v${version}";
-    hash = "sha256-Bxwc8OccmqadLjHtmhToHBYHGkD7Fw3Cl3go9VLV/Bs=";
+    hash = "sha256-JXeHE/wZ3Wcf1I1eGyCNlCGsreiQH6kCYZoDXV1h0A0=";
   };
 
   build-system = [
@@ -47,6 +49,11 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
+  pythonRelaxDeps = [
+    # we patched click 8.2.1
+    "click"
+  ];
+
   dependencies = [
     backports-entry-points-selectable
     cassandra-driver
@@ -56,13 +63,14 @@ buildPythonPackage rec {
     iso8601
     mypy-extensions
     psycopg
+    psycopg-pool
+    pyasyncore
     redis
     tenacity
     swh-core
     swh-model
     swh-objstorage
-  ]
-  ++ psycopg.optional-dependencies.pool;
+  ];
 
   pythonImportsCheck = [ "swh.storage" ];
 
@@ -88,11 +96,13 @@ buildPythonPackage rec {
     "swh/storage/tests/test_cassandra_migration.py"
     "swh/storage/tests/test_cassandra_ttl.py"
     "swh/storage/tests/test_cli_cassandra.py"
+    "swh/storage/tests/test_cli_object_references_cassandra.py"
     # Failing tests
     "swh/storage/tests/test_cli_object_references.py"
   ];
 
   meta = {
+    changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-storage/-/tags/${src.tag}";
     description = "Abstraction layer over the archive, allowing to access all stored source code artifacts as well as their metadata";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-storage";
     license = lib.licenses.gpl3Only;