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

use default nixpkgs import only on top-level nix files

This commit is contained in:
Sebastien Bourdeauducq 2019-04-24 15:23:58 +08:00
parent 607a8fcfee
commit 83d84fc200
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/artiq-board.nix
View File

@ -1,7 +1,7 @@
# Install Vivado in /opt and add to /etc/nixos/configuration.nix: # Install Vivado in /opt and add to /etc/nixos/configuration.nix:
# nix.sandboxPaths = ["/opt"]; # nix.sandboxPaths = ["/opt"];
{ pkgs ? import <nixpkgs> {}}: { pkgs }:
{ target { target
, variant , variant
, buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}" , buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}"

2
artiq/windows/run-test.nix
View File

@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> {}, { pkgs,
diskImage ? "/opt/windows/c.img", diskImage ? "/opt/windows/c.img",
qemuMem ? "2G", qemuMem ? "2G",
testTimeout ? 600, testTimeout ? 600,