lix-project/lix-releng-staging
0
0
Fork 0
Code Packages Activity

Fix tests

Browse source
This commit is contained in:
Eelco Dolstra 2012-03-12 21:41:45 +01:00
parent 005d1e4ccb
commit b461721f17
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
release.nix
View file

@ -1,4 +1,4 @@
{ nixpkgs ? <nixpkgs>, nixos ? <nixos>
{ nixpkgs ? <nixpkgs>
, nix ? { outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
, officialRelease ? false
}:
@ -145,11 +145,11 @@ let
# System tests.
tests.remote_builds = (import ./tests/remote-builds.nix rec {
inherit nixpkgs nixos; nix = build { inherit system; }; system = "x86_64-linux";
nix = build { inherit system; }; system = "x86_64-linux";
}).test;
tests.nix_copy_closure = (import ./tests/nix-copy-closure.nix rec {
inherit nixpkgs nixos; nix = build { inherit system; }; system = "x86_64-linux";
nix = build { inherit system; }; system = "x86_64-linux";
}).test;
};

4
tests/nix-copy-closure.nix
View file

@ -1,8 +1,8 @@
# Test ‘nix-copy-closure’.
{ nixpkgs, nixos, system, nix }:
{ system, nix }:
with import "${nixos}/lib/testing.nix" { inherit nixpkgs system; };
with import <nixos/lib/testing.nix> { inherit system; };
makeTest ({ pkgs, ... }: let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {

4
tests/remote-builds.nix
View file

@ -1,8 +1,8 @@
# Test Nix's remote build feature.
{ nixpkgs, nixos, system, nix }:
{ system, nix }:
with import "${nixos}/lib/testing.nix" { inherit nixpkgs system; };
with import <nixos/lib/testing.nix> { inherit system; };
makeTest ({ pkgs, ... }: