From 776c4279109d1d1e5e7fecac6be3ffbddd0e2e6d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 18 Nov 2023 09:50:32 +0100
Subject: [PATCH] python311Packages.qcodes: 0.41.1 -> 0.42.0

Diff: https://github.com/QCoDeS/Qcodes/compare/refs/tags/v0.41.1...v0.42.0

Changelog: https://github.com/QCoDeS/Qcodes/releases/tag/v0.42.0
---
 .../python-modules/qcodes/default.nix          | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix
index 320054041104..64b36124e7eb 100644
--- a/pkgs/development/python-modules/qcodes/default.nix
+++ b/pkgs/development/python-modules/qcodes/default.nix
@@ -4,7 +4,7 @@
 , cf-xarray
 , dask
 , deepdiff
-, fetchPypi
+, fetchFromGitHub
 , h5netcdf
 , h5py
 , hypothesis
@@ -49,14 +49,16 @@
 
 buildPythonPackage rec {
   pname = "qcodes";
-  version = "0.41.1";
-  format = "pyproject";
+  version = "0.42.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-3Ncg51E4KYbvzlEyesVbTmzmz+UPfFkj3tudVbNYqHQ=";
+  src = fetchFromGitHub {
+    owner = "QCoDeS";
+    repo = "Qcodes";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-+NtPE9mQKWftk3vR5WFZgM+7jl8HWr9MxVA+VpbuHvE=";
   };
 
   nativeBuildInputs = [
@@ -126,9 +128,9 @@ buildPythonPackage rec {
 
   disabledTestPaths = [
     # Test depends on qcodes-loop, causing a cyclic dependency
-    "qcodes/tests/dataset/measurement/test_load_legacy_data.py"
+    "tests/dataset/measurement/test_load_legacy_data.py"
     # TypeError
-    "qcodes/tests/dataset/test_dataset_basic.py"
+    "tests/dataset/test_dataset_basic.py"
   ];
 
   disabledTests = [