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

Merge master into staging-next

parents 3c2db12b 6c484dba

nixos/modules/installer/cd-dvd/iso-image.nix

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ let 
      echo "Usage size: $usage_size"

      echo "Image size: $image_size"

      truncate --size=$image_size "$out"

      faketime "2000-01-01 00:00:00" mkfs.vfat -i 12345678 -n EFIBOOT "$out"

      mkfs.vfat --invariant -i 12345678 -n EFIBOOT "$out"



      # Force a fixed order in mcopy for better determinism, and avoid file globbing

      for d in $(find EFI -type d | sort); do

nixos/modules/installer/sd-card/sd-image.nix

+13 −2
Original line number Diff line number Diff line
@@ -224,14 +224,25 @@ in 
        # Create a FAT32 /boot/firmware partition of suitable size into firmware_part.img

        eval $(partx $img -o START,SECTORS --nr 1 --pairs)

        truncate -s $((SECTORS * 512)) firmware_part.img

        faketime "1970-01-01 00:00:00" mkfs.vfat -i ${config.sdImage.firmwarePartitionID} -n ${config.sdImage.firmwarePartitionName} firmware_part.img



        mkfs.vfat --invariant -i ${config.sdImage.firmwarePartitionID} -n ${config.sdImage.firmwarePartitionName} firmware_part.img



        # Populate the files intended for /boot/firmware

        mkdir firmware

        ${config.sdImage.populateFirmwareCommands}



        find firmware -exec touch --date=2000-01-01 {} +

        # Copy the populated /boot/firmware into the SD image

        (cd firmware; mcopy -psvm -i ../firmware_part.img ./* ::)

        cd firmware

        # Force a fixed order in mcopy for better determinism, and avoid file globbing

        for d in $(find . -type d -mindepth 1 | sort); do

          faketime "2000-01-01 00:00:00" mmd -i ../firmware_part.img "::/$d"

        done

        for f in $(find . -type f | sort); do

          mcopy -pvm -i ../firmware_part.img "$f" "::/$f"

        done

        cd ..



        # Verify the FAT partition before copying it.

        fsck.vfat -vn firmware_part.img

        dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS

nixos/modules/services/web-servers/caddy/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -290,6 +290,9 @@ in 
      }

    '';



    # https://github.com/lucas-clemente/quic-go/wiki/UDP-Receive-Buffer-Size

    boot.kernel.sysctl."net.core.rmem_max" = mkDefault 2500000;



    systemd.packages = [ cfg.package ];

    systemd.services.caddy = {

      wants = map (hostOpts: "acme-finished-${hostOpts.useACMEHost}.target") acmeVHosts;

nixos/modules/system/boot/systemd/nspawn.nix

+3 −1
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@ let 
  ];



  instanceOptions = {

    options = sharedOptions // {

    options =

    (getAttrs [ "enable" ] sharedOptions)

    // {

      execConfig = mkOption {

        default = {};

        example = { Parameters = "/bin/sh"; };

pkgs/applications/emulators/rpcs3/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ 


let

  # Keep these separate so the update script can regex them

  rpcs3GitVersion = "14263-0737c788f";

  rpcs3Version = "0.0.24-14263-0737c788f";

  rpcs3Revision = "0737c788fc8b8b33d79c620065c5fc4990dbed80";

  rpcs3Sha256 = "1r7ibbzdmm5ikk0856hy46c8466liz5jsiqzcqvbdr8jbwdcdmg9";

  rpcs3GitVersion = "14289-0da81d22d";

  rpcs3Version = "0.0.24-14289-0da81d22d";

  rpcs3Revision = "0da81d22d340dca1ac098a9de5274641bdc77869";

  rpcs3Sha256 = "0qblfsdyngj8bb7g49am0q0mq5llwx3g4x4gi6h0jynk0d9j0ir0";



  ittapi = fetchFromGitHub {

    owner = "intel";