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

artiq-full: fix artiq-board paths

This commit is contained in:
Astro 2020-12-22 01:21:43 +01:00
parent 1c103ccb62
commit 22a6d5fb2e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artiq-full.nix
View File

@ -9,6 +9,7 @@ let
cp -a ${<artiq-fast>} $out/fast cp -a ${<artiq-fast>} $out/fast
cp ${./artiq-full}/artiq-board.nix $out cp ${./artiq-full}/artiq-board.nix $out
cp ${./artiq-full}/generate-identifier.py $out
cp ${./artiq-full}/conda-artiq-board.nix $out cp ${./artiq-full}/conda-artiq-board.nix $out
cp ${./artiq-full}/extras.nix $out cp ${./artiq-full}/extras.nix $out
cp ${./artiq-full}/*.patch $out cp ${./artiq-full}/*.patch $out

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

@ -2,14 +2,14 @@
# nix.sandboxPaths = ["/opt"]; # nix.sandboxPaths = ["/opt"];
{ pkgs { pkgs
, vivado ? import ./vivado.nix { inherit pkgs; } , vivado ? import ./fast/vivado.nix { inherit pkgs; }
}: }:
let let
version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; }); version = import ./fast/pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
artiqSrc = import ./pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; }; artiqSrc = import ./fast/pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
artiqpkgs = import ./default.nix { inherit pkgs; }; artiqpkgs = import ./fast/default.nix { inherit pkgs; };
fetchcargo = import ./fetchcargo.nix { fetchcargo = import ./fast/fetchcargo.nix {
inherit (pkgs) stdenv cacert git; inherit (pkgs) stdenv cacert git;
inherit (artiqpkgs) cargo cargo-vendor; inherit (artiqpkgs) cargo cargo-vendor;
}; };

0
artiq-fast/generate-identifier.py → artiq-full/generate-identifier.py
View File