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

Merge master into staging-nixos

parents 8bbbe4ae 16c5074f

maintainers/maintainer-list.nix

+16 −0
Original line number Diff line number Diff line
@@ -7576,6 +7576,12 @@ 
    githubId = 20847625;

    name = "Elizabeth Paź";

  };

  ehrenschwan-gh = {

    email = "luca@ehrenschwan.dev";

    github = "ehrenschwan-gh";

    githubId = 25820532;

    name = "Luca Schwan";

  };

  eigengrau = {

    email = "seb@schattenkopie.de";

    name = "Sebastian Reuße";
@@ -24503,6 +24509,11 @@ 
    githubId = 46294732;

    name = "Sharzy";

  };

  shaunren = {

    name = "Shaun Ren";

    github = "shaunren";

    githubId = 388428;

  };

  shavyn = {

    name = "Marco Desiderati";

    email = "desideratimarco@gmail.com";
@@ -25786,6 +25797,11 @@ 
    githubId = 7543617;

    name = "Struan Robertson";

  };

  structix = {

    github = "STRUCTiX";

    githubId = 15931333;

    name = "Janek";

  };

  stteague = {

    email = "stteague505@yahoo.com";

    github = "stteague";

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

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


- [Ente Auth](https://ente.io/auth/), an open source 2FA authenticator, with end-to-end encrypted backups. Available as [programs.ente-auth](#opt-programs.ente-auth.enable).



- [Tinyauth](https://tinyauth.app/), a simple authentication middleware for web apps, with OAuth and LDAP support. Available as [services.tinyauth](#opt-services.tinyauth.enable).



- [Dawarich](https://dawarich.app/), a self-hostable location history tracker. Available as [services.dawarich](#opt-services.dawarich.enable).



- [Howdy](https://github.com/boltgolt/howdy), a Windows Hello™ style facial authentication program for Linux.

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1525,6 +1525,7 @@ 
  ./services/security/step-ca.nix

  ./services/security/tang.nix

  ./services/security/timekpr.nix

  ./services/security/tinyauth.nix

  ./services/security/tor.nix

  ./services/security/torify.nix

  ./services/security/torsocks.nix

nixos/modules/programs/shadow.nix

+8 −1
Original line number Diff line number Diff line
@@ -22,6 +22,13 @@ in 
      '';

    };



    security.shadow.su.package = lib.mkPackageOption pkgs [ "shadow" "su" ] {

      extraDescription = ''

        This can be overridden by other modules (e.g. sudo-rs) to provide

        an alternative `su` implementation.

      '';

    };



    security.loginDefs = {

      package = lib.mkPackageOption pkgs "shadow" { };
@@ -262,7 +269,7 @@ in 
          };

        in

        {

          su = mkSetuidRoot "${cfg.package.su}/bin/su";

          su = mkSetuidRoot "${config.security.shadow.su.package}/bin/su";

          sg = mkSetuidRoot "${cfg.package.out}/bin/sg";

          newgrp = mkSetuidRoot "${cfg.package.out}/bin/newgrp";

          newuidmap = mkSetuidRoot "${cfg.package.out}/bin/newuidmap";

nixos/modules/security/sudo-rs.nix

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,8 @@ in 
    ];

    security.sudo.enable = lib.mkDefault false;



    security.shadow.su.package = lib.mkDefault cfg.package;



    security.sudo-rs.extraRules =

      let

        defaultRule =