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

Merge staging-next into staging

parents 18fcbf12 9760071a

ci/OWNERS

+3 −0
Original line number Diff line number Diff line
@@ -299,6 +299,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/pkgs/servers/http/nginx/ @raitobezarius

/nixos/modules/services/web-servers/nginx/ @raitobezarius



# D

/pkgs/build-support/dlang @jtbx @TomaSajt



# Dhall

/pkgs/development/dhall-modules      @Gabriella439 @Profpatsch @ehmry

/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry

lib/systems/examples.nix

+4 −0
Original line number Diff line number Diff line
@@ -215,6 +215,10 @@ rec { 
    config = "arm-none-eabi";

    libc = "newlib";

  };

  arm-embedded-nano = {

    config = "arm-none-eabi";

    libc = "newlib-nano";

  };

  armhf-embedded = {

    config = "arm-none-eabihf";

    libc = "newlib";

maintainers/maintainer-list.nix

+19 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ 
  };

  _2hexed = {

    name = "n";

    email = "2hexed@protonmail.com";

    email = "twohexed@gmail.com";

    github = "2hexed";

    githubId = 54501296;

  };
@@ -3749,6 +3749,12 @@ 
    githubId = 510553;

    name = "Jos van Bakel";

  };

  c31io = {

    email = "celiogrand@outlook.com";

    github = "c31io";

    githubId = 83821760;

    name = "Celio Grand";

  };

  c4605 = {

    email = "bolasblack@gmail.com";

    github = "bolasblack";
@@ -10044,6 +10050,12 @@ 
    github = "I-Al-Istannen";

    githubId = 20284688;

  };

  iamanaws = {

    email = "nixpkgs.yjzaw@slmail.me";

    github = "Iamanaws";

    githubId = 78835633;

    name = "Angel J";

  };

  iammrinal0 = {

    email = "nixpkgs@mrinalpurohit.in";

    matrix = "@iammrinal0:nixos.dev";
@@ -10172,6 +10184,12 @@ 
    githubId = 7481521;

    name = "Balázs Lengyel";

  };

  ilarvne = {

    email = "ilarvne@proton.me";

    github = "ilarvne";

    githubId = 99905590;

    name = "Nurali Aslanbekov";

  };

  ilaumjd = {

    email = "ilaumjd@gmail.com";

    github = "ilaumjd";

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

+15 −0
Original line number Diff line number Diff line
@@ -419,6 +419,21 @@ 


- [`system.stateVersion`](#opt-system.stateVersion) is now validated and must be in the `"YY.MM"` format, ideally corresponding to a prior NixOS release.



- `services.mysql` now supports easy cluster setup via [`services.mysql.galeraCluster`](#opt-services.mysql.galeraCluster.enable) option.



  Example:



  ```nix

  services.mysql = {

    enable = true;

    galeraCluster = {

      enable = true;

      localName = "Node 1";

      localAddress = "galera_01";

      nodeAddresses = [ "galera_01" "galera_02" "galera_03"];

    };

  };

  ```



- systemd's {manpage}`systemd-ssh-generator(8)` now works out of the box on NixOS.

  - You can ssh into VMs without any networking configuration if your hypervisor configures the vm to support AF_VSOCK.

nixos/modules/services/audio/navidrome.nix

+5 −0
Original line number Diff line number Diff line
@@ -102,6 +102,11 @@ in 
            mode = "700";

            inherit (cfg) user group;

          };

          "${cfg.settings.MusicFolder or (WorkingDirectory + "/music")}"."d" = {

            mode = ":700";

            user = ":${cfg.user}";

            group = ":${cfg.group}";

          };

        };

        services.navidrome = {

          description = "Navidrome Media Server";