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

Merge master into staging-next

parents 8b6975bc b01e2e15

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -3601,6 +3601,12 @@ 
    githubId = 37768199;

    name = "Christian Bergschneider";

  };

  blokyk = {

    email = "pro@zoeee.net";

    github = "blokyk";

    githubId = 32983140;

    name = "Zoë Courvoisier";

  };

  bloominstrong = {

    email = "github@mail.bloominstrong.net";

    github = "bloominstrong";

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

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


- [nohang](https://github.com/hakavlad/nohang), a daemon for Linux that prevents out of memory (OOM) situations from affecting system responsiveness. Available as [services.nohang](#opt-services.nohang.enable)



- [bentopdf](https://github.com/alam00000/bentopdf), a privacy-first PDF toolkit running completely in-browser. Available as [services.bentopdf](#opt-services.bentopdf.enable).



- [DankMaterialShell](https://danklinux.com), a complete desktop shell for Wayland compositors built with Quickshell. Available as [programs.dms-shell](#opt-programs.dms-shell.enable).



- [dms-greeter](https://danklinux.com), a modern display manager greeter for DankMaterialShell that works with greetd and supports multiple Wayland compositors. Available as [services.displayManager.dms-greeter](#opt-services.displayManager.dms-greeter.enable).

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1591,6 +1591,7 @@ 
  ./services/web-apps/artalk.nix

  ./services/web-apps/audiobookshelf.nix

  ./services/web-apps/baikal.nix

  ./services/web-apps/bentopdf.nix

  ./services/web-apps/bluemap.nix

  ./services/web-apps/bluesky-pds.nix

  ./services/web-apps/bookstack.nix

nixos/modules/rename.nix

+5 −0
Original line number Diff line number Diff line
@@ -109,6 +109,11 @@ in 
      consider using `programs.pay-respects` instead.

    '')

    (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.")

    (mkRemovedOptionModule [

      "programs"

      "unity3d"

      "enable"

    ] "The corresponding package was removed from nixpkgs in 2022.")

    (mkRemovedOptionModule [ "programs" "way-cooler" ] (

      "way-cooler is abandoned by its author: "

      + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"

nixos/modules/security/chromium-suid-sandbox.nix

+0 −7
Original line number Diff line number Diff line
@@ -9,13 +9,6 @@ let 
  sandbox = pkgs.chromium.sandbox;

in

{

  imports = [

    (lib.mkRenamedOptionModule

      [ "programs" "unity3d" "enable" ]

      [ "security" "chromiumSuidSandbox" "enable" ]

    )

  ];



  options.security.chromiumSuidSandbox.enable = lib.mkOption {

    type = lib.types.bool;

    default = false;