From fa9766d77b8e54e01f73800cc3b83fc5decb3b8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 13:03:34 +0000 Subject: [PATCH 1/3] python310Packages.pyprecice: 2.3.0.1 -> 2.4.0.0 --- pkgs/development/python-modules/pyprecice/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix index 7c278d6e1be9..8b1ff9822d18 100644 --- a/pkgs/development/python-modules/pyprecice/default.nix +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyprecice"; - version = "2.3.0.1"; + version = "2.4.0.0"; src = fetchFromGitHub { owner = "precice"; repo = "python-bindings"; - rev = "v${version}"; - sha256 = "1yz96pif63ms797bzxbfrjba4mgz7cz5dqrqghn5sg0g1b9qxnn5"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Endy5oiC1OWdtZlVPUkIdkzoDTc1b5TaQ6VEUWq5iSg="; }; nativeBuildInputs = [ cython ]; From d3a72e4b3050f25b1a856b2c3b185800249dac80 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 May 2022 16:57:09 +0200 Subject: [PATCH 2/3] python310Packages.pyprecice: disable on older Python releases --- .../python-modules/pyprecice/default.nix | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix index 8b1ff9822d18..4a78da435256 100644 --- a/pkgs/development/python-modules/pyprecice/default.nix +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -1,20 +1,40 @@ -{ lib, buildPythonPackage, fetchFromGitHub, precice, numpy, mpi4py, cython }: +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, mpi4py +, numpy +, precice +, pythonOlder +}: buildPythonPackage rec { pname = "pyprecice"; version = "2.4.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "precice"; repo = "python-bindings"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Endy5oiC1OWdtZlVPUkIdkzoDTc1b5TaQ6VEUWq5iSg="; + hash = "sha256-Endy5oiC1OWdtZlVPUkIdkzoDTc1b5TaQ6VEUWq5iSg="; }; - nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ numpy mpi4py precice ]; + nativeBuildInputs = [ + cython + ]; - doCheck = false; # Disable Test because everything depends on open mpi which requires network. + propagatedBuildInputs = [ + numpy + mpi4py + precice + ]; + + # Disable Test because everything depends on open mpi which requires network + doCheck = false; + # Do not use pythonImportsCheck because this will also initialize mpi which requires a network interface meta = with lib; { From 03128a1f486eac4d9315622bb8228684c3ed4c04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 May 2022 17:07:29 +0200 Subject: [PATCH 3/3] python310Packages.pyprecice: remove whitespaces --- pkgs/development/python-modules/pyprecice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix index 4a78da435256..621850742af2 100644 --- a/pkgs/development/python-modules/pyprecice/default.nix +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { # Disable Test because everything depends on open mpi which requires network doCheck = false; - + # Do not use pythonImportsCheck because this will also initialize mpi which requires a network interface meta = with lib; {