diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-08-31 09:18:13 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-09-02 09:16:13 -0700 |
| commit | 36614ff3e290a9330dd8e29bdc6cc38ede1e7001 (patch) | |
| tree | e09b3db53d7b9bd000687beaf82356b237d8056d /nixos/release-combined.nix | |
| parent | af4c369d0a21e77afb1bdb0993e67e027d29235a (diff) | |
| download | nixpkgs-36614ff3e290a9330dd8e29bdc6cc38ede1e7001.tar nixpkgs-36614ff3e290a9330dd8e29bdc6cc38ede1e7001.tar.gz nixpkgs-36614ff3e290a9330dd8e29bdc6cc38ede1e7001.tar.bz2 nixpkgs-36614ff3e290a9330dd8e29bdc6cc38ede1e7001.tar.lz nixpkgs-36614ff3e290a9330dd8e29bdc6cc38ede1e7001.tar.xz nixpkgs-36614ff3e290a9330dd8e29bdc6cc38ede1e7001.tar.zst nixpkgs-36614ff3e290a9330dd8e29bdc6cc38ede1e7001.zip | |
Revert "Revert "Merge pull request #2449 from wkennington/master.grub""
This reverts commit 94205f5f21c4d9942bb4205c06229438051b6853. Conflicts: nixos/modules/system/boot/loader/grub/install-grub.pl
Diffstat (limited to 'nixos/release-combined.nix')
| -rw-r--r-- | nixos/release-combined.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index dae3b9210a8..23348e1d089 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -52,6 +52,10 @@ in rec { (all nixos.tests.installer.lvm) (all nixos.tests.installer.separateBoot) (all nixos.tests.installer.simple) + (all nixos.tests.installer.simpleLabels) + (all nixos.tests.installer.simpleProvided) + (all nixos.tests.installer.btrfsSimple) + (all nixos.tests.installer.btrfsSubvols) (all nixos.tests.ipv6) (all nixos.tests.kde4) (all nixos.tests.login) |