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

Merge master into staging-nixos

parents 1d7828c2 9fcf7671

nixos/modules/security/pam.nix

+7 −0
Original line number Diff line number Diff line
@@ -2636,6 +2636,13 @@ in 
          (lib.concatMap lib.attrValues)

          (lib.concatMap lib.attrValues)

          (lib.filter (rule: rule.enable))

          (lib.filter (

            rule:

            !builtins.elem rule.control [

              "include"

              "substack"

            ]

          ))

          (lib.catAttrs "modulePath")

          (map (

            modulePath:

nixos/modules/services/web-apps/sillytavern.nix

+4 −4
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ in 


      configFile = lib.mkOption {

        type = lib.types.path;

        default = "${pkgs.sillytavern}/lib/node_modules/sillytavern/config.yaml";

        defaultText = lib.literalExpression "\${pkgs.sillytavern}/lib/node_modules/sillytavern/config.yaml";

        default = "${cfg.package}/lib/node_modules/sillytavern/config.yaml";

        defaultText = lib.literalExpression "\${cfg.package}/lib/node_modules/sillytavern/config.yaml";

        description = ''

          Path to the SillyTavern configuration file.

        '';
@@ -109,7 +109,7 @@ in 
          in

          lib.concatStringsSep " " (

            [

              "${lib.getExe pkgs.sillytavern}"

              "${lib.getExe cfg.package}"

            ]

            ++ f cfg.port "port"

            ++ f cfg.listen "listen"
@@ -122,7 +122,7 @@ in 
        Restart = "always";

        StateDirectory = "SillyTavern";

        BindPaths = [

          "%S/SillyTavern/extensions:${pkgs.sillytavern}/lib/node_modules/sillytavern/public/scripts/extensions/third-party"

          "%S/SillyTavern/extensions:${cfg.package}/lib/node_modules/sillytavern/public/scripts/extensions/third-party"

        ];



        # Security hardening

nixos/tests/installer.nix

+2 −2
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ let 
        let

          commonConfig = {

            # builds stuff in the VM, needs more juice

            virtualisation.diskSize = 8 * 1024;

            virtualisation.diskSize = 12 * 1024;

            virtualisation.cores = 8;

            virtualisation.memorySize = 2048;
@@ -700,7 +700,7 @@ let 
              # Use a small /dev/vdb as the root disk for the

              # installer. This ensures the target disk (/dev/vda) is

              # the same during and after installation.

              virtualisation.emptyDiskImages = [ 512 ];

              virtualisation.emptyDiskImages = [ 1024 ];

              virtualisation.rootDevice = "/dev/vdb";



              nix.package = selectNixPackage pkgs;

pkgs/applications/editors/kakoune/plugins/update.py

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ let 
          submodules = value.src.fetchSubmodules or false;

          sha256 = value.src.outputHash;

          rev = value.src.rev;

          tag = value.src.tag or null;

        }}

      else

        null;

pkgs/applications/editors/vim/plugins/generated.nix

+638 −638

File changed.

Preview size limit exceeded, changes collapsed.