rarias/jungle
rarias/jungle
1
0
Fork 0
Code Issues 27 Pull Requests Packages Projects Releases Wiki Activity

Use explicit order in overlays

Browse Source
This commit is contained in:
Rodrigo Arias 2023-06-16 16:02:25 +02:00
parent 5b41670f36
commit 1724535495
2 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
m/common/main.nix
View File

@ -9,11 +9,12 @@
./slurm.nix ./slurm.nix
./ssh.nix ./ssh.nix
./users.nix ./users.nix
../../pkgs/mpi.nix
]; ];
nixpkgs.overlays = [ bscpkgs.bscOverlay ]; nixpkgs.overlays = [
bscpkgs.bscOverlay
(import ../../pkgs/mpi.nix)
];
nix.nixPath = [ nix.nixPath = [
"nixpkgs=${nixpkgs}" "nixpkgs=${nixpkgs}"

52
pkgs/mpi.nix
View File

@ -1,31 +1,25 @@
let final: prev:
overlay = final: prev:
{
bsc = prev.bsc.extend (bsc: {
mpi2 = bsc.mpich;
mpich = with final; prev.mpich.overrideAttrs (old: {
buildInput = old.buildInputs ++ [
libfabric
pmix
];
configureFlags = [
"--enable-shared"
"--enable-sharedlib"
"--with-pm=no"
"--with-device=ch4:ofi"
"--with-pmi=pmix"
"--with-pmix=${final.pmix}"
"--with-libfabric=${final.libfabric}"
"--enable-g=log"
] ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [
"FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300
"FCFLAGS=-fallow-argument-mismatch"
];
});
};
};
in
{ {
nixpkgs.overlays = [ overlay ]; bsc = prev.bsc.extend (bsc: {
mpi2 = bsc.mpich;
mpich = with final; prev.mpich.overrideAttrs (old: {
buildInput = old.buildInputs ++ [
libfabric
pmix
];
configureFlags = [
"--enable-shared"
"--enable-sharedlib"
"--with-pm=no"
"--with-device=ch4:ofi"
"--with-pmi=pmix"
"--with-pmix=${final.pmix}"
"--with-libfabric=${final.libfabric}"
"--enable-g=log"
] ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [
"FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300
"FCFLAGS=-fallow-argument-mismatch"
];
});
});
} }