Unverified Commit 98892da8 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents f90dd167 44f8b998

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -18135,6 +18135,12 @@ 
    githubId = 90482;

    name = "Viktor Nordling";

  };

  vilsol = {

    email = "me@vil.so";

    github = "vilsol";

    githubId = 1759390;

    name = "Vilsol";

  };

  viluon = {

    email = "nix@viluon.me";

    github = "viluon";

nixos/modules/config/update-users-groups.pl

+4 −4
Original line number Diff line number Diff line
@@ -239,12 +239,12 @@ foreach my $u (@{$spec->{users}}) { 
        chmod oct($u->{homeMode}), $u->{home};

    }



    if (defined $u->{passwordFile}) {

        if (-e $u->{passwordFile}) {

            $u->{hashedPassword} = read_file($u->{passwordFile});

    if (defined $u->{hashedPasswordFile}) {

        if (-e $u->{hashedPasswordFile}) {

            $u->{hashedPassword} = read_file($u->{hashedPasswordFile});

            chomp $u->{hashedPassword};

        } else {

            warn "warning: password file ‘$u->{passwordFile}’ does not exist\n";

            warn "warning: password file ‘$u->{hashedPasswordFile}’ does not exist\n";

        }

    } elsif (defined $u->{password}) {

        $u->{hashedPassword} = hashPassword($u->{password});

nixos/modules/config/users-groups.nix

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ let 
      };



      passwordFile = mkOption {

        type = with types; nullOr (passwdEntry str);

        type = with types; nullOr str;

        default = null;

        visible = false;

        description = lib.mdDoc "Deprecated alias of hashedPasswordFile";

nixos/modules/programs/clash-verge.nix

+3 −11
Original line number Diff line number Diff line
@@ -2,17 +2,9 @@ 


{

  options.programs.clash-verge = {

    enable = lib.mkEnableOption (lib.mdDoc ''

      Clash Verge.

    '');



    autoStart = lib.mkEnableOption (lib.mdDoc ''

      Clash Verge Auto Launch.

    '');



    tunMode = lib.mkEnableOption (lib.mdDoc ''

      Clash Verge Tun Mode.

    '');

    enable = lib.mkEnableOption (lib.mdDoc "Clash Verge");

    autoStart = lib.mkEnableOption (lib.mdDoc "Clash Verge auto launch");

    tunMode = lib.mkEnableOption (lib.mdDoc "Clash Verge TUN mode");

  };



  config =

nixos/tests/shadow.nix

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ in import ./make-test-python.nix ({ pkgs, ... }: { 
      };

      users.berta = {

        isNormalUser = true;

        hashedPassword = hashed_bcrypt;

        hashedPasswordFile = (pkgs.writeText "hashed_bcrypt" hashed_bcrypt).outPath;

        shell = pkgs.bash;

      };

      users.yesim = {