Unverified Commit 057a9046 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 4c907dbb 173eb8c1

.github/actions/checkout/action.yml

+8 −8
Original line number Diff line number Diff line
@@ -103,14 +103,14 @@ runs: 
            await run('sudo', 'mount', '-t', 'tmpfs', 'tmpfs', 'nixpkgs')

          }



          // Create all worktrees in parallel.

          await Promise.all(

            commits.map(async ({ sha, path }) => {

          // Git worktree setup can race when multiple worktrees are created and

          // initialized at the same time against one repository. See #511286.

          // Keep the setup sequential so shared repo config updates cannot contend.

          for (const { sha, path } of commits) {

            await run('git', 'worktree', 'add', join('nixpkgs', path), sha, '--no-checkout')

            await run('git', '-C', join('nixpkgs', path), 'sparse-checkout', 'disable')

            await run('git', '-C', join('nixpkgs', path), 'checkout', '--progress')

            })

          )

          }



          // Apply pin bump to untrusted worktree

          if (pin_bump_sha) {

ci/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -184,9 +184,10 @@ rec { 
    nix = pkgs.nixVersions.latest;

  };

  parse = pkgs.lib.recurseIntoAttrs {

    latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };

    lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };

    nix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };

    nix_2_28 = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_28; };

    lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };

    lix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.lixPackageSets.latest.lix; };

  };

  shell = import ../shell.nix { inherit nixpkgs system; };

  tarball = import ../pkgs/top-level/make-tarball.nix {

ci/parse.nix

+8 −1
Original line number Diff line number Diff line
@@ -28,7 +28,14 @@ runCommand "nix-parse-${nix.name}" 
    # the other CI jobs will report in more detail. This job is about checking parsing

    # across different implementations / versions, not about providing the best DX.

    # Returning all parse errors requires significantly more resources.

    find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse >/dev/null



    find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse 2>&1 >/dev/null | {

      # Also fail on (deprecation) warnings printed to stderr.

      if grep "warning"; then

        echo "Failing due to warnings in stderr" >&2

        exit 1

      fi

    }



    touch $out

  ''

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

+3 −0
Original line number Diff line number Diff line
@@ -303,6 +303,9 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>. 
  - SQLite paths are now relative to `service.rootpath` unless absolute. Startup now validates file

    storage and OAuth providers.



- `xfsprogs` was updated to version 6.18.0, which enables parent pointers and exchange-range by default. Upstream recommends not to use these features with kernels older than 6.18.

   GRUB2 is likely unable to boot from filesystems with these features enabled.



- `lunarvim` package has been removed, as it was abandoned upstream and relied on an old version of `neovim` to work properly.



- `opengfw` package and `services.opengfw` module have been removed as the upstream GitHub repository and website have been shut down.

nixos/tests/installer.nix

+6 −2
Original line number Diff line number Diff line
@@ -1323,7 +1323,7 @@ in 
  };



  # Create two physical LVM partitions combined into one volume group

  # that contains the logical swap and root partitions.

  # that contains the logical swap, boot and root partitions.

  lvm = makeInstallerTest "lvm" {

    createPartitions = ''

      installer.succeed(
@@ -1336,11 +1336,15 @@ in 
          "pvcreate /dev/vda1 /dev/vda2",

          "vgcreate MyVolGroup /dev/vda1 /dev/vda2",

          "lvcreate --size 1G --name swap MyVolGroup",

          "lvcreate --size 6G --name nixos MyVolGroup",

          "lvcreate --size 1G --name boot MyVolGroup",

          "lvcreate --size 5G --name nixos MyVolGroup",

          "mkswap -f /dev/MyVolGroup/swap -L swap",

          "swapon -L swap",

          "mkfs.ext4 -L boot /dev/MyVolGroup/boot",

          "mkfs.xfs -L nixos /dev/MyVolGroup/nixos",

          "mount LABEL=nixos /mnt",

          "mkdir /mnt/boot",

          "mount LABEL=boot /mnt/boot",

      )

    '';

    extraConfig = optionalString systemdStage1 ''