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

artiq-fast: fix a448d3bdc

This commit is contained in:
Sebastien Bourdeauducq 2020-06-22 15:22:25 +08:00
parent 97bb368cab
commit 11dfff09b9
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-fast/default.nix
View File

@ -64,7 +64,7 @@ let
}; };
conda-bscan-spi-bitstreams = import ./conda/bscan-spi-bitstreams.nix { conda-bscan-spi-bitstreams = import ./conda/bscan-spi-bitstreams.nix {
inherit pkgs; inherit pkgs;
inherit (openocd) bscan_spi_bitstreams; inherit (mainPackages.openocd) bscan_spi_bitstreams;
}; };
conda-artiq = import ./conda/artiq.nix { inherit pkgs; }; conda-artiq = import ./conda/artiq.nix { inherit pkgs; };
conda-asyncserial = import ./conda/build.nix { inherit pkgs; } { conda-asyncserial = import ./conda/build.nix { inherit pkgs; } {
@ -77,7 +77,7 @@ let
}; };
}; };
condaLinux = { condaLinux = rec {
conda-binutils-or1k = import ./conda/binutils.nix { conda-binutils-or1k = import ./conda/binutils.nix {
inherit pkgs; inherit pkgs;
inherit (mainPackages.binutils-or1k) version src; inherit (mainPackages.binutils-or1k) version src;