forked from mirrors/nixpkgs
Fix NixOS evaluation
This commit is contained in:
parent
5ae6385175
commit
6b2a14d698
|
@ -113,7 +113,8 @@ let
|
|||
platform = pkgs.stdenv.platform;
|
||||
in
|
||||
{
|
||||
assertions = [ { assertion = ! config.boot.kernelPackages.kernel ? features || config.boot.kernelPackages.kernel.features ? efiBootStub; message = "This kernel does not support the EFI boot stub"; } ];
|
||||
#assertions = [ { assertion = ! config.boot.kernelPackages.kernel ? features || config.boot.kernelPackages.kernel.features ? efiBootStub; message = "This kernel does not support the EFI boot stub"; } ];
|
||||
|
||||
require = [
|
||||
options
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ nixosSrc ? {outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
|
||||
, nixpkgs ? {outPath = <nixpkgs>; revCount = 5678; shortRev = "fedcba"; }
|
||||
, minimal ? false
|
||||
#, minimal ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -195,8 +195,8 @@ let
|
|||
|
||||
tests =
|
||||
let
|
||||
t = import ./tests { system = "i686-linux"; inherit minimal; };
|
||||
t_64 = import ./tests { system = "x86_64-linux"; inherit minimal; };
|
||||
t = import ./tests { system = "i686-linux"; };
|
||||
t_64 = import ./tests { system = "x86_64-linux"; };
|
||||
in {
|
||||
avahi = t.avahi.test;
|
||||
bittorrent = t.bittorrent.test;
|
||||
|
|
Loading…
Reference in a new issue