From 4f58c15ee64e91f5a8d8b4664d929741a77dcb97 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sat, 15 Feb 2020 17:12:04 +0100 Subject: [PATCH] petsc: 3.8.4 -> 3.12.4 + add cxx flag to configure, because getdp needs it --- .../libraries/science/math/petsc/default.nix | 34 +++++++------------ 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index c2eda9dac48b..492ad63f27b6 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -1,17 +1,12 @@ -{ stdenv -, fetchurl -, blas -, gfortran -, liblapack -, python }: +{ stdenv , fetchurl , blas , gfortran , liblapack , python }: stdenv.mkDerivation rec { pname = "petsc"; - version = "3.8.4"; + version = "3.12.4"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "1iy49gagxncx09d88kxnwkj876p35683mpfk33x37165si6xqy4z"; + sha256 = "1hw4f12v2xwrs37gjh83dbixhg0yxandqx7s7k5vlfx91l9l3aan"; }; nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; @@ -26,7 +21,7 @@ stdenv.mkDerivation rec { configureFlagsArray=( $configureFlagsArray "--CC=$CC" - "--with-cxx=0" + "--with-cxx=g++" "--with-fc=0" "--with-mpi=0" "--with-blas-lib=[${blas}/lib/libblas.a,${gfortran.cc.lib}/lib/libgfortran.a]" @@ -34,17 +29,14 @@ stdenv.mkDerivation rec { ) ''; - postInstall = '' - rm $out/bin/petscmpiexec - rm $out/bin/popup - rm $out/bin/uncrustify.cfg - rm -rf $out/bin/win32fe - ''; - - meta = { - description = "Library of linear algebra algorithms for solving partial differential equations"; - homepage = https://www.mcs.anl.gov/petsc/index.html; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.bsd2; + meta = with stdenv.lib; { + description = '' + Library of linear algebra algorithms for solving partial differential + equations + ''; + homepage = "https://www.mcs.anl.gov/petsc/index.html"; + license = licenses.bsd2; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.all; }; }