develop: Simplify packages

This commit is contained in:
Rodrigo Arias 2021-01-26 14:59:24 +01:00
parent ed4a9e1bc3
commit a3804e31f2

View File

@ -6,20 +6,24 @@
}:
{
unsafeDevelop = callPackage ./develop/default.nix {
extraInputs = with self; [
develop = let
commonPackages = with self; [
coreutils htop procps-ng vim which strace
tmux gdb kakoune universal-ctags bashInteractive
glibcLocales ncurses git screen curl
# Add more nixpkgs packages here...
bsc.slurm bsc.clangOmpss2 bsc.icc bsc.mcxx bsc.perf
# Add more bscpkgs packages here...
];
};
develop = bsc.garlic.stages.exec rec {
bscPackages = with bsc; [
slurm clangOmpss2 icc mcxx perf tampi impi
# Add more bsc packages here...
];
packages = commonPackages ++ bscPackages;
in
bsc.garlic.stages.exec rec {
nextStage = bsc.garlic.stages.isolate {
nextStage = bsc.garlic.unsafeDevelop;
nextStage = bsc.garlic.unsafeDevelop.override {
extraInputs = packages;
};
nixPrefix = bsc.garlic.targetMachine.config.nixPrefix;
extraMounts = [ "/tmp:$TMPDIR" ];
};
@ -38,6 +42,8 @@
post = "\n";
};
unsafeDevelop = callPackage ./develop/default.nix { };
# Configuration for the machines
machines = callPackage ./machines.nix { };