Unverified Commit 5af80acc authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents a4b5a14b 06570e54

nixos/doc/manual/release-notes/rl-2405.section.md

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ In addition to numerous new and upgraded packages, this release has the followin 


- `screen`'s module has been cleaned, and will now require you to set `programs.screen.enable` in order to populate `screenrc` and add the program to the environment.



- `linuxPackages_testing_bcachefs` is now fully deprecated by `linuxPackages_testing`, and is therefore no longer available.

- `linuxPackages_testing_bcachefs` is now fully deprecated by `linuxPackages_latest`, and is therefore no longer available.



- NixOS now installs a stub ELF loader that prints an informative error message when users attempt to run binaries not made for NixOS.

   - This can be disabled through the `environment.stub-ld.enable` option.

nixos/modules/module-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ 
  ./programs/haguichi.nix

  ./programs/hamster.nix

  ./programs/htop.nix

  ./programs/hyprland.nix

  ./programs/iay.nix

  ./programs/iftop.nix

  ./programs/i3lock.nix
@@ -273,6 +272,7 @@ 
  ./programs/wavemon.nix

  ./programs/wayland/cardboard.nix

  ./programs/wayland/labwc.nix

  ./programs/wayland/hyprland.nix

  ./programs/wayland/river.nix

  ./programs/wayland/sway.nix

  ./programs/wayland/waybar.nix

nixos/modules/system/boot/stage-1-init.sh

+8 −3
Original line number Diff line number Diff line
@@ -86,9 +86,14 @@ touch /etc/initrd-release 
# Function for waiting for device(s) to appear.

waitDevice() {

    local device="$1"

    # Split device string using ':' as a delimiter as bcachefs

    # uses this for multi-device filesystems, i.e. /dev/sda1:/dev/sda2:/dev/sda3

    local IFS=':'

    # Split device string using ':' as a delimiter, bcachefs uses

    # this for multi-device filesystems, i.e. /dev/sda1:/dev/sda2:/dev/sda3

    local IFS



    # bcachefs is the only known use for this at the moment

    # Preferably, the 'UUID=' syntax should be enforced, but

    # this is kept for compatibility reasons

    if [ "$fsType" = bcachefs ]; then IFS=':'; fi



    # USB storage devices tend to appear with some delay.  It would be

    # great if we had a way to synchronously wait for them, but

nixos/modules/tasks/filesystems/bcachefs.nix

+7 −2
Original line number Diff line number Diff line
@@ -123,9 +123,14 @@ in 
      inherit assertions;

      # needed for systemd-remount-fs

      system.fsPackages = [ pkgs.bcachefs-tools ];

      # FIXME: Remove this line when the default kernel has bcachefs

      # FIXME: Remove this line when the LTS (default) kernel is at least version 6.7

      boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;

      systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems);

      services.udev.packages = [ pkgs.bcachefs-tools ];



      systemd = {

        packages = [ pkgs.bcachefs-tools ];

        services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems);

      };

    }



    (lib.mkIf ((lib.elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) {