Merge master into staging-next (dee80e34) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -16718,6 +16718,12 @@
		githubId = 63069986;
		name = "Per Stark";
		};
		petee = {
		name = "Pete Erickson";
		email = "pete.perickson@gmail.com";
		github = "petee";
		githubId = 89916;
		};
		petercommand = {
		email = "petercommand@gmail.com";
		github = "petercommand";

+4 −4

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ system has booted, you can make the selected configuration the default
		for subsequent boots:

		```ShellSession
		# /run/current-system/bin/switch-to-configuration boot
		# /run/current-system/bin/apply boot
		```

		Second, you can switch to the previous configuration in a running
		@@ -25,11 +25,11 @@ system:
		This is equivalent to running:

		```ShellSession
		# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch
		# /nix/var/nix/profiles/system-N-link/bin/apply switch
		```

		where `N` is the number of the NixOS system configuration. To get a
		list of the available configurations, do:
		where `N` is the number of the NixOS system configuration to roll back to.
		To get a list of the available configurations, run:

		```ShellSession
		$ ls -l /nix/var/nix/profiles/system-*-link

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,6 @@ profile:
		The most notable deviation of this profile from a standard NixOS configuration
		is that after building it, you cannot switch to the configuration anymore.
		The profile sets `config.system.switch.enable = false;`, which excludes
		`switch-to-configuration`, the central script called by `nixos-rebuild`, from
		`apply` and `switch-to-configuration`, the central scripts called by `nixos-rebuild`, from
		your system. Removing this script makes the image lighter and slightly more
		secure.

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,8 +5,8 @@ This chapter explains some of the internals of this command to make it simpler
		for new module developers to configure their units correctly and to make it
		easier to understand what is happening and why for curious administrators.

		`nixos-rebuild`, like many deployment solutions, calls `switch-to-configuration`
		which resides in a NixOS system at `$out/bin/switch-to-configuration`. The
		`nixos-rebuild`, like many deployment solutions, calls `apply` (or for NixOS older than 24.11, `switch-to-configuration`)
		which resides in a NixOS system at `$out/bin/apply`. The
		script is called with the action that is to be performed like `switch`, `test`,
		`boot`. There is also the `dry-activate` action which does not really perform
		the actions but rather prints what it would do if you called it with `test`.

+1 −1

Original line number	Diff line number	Diff line
		@@ -247,7 +247,7 @@ The first steps to all these are the same:

		```ShellSession
		$ sudo mv -v /boot /boot.bak &&
		sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot
		sudo /nix/var/nix/profiles/system/bin/apply boot
		```

		Cross your fingers, reboot, hopefully you should get a NixOS prompt!