diff options
author | Carsten Burstedde <burstedde@ins.uni-bonn.de> | 2021-07-05 19:30:59 +0200 |
---|---|---|
committer | Carsten Burstedde <burstedde@ins.uni-bonn.de> | 2021-07-05 19:30:59 +0200 |
commit | 705afbd338e26b486aaacc237ee4fffbf9759b21 (patch) | |
tree | 5c69ce5ff8d77f023b12dcbea6b6d3a4d68e982b /pkgs/development/libraries/science | |
parent | c99a5b9a60ae5c5204a3f41f5d65b642093d1b82 (diff) | |
parent | 94982e6f874ec52eaf3fed29c8d229cdc1f8bc2c (diff) | |
download | nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.gz nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.bz2 nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.lz nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.xz nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.tar.zst nixpkgs-705afbd338e26b486aaacc237ee4fffbf9759b21.zip |
Merge branch 'master' into package-petsc-p4est
Diffstat (limited to 'pkgs/development/libraries/science')
3 files changed, 16 insertions, 14 deletions
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 332806c495c..85a73ccd569 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "blas"; - version = "3.8.0"; + version = "3.10.0"; src = fetchurl { url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; - sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm"; + sha256 = "sha256-LjYNmcm9yEB6YYiMQKqFP7QhlCDruCZNtIbLiGBGirM="; }; buildInputs = [ gfortran ]; @@ -20,17 +20,17 @@ stdenv.mkDerivation rec { echo >>make.inc "NOOPT = -O0 -fPIC" echo >>make.inc "LOADER = gfortran" echo >>make.inc "LOADOPTS =" - echo >>make.inc "ARCH = gfortran" - echo >>make.inc "ARCHFLAGS = -shared -o" + echo >>make.inc "AR = gfortran" + echo >>make.inc "ARFLAGS = -shared -o" echo >>make.inc "RANLIB = echo" echo >>make.inc "BLASLIB = libblas.so.${version}" ''; buildPhase = '' make - echo >>make.inc "ARCHFLAGS = " + echo >>make.inc "ARFLAGS = " echo >>make.inc "BLASLIB = libblas.a" - echo >>make.inc "ARCH = ar rcs" + echo >>make.inc "AR = ar rcs" echo >>make.inc "RANLIB = ranlib" make ''; diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix index 222380e15b2..00ce1e3b17c 100644 --- a/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config , p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true -, mpi, openmpi, openssh, zlib +, mpi, openssh, zlib }: let dbg = if debugEnable then "-dbg" else ""; debugEnable = p4est-sc-debugEnable; mpiSupport = p4est-sc-mpiSupport; + isOpenmpi = mpiSupport && mpi.pname == "openmpi"; in stdenv.mkDerivation { pname = "p4est-sc${dbg}"; @@ -24,7 +25,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ zlib ] ++ lib.optional mpiSupport mpi - ++ lib.optional (mpiSupport && mpi == openmpi) openssh + ++ lib.optional isOpenmpi openssh ; inherit debugEnable mpiSupport; @@ -36,15 +37,17 @@ stdenv.mkDerivation { ${if mpiSupport then "unset CC" else ""} ''; - configureFlags = lib.optional debugEnable "--enable-debug" + configureFlags = [ "--enable-pthread=-pthread" ] + ++ lib.optional debugEnable "--enable-debug" ++ lib.optional mpiSupport "--enable-mpi" ; makeFlags = [ "V=0" ]; + checkFlags = lib.optional isOpenmpi "-j1"; dontDisableStatic = true; enableParallelBuilding = true; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = !stdenv.isAarch64 && stdenv.hostPlatform == stdenv.buildPlatform; meta = { branch = "prev3-develop"; diff --git a/pkgs/development/libraries/science/math/p4est/default.nix b/pkgs/development/libraries/science/math/p4est/default.nix index 99c4b0be3f3..b0bb543c760 100644 --- a/pkgs/development/libraries/science/math/p4est/default.nix +++ b/pkgs/development/libraries/science/math/p4est/default.nix @@ -35,13 +35,12 @@ stdenv.mkDerivation { ${if mpiSupport then "unset CC" else ""} ''; - configureFlags = [ "--with-sc=${p4est-sc}" ] + configureFlags = p4est-sc.configureFlags + ++ [ "--with-sc=${p4est-sc}" ] ++ lib.optional withMetis "--with-metis" - ++ lib.optional debugEnable "--enable-debug" - ++ lib.optional mpiSupport "--enable-mpi" ; - inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding doCheck; + inherit (p4est-sc) makeFlags checkFlags dontDisableStatic enableParallelBuilding doCheck; meta = { branch = "prev3-develop"; |