forked from M-Labs/nix-scripts
use pkgs.lib.strings.versionAtLeast
This commit is contained in:
parent
ddaaaa543b
commit
5f031e78ac
@ -79,7 +79,7 @@ let
|
|||||||
"wipm4"
|
"wipm4"
|
||||||
"wipm5master"
|
"wipm5master"
|
||||||
"wipm5satellite"
|
"wipm5satellite"
|
||||||
] ++ (pkgs.lib.lists.optionals ((pkgs.lib.versions.major artiq-fast.artiq.version) == "6") [
|
] ++ (pkgs.lib.lists.optionals ((pkgs.lib.strings.versionAtLeast artiq-fast.artiq.version "6.0") [
|
||||||
"bonn1master"
|
"bonn1master"
|
||||||
"bonn1satellite"
|
"bonn1satellite"
|
||||||
]);
|
]);
|
||||||
@ -143,7 +143,7 @@ let
|
|||||||
"1" = "wipm5satellite";
|
"1" = "wipm5satellite";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
} // (pkgs.lib.optionalAttrs ((pkgs.lib.versions.major artiq-fast.artiq.version) == "6") {
|
} // (pkgs.lib.optionalAttrs ((pkgs.lib.strings.versionAtLeast artiq-fast.artiq.version "6.0") {
|
||||||
bonn1 = {
|
bonn1 = {
|
||||||
master = "bonn1master";
|
master = "bonn1master";
|
||||||
satellites = {
|
satellites = {
|
||||||
|
Loading…
Reference in New Issue
Block a user