[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
38/64: Fix test evaluation
From: |
Ludovic Courtès |
Subject: |
38/64: Fix test evaluation |
Date: |
Mon, 05 Jan 2015 16:39:03 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit fb5d76b89e8b0084fb147d79af5481e09b889386
Author: Eelco Dolstra <address@hidden>
Date: Tue Apr 15 15:32:27 2014 +0200
Fix test evaluation
---
tests/nix-copy-closure.nix | 6 +++---
tests/remote-builds.nix | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/nix-copy-closure.nix b/tests/nix-copy-closure.nix
index 66c19a4..bfd7084 100644
--- a/tests/nix-copy-closure.nix
+++ b/tests/nix-copy-closure.nix
@@ -4,14 +4,14 @@
with import <nixpkgs/nixos/lib/testing.nix> { inherit system; };
-makeTest ({ pkgs, ... }: let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {
+makeTest (let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {
nodes =
{ client =
{ config, pkgs, ... }:
{ virtualisation.writableStore = true;
virtualisation.pathsInNixDB = [ pkgA ];
- environment.nix = nix;
+ nix.package = nix;
};
server =
@@ -19,7 +19,7 @@ makeTest ({ pkgs, ... }: let pkgA = pkgs.aterm; pkgB =
pkgs.wget; in {
{ services.openssh.enable = true;
virtualisation.writableStore = true;
virtualisation.pathsInNixDB = [ pkgB ];
- environment.nix = nix;
+ nix.package = nix;
};
};
diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix
index 56514e1..571cdfb 100644
--- a/tests/remote-builds.nix
+++ b/tests/remote-builds.nix
@@ -4,7 +4,7 @@
with import <nixpkgs/nixos/lib/testing.nix> { inherit system; };
-makeTest ({ pkgs, ... }:
+makeTest (
let
@@ -57,7 +57,7 @@ in
];
virtualisation.writableStore = true;
virtualisation.pathsInNixDB = [ config.system.build.extraUtils ];
- environment.nix = nix;
+ nix.package = nix;
};
};
- 29/64: nix-shell --pure: Keep the user's $PAGER, (continued)
- 29/64: nix-shell --pure: Keep the user's $PAGER, Ludovic Courtès, 2015/01/05
- 27/64: Update release notes, Ludovic Courtès, 2015/01/05
- 26/64: Install systemd units, Ludovic Courtès, 2015/01/05
- 20/64: forceAttrs: Show position info, Ludovic Courtès, 2015/01/05
- 22/64: derivation: Don't require certain function arguments, Ludovic Courtès, 2015/01/05
- 30/64: Update installation instructions, Ludovic Courtès, 2015/01/05
- 23/64: Show position info in string concatenation / addition errors, Ludovic Courtès, 2015/01/05
- 35/64: Don't barf when installing as root, Ludovic Courtès, 2015/01/05
- 31/64: Remove redundant stuff, Ludovic Courtès, 2015/01/05
- 24/64: Show position info in Boolean operations, Ludovic Courtès, 2015/01/05
- 38/64: Fix test evaluation,
Ludovic Courtès <=
- 34/64: Add docbook icons to the distribution, Ludovic Courtès, 2015/01/05
- 37/64: Bump date, Ludovic Courtès, 2015/01/05
- 39/64: nix-env: Minor change to '--delete-generations Nd' semantics, Ludovic Courtès, 2015/01/05
- 33/64: If a .drv cannot be parsed, show its path, Ludovic Courtès, 2015/01/05
- 40/64: trunk -> master, Ludovic Courtès, 2015/01/05
- 17/64: Pass position information to primop calls, Ludovic Courtès, 2015/01/05
- 32/64: Simplify quick start section, Ludovic Courtès, 2015/01/05
- 43/64: Set build-max-jobs to the number of available cores by default, Ludovic Courtès, 2015/01/05
- 41/64: doc fix: swap 'import' and 'export', Ludovic Courtès, 2015/01/05
- 28/64: Ensure that systemd units to into lib, not lib64, Ludovic Courtès, 2015/01/05