From 2459db3762cb0cf95ea3b2ceb9feb9adfdf23592 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sat, 21 Mar 2026 18:01:22 +0100
Subject: [PATCH 1/3] python3Packages.logilab-common: 2.0.0 -> 2.1.0

Changelog: https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/2.1.0/CHANGELOG.md
Diff: https://forge.extranet.logilab.fr/open-source/logilab-common/-/compare/2.0.0...2.1.0
---
 .../development/python-modules/logilab/common.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix
index 5ca97bffebe9..14cd73913c1e 100644
--- a/pkgs/development/python-modules/logilab/common.nix
+++ b/pkgs/development/python-modules/logilab/common.nix
@@ -4,7 +4,6 @@
   fetchPypi,
   mypy-extensions,
   pytestCheckHook,
-  pythonAtLeast,
   pytz,
   setuptools,
   typing-extensions,
@@ -12,19 +11,15 @@
 
 buildPythonPackage rec {
   pname = "logilab-common";
-  version = "2.0.0";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ojvR2k3Wpj5Ej0OS57I4aFX/cGFVeL/PmT7riCTelws=";
+    pname = "logilab_common";
+    inherit version;
+    hash = "sha256-2GPHkd6gj85dPpMrrC8DwyK/wOuT1i1r+XTnZZ4r+34=";
   };
 
-  postPatch = lib.optionals (pythonAtLeast "3.12") ''
-    substituteInPlace logilab/common/testlib.py \
-      --replace-fail "_TextTestResult" "TextTestResult"
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -45,7 +40,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python packages and modules used by Logilab";
     homepage = "https://logilab-common.readthedocs.io/";
-    changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/branch/default/CHANGELOG.md";
+    changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/${version}/CHANGELOG.md";
     license = lib.licenses.lgpl21Plus;
     maintainers = [ ];
     mainProgram = "logilab-pytest";

From f83af9e98336f07438e10bb087accf37a31e1dc9 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 22 Mar 2026 09:54:01 +0100
Subject: [PATCH 2/3] python3Packages.logilab-common: fetch `src` from GitLab

---
 pkgs/development/python-modules/logilab/common.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix
index 14cd73913c1e..1b335e9fe9a9 100644
--- a/pkgs/development/python-modules/logilab/common.nix
+++ b/pkgs/development/python-modules/logilab/common.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitLab,
   mypy-extensions,
   pytestCheckHook,
   pytz,
@@ -14,10 +14,12 @@ buildPythonPackage rec {
   version = "2.1.0";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "logilab_common";
-    inherit version;
-    hash = "sha256-2GPHkd6gj85dPpMrrC8DwyK/wOuT1i1r+XTnZZ4r+34=";
+  src = fetchFromGitLab {
+    domain = "forge.extranet.logilab.fr";
+    owner = "open-source";
+    repo = "logilab-common";
+    tag = version;
+    hash = "sha256-cKodCj9m3n4P54CZ2X+BXN62ewd9nHSZBMENlo8S1iY=";
   };
 
   build-system = [ setuptools ];
@@ -40,7 +42,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python packages and modules used by Logilab";
     homepage = "https://logilab-common.readthedocs.io/";
-    changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/${version}/CHANGELOG.md";
+    changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.lgpl21Plus;
     maintainers = [ ];
     mainProgram = "logilab-pytest";

From 986e88cbc22514b0772796aeda0676e12c75de40 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 22 Mar 2026 09:54:48 +0100
Subject: [PATCH 3/3] python3Packages.logilab-common: use `finalAttrs`

---
 pkgs/development/python-modules/logilab/common.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix
index 1b335e9fe9a9..70248afbb7f0 100644
--- a/pkgs/development/python-modules/logilab/common.nix
+++ b/pkgs/development/python-modules/logilab/common.nix
@@ -9,7 +9,7 @@
   typing-extensions,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "logilab-common";
   version = "2.1.0";
   pyproject = true;
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     domain = "forge.extranet.logilab.fr";
     owner = "open-source";
     repo = "logilab-common";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-cKodCj9m3n4P54CZ2X+BXN62ewd9nHSZBMENlo8S1iY=";
   };
 
@@ -42,9 +42,9 @@ buildPythonPackage rec {
   meta = {
     description = "Python packages and modules used by Logilab";
     homepage = "https://logilab-common.readthedocs.io/";
-    changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.lgpl21Plus;
     maintainers = [ ];
     mainProgram = "logilab-pytest";
   };
-}
+})