···356356 </listitem>
357357 <listitem>
358358 <para>
359359+ The <literal>--target-host</literal> and
360360+ <literal>--build-host</literal> options of
361361+ <literal>nixos-rebuild</literal> no longer treat the
362362+ <literal>localhost</literal> value specially – to build
363363+ on/deploy to local machine, omit the relevant flag.
364364+ </para>
365365+ </listitem>
366366+ <listitem>
367367+ <para>
359368 The <literal>nix.readOnlyStore</literal> option has been
360369 renamed to <literal>boot.readOnlyNixStore</literal> to clarify
361370 that it configures the NixOS boot process, not the Nix daemon.
+3-3
nixos/doc/manual/man-nixos-rebuild.xml
···583583 <listitem>
584584 <para>
585585 Specifies the NixOS target host. By setting this to something other than
586586- <replaceable>localhost</replaceable>, the system activation will happen
586586+ an empty string, the system activation will happen
587587 on the remote host instead of the local machine. The remote host needs to
588588 be accessible over ssh, and for the commands <option>switch</option>,
589589 <option>boot</option> and <option>test</option> you need root access.
590590 </para>
591591592592 <para>
593593- If <option>--build-host</option> is not explicitly specified, building
594594- will take place locally.
593593+ If <option>--build-host</option> is not explicitly specified or empty,
594594+ building will take place locally.
595595 </para>
596596597597 <para>
+2
nixos/doc/manual/release-notes/rl-2305.section.md
···87878888- In `mastodon` it is now necessary to specify location of file with `PostgreSQL` database password. In `services.mastodon.database.passwordFile` parameter default value `/var/lib/mastodon/secrets/db-password` has been changed to `null`.
89899090+- The `--target-host` and `--build-host` options of `nixos-rebuild` no longer treat the `localhost` value specially – to build on/deploy to local machine, omit the relevant flag.
9191+9092- The `nix.readOnlyStore` option has been renamed to `boot.readOnlyNixStore` to clarify that it configures the NixOS boot process, not the Nix daemon.
91939294- Deprecated `xlibsWrapper` transitional package has been removed in favour of direct use of its constitutents: `xorg.libX11`, `freetype` and others.
···242242 warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning)
243243 os.environ["NIXOS_INSTALL_BOOTLOADER"] = "1"
244244245245+ # flags to pass to bootctl install/update
246246+ bootctl_flags = []
247247+248248+ if "@canTouchEfiVariables@" != "1":
249249+ bootctl_flags.append("--no-variables")
250250+251251+ if "@graceful@" == "1":
252252+ bootctl_flags.append("--graceful")
253253+245254 if os.getenv("NIXOS_INSTALL_BOOTLOADER") == "1":
246255 # bootctl uses fopen() with modes "wxe" and fails if the file exists.
247256 if os.path.exists("@efiSysMountPoint@/loader/loader.conf"):
248257 os.unlink("@efiSysMountPoint@/loader/loader.conf")
249258250250- flags = []
251251-252252- if "@canTouchEfiVariables@" != "1":
253253- flags.append("--no-variables")
254254-255255- if "@graceful@" == "1":
256256- flags.append("--graceful")
257257-258258- subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + flags + ["install"])
259259+ subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["install"])
259260 else:
260261 # Update bootloader to latest if needed
261262 available_out = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[2]
···284285 print("skipping systemd-boot update to %s because of known regression" % available_version)
285286 else:
286287 print("updating systemd-boot from %s to %s" % (installed_version, available_version))
287287- subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@", "update"])
288288+ subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["update"])
288289289290 mkdir_p("@efiSysMountPoint@/efi/nixos")
290291 mkdir_p("@efiSysMountPoint@/loader/entries")
+1-1
nixos/modules/system/boot/modprobe.nix
···77 ###### interface
8899 options = {
1010- boot.modprobeConfig.enable = mkEnableOption (lib.mdDoc "modprobe config. This is useful for systemds like containers which do not require a kernel.") // {
1010+ boot.modprobeConfig.enable = mkEnableOption (lib.mdDoc "modprobe config. This is useful for systems like containers which do not require a kernel") // {
1111 default = true;
1212 };
1313
+2-2
nixos/modules/virtualisation/qemu-vm.nix
···211211 ''
212212 mkdir $out
213213 diskImage=$out/disk.img
214214- ${qemu}/bin/qemu-img create -f qcow2 $diskImage "60M"
214214+ ${qemu}/bin/qemu-img create -f qcow2 $diskImage "120M"
215215 ${if cfg.useEFIBoot then ''
216216 efiVars=$out/efi-vars.fd
217217 cp ${cfg.efi.variables} $efiVars
···225225 + " -drive if=pflash,format=raw,unit=1,file=$efiVars");
226226 }
227227 ''
228228- # Create a /boot EFI partition with 60M and arbitrary but fixed GUIDs for reproducibility
228228+ # Create a /boot EFI partition with 120M and arbitrary but fixed GUIDs for reproducibility
229229 ${pkgs.gptfdisk}/bin/sgdisk \
230230 --set-alignment=1 --new=1:34:2047 --change-name=1:BIOSBootPartition --typecode=1:ef02 \
231231 --set-alignment=512 --largest-new=2 --change-name=2:EFISystem --typecode=2:ef00 \
···2233stdenv.mkDerivation rec {
44 pname = "tdlib";
55- version = "1.8.8";
55+ version = "1.8.10";
6677 src = fetchFromGitHub {
88 owner = "tdlib";
···1111 # The tdlib authors do not set tags for minor versions, but
1212 # external programs depending on tdlib constrain the minor
1313 # version, hence we set a specific commit with a known version.
1414- rev = "bbe37ee594d97f3c7820dd23ebcd9c9b8dac51a0";
1515- sha256 = "jLJglvq+7f+zCoanDRTFpUsH/M1Qf7PWJ1JjvmZsa24=";
1414+ rev = "93c42f6d7c1209937431469f80427d48907f1b8d";
1515+ hash = "sha256-vdaVnC26txUBp8rlqx1CdLHlNlack3XXYdfFal1VLh4=";
1616 };
17171818 buildInputs = [ gperf openssl readline zlib ];
···157157 maybeSudo=(sudo --preserve-env="$preservedSudoVars" --)
158158fi
159159160160-if [[ -z "$buildHost" && -n "$targetHost" ]]; then
161161- buildHost="$targetHost"
162162-fi
163163-164160# log the given argument to stderr if verbose mode is on
165161logVerbose() {
166162 if [ -n "$verboseScript" ]; then
···159159 ];
160160 };
161161162162- linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream";
163163-164162 linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";
165163166164 linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream";
167165168168- linux_6_0 = callPackage ../os-specific/linux/kernel/linux-6.0.nix {
169169- kernelPatches = [
170170- kernelPatches.bridge_stp_helper
171171- kernelPatches.request_key_helper
172172- ];
173173- };
166166+ linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream";
174167175168 linux_6_1 = callPackage ../os-specific/linux/kernel/linux-6.1.nix {
176169 kernelPatches = [
···248241 linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
249242 linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
250243 linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
251251- linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { };
244244+ linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream";
252245 linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
253246254247 }));
···532525 linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
533526 linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
534527 linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
535535- linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23
536528 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17
537529 linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01
538538- linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0);
530530+ linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20
539531 linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
540532 };
541533···577569 linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
578570 linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
579571 linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
580580- linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { });
572572+ linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream";
581573 linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { });
582574583575 linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);