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

Merge master into staging-next

parents 01b54c62 cc650dc3

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -19511,6 +19511,12 @@ 
    githubId = 7536431;

    name = "Jonas Fierlings";

  };

  pilz = {

    name = "Pilz";

    email = "nix@pilz.foo";

    github = "pilz0";

    githubId = 48645439;

  };

  pimeys = {

    email = "julius@nauk.io";

    github = "pimeys";

nixos/doc/manual/redirects.json

+21 −0
Original line number Diff line number Diff line
@@ -56,6 +56,12 @@ 
  "module-services-opencloud-basic-usage": [

    "index.html#module-services-opencloud-basic-usage"

  ],

  "module-services-networking-pihole-ftl-configuration-inherit-dnsmasq": [

    "index.html#module-services-networking-pihole-ftl-configuration-inherit-dnsmasq"

  ],

  "module-services-networking-pihole-ftl-configuration-multiple-interfaces": [

    "index.html#module-services-networking-pihole-ftl-configuration-multiple-interfaces"

  ],

  "module-services-strfry": [

    "index.html#module-services-strfry"

  ],
@@ -1448,6 +1454,21 @@ 
  "module-services-input-methods-kime": [

    "index.html#module-services-input-methods-kime"

  ],

  "module-services-networking-pihole-ftl": [

    "index.html#module-services-networking-pihole-ftl"

  ],

  "module-services-networking-pihole-ftl-administration": [

    "index.html#module-services-networking-pihole-ftl-administration"

  ],

  "module-services-networking-pihole-ftl-configuration": [

    "index.html#module-services-networking-pihole-ftl-configuration"

  ],

  "module-services-web-apps-pihole-web": [

    "index.html#module-services-web-apps-pihole-web"

  ],

  "module-services-web-apps-pihole-web-configuration": [

    "index.html#module-services-web-apps-pihole-web-configuration"

  ],

  "ch-profiles": [

    "index.html#ch-profiles"

  ],

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

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
- [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable).

- [Chrysalis](https://github.com/keyboardio/Chrysalis), a graphical configurator for Kaleidoscope-powered keyboards. Available as [programs.chrysalis](#opt-programs.chrysalis.enable).



- [Pi-hole](https://pi-hole.net/), a DNS sinkhole for advertisements based on Dnsmasq. Available as [services.pihole-ftl](#opt-services.pihole-ftl.enable), and [services.pihole-web](#opt-services.pihole-web.enable) for the web GUI and API.



- [FileBrowser](https://filebrowser.org/), a web application for managing and sharing files. Available as [services.filebrowser](#opt-services.filebrowser.enable).



- [LACT](https://github.com/ilya-zlobintsev/LACT), a GPU monitoring and configuration tool, can now be enabled through [services.lact.enable](#opt-services.lact.enable).

nixos/modules/module-list.nix

+2 −0
Original line number Diff line number Diff line
@@ -1268,6 +1268,7 @@ 
  ./services/networking/pdnsd.nix

  ./services/networking/peroxide.nix

  ./services/networking/picosnitch.nix

  ./services/networking/pihole-ftl.nix

  ./services/networking/pixiecore.nix

  ./services/networking/pleroma.nix

  ./services/networking/powerdns.nix
@@ -1629,6 +1630,7 @@ 
  ./services/web-apps/photoprism.nix

  ./services/web-apps/phylactery.nix

  ./services/web-apps/pict-rs.nix

  ./services/web-apps/pihole-web.nix

  ./services/web-apps/pingvin-share.nix

  ./services/web-apps/pixelfed.nix

  ./services/web-apps/plantuml-server.nix

nixos/modules/services/backup/borgmatic.nix

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

        {

          pg_dump_command =

            if d.name == "all" then

            if d.name == "all" && (!(d ? format) || isNull d.format) then

              "${as_user}${postgresql}/bin/pg_dumpall"

            else

              "${as_user}${postgresql}/bin/pg_dump";