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

Merge master into staging-next

parents 931d442e dd1b384c

ci/github-script/labels.js

+8 −1
Original line number Diff line number Diff line
@@ -93,6 +93,13 @@ module.exports = async ({ github, context, core, dry }) => { 
    log('Last eval run', run_id ?? '<n/a>')



    if (conclusion === 'success') {

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

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

      const humanReviews = reviews.filter(

        (r) =>

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

      )



      Object.assign(prLabels, {

        // We only set this label if the latest eval run was successful, because if it was not, it

        // *could* have requested reviewers. We will let the PR author fix CI first, before "escalating"
@@ -105,7 +112,7 @@ module.exports = async ({ github, context, core, dry }) => { 
        '9.needs: reviewer':

          !pull_request.draft &&

          pull_request.requested_reviewers.length === 0 &&

          reviews.length === 0,

          humanReviews.length === 0,

      })

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -1030,7 +1030,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2 


- [eris-server](https://codeberg.org/eris/eris-go), an implementation of the

  Encoding for Robust Immutable Storage (ERIS). Available as

  [services.eris-server](#opt-services.eris-server.enable).

  `services.eris-server`.



- [forgejo](https://forgejo.org/), a git forge and drop-in replacement for

  Gitea. Available as [services.forgejo](#opt-services.forgejo.enable).

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

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


- `services.clamsmtp` is unmaintained and was removed from Nixpkgs.



- `services.eris-server` was removed from Nixpkgs due to a hostile upstream.



- `prosody` gained a config check option named `services.prosody.checkConfig` which runs `prosodyctl check config` and is turned on by default.



- `services.dependency-track` removed its configuration of the JVM heap size. This lets the JVM choose its maximum heap size automatically, which should work much better in practice for most users. For deployments on systems with little RAM, it may now be necessary to manually configure a maximum heap size using  {option}`services.dependency-track.javaArgs`.

nixos/modules/module-list.nix

+0 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,6 @@ 
  ./services/network-filesystems/davfs2.nix

  ./services/network-filesystems/diod.nix

  ./services/network-filesystems/drbd.nix

  ./services/network-filesystems/eris-server.nix

  ./services/network-filesystems/glusterfs.nix

  ./services/network-filesystems/ipfs-cluster.nix

  ./services/network-filesystems/kbfs.nix

nixos/modules/services/misc/ntfy-sh.nix

+13 −0
Original line number Diff line number Diff line
@@ -61,6 +61,18 @@ in 
        Configuration for ntfy.sh, supported values are [here](https://ntfy.sh/docs/config/#config-options).

      '';

    };



    environmentFile = lib.mkOption {

      type = lib.types.nullOr lib.types.path;

      default = null;

      example = "/run/secrets/ntfy";

      description = ''

        Path to a file containing extra ntfy environment variables in the systemd `EnvironmentFile`

        format. Refer to the [documentation](https://docs.ntfy.sh/config/) for config options.



        This can be used to pass secrets such as creating declarative users or token without putting them in the Nix store.

      '';

    };

  };



  config =
@@ -109,6 +121,7 @@ in 
          MemoryDenyWriteExecute = true;

          # Upstream Recommendation

          LimitNOFILE = 20500;

          EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;

        };

      };