This commit is contained in:
Eelco Dolstra 2016-01-20 00:26:51 +01:00
parent b669d3d2e8
commit da4495eb17

View file

@ -1,4 +1,5 @@
{ nix ? { outPath = ./.; revCount = 1234; shortRev = "abcdef"; } { nix ? { outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
, nixpkgs ? { outPath = <nixpkgs>; revCount = 1234; shortRev = "abcdef"; }
, officialRelease ? false , officialRelease ? false
}: }:
@ -235,7 +236,6 @@ let
''); # */ ''); # */
tests.evalNixpkgs = tests.evalNixpkgs =
{ nixpkgs ? { outPath = pkgs.lib.cleanSource <nixpkgs>; revCount = 1234; shortRev = "abcdef"; } }:
import <nixpkgs/pkgs/top-level/make-tarball.nix> { import <nixpkgs/pkgs/top-level/make-tarball.nix> {
inherit nixpkgs; inherit nixpkgs;
inherit pkgs; inherit pkgs;
@ -244,7 +244,6 @@ let
}; };
tests.evalNixOS = tests.evalNixOS =
{ nixpkgs ? { outPath = pkgs.lib.cleanSource <nixpkgs>; revCount = 1234; shortRev = "abcdef"; } }:
pkgs.runCommand "eval-nixos" { buildInputs = [ build.x86_64-linux ]; } pkgs.runCommand "eval-nixos" { buildInputs = [ build.x86_64-linux ]; }
'' ''
export NIX_DB_DIR=$TMPDIR export NIX_DB_DIR=$TMPDIR