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

beta -> a6p

pull/44/head
Sebastien Bourdeauducq 2021-02-17 16:01:19 +08:00
parent 9806228a8c
commit 5eea3a8267
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
artiq-full.nix
View File

@ -1,12 +1,12 @@
{ pkgs ? import <nixpkgs> {} { pkgs ? import <nixpkgs> {}
, beta ? <beta> , a6p ? <a6p>
}: }:
let let
sinaraSystemsRev = builtins.readFile <artiq-board-generated/sinara-rev.txt>; sinaraSystemsRev = builtins.readFile <artiq-board-generated/sinara-rev.txt>;
sinaraSystemsHash = builtins.readFile <artiq-board-generated/sinara-hash.txt>; sinaraSystemsHash = builtins.readFile <artiq-board-generated/sinara-hash.txt>;
sinaraSystemsSrc = sinaraSystemsSrc =
if beta if a6p
then pkgs.fetchgit { then pkgs.fetchgit {
url = "https://git.m-labs.hk/M-Labs/sinara-systems.git"; url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
rev = sinaraSystemsRev; rev = sinaraSystemsRev;
@ -14,7 +14,7 @@ let
} }
else <sinaraSystemsSrc>; else <sinaraSystemsSrc>;
artiq-fast = artiq-fast =
if beta if a6p
then <artiq-board-generated/fast> then <artiq-board-generated/fast>
else <artiq-fast>; else <artiq-fast>;
artiqVersion = import (artiq-fast + "/pkgs/artiq-version.nix") { artiqVersion = import (artiq-fast + "/pkgs/artiq-version.nix") {
@ -47,7 +47,7 @@ let
'' ''
mkdir $out mkdir $out
${if beta ${if a6p
then '' then ''
cp -a ${<artiq-board-generated>} $out/board-generated cp -a ${<artiq-board-generated>} $out/board-generated
ln -s board-generated/fast $out/fast ln -s board-generated/fast $out/fast
@ -59,7 +59,7 @@ let
cp ${./artiq-full}/extras.nix $out cp ${./artiq-full}/extras.nix $out
cp ${./artiq-full}/*.patch $out cp ${./artiq-full}/*.patch $out
${if beta ${if a6p
then '' then ''
REV=${sinaraSystemsRev} REV=${sinaraSystemsRev}
HASH=${sinaraSystemsHash} HASH=${sinaraSystemsHash}
@ -77,7 +77,7 @@ let
{ pkgs ? import <nixpkgs> {}}: { pkgs ? import <nixpkgs> {}}:
let let
artiq-fast = import ${if beta then "./board-generated" else "."}/fast { inherit pkgs; }; artiq-fast = import ${if a6p then "./board-generated" else "."}/fast { inherit pkgs; };
ddbDeps = [ ddbDeps = [
artiq-fast.artiq artiq-fast.artiq
(pkgs.python3.withPackages (ps: [ ps.jsonschema ])) (pkgs.python3.withPackages (ps: [ ps.jsonschema ]))
@ -90,11 +90,11 @@ let
builtins.map (variant: "\"${variant}\"") standaloneVariants builtins.map (variant: "\"${variant}\"") standaloneVariants
)}]; )}];
vivado = import ${if beta then "./board-generated" else "."}/fast/vivado.nix { vivado = import ${if a6p then "./board-generated" else "."}/fast/vivado.nix {
inherit pkgs; inherit pkgs;
}; };
artiq-board = artiq-board =
${if beta ${if a6p
then '' then ''
import ./artiq-board-vivado.nix { import ./artiq-board-vivado.nix {
inherit pkgs vivado; inherit pkgs vivado;
@ -147,7 +147,7 @@ let
}) })
) {} ${serializedTargets}; ) {} ${serializedTargets};
drtio-systems = { drtio-systems = {
${pkgs.lib.optionalString beta '' ${pkgs.lib.optionalString a6p ''
berkeley3 = { berkeley3 = {
master = "berkeley3master"; master = "berkeley3master";
satellites = { satellites = {

4
hydra/artiq.json
View File

@ -48,7 +48,7 @@
"inputs": { "inputs": {
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false }, "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false },
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
"beta": { "type": "boolean", "value": "true" }, "a6p": { "type": "boolean", "value": "true" },
"artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated-beta:generated-nix", "emailresponsible": false } "artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated-beta:generated-nix", "emailresponsible": false }
} }
}, },
@ -84,7 +84,7 @@
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.03", "emailresponsible": false }, "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.03", "emailresponsible": false },
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
"sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false }, "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
"beta": { "type": "boolean", "value": "false" }, "a6p": { "type": "boolean", "value": "false" },
"artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false } "artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false }
} }
}, },