From 43d457772b6b5e7e58dd8bdca6ed3335c682361e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 4 Apr 2025 10:26:29 +0200
Subject: [PATCH 1/2] python312Packages.qcodes: 0.51.0 -> 0.52.0

Diff: https://github.com/microsoft/Qcodes/compare/refs/tags/v0.51.0...v0.52.0

Changelog: https://github.com/QCoDeS/Qcodes/releases/tag/v0.52.0
---
 pkgs/development/python-modules/qcodes/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix
index 757e82e773ff..c89d785f6c7b 100644
--- a/pkgs/development/python-modules/qcodes/default.nix
+++ b/pkgs/development/python-modules/qcodes/default.nix
@@ -51,6 +51,7 @@
   lxml,
   pip,
   pytest-asyncio,
+  pytest-cov-stub,
   pytest-mock,
   pytest-rerunfailures,
   pytest-xdist,
@@ -60,14 +61,14 @@
 
 buildPythonPackage rec {
   pname = "qcodes";
-  version = "0.51.0";
+  version = "0.52.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "Qcodes";
     tag = "v${version}";
-    hash = "sha256-QgCMoZrC3ZCo8yayRXw9fvBj5xi+XH2x/E1MuQFULPo=";
+    hash = "sha256-AQBzYKD4RsPQBtq/FxFwYnSUf8wW87JOb2cOnk9MHDY=";
   };
 
   postPatch = ''
@@ -142,6 +143,7 @@ buildPythonPackage rec {
     lxml
     pip
     pytest-asyncio
+    pytest-cov-stub
     pytest-mock
     pytest-rerunfailures
     pytest-xdist

From d3780887fa0c2d81bd73ba5d055ecc41f5765085 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 4 Apr 2025 11:02:38 +0200
Subject: [PATCH 2/2] python312Packages.qcodes-contrib-drivers: 0.22.0 ->
 0.23.0

Diff: https://github.com/QCoDeS/Qcodes_contrib_drivers/compare/refs/tags/v0.22.0...v0.23.0

Changelog: https://github.com/QCoDeS/Qcodes_contrib_drivers/releases/tag/v0.23.0
---
 .../qcodes-contrib-drivers/default.nix        | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
index 9f4bd2cf0de6..ef5048090a7a 100644
--- a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
+++ b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
@@ -1,65 +1,65 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
-  fetchpatch2,
+
+  # build-system
   setuptools,
   versioningit,
+
+  # dependencies
+  autobahn,
   cffi,
-  qcodes,
   packaging,
   pandas,
-  pytestCheckHook,
+  qcodes,
+  python-dotenv,
+
+  # tests
   pytest-mock,
+  pytestCheckHook,
   pyvisa-sim,
-  stdenv,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "qcodes-contrib-drivers";
-  version = "0.22.0";
+  version = "0.23.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "QCoDeS";
     repo = "Qcodes_contrib_drivers";
     tag = "v${version}";
-    sha256 = "sha256-/W5oC5iqYifMR3/s7aSQ2yTJNmkemkc0KVxIU0Es3zY=";
+    hash = "sha256-m2idBaQl2OVhrY5hcLTeXY6BycGf0ufa/ySgxaU2L/4=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "numpy-v2-compat.patch";
-      url = "https://github.com/QCoDeS/Qcodes_contrib_drivers/commit/fc792779dbc0b023bdccfe8877dac192d75a88db.patch?full_index=1";
-      hash = "sha256-G+/IVG9a4mOFudpqEpI+Q/+WwF6lm2nRKjODCdzWHe0=";
-    })
-  ];
-
   build-system = [
     setuptools
     versioningit
   ];
 
   dependencies = [
+    autobahn
     cffi
-    qcodes
     packaging
     pandas
+    qcodes
+    python-dotenv
   ];
 
   nativeCheckInputs = [
-    pytestCheckHook
     pytest-mock
+    pytestCheckHook
     pyvisa-sim
+    writableTmpDirAsHomeHook
   ];
 
   pythonImportsCheck = [ "qcodes_contrib_drivers" ];
 
   disabledTests =
-    lib.optionals (stdenv.hostPlatform.isDarwin) [
+    lib.optionals stdenv.hostPlatform.isDarwin [
       # At index 13 diff: 'sour6:volt 0.29000000000000004' != 'sour6:volt 0.29'
       "test_stability_diagram_external"
     ]
@@ -68,10 +68,6 @@ buildPythonPackage rec {
       "test_stability_diagram_external"
     ];
 
-  postInstall = ''
-    export HOME="$TMPDIR"
-  '';
-
   meta = {
     description = "User contributed drivers for QCoDeS";
     homepage = "https://github.com/QCoDeS/Qcodes_contrib_drivers";