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

BSC packages are no longer in bsc attribute

Browse Source 
Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>
This commit is contained in:
Rodrigo Arias 2023-11-06 23:03:56 +01:00
parent 190e273112
commit dd341902fc
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
m/common/main.nix
View File

@ -42,7 +42,7 @@
nix-diff ipmitool freeipmi ethtool lm_sensors ix cmake gnumake file tree nix-diff ipmitool freeipmi ethtool lm_sensors ix cmake gnumake file tree
ncdu config.boot.kernelPackages.perf ldns ncdu config.boot.kernelPackages.perf ldns
# From bsckgs overlay # From bsckgs overlay
bsc.osumb osumb
]; ];
programs.direnv.enable = true; programs.direnv.enable = true;

44
pkgs/overlay.nix
View File

@ -1,29 +1,27 @@
final: prev: final: prev:
{ {
bsc = prev.bsc.extend (bscFinal: bscPrev: { # Set MPICH as default
# Set MPICH as default mpi = final.mpich;
mpi = bscFinal.mpich;
# Configure the network for MPICH # Configure the network for MPICH
mpich = with final; prev.mpich.overrideAttrs (old: { mpich = with final; prev.mpich.overrideAttrs (old: {
buildInput = old.buildInputs ++ [ buildInput = old.buildInputs ++ [
libfabric libfabric
pmix pmix
]; ];
configureFlags = [ configureFlags = [
"--enable-shared" "--enable-shared"
"--enable-sharedlib" "--enable-sharedlib"
"--with-pm=no" "--with-pm=no"
"--with-device=ch4:ofi" "--with-device=ch4:ofi"
"--with-pmi=pmix" "--with-pmi=pmix"
"--with-pmix=${final.pmix}" "--with-pmix=${final.pmix}"
"--with-libfabric=${final.libfabric}" "--with-libfabric=${final.libfabric}"
"--enable-g=log" "--enable-g=log"
] ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [ ] ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [
"FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300 "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300
"FCFLAGS=-fallow-argument-mismatch" "FCFLAGS=-fallow-argument-mismatch"
]; ];
});
}); });
# Update ceph to 18.2.0 until it lands in nixpkgs, see: # Update ceph to 18.2.0 until it lands in nixpkgs, see: