octopus: 16.0 -> 16.2
This commit is contained in:
@@ -31,20 +31,15 @@ assert (blas.isILP64 == arpack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "octopus";
|
||||
version = "16.0";
|
||||
version = "16.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "octopus-code";
|
||||
repo = "octopus";
|
||||
rev = version;
|
||||
hash = "sha256-sByiRTgAntJtSeL4h+49Mi9Rcxw2wK/BvXvsePa77HE=";
|
||||
tag = version;
|
||||
hash = "sha256-L97igB+bdZ19zpbffHi8DVSJXKtUyDqauUB+l5zzFwQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Discover all MPI languages components to avoid scalpack discovery failure
|
||||
./scalapack-mpi-alias.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
perl
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 70d89efb5e..47ba750d7a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -131,7 +131,7 @@ set(Octopus_ext_libs)
|
||||
find_package(GSL)
|
||||
if (OCTOPUS_MPI)
|
||||
set(MPI_DETERMINE_LIBRARY_VERSION ON)
|
||||
- find_package(MPI 3 COMPONENTS Fortran)
|
||||
+ find_package(MPI 3)
|
||||
# Further set MKL variables
|
||||
if (MPI_Fortran_LIBRARY_VERSION_STRING MATCHES Intel)
|
||||
set(MKL_MPI intelmpi CACHE STRING "Octopus: Overloaded")
|
||||
Reference in New Issue
Block a user