From 5afdaa28a6bff66656cef83a6169462b2b1059d8 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 29 Sep 2020 21:52:44 +0100 Subject: [PATCH 1/3] precice: fix build cmake gets confused with python 3.8's version number, switch back to 3.7 for now until upstream's resolved that --- pkgs/development/libraries/precice/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index 22726858a22..ed46387a214 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, python3Packages, petsc }: +{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, petsc }: stdenv.mkDerivation rec { pname = "precice"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake gcc ]; - buildInputs = [ boost eigen libxml2 openmpi python3 python3Packages.numpy ]; + buildInputs = [ boost eigen libxml2 openmpi python3 python3.pkgs.numpy ]; enableParallelBuilding = true; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a455c9b5e5..98325008d50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2351,7 +2351,7 @@ in psstop = callPackage ../tools/system/psstop { }; - precice = callPackage ../development/libraries/precice { }; + precice = callPackage ../development/libraries/precice { python3 = python37; }; pueue = callPackage ../applications/misc/pueue { }; From c943e6bc148691ac94f3be1d4fca90ce685e3c61 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 29 Sep 2020 21:53:37 +0100 Subject: [PATCH 2/3] precice: 2.0.2 -> 2.1.0 --- pkgs/development/libraries/precice/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index ed46387a214..e8a0698398f 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -2,14 +2,13 @@ stdenv.mkDerivation rec { pname = "precice"; - version = "2.0.2"; - # Todo next release switch back to versioning but for python3 support master is needed + version = "2.1.0"; src = fetchFromGitHub { owner = "precice"; repo = pname; rev = "v${version}"; - sha256 = "1s41wv2077d2gqj0wsxls6wkgdk9cgzcbmk2q43ha08ccq5i3dav"; + sha256 = "1268dz39sx3gygnm7vpg59k1wdhy6rhf72i8i0kz4jckll0s9102"; }; cmakeFlags = [ From 509208ea456d65354fc2e7b173dcfee3d15d6467 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 29 Sep 2020 22:26:30 +0100 Subject: [PATCH 3/3] precice: enable for darwin --- pkgs/development/libraries/precice/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index e8a0698398f..d8501428079 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}m" ]; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ]; + nativeBuildInputs = [ cmake gcc ]; buildInputs = [ boost eigen libxml2 openmpi python3 python3.pkgs.numpy ]; enableParallelBuilding = true; @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { description = "preCICE stands for Precise Code Interaction Coupling Environment"; license = with lib.licenses; [ gpl3 ]; homepage = "https://www.precice.org/"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ Scriptkiddi ]; }; }