M-Labs
/
nix-scripts
9
0
Fork 8
Code Issues 6 Pull Requests 3 Releases Wiki Activity

artiq-full: hw2 is ARTIQ-6+ only (Mirny)

pull/30/head
Sebastien Bourdeauducq 2020-03-16 19:03:41 +08:00
parent 78c3352fb9
commit 3dfe8d9902
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
artiq-full.nix
View File

@ -44,8 +44,6 @@ let
"hustmaster" "hustmaster"
"hustsatellite" "hustsatellite"
"hw" "hw"
"hw2master"
"hw2satellite"
"indiana" "indiana"
"innsbruck2" "innsbruck2"
"ist" "ist"
@ -100,6 +98,8 @@ let
] ++ (pkgs.lib.lists.optionals (pkgs.lib.strings.versionAtLeast artiq-fast.artiq.version "6.0") [ ] ++ (pkgs.lib.lists.optionals (pkgs.lib.strings.versionAtLeast artiq-fast.artiq.version "6.0") [
"bonn1master" "bonn1master"
"bonn1satellite" "bonn1satellite"
"hw2master"
"hw2satellite"
"uamsterdam" "uamsterdam"
]); ]);
@ -144,12 +144,6 @@ let
"1" = "afsatellite"; "1" = "afsatellite";
}; };
}; };
hw2 = {
master = "hw2master";
satellites = {
"1" = "hw2satellite";
};
};
hust = { hust = {
master = "hustmaster"; master = "hustmaster";
satellites = { satellites = {
@ -181,6 +175,12 @@ let
"1" = "bonn1satellite"; "1" = "bonn1satellite";
}; };
}; };
hw2 = {
master = "hw2master";
satellites = {
"1" = "hw2satellite";
};
};
}); });
drtio-ddbs = pkgs.lib.attrsets.mapAttrs' drtio-ddbs = pkgs.lib.attrsets.mapAttrs'
(system: crates: pkgs.lib.attrsets.nameValuePair ("device-db-" + system) (system: crates: pkgs.lib.attrsets.nameValuePair ("device-db-" + system)