Unverified Commit fb3e2499 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents cfc75eec 28eb9362

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -11667,6 +11667,13 @@ 
    githubId = 149558;

    name = "Merlin Gaillard";

  };

  mirkolenz = {

    name = "Mirko Lenz";

    email = "mirko@mirkolenz.com";

    matrix = "@mlenz:matrix.org";

    github = "mirkolenz";

    githubId = 5160954;

  };

  mirrexagon = {

    email = "mirrexagon@mirrexagon.com";

    github = "mirrexagon";

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

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


- Garage has been upgraded to 0.9.x. `services.garage.package` now needs to be explicitly set, so version upgrades can be done in a controlled fashion. For this, we expose `garage_x_y` attributes which can be set here.



- `voms` and `xrootd` now moves the `$out/etc` content to the `$etc` output instead of `$out/etc.orig`, when input argument `externalEtc` is not `null`.



- The `woodpecker-*` CI packages have been updated to 1.0.0. This release is wildly incompatible with the 0.15.X versions that were previously packaged. Please read [upstream's documentation](https://woodpecker-ci.org/docs/next/migrations#100) to learn how to update your CI configurations.



- The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely.

nixos/modules/misc/ids.nix

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ in 
      #dialout = 27; # unused

      polkituser = 28;

      #utmp = 29; # unused

      # ddclient = 30; # software removed

      # ddclient = 30; # converted to DynamicUser = true

      davfs2 = 31;

      disnix = 33;

      osgi = 34;
@@ -394,7 +394,7 @@ in 
      dialout = 27;

      #polkituser = 28; # currently unused, polkitd doesn't need a group

      utmp = 29;

      # ddclient = 30; # software removed

      # ddclient = 30; # converted to DynamicUser = true

      davfs2 = 31;

      disnix = 33;

      osgi = 34;

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -884,6 +884,7 @@ 
  ./services/networking/dae.nix

  ./services/networking/dante.nix

  ./services/networking/deconz.nix

  ./services/networking/ddclient.nix

  ./services/networking/dhcpcd.nix

  ./services/networking/dnscache.nix

  ./services/networking/dnscrypt-proxy2.nix

nixos/modules/rename.nix

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ in 
    (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")

    (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.")

    (mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.")

    (mkRemovedOptionModule [ "services" "ddclient" ] "ddclient has been removed on the request of the upstream maintainer because it is unmaintained and has bugs. Please switch to a different software like `inadyn` or `knsupdate`.") # Added 2023-07-04

    (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")

    (mkRemovedOptionModule [ "services" "exhibitor" ] "The corresponding package was removed from nixpkgs.")

    (mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.")