From 0bd7db7d6211c5a6b481efbcaa5567bcc0bd75e9 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 10 Aug 2021 22:54:55 +0100 Subject: [PATCH 1/2] python3Packages.cassandra-driver: relax geomet version constraint also disable a time-sensitive test which is annoying on a loaded machine --- .../development/python-modules/cassandra-driver/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index e5b1a4c4fb0f..1243aad64cc4 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -35,6 +35,10 @@ buildPythonPackage rec { sha256 = "1dn7iiavsrhh6i9hcyw0mk8j95r5ym0gbrvdca998hx2rnz5ark6"; }; + postPatch = '' + substituteInPlace setup.py --replace 'geomet>=0.1,<0.3' 'geomet' + ''; + nativeBuildInputs = [ cython ]; buildInputs = [ libev ]; propagatedBuildInputs = [ six geomet ] @@ -80,6 +84,8 @@ buildPythonPackage rec { "_PoolTests" # attempts to make connection to localhost "test_connection_initialization" + # time-sensitive + "test_nts_token_performance" ]; meta = with lib; { From c277b4592d05a53c26b33331b4970e684f3f6c27 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 10 Aug 2021 20:29:27 +0100 Subject: [PATCH 2/2] python3Packages.geomet: 0.2.1 -> 0.3.0 --- pkgs/development/python-modules/geomet/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/geomet/default.nix b/pkgs/development/python-modules/geomet/default.nix index a4df450098df..bace792ee84a 100644 --- a/pkgs/development/python-modules/geomet/default.nix +++ b/pkgs/development/python-modules/geomet/default.nix @@ -1,31 +1,22 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , click , six }: buildPythonPackage rec { pname = "geomet"; - version = "0.2.1"; + version = "0.3.0"; # pypi tarball doesn't include tests src = fetchFromGitHub { owner = "geomet"; repo = "geomet"; rev = version; - sha256 = "0fdi26glsmrsyqk86rnsfcqw79svn2b0ikdv89pq98ihrpwhn85y"; + sha256 = "1lb0df78gkivsb7hy3ix0xccvcznvskip11hr5sgq5y76qnfc8p0"; }; - patches = [ - (fetchpatch { - name = "python-3.8-support.patch"; - url = "https://github.com/geomet/geomet/commit/dc4cb4a856d3ad814b57b4b7487d86d9e0f0fad4.patch"; - sha256 = "1f1cdfqyp3z01jdjvax77219l3gc75glywqrisqpd2k0m0g7fwh3"; - }) - ]; - propagatedBuildInputs = [ click six ]; meta = with lib; {