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

Merge master into staging-next

parents 92c7569b 398f7eb6

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

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ 


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



- `services.rippled` has been removed, as `rippled` was broken and had not been updated since 2022.



- `services.rippleDataApi` has been removed, as `ripple-data-api` was broken and had not been updated since 2022.



- `squid` has been updated to version 7, this release includes multiple breaking changes, like ESI removal.

  For more information, [check the release notes](https://github.com/squid-cache/squid/releases/tag/SQUID_7_0_1).



- The [`no-broken-symlinks` hook](https://nixos.org/manual/nixpkgs/unstable/#no-broken-symlinks.sh) was added to catch builds containing dangling or reflexive symlinks, as these are indicative of problems with packaging.

  The hook can be disabled by providing `dontCheckForBrokenSymlinks = true;` as an argument to `mkDerivation`.

  For more information, [check the docs](https://nixos.org/manual/nixpkgs/unstable/#no-broken-symlinks.sh) or [see this PR](https://github.com/NixOS/nixpkgs/pull/370750).

maintainers/maintainer-list.nix

+23 −0
Original line number Diff line number Diff line
@@ -14363,6 +14363,12 @@ 
    githubId = 50797868;

    name = "Shaolong Chen";

  };

  mapperfr = {

    email = "jeremy@mapper.fr";

    github = "mapperfr";

    githubId = 3398608;

    name = "Jérémy Garniaux";

  };

  maralorn = {

    email = "mail@maralorn.de";

    matrix = "@maralorn:maralorn.de";
@@ -17451,6 +17457,12 @@ 
    githubId = 25470747;

    name = "Nick";

  };

  okwilkins = {

    email = "okwilkins@gmail.com";

    github = "okwilkins";

    githubId = 5969778;

    name = "Oliver Wilkins";

  };

  olcai = {

    email = "dev@timan.info";

    github = "olcai";
@@ -25124,6 +25136,12 @@ 
    github = "wegank";

    githubId = 9713184;

  };

  weirdrock = {

    name = "weirdrock";

    email = "weirdrock@riseup.net";

    github = "weirdrock";

    githubId = 142561048;

  };

  weitzj = {

    name = "Jan Weitz";

    email = "nixpkgs@janweitz.de";
@@ -26017,6 +26035,11 @@ 
    githubId = 73419713;

    name = "Yunfachi";

  };

  yunz = {

    github = "yunz-dev";

    githubId = 112053367;

    name = "Yunus";

  };

  yureien = {

    email = "contact@sohamsen.me";

    github = "Yureien";

nixos/modules/image/repart.nix

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ let 
        };

        description = ''

          Specify the repart options for a partiton as a structural setting.

          See <https://www.freedesktop.org/software/systemd/man/repart.d.html>

          See {manpage}`repart.d(5)`

          for all available options.

        '';

      };

nixos/modules/misc/version.nix

+4 −4
Original line number Diff line number Diff line
@@ -189,9 +189,9 @@ in 
        description = ''

          Image identifier.



          This corresponds to the IMAGE_ID field in os-release. See the

          This corresponds to the `IMAGE_ID` field in {manpage}`os-release(5)`. See the

          upstream docs for more details on valid characters for this field:

          https://www.freedesktop.org/software/systemd/man/latest/os-release.html#IMAGE_ID=

          <https://www.freedesktop.org/software/systemd/man/latest/os-release.html#IMAGE_ID=>



          You would only want to set this option if you're build NixOS appliance images.

        '';
@@ -203,9 +203,9 @@ in 
        description = ''

          Image version.



          This corresponds to the IMAGE_VERSION field in os-release. See the

          This corresponds to the `IMAGE_VERSION` field in {manpage}`os-release(5)`. See the

          upstream docs for more details on valid characters for this field:

          https://www.freedesktop.org/software/systemd/man/latest/os-release.html#IMAGE_VERSION=

          <https://www.freedesktop.org/software/systemd/man/latest/os-release.html#IMAGE_VERSION=>



          You would only want to set this option if you're build NixOS appliance images.

        '';

nixos/modules/services/games/mchprs.nix

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ in 
        description = ''

          Automatically restart the server after

          {option}`services.mchprs.maxRuntime`.

          The time span format is described here:

          The {manpage}`systemd.time(7)` time span format is described here:

          <https://www.freedesktop.org/software/systemd/man/systemd.time.html#Parsing%20Time%20Spans>.

          If `null`, then the server is not restarted automatically.

        '';