newell/nix-scripts
1
0
Fork 0
forked from M-Labs/nix-scripts
Code Pull Requests Activity

use pkgs.lib.strings.versionAtLeast

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2019-12-03 12:01:42 +08:00
parent ddaaaa543b
commit 5f031e78ac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq-full.nix
View File

@ -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 = {