1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-08 02:43:54 +02:00

Merge remote-tracking branch 'origin/master' into flakes

This commit is contained in:
Eelco Dolstra 2019-11-07 11:44:02 +01:00
commit f730841db4
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
15 changed files with 153 additions and 25 deletions

View file

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