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

Merge master into staging-next

parents a49c860e 2b78ecc4

maintainers/maintainer-list.nix

+6 −1
Original line number Diff line number Diff line
@@ -1738,7 +1738,7 @@ 
  };

  annaaurora = {

    email = "anna@annaaurora.eu";

    matrix = "@papojari:artemislena.eu";

    matrix = "@anna:annaaurora.eu";

    github = "auroraanna";

    githubId = 81317317;

    name = "Anna Aurora";
@@ -10340,6 +10340,11 @@ 
    github = "higebu";

    githubId = 733288;

  };

  higherorderlogic = {

    name = "Hol";

    github = "HigherOrderLogic";

    githubId = 73709188;

  };

  hirenashah = {

    email = "hiren@hiren.io";

    github = "hirenashah";

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

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


- The `services.mysql` module now restarts the database `on-abnormal`, which means that it now will be restarted in certain situations, it wasn't before. For example an OOM-kill.



- The `services.tt-rss` module and package have been removed as upstream development ceased on 2025-11-01, and the source is no longer available officially.



- The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x.



- `services.tor.torsocks.enable` no longer defaults to true if Tor and Tor client functionality is enabled.

nixos/modules/installer/netboot/netboot.nix

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ with lib; 


    # Create the initrd

    system.build.netbootRamdisk = pkgs.makeInitrdNG {

      inherit (config.boot.initrd) compressor;

      inherit (config.boot.initrd) compressor compressorArgs;

      prepend = [ "${config.system.build.initialRamdisk}/initrd" ];



      contents = [

nixos/modules/module-list.nix

+0 −1
Original line number Diff line number Diff line
@@ -1705,7 +1705,6 @@ 
  ./services/web-apps/suwayomi-server.nix

  ./services/web-apps/szurubooru.nix

  ./services/web-apps/trilium.nix

  ./services/web-apps/tt-rss.nix

  ./services/web-apps/umami.nix

  ./services/web-apps/vikunja.nix

  ./services/web-apps/wakapi.nix

nixos/modules/rename.nix

+3 −0
Original line number Diff line number Diff line
@@ -266,6 +266,9 @@ in 
    (mkRemovedOptionModule [ "services" "sourcehut" ] ''

      The sourcehut packages and the corresponding module have been removed due to being broken and unmaintained.

    '')

    (mkRemovedOptionModule [ "services" "tt-rss" ] ''

      The tt-rss package and module have been removed, since upstream development ceased 2025-11-01 and the source is no longer available officially.

    '')

    (mkRemovedOptionModule [ "services" "tvheadend" ]

      "The tvheadend package and the corresponding module have been removed as nobody was willing to maintain them and they were stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version."

    )