rarias/jungle
rarias/jungle
2
0
Fork 2
Code Issues 54 Pull Requests 9 Actions Packages Projects Releases Wiki Activity

develop: Simplify packages

Browse Source
This commit is contained in:
Rodrigo Arias 2021-01-26 14:59:24 +01:00
parent ed4a9e1bc3
commit a3804e31f2
1 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
garlic/index.nix
View File

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