From 83d84fc20007f6f0ddba0ab8f72f6c849b1bcd16 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 24 Apr 2019 15:23:58 +0800 Subject: [PATCH] use default nixpkgs import only on top-level nix files --- artiq/artiq-board.nix | 2 +- artiq/windows/run-test.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/artiq/artiq-board.nix b/artiq/artiq-board.nix index dfbbe1e..d2ff017 100644 --- a/artiq/artiq-board.nix +++ b/artiq/artiq-board.nix @@ -1,7 +1,7 @@ # Install Vivado in /opt and add to /etc/nixos/configuration.nix: # nix.sandboxPaths = ["/opt"]; -{ pkgs ? import {}}: +{ pkgs }: { target , variant , buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}" diff --git a/artiq/windows/run-test.nix b/artiq/windows/run-test.nix index d9a7935..dc15b43 100644 --- a/artiq/windows/run-test.nix +++ b/artiq/windows/run-test.nix @@ -1,4 +1,4 @@ -{ pkgs ? import {}, +{ pkgs, diskImage ? "/opt/windows/c.img", qemuMem ? "2G", testTimeout ? 600,