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 42f2227a9f - Show all commits

View File

@@ -43,7 +43,14 @@ rec {
# experiment, if the reservation is set like with nodes or ntasksPerNode.
optionalAttrs (config ? garlic.sbatch.reservation) {
inherit (config.garlic.sbatch) reservation;
} // {
} //
# However, if the experiment contains a reservation, that takes priority
# over the one set in the ~/.config/nixpkgs/config.nix file
optionalAttrs (conf ? reservation) {
inherit (conf) reservation;
} //
# Finally, add all the other required parameters
{
exclusive = true;
inherit nextStage nixPrefix nodes ntasksPerNode time qos jobName;
}