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.nix | |
| parent | af4c369d0a21e77afb1bdb0993e67e027d29235a (diff) | |
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.nix')
| -rw-r--r-- | nixos/release.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index e2b93640f917b..f78ecb4383d0c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -231,7 +231,7 @@ in rec { tests.installer.simpleLabels = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleLabels.test); tests.installer.simpleProvided = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleProvided.test); tests.installer.btrfsSimple = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSimple.test); - #tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test); + tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test); tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; |