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

Merge master into staging-nixos

parents 8a847eb3 6b7b79b0

.github/workflows/backport.yml

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ jobs: 


      - name: Create backport PRs

        id: backport

        uses: korthout/backport-action@ca4972adce8039ff995e618f5fc02d1b7961f27a # v3.3.0

        uses: korthout/backport-action@d07416681cab29bf2661702f925f020aaa962997 # v3.4.1

        with:

          # Config README: https://github.com/korthout/backport-action#backport-action

          copy_labels_pattern: 'severity:\ssecurity'

doc/release-notes/rl-2511.section.md

+2 −0
Original line number Diff line number Diff line
@@ -294,6 +294,8 @@ 


- `forgejo-runner`: The upgrade to version 11 brings a license change from MIT to GPLv3-or-later.



- `waydroid-nftables`: New variant of `waydroid` that supports nftables instead of iptables.



- `lisp-modules` were brought in sync with the [June 2025 Quicklisp release](http://blog.quicklisp.org/2025/07/june-2025-quicklisp-dist-now-available.html).



- `ffmpeg_8`, `ffmpeg_8-headless`, and `ffmpeg_8-full` have been added. The default version of FFmpeg remains ffmpeg_7 for now, though this may change before release.

lib/systems/default.nix

+8 −1
Original line number Diff line number Diff line
@@ -491,6 +491,13 @@ let 
                }

                .${cpu.name} or cpu.name;

              vendor_ = final.rust.platform.vendor;

              abi_ =

                # We're very explicit about the POWER ELF ABI w/ glibc in our parsing, while Rust is not.

                # TODO: Somehow ensure that Rust actually *uses* the correct ABI, and not just a libc-based default.

                if (lib.strings.hasPrefix "powerpc" cpu.name) && (lib.strings.hasPrefix "gnuabielfv" abi.name) then

                  "gnu"

                else

                  abi.name;

            in

            # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL.

            args.rust.rustcTarget or args.rustc.config or (
@@ -501,7 +508,7 @@ let 
              if final.isWasi then

                "${cpu_}-wasip1"

              else

                "${cpu_}-${vendor_}-${kernel.name}${optionalString (abi.name != "unknown") "-${abi.name}"}"

                "${cpu_}-${vendor_}-${kernel.name}${optionalString (abi.name != "unknown") "-${abi_}"}"

            );



          # The name of the rust target if it is standard, or the json file

lib/systems/examples.nix

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ rec { 


  ppc64-elfv1 = {

    config = "powerpc64-unknown-linux-gnuabielfv1";

    rust.rustcTarget = "powerpc64-unknown-linux-gnu";

  };

  ppc64-elfv2 = {

    config = "powerpc64-unknown-linux-gnuabielfv2";

lib/systems/parse.nix

+2 −2
Original line number Diff line number Diff line
@@ -919,9 +919,9 @@ rec { 
          else if isLinux parsed || isWindows parsed then

            if isAarch32 parsed then

              if versionAtLeast (parsed.cpu.version or "0") "6" then abis.gnueabihf else abis.gnueabi

            # Default ppc64 BE to ELFv2

            # Default ppc64 BE to ELFv1

            else if isPower64 parsed && isBigEndian parsed then

              abis.gnuabielfv2

              abis.gnuabielfv1

            else

              abis.gnu

          else