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

Merge master into staging-next

parents da71ac00 2d52ed7a

ci/OWNERS

+1 −5
Original line number Diff line number Diff line
@@ -293,11 +293,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/nixos/modules/services/backup/mysql-backup.nix @6543



# Hardened profile & related modules

/nixos/modules/profiles/hardened.nix                       @joachifm

/nixos/modules/security/lock-kernel-modules.nix            @joachifm

/nixos/modules/security/misc.nix                           @joachifm

/nixos/tests/hardened.nix                                  @joachifm

/pkgs/os-specific/linux/kernel/hardened/        @fabianhjr @joachifm

/pkgs/os-specific/linux/kernel/hardened/        @fabianhjr



# Home Automation

/nixos/modules/services/home-automation/home-assistant.nix @mweinelt

maintainers/maintainer-list.nix

+6 −12
Original line number Diff line number Diff line
@@ -5201,12 +5201,6 @@ 
    githubId = 27779510;

    keys = [ { fingerprint = "FDF5 EF67 8CC1 FE22 1845  6A22 CF7B BB5B C756 1BD3"; } ];

  };

  codyopel = {

    email = "codyopel@gmail.com";

    github = "codyopel";

    githubId = 5561189;

    name = "Cody Opel";

  };

  coffeeispower = {

    email = "tiagodinis33@proton.me";

    github = "coffeeispower";
@@ -12616,12 +12610,6 @@ 
    githubId = 26695750;

    name = "Joakim Holm";

  };

  joachifm = {

    email = "joachifm@fastmail.fm";

    github = "joachifm";

    githubId = 41977;

    name = "Joachim Fasting";

  };

  joachimschmidt557 = {

    email = "joachim.schmidt557@outlook.com";

    github = "joachimschmidt557";
@@ -24908,6 +24896,12 @@ 
    github = "Skyb0rg007";

    githubId = 30806179;

  };

  skyethepinkcat = {

    name = "Skye Jonke";

    email = "skye@skyenet.online";

    github = "skyethepinkcat";

    githubId = 29717600;

  };

  skykanin = {

    github = "skykanin";

    githubId = 3789764;

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

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


- [PdfDing](https://www.pdfding.com/), manage, view and edit your PDFs seamlessly on all your devices wherever you are. Available as [services.pdfding](#opt-services.pdfding.enable).



- [mangowc](https://github.com/DreamMaoMao/mangowc), a lightweight and feature-rich Wayland compositor based on dwl. Available as [programs.mangowc](#opt-programs.mangowc.enable).



- [reaction](https://reaction.ppom.me/), a daemon that scans program outputs for repeated patterns, and takes action. A common usage is to scan ssh and webserver logs, and to ban hosts that cause multiple authentication errors. A modern alternative to fail2ban. Available as [services.reaction](#opt-services.reaction.enable).



- [rqbit](https://github.com/ikatson/rqbit), a bittorrent client written in Rust. It has HTTP API and Web UI, and can be used as a library. Available as [services.rqbit](#opt-services.rqbit.enable).

nixos/modules/config/malloc.nix

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


{

  meta = {

    maintainers = [ lib.maintainers.joachifm ];

    maintainers = [ ];

  };



  options = {

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ 
  ./programs/wayland/hyprland.nix

  ./programs/wayland/hyprlock.nix

  ./programs/wayland/labwc.nix

  ./programs/wayland/mangowc.nix

  ./programs/wayland/miracle-wm.nix

  ./programs/wayland/niri.nix

  ./programs/wayland/river.nix