Merge bscpkgs into jungle #189

Manually merged
rarias merged 1013 commits from merge-bscpkgs into master 2025-10-07 16:12:34 +02:00
Showing only changes of commit a83627890e - Show all commits

View File

@@ -8,11 +8,6 @@ let
self.bsc = rec {
# Custom OpenMPI with mpi_cxx enabled for TAMPI
openmpi = callPackage ./bsc/openmpi/default.nix {
enableCxx = true;
};
# Load the default implementation
#mpi = pkgs.mpich;
#mpi = pkgs.openmpi;
@@ -27,6 +22,15 @@ let
binutils = pkgs.binutils;
coreutils = pkgs.coreutils;
# --------------------------------------------------------- #
# BSC Packages
# --------------------------------------------------------- #
# Custom OpenMPI with mpi_cxx enabled for TAMPI
openmpi = callPackage ./bsc/openmpi/default.nix {
enableCxx = true;
};
fftw = callPackage ./bsc/fftw/default.nix {
mpi = mpi;
};
@@ -78,12 +82,14 @@ let
inherit mpi tampi;
};
inherit (callPackage ./bsc/nix {
inherit (callPackage ./bsc/nix/default.nix {
storeDir = "/nix/store";
stateDir = "/nix/var";
boehmgc = pkgs.boehmgc.override { enableLargeConfig = true; };
})
nix;
nix
nixUnstable
nixFlakes;
};
in pkgs // self