From 6f0b9f1f14bc699f9037047bccff23f30d0a5de1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Apr 2026 23:45:08 +0000
Subject: [PATCH 1/5] python3Packages.test2ref: 1.1.1 -> 1.2.3

---
 pkgs/development/python-modules/test2ref/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/test2ref/default.nix b/pkgs/development/python-modules/test2ref/default.nix
index 4401694c22e6..e7f393fb3eb5 100644
--- a/pkgs/development/python-modules/test2ref/default.nix
+++ b/pkgs/development/python-modules/test2ref/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "test2ref";
-  version = "1.1.1";
+  version = "1.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nbiotcloud";
     repo = "test2ref";
     tag = "v${version}";
-    hash = "sha256-Lo0rXKpiXGZle6X2f2Zofc/ihzAqruDyKNP4wp2jqv4=";
+    hash = "sha256-20vE6o8yKphKxlfGo+lBZ1VlKyCVlNawlMYVcj4JAtY=";
   };
 
   build-system = [
@@ -35,6 +35,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # AssertionError:
+    #   Only in /build/pytest-of-nixbld/pytest-0/test_known0/ref: file0.txt
+    #   Only in /build/pytest-of-nixbld/pytest-0/test_known0/ref: sub0
+    # Reported upstream: https://github.com/nbiotcloud/test2ref/issues/36
+    "test_known"
+  ];
+
   meta = {
     description = "Testing Against Learned Reference Data";
     homepage = "https://github.com/nbiotcloud/test2ref";

From 9b505a8bdb87a7da6d8dc94ba045bcc587c428d5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 27 Apr 2026 09:43:24 +0000
Subject: [PATCH 2/5] python3Packages.test2ref: re-order inputs

---
 pkgs/development/python-modules/test2ref/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/test2ref/default.nix b/pkgs/development/python-modules/test2ref/default.nix
index e7f393fb3eb5..345c8e4de8e2 100644
--- a/pkgs/development/python-modules/test2ref/default.nix
+++ b/pkgs/development/python-modules/test2ref/default.nix
@@ -2,8 +2,14 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   pdm-backend,
+
+  # dependencies
   binaryornot,
+
+  # tests
   pytest-cov-stub,
   pytestCheckHook,
 }:

From 42908f73091ab18e2627d17fd0fddfc27a95a0f9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 27 Apr 2026 09:43:39 +0000
Subject: [PATCH 3/5] python3Packages.test2ref: enable __structuredAttrs

---
 pkgs/development/python-modules/test2ref/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/test2ref/default.nix b/pkgs/development/python-modules/test2ref/default.nix
index 345c8e4de8e2..3dfaf492a5bb 100644
--- a/pkgs/development/python-modules/test2ref/default.nix
+++ b/pkgs/development/python-modules/test2ref/default.nix
@@ -18,6 +18,7 @@ buildPythonPackage rec {
   pname = "test2ref";
   version = "1.2.3";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "nbiotcloud";

From c446952cb03a0dc2e88e8b8efb21ec6166bc7cab Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 27 Apr 2026 09:43:53 +0000
Subject: [PATCH 4/5] python3Packages.test2ref: use the finalAttrs pattern

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

diff --git a/pkgs/development/python-modules/test2ref/default.nix b/pkgs/development/python-modules/test2ref/default.nix
index 3dfaf492a5bb..5c4945b4d84f 100644
--- a/pkgs/development/python-modules/test2ref/default.nix
+++ b/pkgs/development/python-modules/test2ref/default.nix
@@ -14,7 +14,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "test2ref";
   version = "1.2.3";
   pyproject = true;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nbiotcloud";
     repo = "test2ref";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-20vE6o8yKphKxlfGo+lBZ1VlKyCVlNawlMYVcj4JAtY=";
   };
 
@@ -53,8 +53,8 @@ buildPythonPackage rec {
   meta = {
     description = "Testing Against Learned Reference Data";
     homepage = "https://github.com/nbiotcloud/test2ref";
-    changelog = "https://github.com/nbiotcloud/test2ref/releases/tag/${src.tag}";
+    changelog = "https://github.com/nbiotcloud/test2ref/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
-}
+})

From 3e0ae0239965ece1ba8cf4da08bbe9e41d2ae5df Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 27 Apr 2026 07:39:19 +0000
Subject: [PATCH 5/5] python3Packages.pyqtgraph: enable __structuredAttrs

---
 pkgs/development/python-modules/pyqtgraph/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix
index 6ee92d850f6e..f28ffe84b751 100644
--- a/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -30,6 +30,7 @@ buildPythonPackage (finalAttrs: {
   pname = "pyqtgraph";
   version = "0.14.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "pyqtgraph";