summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeder Bergebakken Sundt <pbsds@hotmail.com>2023-11-01 00:13:32 +0100
committerPeder Bergebakken Sundt <pbsds@hotmail.com>2023-11-01 00:15:22 +0100
commitdde1a57138f2955bc51bbbc5db94dbbfa85222c7 (patch)
tree87871ec773a1a87ee5419a1b08108b87b87e1395
parent0a040b6fbf10b686f3c5ecf66e42922b5acd0d4f (diff)
downloadnixpkgs-dde1a57138f2955bc51bbbc5db94dbbfa85222c7.tar
nixpkgs-dde1a57138f2955bc51bbbc5db94dbbfa85222c7.tar.gz
nixpkgs-dde1a57138f2955bc51bbbc5db94dbbfa85222c7.tar.bz2
nixpkgs-dde1a57138f2955bc51bbbc5db94dbbfa85222c7.tar.lz
nixpkgs-dde1a57138f2955bc51bbbc5db94dbbfa85222c7.tar.xz
nixpkgs-dde1a57138f2955bc51bbbc5db94dbbfa85222c7.tar.zst
nixpkgs-dde1a57138f2955bc51bbbc5db94dbbfa85222c7.zip
python3Packages.db-dtypes: unbreak
fixes https://hydra.nixos.org/build/239679666

This fix pulls in fixes from upstream.
Resulted from changes further upstream.
-rw-r--r--pkgs/development/python-modules/db-dtypes/default.nix16
1 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix
index d3fc32ab01d..a7fbfd1b378 100644
--- a/pkgs/development/python-modules/db-dtypes/default.nix
+++ b/pkgs/development/python-modules/db-dtypes/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , numpy
 , packaging
 , pandas
@@ -23,6 +24,21 @@ buildPythonPackage rec {
     hash = "sha256-OAVHx/a4uupVGXSWN2/3uem9/4i+TUkzTX4kp0uLY44=";
   };
 
+  patches = [
+    # on master branch, to be released as 1.1.2
+    (fetchpatch {
+      name = "xfail-tests-that-are-known-to-fail.patch";
+      url = "https://github.com/googleapis/python-db-dtypes-pandas/commit/4a56b766b0ccba900a555167863f1081a76c4c0d.patch";
+      hash = "sha256-ra1d8Vewvwhkr7PBHc3KM6IUCWsHxE+B7UP2duTgjew=";
+    })
+    # on master branch, to be released as 1.1.2
+    (fetchpatch {
+      name = "add-import-and-object-reference-due-to-upstream-changes.patch";
+      url = "https://github.com/googleapis/python-db-dtypes-pandas/commit/8a7b25f3e708df5cd32afcb702fe16130846b165.patch";
+      hash = "sha256-JVbhiOIr5gKMSQpIQ+DgIRqq8V5x5ClQhkQzAmIYqEU=";
+    })
+  ];
+
   propagatedBuildInputs = [
     numpy
     packaging