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

Merge master into staging-nixos

parents 03bb3f79 ffd468f2

ci/github-script/bot.js

+6 −2
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ module.exports = async ({ github, context, core, dry }) => { 
      }

    }



    // Check for any human reviews other than GitHub actions and other GitHub apps.

    // Check for any human reviews other than the PR author, GitHub actions and other GitHub apps.

    // Accounts could be deleted as well, so don't count them.

    const reviews = (

      await github.paginate(github.rest.pulls.listReviews, {
@@ -218,7 +218,11 @@ module.exports = async ({ github, context, core, dry }) => { 
        pull_number,

      })

    ).filter(

      (r) => r.user && !r.user.login.endsWith('[bot]') && r.user.type !== 'Bot',

      (r) =>

        r.user &&

        !r.user.login.endsWith('[bot]') &&

        r.user.type !== 'Bot' &&

        r.user.id !== pull_request.user?.id,

    )



    const approvals = new Set(

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

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


- `plasma6`: Fixed the `ksycoca` cache not being re-built when `$XDG_CACHE_HOME` is set to something that isn't `$HOME/.cache`.



- `dragonflydb` has been updated from version 0.1.0 to version 1.34.2.



## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

maintainers/maintainer-list.nix

+6 −6
Original line number Diff line number Diff line
@@ -5417,12 +5417,6 @@ 
    githubId = 202474;

    name = "Jens Reimann";

  };

  ctucx = {

    email = "katja@ctu.cx";

    github = "katjakwast";

    githubId = 176372446;

    name = "Katja Kwast";

  };

  cupcakearmy = {

    name = "Niccolo Borgioli";

    email = "nix@nicco.io";
@@ -29007,6 +29001,12 @@ 
    githubId = 450885;

    name = "Francesco Zanini";

  };

  zaphyra = {

    email = "katja@zaphyra.eu";

    github = "katjakwast";

    githubId = 176372446;

    name = "Katja Kwast";

  };

  zareix = {

    email = "contact@raphael-catarino.fr";

    github = "zareix";

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

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


- `services.quorum` has been removed as the `quorum` package was broken and abandoned upstream.



- `orjail` package has been removed as it is broken by the latest firejail release and seems unmaintained.



- `teleport` has been upgraded from major version 17 to major version 18.

Refer to [upstream upgrade instructions](https://goteleport.com/docs/upgrading/overview/)

and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).

nixos/modules/config/nix-channel.nix

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ in 
      defaultChannel = mkOption {

        internal = true;

        type = types.str;

        default = "https://nixos.org/channels/nixos-unstable";

        default = "https://channels.nixos.org/nixos-unstable";

        description = "Default NixOS channel to which the root user is subscribed.";

      };

    };