summaryrefslogtreecommitdiff
path: root/release.nix
diff options
context:
space:
mode:
authorEmily <vcs@emily.moe>2024-09-12 17:21:48 +0100
committerEmily <vcs@emily.moe>2024-09-12 18:35:10 +0100
commit04e3cfc822568d354b540a3207121af27b699057 (patch)
tree27ed3c3b4747c2ee8144b1650d90c6c044d1ac9d /release.nix
parentf4f18f3d7229845e1c9d517457b7a0b90a38b728 (diff)
version: make `system.stateVersion` mandatory
When testing the Sequoia UID change, I discovered that @mjm didn’t have `system.stateVersion` set; I suspect this is not too uncommon. Let’s make it required now, like NixOS is trying to, to improve our backwards‐compatibility story in anticipation of starting to cut release branches.
Diffstat (limited to 'release.nix')
-rw-r--r--release.nix12
1 files changed, 9 insertions, 3 deletions
diff --git a/release.nix b/release.nix
index 648e9a2..c3a9dde 100644
--- a/release.nix
+++ b/release.nix
@@ -40,6 +40,8 @@ let
};
config = {
+ system.stateVersion = lib.mkDefault config.system.maxStateVersion;
+
system.build.run-test = pkgs.runCommand "darwin-test-${testName}"
{ allowSubstitutes = false; preferLocalBuild = true; }
''
@@ -71,6 +73,10 @@ let
nano emacs vim;
};
+ manual = buildFromConfig ({ lib, config, ... }: {
+ system.stateVersion = lib.mkDefault config.system.maxStateVersion;
+ }) (config: config.system.build.manual);
+
jobs = {
unstable = pkgs.releaseTools.aggregate {
@@ -92,9 +98,9 @@ let
meta.description = "Release-critical builds for the darwin channel";
};
- manualHTML = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualHTML);
- manpages = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manpages);
- options = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.optionsJSON);
+ manualHTML = manual.manualHTML;
+ manpages = manual.manpages;
+ options = manual.optionsJSON;
examples.hydra = makeSystem ./modules/examples/hydra.nix;
examples.lnl = makeSystem ./modules/examples/lnl.nix;