From f946a7cd9b9a469843dd71225fef9f157453d834 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Tue, 5 Jul 2022 12:19:01 +0200 Subject: [PATCH] examples: use `mkDefault` for setting `system.stateVersion` This makes it easier for users to override the default. --- examples/deploy-krops.sh | 2 +- examples/qemu-vm/minimal-vm.nix | 2 +- test/lib/make-test.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/deploy-krops.sh b/examples/deploy-krops.sh index 6cbd0e1..1615131 100755 --- a/examples/deploy-krops.sh +++ b/examples/deploy-krops.sh @@ -34,7 +34,7 @@ nix-build --out-link $tmpDir/vm - <<'EOF' # warning: Nix search path entry '/nix/var/nix/profiles/per-user/root/channels' does not exist, ignoring nix.nixPath = lib.mkForce []; - system.stateVersion = config.system.nixos.release; + system.stateVersion = lib.mkDefault config.system.nixos.release; }; }).config.system.build.vm EOF diff --git a/examples/qemu-vm/minimal-vm.nix b/examples/qemu-vm/minimal-vm.nix index 2c1f51a..6bb9275 100644 --- a/examples/qemu-vm/minimal-vm.nix +++ b/examples/qemu-vm/minimal-vm.nix @@ -45,7 +45,7 @@ rec { echo o >/proc/sysrq-trigger ''; - system.stateVersion = config.system.nixos.release; + system.stateVersion = lib.mkDefault config.system.nixos.release; }; }).config.system.build.vm; diff --git a/test/lib/make-test.nix b/test/lib/make-test.nix index 6bd52be..09f4b50 100644 --- a/test/lib/make-test.nix +++ b/test/lib/make-test.nix @@ -79,7 +79,7 @@ name: testConfig: '')) ]; - system.stateVersion = config.system.nixos.release; + system.stateVersion = lib.mkDefault config.system.nixos.release; })).config.system.build.vm; config = testConfig;