rarias/bscpkgs
rarias/bscpkgs
Archived
2
0
Fork 3
Code Issues 2 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Enable strictDeps on all our toplevel packages #12

Open
abonerib wants to merge 473 commits from abonerib/bscpkgs:enableStrictDeps into master
pull from: abonerib/bscpkgs:enableStrictDeps
merge into: rarias:master
Conversation 0 Commits 473 Files Changed 140 +22 -24
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0d9c99a24e - Show all commits

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: