Unverified Commit 22024142 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #263744 from K900/stateversion-docs 

treewide: rewrite stateVersion docs (again), clean up some stateVersion usages (again)
parents 24043a2b 424b0cef

nixos/maintainers/scripts/azure-new/examples/basic/system.nix

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ in 


  virtualisation.azureImage.diskSize = 2500;



  system.stateVersion = "20.03";

  boot.kernelPackages = pkgs.linuxPackages_latest;



  # test user doesn't have a password

nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 
# your system.  Help is available in the configuration.nix(5) man page

# and in the NixOS manual (accessible by running ‘nixos-help’).



{ config, pkgs, lib, ... }:

{ config, pkgs, lib, modulesPath, ... }:



{

  imports =

    [

      # Include the default lxd configuration.

      ../../../modules/virtualisation/lxc-container.nix

      "${modulesPath}/modules/virtualisation/lxc-container.nix"

      # Include the container-specific autogenerated configuration.

      ./lxd.nix

    ];
@@ -16,5 +16,5 @@ 
  networking.useDHCP = false;

  networking.interfaces.eth0.useDHCP = true;



  system.stateVersion = "21.05"; # Did you read the comment?

  system.stateVersion = "@stateVersion@"; # Did you read the comment?

}

nixos/maintainers/scripts/lxd/lxd-container-image.nix

+7 −3
Original line number Diff line number Diff line
@@ -13,11 +13,15 @@ 
  };



  # copy the config for nixos-rebuild

  system.activationScripts.config = ''

  system.activationScripts.config = let

    config = pkgs.substituteAll {

      src = ./lxd-container-image-inner.nix;

      stateVersion = lib.trivial.release;

    };

  in ''

    if [ ! -e /etc/nixos/configuration.nix ]; then

      mkdir -p /etc/nixos

      cat ${./lxd-container-image-inner.nix} > /etc/nixos/configuration.nix

      ${lib.getExe pkgs.gnused} 's|../../../modules/virtualisation/lxc-container.nix|<nixpkgs/nixos/modules/virtualisation/lxc-container.nix>|g' -i /etc/nixos/configuration.nix

      cp ${config} /etc/nixos/configuration.nix

    fi

  '';

nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 
# your system.  Help is available in the configuration.nix(5) man page

# and in the NixOS manual (accessible by running ‘nixos-help’).



{ config, pkgs, lib, ... }:

{ config, pkgs, lib, modulesPath, ... }:



{

  imports =

    [

      # Include the default lxd configuration.

      ../../../modules/virtualisation/lxd-virtual-machine.nix

      "${modulesPath}/virtualisation/lxd-virtual-machine.nix"

      # Include the container-specific autogenerated configuration.

      ./lxd.nix

    ];
@@ -16,5 +16,5 @@ 
  networking.useDHCP = false;

  networking.interfaces.eth0.useDHCP = true;



  system.stateVersion = "23.05"; # Did you read the comment?

  system.stateVersion = "@stateVersion@"; # Did you read the comment?

}

nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix

+7 −3
Original line number Diff line number Diff line
@@ -13,11 +13,15 @@ 
  };



  # copy the config for nixos-rebuild

  system.activationScripts.config = ''

  system.activationScripts.config = let

    config = pkgs.substituteAll {

      src = ./lxd-virtual-machine-image-inner.nix;

      stateVersion = lib.trivial.release;

    };

  in ''

    if [ ! -e /etc/nixos/configuration.nix ]; then

      mkdir -p /etc/nixos

      cat ${./lxd-virtual-machine-image-inner.nix} > /etc/nixos/configuration.nix

      ${lib.getExe pkgs.gnused} 's|../../../modules/virtualisation/lxd-virtual-machine.nix|<nixpkgs/nixos/modules/virtualisation/lxd-virtual-machine.nix>|g' -i /etc/nixos/configuration.nix

      cp ${config} /etc/nixos/configuration.nix

    fi

  '';