This commit is contained in:
Sebastien Bourdeauducq 2019-05-09 16:34:31 +08:00
parent be604d25c1
commit 6b84de1190
1 changed files with 2 additions and 3 deletions

View File

@ -18,7 +18,7 @@ let
let let
target = "kasli"; target = "kasli";
variants = ["berkeley" "duke2" "hub" "hustmaster" "hustsatellite" ist" "luh" "mitll2" "mitll" "mpik" "nrc" "nudt" "ptb" "ptb2" "ptb3" "sysu" "tsinghua2" "tsinghua" "ubirmingham" "ucr" "unsw" "ustc" "vlbaimaster" "vlbaisatellite" "wipm" "wipm2" "wipm3"]; variants = ["berkeley" "duke2" "hub" "hustmaster" "hustsatellite" "ist" "luh" "mitll2" "mitll" "mpik" "nrc" "nudt" "ptb" "ptb2" "ptb3" "sysu" "tsinghua2" "tsinghua" "ubirmingham" "ucr" "unsw" "ustc" "vlbaimaster" "vlbaisatellite" "wipm" "wipm2" "wipm3"];
artiq = import <m-labs> { inherit pkgs; }; artiq = import <m-labs> { inherit pkgs; };
artiq-board = import <m-labs/artiq-board.nix> { inherit pkgs; }; artiq-board = import <m-labs/artiq-board.nix> { inherit pkgs; };
@ -42,8 +42,7 @@ let
boardBinaries = boardBinaries; boardBinaries = boardBinaries;
inherit target variant; inherit target variant;
}; };
} // (pkgs.lib.optionalAttrs ((builtins.fromJSON (builtins.readFile json)).base == "standalone") } // (pkgs.lib.optionalAttrs ((builtins.fromJSON (builtins.readFile json)).base == "standalone") {
{
"device-db-\''${target}-\''${variant}" = pkgs.stdenv.mkDerivation { "device-db-\''${target}-\''${variant}" = pkgs.stdenv.mkDerivation {
name = "device-db-\''${target}-\''${variant}"; name = "device-db-\''${target}-\''${variant}";
buildInputs = [ artiq.artiq ]; buildInputs = [ artiq.artiq ];