···356356 </listitem>357357 <listitem>358358 <para>359359+ The <literal>--target-host</literal> and360360+ <literal>--build-host</literal> options of361361+ <literal>nixos-rebuild</literal> no longer treat the362362+ <literal>localhost</literal> value specially – to build363363+ 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 been360369 renamed to <literal>boot.readOnlyNixStore</literal> to clarify361370 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 than586586- <replaceable>localhost</replaceable>, the system activation will happen586586+ an empty string, the system activation will happen587587 on the remote host instead of the local machine. The remote host needs to588588 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, building594594- 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/update246246+ 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 needed261262 available_out = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[2]···285284 print("skipping systemd-boot update to %s because of known regression" % available_version)286285 else:287286 print("updating systemd-boot from %s to %s" % (installed_version, available_version))288288- subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@", "update"])287287+ subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["update"])289288290289 mkdir_p("@efiSysMountPoint@/efi/nixos")291290 mkdir_p("@efiSysMountPoint@/loader/entries")
+1-1
nixos/modules/system/boot/modprobe.nix
···77 ###### interface8899 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 $out213213 diskImage=$out/disk.img214214- ${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.fd217217 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 reproducibility228228+ # Create a /boot EFI partition with 120M and arbitrary but fixed GUIDs for reproducibility229229 ${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, but1212 # external programs depending on tdlib constrain the minor1313 # 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 ];
···11+diff --git a/CMakeLists.txt b/CMakeLists.txt22+index 48af2a89..43786c31 10064413--- a/CMakeLists.txt24+++ b/CMakeLists.txt33-@@ -1,4 +1,4 @@44--cmake_minimum_required(VERSION 2.8)55-+cmake_minimum_required(VERSION 3.6)66- project(Performous CXX C)55+@@ -75,15 +75,7 @@ else()66+ message(STATUS "Localization disabled: Gettext tools (msgfmt) missing")77+ endif()7888- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")99---- a/cmake/Modules/FindPango.cmake1010-+++ b/cmake/Modules/FindPango.cmake1111-@@ -2,31 +2,10 @@1212- # Once done, this will define1313- #1414- # Pango_FOUND - system has Pango1515--# Pango_INCLUDE_DIRS - the Pango include directories1616- # Pango_LIBRARIES - link these to use Pango1717-1818- include(LibFindMacros)1919-2020--# Dependencies2121--libfind_package(Pango Freetype)2222--libfind_package(Pango Glib)2323--libfind_package(Pango GObject)2424--2525--# Use pkg-config to get hints about paths2626--libfind_pkg_check_modules(Pango_PKGCONF pango)2727--2828--# Include dir2929--find_path(Pango_INCLUDE_DIR3030-- NAMES pango/pango.h3131-- HINTS ${Pango_PKGCONF_INCLUDE_DIRS}3232-- PATH_SUFFIXES pango-1.099+-include(FetchContent)1010+-FetchContent_Declare(ced-sources1111+- GIT_REPOSITORY https://github.com/performous/compact_enc_det.git1212+- #https://github.com/google/compact_enc_det.git1313+- GIT_TAG master1414+- SOURCE_DIR ced-src3315-)3416-3535--# Finally the library itself3636--find_library(Pango_LIBRARY3737-- NAMES pango-1.03838-- HINTS ${Pango_PKGCONF_LIBRARY_DIRS}3939--)4040--4141-+libfind_pkg_check_modules(Pango_PKGCONF IMPORTED_TARGET pango)4242-+set(Pango_LIBRARY PkgConfig::Pango_PKGCONF)4343- libfind_process(Pango)4444--4545---- a/cmake/Modules/FindPangoCairo.cmake4646-+++ b/cmake/Modules/FindPangoCairo.cmake4747-@@ -1,35 +1,11 @@4848- # - Try to find PangoCairo4949- # Once done, this will define5050- #5151--# PangoCairo_FOUND - system has Pango5252--# PangoCairo_INCLUDE_DIRS - the Pango include directories5353--# PangoCairo_LIBRARIES - link these to use Pango5454-+# PangoCairo_FOUND - system has PangoCairo5555-+# PangoCairo_LIBRARIES - link these to use PangoCairo1717+-FetchContent_MakeAvailable(ced-sources)1818++add_subdirectory(ced-src)56195757- include(LibFindMacros)2020+ option(USE_SELF_BUILT_AUBIO "Use custom aubio local build instead of using system lib (if available)" FALSE)58215959--# Dependencies6060--libfind_package(PangoCairo Pango)6161--libfind_package(PangoCairo Cairo)6262--6363--# Use pkg-config to get hints about paths6464--libfind_pkg_check_modules(PangoCairo_PKGCONF pangocairo)6565--6666--# Include dir6767--find_path(PangoCairo_INCLUDE_DIR6868-- NAMES pango/pangocairo.h6969-- HINTS ${PangoCairo_PKGCONF_INCLUDE_DIRS}7070-- PATH_SUFFIXES pango-1.07171--)7272--7373--# Finally the library itself7474--find_library(PangoCairo_LIBRARY7575-- NAMES pangocairo-1.07676-- HINTS ${PangoCairo_PKGCONF_LIBRARY_DIRS}7777--)7878--7979--# Set the include dir variables and the libraries and let libfind_process do the rest.8080--# NOTE: Singular variables for this library, plural for libraries this this lib depends on.8181--set(PangoCairo_PROCESS_INCLUDES PangoCairo_INCLUDE_DIR Pango_INCLUDE_DIR Cairo_INCLUDE_DIR)8282--set(PangoCairo_PROCESS_LIBS PangoCairo_LIBRARY Pango_LIBRARY Cairo_LIBRARY)8383-+libfind_pkg_check_modules(PangoCairo_PKGCONF IMPORTED_TARGET pangocairo)8484-+set(PangoCairo_LIBRARY PkgConfig::PangoCairo_PKGCONF)8585- libfind_process(PangoCairo)8686--
···157157 maybeSudo=(sudo --preserve-env="$preservedSudoVars" --)158158fi159159160160-if [[ -z "$buildHost" && -n "$targetHost" ]]; then161161- buildHost="$targetHost"162162-fi163163-164160# log the given argument to stderr if verbose mode is on165161logVerbose() {166162 if [ -n "$verboseScript" ]; then
···1616, enablePython ? true17171818# for determining the latest compatible linuxPackages1919-, linuxPackages_6_0 ? pkgs.linuxKernel.packages.linux_6_01919+, linuxPackages_6_1 ? pkgs.linuxKernel.packages.linux_6_12020}:21212222let···222222 # to be adapted223223 zfsStable = common {224224 # check the release notes for compatible kernels225225- kernelCompatible = kernel.kernelOlder "6.1";226226- latestCompatibleLinuxPackages = linuxPackages_6_0;225225+ kernelCompatible = kernel.kernelOlder "6.2";226226+ latestCompatibleLinuxPackages = linuxPackages_6_1;227227228228 # this package should point to the latest release.229229- version = "2.1.7";229229+ version = "2.1.8";230230231231- sha256 = "sha256-vLm6RE11nqOCoYXne79JU3nUQnVEUNbwrULwFfghWcI=";231231+ sha256 = "sha256-/+23SEtywa7b1dgvQNmEGrfqXzM1mlk00TSpuiCkQOk=";232232 };233233234234 zfsUnstable = common {235235 # check the release notes for compatible kernels236236- kernelCompatible = kernel.kernelOlder "6.1";237237- latestCompatibleLinuxPackages = linuxPackages_6_0;236236+ kernelCompatible = kernel.kernelOlder "6.2";237237+ latestCompatibleLinuxPackages = linuxPackages_6_1;238238239239 # this package should point to a version / git revision compatible with the latest kernel release240240 # IMPORTANT: Always use a tagged release candidate or commits from the241241 # zfs-<version>-staging branch, because this is tested by the OpenZFS242242 # maintainers.243243- version = "2.1.8-staging-2023-01-10";244244- rev = "0156253d29a303bdcca3e535958e754d8f086e33";243243+ version = "2.1.9-staging-2023-01-19";244244+ rev = "04b02785b67f9b976c43643dd52ce6cdbc22e11e";245245246246- sha256 = "sha256-2+vymBesmNLB3fuaCwQOojEzn3aYqtxIo35MvlwOoNw=";246246+ sha256 = "sha256-/+23SEtywa7b1dgvQNmEGrfqXzM1mlk00TSpuiCkQOk=";247247248248 isUnstable = true;249249 };
···22, lib33, buildGoModule44, fetchFromGitHub55+, fetchpatch56, writeText67, writeShellScriptBin78, runtimeShell···45444645 ldflags = [4746 "-s" "-w" "-X main.version=${version} -X main.revision=${src.rev}"4747+ ];4848+4949+ patches = [5050+ # fix for test failure on 32-bit platforms5151+ # can be removed in the next release of fzf5252+ # https://github.com/junegunn/fzf/issues/31275353+ (fetchpatch {5454+ url = "https://github.com/junegunn/fzf/commit/aa7361337d3f78ae1e32283ba395446025323abb.patch";5555+ hash = "sha256-ZmBdJa7eq9f58f2pL7QrtDSApkQJQBH/Em12J5xk3Q4=";5656+ })4857 ];49585059 # The vim plugin expects a relative path to the binary; patch it to abspath.
···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_helper171171- kernelPatches.request_key_helper172172- ];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 = [···241248 linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };242249 linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";243250 linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";244244- linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { };251251+ linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream";245252 linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };246253247254 }));···525532 linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);526533 linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);527534 linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);528528- linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23529535 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17530536 linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01531531- linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0);537537+ linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20532538 linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);533539 };534540···569577 linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });570578 linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";571579 linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";572572- linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { });580580+ linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream";573581 linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { });574582575583 linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);