MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #141604 from doronbehar/pkg/nodePackages/pkgsAttr

Browse source
This commit is contained in:
Doron Behar 2021-11-04 14:15:00 +00:00 committed by GitHub
commit 7cb82625b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/web/nodejs/nodejs.nix
View file

@ -1,5 +1,7 @@
{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser { lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser
, pkg-config, which , pkg-config, which
# for `.pkgs` attribute
, callPackage
# Updater dependencies # Updater dependencies
, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell
, gnupg , gnupg
@ -40,9 +42,7 @@ let
(builtins.attrNames sharedLibDeps); (builtins.attrNames sharedLibDeps);
extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ];
in self = stdenv.mkDerivation {
stdenv.mkDerivation {
inherit version; inherit version;
name = "${baseName}-${version}"; name = "${baseName}-${version}";
@ -83,6 +83,10 @@ in
passthru.interpreterName = "nodejs"; passthru.interpreterName = "nodejs";
passthru.pkgs = callPackage ../../node-packages/default.nix {
nodejs = self;
};
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
pos = builtins.unsafeGetAttrPos "version" args; pos = builtins.unsafeGetAttrPos "version" args;
@ -147,4 +151,5 @@ in
}; };
passthru.python = python; # to ensure nodeEnv uses the same version passthru.python = python; # to ensure nodeEnv uses the same version
} };
in self

8
pkgs/top-level/all-packages.nix
View file

@ -7085,13 +7085,9 @@ with pkgs;
nodejs_latest = nodejs-16_x; nodejs_latest = nodejs-16_x;
nodejs-slim_latest = nodejs-slim-16_x; nodejs-slim_latest = nodejs-slim-16_x;
nodePackages_latest = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix { nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs;
nodejs = nodejs_latest;
});
nodePackages = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix { nodePackages = dontRecurseIntoAttrs nodejs.pkgs;
inherit nodejs;
});
np2kai = callPackage ../misc/emulators/np2kai { }; np2kai = callPackage ../misc/emulators/np2kai { };