Merge bscpkgs into jungle #189

Manually merged
rarias merged 1013 commits from merge-bscpkgs into master 2025-10-07 16:12:34 +02:00
2 changed files with 51 additions and 0 deletions
Showing only changes of commit 266fffdb5f - Show all commits

View File

@@ -0,0 +1,46 @@
{
stdenv
, tampi
, clangOmpss2
, mpi
, nanos6
, mcxx
, variant
}:
with stdenv.lib;
assert (assertOneOf "variant" variant [ "openmp" "openmp-tasks" "ompss-2" ]);
let
cc=mcxx;
in
stdenv.mkDerivation rec {
name = "miniamr";
src = builtins.fetchGit {
url = "ssh://git@bscpm02.bsc.es/ksala/miniamr.git";
ref = "master";
};
postUnpack = ''
sourceRoot=$sourceRoot/${variant}
'';
buildInputs = [ tampi clangOmpss2 mpi nanos6 mcxx ];
makeFlags = [
"CC=${cc.CC}"
"CXX=${cc.CXX}"
];
enableParallelBuilding = true;
installPhase = ''
mkdir -p $out/bin
cp miniAMR.x $out/bin/
'';
programPath = "/bin/miniAMR.x";
}

View File

@@ -303,6 +303,11 @@ let
};
heat = callPackage ./garlic/apps/heat/default.nix { };
miniamr = callPackage ./garlic/apps/miniamr/default.nix {
variant = "ompss-2";
};
# heat = callPackage ./garlic/apps/heat/default.nix {
# # FIXME: The heat program must be able to compile with gcc9 and newer
# stdenv = self.gcc7Stdenv;