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

Merge master into staging-next

parents c17ba56f ab5d8762

doc/languages-frameworks/javascript.section.md

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ In the default `installPhase` set by `buildNpmPackage`, it uses `npm pack --json 
* `npmPackFlags`: Flags to pass to `npm pack`.

* `npmPruneFlags`: Flags to pass to `npm prune`. Defaults to the value of `npmInstallFlags`.

* `makeWrapperArgs`: Flags to pass to `makeWrapper`, added to executable calling the generated `.js` with `node` as an interpreter. These scripts are defined in `package.json`.

* `nodejs`: The `nodejs` package to build against, using the corresponding `npm` shipped with that version of `node`. Defaults to `pkgs.nodejs`.



#### prefetch-npm-deps {#javascript-buildNpmPackage-prefetch-npm-deps}

maintainers/maintainer-list.nix

+11 −0
Original line number Diff line number Diff line
@@ -12914,6 +12914,11 @@ 
    githubId = 66913205;

    name = "Rick Sanchez";

  };

  nix-julia = {

    name = "nix-julia";

    github = "nix-julia";

    githubId = 149073815;

  };

  nixy = {

    email = "nixy@nixy.moe";

    github = "nixy";
@@ -13932,6 +13937,12 @@ 
    githubId = 9267430;

    name = "Philipp Mildenberger";

  };

  philiptaron = {

    email = "philip.taron@gmail.com";

    github = "philiptaron";

    githubId = 43863;

    name = "Philip Taron";

  };

  phip1611 = {

    email = "phip1611@gmail.com";

    github = "phip1611";

nixos/modules/config/terminfo.nix

+1 −4
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ with lib; 
    };



    security.sudo.keepTerminfo = mkOption {

      default = config.security.sudo.package.pname != "sudo-rs";

      defaultText = literalMD ''

        `true` unless using `sudo-rs`

      '';

      default = true;

      type = types.bool;

      description = lib.mdDoc ''

        Whether to preserve the `TERMINFO` and `TERMINFO_DIRS`

nixos/modules/installer/tools/nix-fallback-paths.nix

+5 −5
Original line number Diff line number Diff line 
{

  x86_64-linux = "/nix/store/3wqasl97rjiza3vd7fxjnvli2w9l30mk-nix-2.17.0";

  i686-linux = "/nix/store/z360xswxfx55pmm1fng3hw748rbs0kkj-nix-2.17.0";

  aarch64-linux = "/nix/store/9670sxa916xmv8n1kqs7cdvmnsrhrdjv-nix-2.17.0";

  x86_64-darwin = "/nix/store/2rdbky9j8hc3mbgl6pnda4hkjllyfwnn-nix-2.17.0";

  aarch64-darwin = "/nix/store/jl9qma14fb4zk9lq1k0syw2k9qm2gqjw-nix-2.17.0";

  x86_64-linux = "/nix/store/azvn85cras6xv4z5j85fiy406f24r1q0-nix-2.18.1";

  i686-linux = "/nix/store/9bnwy7f9h0kzdzmcnjjsjg0aak5waj40-nix-2.18.1";

  aarch64-linux = "/nix/store/hh65xwqm9s040s3cgn9vzcmrxj0sf5ij-nix-2.18.1";

  x86_64-darwin = "/nix/store/6zi5fqzn9n17wrk8r41rhdw4j7jqqsi3-nix-2.18.1";

  aarch64-darwin = "/nix/store/0pbq6wzr2f1jgpn5212knyxpwmkjgjah-nix-2.18.1";

}

nixos/modules/security/pam.nix

+5 −1
Original line number Diff line number Diff line
@@ -1531,6 +1531,10 @@ in 
        (map (module: "mr ${module},"))

        concatLines

      ]);

  };



    security.sudo.extraConfig = optionalString config.security.pam.enableSSHAgentAuth ''

      # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.

      Defaults env_keep+=SSH_AUTH_SOCK

    '';

    };

}