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

Merge master into staging-next

parents c9252789 02384565

.github/workflows/check-shell.yml

+6 −0
Original line number Diff line number Diff line
@@ -44,5 +44,11 @@ jobs: 


      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31



      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16

        with:

          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.

          name: nixpkgs-ci

          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"



      - name: Build shell

        run: nix-build untrusted/ci -A shell

.github/workflows/lib-tests.yml

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,12 @@ jobs: 
        with:

          extra_nix_config: sandbox = true



      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16

        with:

          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.

          name: nixpkgs-ci

          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"



      - name: Building Nixpkgs lib-tests

        run: |

          nix-build untrusted/ci -A lib-tests

ci/OWNERS

+3 −6
Original line number Diff line number Diff line
@@ -15,12 +15,9 @@ 


# CI

/.github/*_TEMPLATE*                    @SigmaSquadron

/.github/actions                        @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther

/.github/workflows                      @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther

/.github/workflows/check-format.yml     @infinisil @wolfgangwalther

/.github/workflows/codeowners-v2.yml    @infinisil @wolfgangwalther

/.github/workflows/nixpkgs-vet.yml      @infinisil @philiptaron @wolfgangwalther

/ci                                     @infinisil @philiptaron @NixOS/Security @wolfgangwalther

/.github/actions                        @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron

/.github/workflows                      @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron

/ci                                     @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron

/ci/OWNERS                              @infinisil @philiptaron



# Development support

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

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ 
  - Applications linked against different Mesa versions than installed on the system should now work correctly going forward (however, applications against older Mesa, e.g. from Nixpkgs releases before 25.05, remain broken)

  - Packages that used to depend on Mesa for libgbm or libdri should use `libgbm` or `dri-pkgconfig-stub` as inputs, respectively



- GNU Taler has been updated to version 1.0.

  This marks a significant milestone as the GNU Taler payment system is now available in Swiss Francs for individuals and businesses in Switzerland.

  For more details, see the [upstream release notes](https://www.taler.net/en/news/2025-01.html).



- OpenSSH has been updated from 9.9p2 to 10.0p2, dropping support for DSA keys and adding a new `ssh-auth` binary to handle user authentication in a different address space from unauthenticated sessions. See the [full changelog](https://www.openwall.com/lists/oss-security/2025/04/09/1) for more details.



- Emacs has been updated to 30.1.

lib/tests/maintainers.nix

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ let 


  missingGithubIds = lib.concatLists (lib.mapAttrsToList checkMaintainer lib.maintainers);



  success = pkgs.runCommand "checked-maintainers-success" { } ">$out";

  success = pkgs.runCommand "checked-maintainers-success" { } "mkdir $out";



  failure =

    pkgs.runCommand "checked-maintainers-failure"