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}"

12
pkgs/mpi.nix
View File

@ -1,6 +1,5 @@
let final: prev:
overlay = final: prev: {
{
bsc = prev.bsc.extend (bsc: { bsc = prev.bsc.extend (bsc: {
mpi2 = bsc.mpich; mpi2 = bsc.mpich;
mpich = with final; prev.mpich.overrideAttrs (old: { mpich = with final; prev.mpich.overrideAttrs (old: {
@ -22,10 +21,5 @@ let
"FCFLAGS=-fallow-argument-mismatch" "FCFLAGS=-fallow-argument-mismatch"
]; ];
}); });
}; });
};
in
{
nixpkgs.overlays = [ overlay ];
} }