astro
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

artiq: add dependency jsonschema 

Support for resolution of https://github.com/m-labs/artiq/issues/1474
This commit is contained in:
Astro 2020-12-29 19:30:40 +01:00
parent 58b49c173e
commit 0585a2dd3f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq-full.nix
View File

@ -26,6 +26,7 @@ let
let let
artiq-fast = import ./fast { inherit pkgs; }; artiq-fast = import ./fast { inherit pkgs; };
ddbDeps = pkgs.python3.withPackages (ps: [ ps.jsonschema ]);
target = "kasli"; target = "kasli";
variants = [ variants = [
@ -144,7 +145,7 @@ let
} // (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-fast.artiq ]; buildInputs = [ artiq-fast.artiq ddbDeps ];
phases = [ "buildPhase" ]; phases = [ "buildPhase" ];
buildPhase = " buildPhase = "
mkdir \$out mkdir \$out
@ -203,7 +204,7 @@ let
(system: crates: pkgs.lib.attrsets.nameValuePair ("device-db-" + system) (system: crates: pkgs.lib.attrsets.nameValuePair ("device-db-" + system)
(pkgs.stdenv.mkDerivation { (pkgs.stdenv.mkDerivation {
name = "device-db-\''${system}"; name = "device-db-\''${system}";
buildInputs = [ artiq-fast.artiq ]; buildInputs = [ artiq-fast.artiq ddbDeps ];
phases = [ "buildPhase" ]; phases = [ "buildPhase" ];
buildPhase = " buildPhase = "
mkdir \$out mkdir \$out

6
artiq-full/artiq-board.nix
View File

@ -78,7 +78,11 @@ let
installPath = builtins.unsafeDiscardStringContext "${pkgs.python3Packages.python.sitePackages}/artiq/board-support/${target}-${variant}"; installPath = builtins.unsafeDiscardStringContext "${pkgs.python3Packages.python.sitePackages}/artiq/board-support/${target}-${variant}";
pythonEnv = pkgs.python3.withPackages (ps: with ps; [ pythonEnv = pkgs.python3.withPackages (ps: with ps; [
jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq
]); ] ++
(if target == "kasli"
then [ jsonschema ]
else []
));
generatedSources = generatedSources =
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {