From 758e81662f086a29079c9702afa1f6cef3f1d36c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Apr 2020 11:46:40 +0000 Subject: [PATCH 1/2] petsc: 3.12.4 -> 3.13.0 --- pkgs/development/libraries/science/math/petsc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 492ad63f27b..7b0b500d12d 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.12.4"; + version = "3.13.0"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "1hw4f12v2xwrs37gjh83dbixhg0yxandqx7s7k5vlfx91l9l3aan"; + sha256 = "0943bydmsq3sjwj3rxhb8hx58b1fm8vymny731557fs10g5zfbyz"; }; nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; From ad15e4e8a0beb93ba5b79d64c9cd8b2ac25fde88 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 6 Apr 2020 12:00:00 +0000 Subject: [PATCH 2/2] petsc: fix build on darwin --- pkgs/development/libraries/science/math/petsc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 7b0b500d12d..911f0a1cf89 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlagsArray=( $configureFlagsArray "--CC=$CC" - "--with-cxx=g++" + "--with-cxx=$CXX" "--with-fc=0" "--with-mpi=0" "--with-blas-lib=[${blas}/lib/libblas.a,${gfortran.cc.lib}/lib/libgfortran.a]"