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:
commit
f730841db4
15 changed files with 153 additions and 25 deletions
|
@ -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
|
||||
];
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue