colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NixOS evaluation

Browse Source
This commit is contained in:
Eelco Dolstra 2012-08-09 10:04:25 -04:00
parent 5ae6385175
commit 6b2a14d698
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix
View File

@ -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

6
release.nix
View File

@ -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;