aboutsummaryrefslogtreecommitdiff
path: root/flake.nix
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-11-07 11:44:02 +0100
committerEelco Dolstra <edolstra@gmail.com>2019-11-07 11:44:02 +0100
commitf730841db4db3da4dd33a477fcf016139d699722 (patch)
treec6f942a2e8a05c3dd3cddf600507b1e07815c177 /flake.nix
parent850f73045f7d34c51bfd1cddfd2c4c0c61e15a36 (diff)
parent99af822004418b25b6d04eca67949c62e770c16b (diff)
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/flake.nix b/flake.nix
index b3a7ea535..b3a06bdd0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -386,7 +386,6 @@
pkgs = nixpkgsFor.x86_64-linux;
officialRelease = false;
};
- */
# Check whether we can still evaluate NixOS.
tests.evalNixOS =
@@ -400,6 +399,7 @@
touch $out
'';
+ */
# Aggregate job containing the release-critical jobs.
release =
@@ -421,7 +421,7 @@
tests.nix-copy-closure
tests.binaryTarball
#tests.evalNixpkgs
- tests.evalNixOS
+ #tests.evalNixOS
installerScript
];
};