Place packages together

This commit is contained in:
Rodrigo Arias 2020-06-25 20:43:35 +02:00
parent 53aebe5846
commit a83627890e

View File

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