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

Merge staging-next into staging

parents 4dd9e7e1 016c52f8

maintainers/maintainer-list.nix

+1 −8
Original line number Diff line number Diff line
@@ -11785,12 +11785,6 @@ 
    githubId = 4599384;

    name = "Jack Baldry";

  };

  jdehaas = {

    email = "qqlq@nullptr.club";

    github = "jeroendehaas";

    githubId = 117874;

    name = "Jeroen de Haas";

  };

  jdelStrother = {

    email = "me@delstrother.com";

    github = "jdelStrother";
@@ -14409,12 +14403,11 @@ 
    name = "Leiser Fernández Gallo";

  };

  leixb = {

    email = "abone9999+nixpkgs@gmail.com";

    email = "abone9999@gmail.com";

    matrix = "@leix_b:matrix.org";

    github = "Leixb";

    githubId = 17183803;

    name = "Aleix Boné";

    keys = [ { fingerprint = "63D3 F436 EDE8 7E1F 1292  24AF FC03 5BB2 BB28 E15D"; } ];

  };

  lejonet = {

    email = "daniel@kuehn.se";

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

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


- Added `nixos-init`, a Rust-based bashless initialization system for systemd initrd. This allows to build NixOS systems without any interpreter. Enable via `system.nixos-init.enable = true;`.



- [nvme-rs](https://github.com/liberodark/nvme-rs), NVMe monitoring [services.nvme-rs](#opt-services.nvme-rs.enable).



## Backward Incompatibilities {#sec-release-25.11-incompatibilities}



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

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1502,6 +1502,7 @@ 
  ./services/system/localtimed.nix

  ./services/system/nix-daemon.nix

  ./services/system/nscd.nix

  ./services/system/nvme-rs.nix

  ./services/system/saslauthd.nix

  ./services/system/self-deploy.nix

  ./services/system/swapspace.nix

nixos/modules/services/mail/postfix.nix

+1 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ in 
        default = "";

        type = lib.types.lines;

        description = ''

          Entries for the transport map, cf. man-page {manpage}`transport(8)`.

          Entries for the transport map, cf. man-page {manpage}`transport(5)`.

        '';

      };

nixos/modules/services/monitoring/loki.nix

+8 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ let 
in

{

  options.services.loki = {

    enable = mkEnableOption "loki";

    enable = mkEnableOption "Grafana Loki";



    user = mkOption {

      type = types.str;
@@ -49,7 +49,7 @@ in 
      type = types.path;

      default = "/var/lib/loki";

      description = ''

        Specify the directory for Loki.

        Specify the data directory for Loki.

      '';

    };
@@ -58,6 +58,10 @@ in 
      default = { };

      description = ''

        Specify the configuration for Loki in Nix.



        See [documentation of Grafana Loki](https://grafana.com/docs/loki/latest/configure/) for all available options.



        Cannot be specified together with {option}`services.loki.configFile`.

      '';

    };
@@ -66,6 +70,8 @@ in 
      default = null;

      description = ''

        Specify a configuration file that Loki should use.



        Cannot be specified together with {option}`services.loki.configuration`.

      '';

    };