git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #111247 from siraben/stdenv-lib-node-env

pkgs/development: stdenv.lib -> lib in node-composition files

commitfd2dcf3b17d7624ad646b5353232148fffc183a4 authorJörg Thalheim <Mic92@users.noreply.github.com> dateSat 30 Jan 2021, 08:40 (6 years ago) parent1c12fe632fc8b9
17 files changed+83−83
compare with master
unifiedsplit
pkgs/applications/networking/cluster/spacegun/node-composition.nix+1−1 pkgs/development/compilers/elm/packages/node-composition.nix+1−1 pkgs/development/compilers/elm/packages/node-env.nix+23−23 pkgs/development/misc/google-clasp/google-clasp.nix+1−1 pkgs/development/node-packages/composition.nix+1−1 pkgs/development/node-packages/node-env.nix+23−23 pkgs/development/web/newman/node-composition.nix+1−1 pkgs/development/web/newman/node-env.nix+23−23 pkgs/development/web/remarkjs/nodepkgs.nix+1−1 pkgs/misc/base16-builder/node-packages.nix+1−1 pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix+1−1 pkgs/servers/web-apps/cryptpad/node-packages.nix+1−1 pkgs/servers/web-apps/whitebophir/node-packages.nix+1−1 pkgs/servers/zigbee2mqtt/node.nix+1−1 pkgs/tools/graphics/ldgallery/viewer/node-composition.nix+1−1 pkgs/tools/networking/airfield/node.nix+1−1 pkgs/tools/package-management/nixui/nixui.nix+1−1
pkgs/applications/networking/cluster/spacegun/node-composition.nix+1−1
@@ -6,7 +6,7 @@
66
77let
88 nodeEnv = import ../../../../development/node-packages/node-env.nix {
9− inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
9+ inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
1010 inherit nodejs;
1111 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1212 };
pkgs/development/compilers/elm/packages/node-composition.nix+1−1
@@ -6,7 +6,7 @@
66
77let
88 nodeEnv = import ./node-env.nix {
9− inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
9+ inherit (pkgs) lib stdenv python2 utillinux runCommand writeTextFile;
1010 inherit nodejs;
1111 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1212 };
pkgs/development/compilers/elm/packages/node-env.nix+23−23
@@ -1,6 +1,6 @@
11# This file originates from node2nix
22
3−{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
3+{lib, stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
44
55let
66 python = if nodejs ? python then nodejs.python else python2;
@@ -38,8 +38,8 @@ let
3838 };
3939
4040 includeDependencies = {dependencies}:
41− stdenv.lib.optionalString (dependencies != [])
42− (stdenv.lib.concatMapStrings (dependency:
41+ lib.optionalString (dependencies != [])
42+ (lib.concatMapStrings (dependency:
4343 ''
4444 # Bundle the dependencies of the package
4545 mkdir -p node_modules
@@ -100,7 +100,7 @@ let
100100 cd "$DIR/${packageName}"
101101 ${includeDependencies { inherit dependencies; }}
102102 cd ..
103− ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
103+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
104104 '';
105105
106106 pinpointDependencies = {dependencies, production}:
@@ -161,12 +161,12 @@ let
161161 ''
162162 node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
163163
164− ${stdenv.lib.optionalString (dependencies != [])
164+ ${lib.optionalString (dependencies != [])
165165 ''
166166 if [ -d node_modules ]
167167 then
168168 cd node_modules
169− ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
169+ ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
170170 cd ..
171171 fi
172172 ''}
@@ -183,7 +183,7 @@ let
183183 cd "${packageName}"
184184 ${pinpointDependencies { inherit dependencies production; }}
185185 cd ..
186− ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
186+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
187187 fi
188188 '';
189189
@@ -344,8 +344,8 @@ let
344344 cd "${packageName}"
345345 runHook preRebuild
346346
347− ${stdenv.lib.optionalString bypassCache ''
348− ${stdenv.lib.optionalString reconstructLock ''
347+ ${lib.optionalString bypassCache ''
348+ ${lib.optionalString reconstructLock ''
349349 if [ -f package-lock.json ]
350350 then
351351 echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
@@ -361,14 +361,14 @@ let
361361 node ${addIntegrityFieldsScript}
362362 ''}
363363
364− npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
364+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
365365
366366 if [ "''${dontNpmInstall-}" != "1" ]
367367 then
368368 # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
369369 rm -f npm-shrinkwrap.json
370370
371− npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
371+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
372372 fi
373373 '';
374374
@@ -396,8 +396,8 @@ let
396396 stdenv.mkDerivation ({
397397 name = "node_${name}-${version}";
398398 buildInputs = [ tarWrapper python nodejs ]
399− ++ stdenv.lib.optional (stdenv.isLinux) utillinux
400− ++ stdenv.lib.optional (stdenv.isDarwin) libtool
399+ ++ lib.optional (stdenv.isLinux) utillinux
400+ ++ lib.optional (stdenv.isDarwin) libtool
401401 ++ buildInputs;
402402
403403 inherit nodejs;
@@ -470,8 +470,8 @@ let
470470 name = "node-dependencies-${name}-${version}";
471471
472472 buildInputs = [ tarWrapper python nodejs ]
473− ++ stdenv.lib.optional (stdenv.isLinux) utillinux
474− ++ stdenv.lib.optional (stdenv.isDarwin) libtool
473+ ++ lib.optional (stdenv.isLinux) utillinux
474+ ++ lib.optional (stdenv.isDarwin) libtool
475475 ++ buildInputs;
476476
477477 inherit dontStrip; # Stripping may fail a build for some package deployments
@@ -491,7 +491,7 @@ let
491491 # Create fake package.json to make the npm commands work properly
492492 cp ${src}/package.json .
493493 chmod 644 package.json
494− ${stdenv.lib.optionalString bypassCache ''
494+ ${lib.optionalString bypassCache ''
495495 if [ -f ${src}/package-lock.json ]
496496 then
497497 cp ${src}/package-lock.json .
@@ -500,13 +500,13 @@ let
500500
501501 # Go to the parent folder to make sure that all packages are pinpointed
502502 cd ..
503− ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
503+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
504504
505505 ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
506506
507507 # Expose the executables that were installed
508508 cd ..
509− ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
509+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
510510
511511 mv ${packageName} lib
512512 ln -s $out/lib/node_modules/.bin $out/bin
@@ -516,7 +516,7 @@ let
516516 stdenv.mkDerivation {
517517 name = "node-shell-${name}-${version}";
518518
519− buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
519+ buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
520520 buildCommand = ''
521521 mkdir -p $out/bin
522522 cat > $out/bin/shell <<EOF
@@ -529,14 +529,14 @@ let
529529
530530 # Provide the dependencies in a development shell through the NODE_PATH environment variable
531531 inherit nodeDependencies;
532− shellHook = stdenv.lib.optionalString (dependencies != []) ''
532+ shellHook = lib.optionalString (dependencies != []) ''
533533 export NODE_PATH=${nodeDependencies}/lib/node_modules
534534 export PATH="${nodeDependencies}/bin:$PATH"
535535 '';
536536 };
537537in
538538{
539− buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
540− buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
541− buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
539+ buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
540+ buildNodePackage = lib.makeOverridable buildNodePackage;
541+ buildNodeShell = lib.makeOverridable buildNodeShell;
542542}
pkgs/development/misc/google-clasp/google-clasp.nix+1−1
@@ -6,7 +6,7 @@
66
77let
88 nodeEnv = import ../../node-packages/node-env.nix {
9− inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
9+ inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
1010 inherit nodejs;
1111 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1212 };
pkgs/development/node-packages/composition.nix+1−1
@@ -6,7 +6,7 @@
66
77let
88 nodeEnv = import ./node-env.nix {
9− inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
9+ inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
1010 inherit nodejs;
1111 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1212 };
pkgs/development/node-packages/node-env.nix+23−23
@@ -1,6 +1,6 @@
11# This file originates from node2nix
22
3−{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
3+{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
44
55let
66 python = if nodejs ? python then nodejs.python else python2;
@@ -38,8 +38,8 @@ let
3838 };
3939
4040 includeDependencies = {dependencies}:
41− stdenv.lib.optionalString (dependencies != [])
42− (stdenv.lib.concatMapStrings (dependency:
41+ lib.optionalString (dependencies != [])
42+ (lib.concatMapStrings (dependency:
4343 ''
4444 # Bundle the dependencies of the package
4545 mkdir -p node_modules
@@ -100,7 +100,7 @@ let
100100 cd "$DIR/${packageName}"
101101 ${includeDependencies { inherit dependencies; }}
102102 cd ..
103− ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
103+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
104104 '';
105105
106106 pinpointDependencies = {dependencies, production}:
@@ -161,12 +161,12 @@ let
161161 ''
162162 node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
163163
164− ${stdenv.lib.optionalString (dependencies != [])
164+ ${lib.optionalString (dependencies != [])
165165 ''
166166 if [ -d node_modules ]
167167 then
168168 cd node_modules
169− ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
169+ ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
170170 cd ..
171171 fi
172172 ''}
@@ -183,7 +183,7 @@ let
183183 cd "${packageName}"
184184 ${pinpointDependencies { inherit dependencies production; }}
185185 cd ..
186− ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
186+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
187187 fi
188188 '';
189189
@@ -344,8 +344,8 @@ let
344344 cd "${packageName}"
345345 runHook preRebuild
346346
347− ${stdenv.lib.optionalString bypassCache ''
348− ${stdenv.lib.optionalString reconstructLock ''
347+ ${lib.optionalString bypassCache ''
348+ ${lib.optionalString reconstructLock ''
349349 if [ -f package-lock.json ]
350350 then
351351 echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
@@ -361,14 +361,14 @@ let
361361 node ${addIntegrityFieldsScript}
362362 ''}
363363
364− npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
364+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
365365
366366 if [ "''${dontNpmInstall-}" != "1" ]
367367 then
368368 # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
369369 rm -f npm-shrinkwrap.json
370370
371− npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
371+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
372372 fi
373373 '';
374374
@@ -397,8 +397,8 @@ let
397397 stdenv.mkDerivation ({
398398 name = "node_${name}-${version}";
399399 buildInputs = [ tarWrapper python nodejs ]
400− ++ stdenv.lib.optional (stdenv.isLinux) util-linux
401− ++ stdenv.lib.optional (stdenv.isDarwin) libtool
400+ ++ lib.optional (stdenv.isLinux) util-linux
401+ ++ lib.optional (stdenv.isDarwin) libtool
402402 ++ buildInputs;
403403
404404 inherit nodejs;
@@ -476,8 +476,8 @@ let
476476 name = "node-dependencies-${name}-${version}";
477477
478478 buildInputs = [ tarWrapper python nodejs ]
479− ++ stdenv.lib.optional (stdenv.isLinux) util-linux
480− ++ stdenv.lib.optional (stdenv.isDarwin) libtool
479+ ++ lib.optional (stdenv.isLinux) util-linux
480+ ++ lib.optional (stdenv.isDarwin) libtool
481481 ++ buildInputs;
482482
483483 inherit dontStrip; # Stripping may fail a build for some package deployments
@@ -497,7 +497,7 @@ let
497497 # Create fake package.json to make the npm commands work properly
498498 cp ${src}/package.json .
499499 chmod 644 package.json
500− ${stdenv.lib.optionalString bypassCache ''
500+ ${lib.optionalString bypassCache ''
501501 if [ -f ${src}/package-lock.json ]
502502 then
503503 cp ${src}/package-lock.json .
@@ -506,13 +506,13 @@ let
506506
507507 # Go to the parent folder to make sure that all packages are pinpointed
508508 cd ..
509− ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
509+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
510510
511511 ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
512512
513513 # Expose the executables that were installed
514514 cd ..
515− ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
515+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
516516
517517 mv ${packageName} lib
518518 ln -s $out/lib/node_modules/.bin $out/bin
@@ -522,7 +522,7 @@ let
522522 stdenv.mkDerivation {
523523 name = "node-shell-${name}-${version}";
524524
525− buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
525+ buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
526526 buildCommand = ''
527527 mkdir -p $out/bin
528528 cat > $out/bin/shell <<EOF
@@ -535,14 +535,14 @@ let
535535
536536 # Provide the dependencies in a development shell through the NODE_PATH environment variable
537537 inherit nodeDependencies;
538− shellHook = stdenv.lib.optionalString (dependencies != []) ''
538+ shellHook = lib.optionalString (dependencies != []) ''
539539 export NODE_PATH=${nodeDependencies}/lib/node_modules
540540 export PATH="${nodeDependencies}/bin:$PATH"
541541 '';
542542 };
543543in
544544{
545− buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
546− buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
547− buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
545+ buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
546+ buildNodePackage = lib.makeOverridable buildNodePackage;
547+ buildNodeShell = lib.makeOverridable buildNodeShell;
548548}
pkgs/development/web/newman/node-composition.nix+1−1
@@ -6,7 +6,7 @@
66
77let
88 nodeEnv = import ./node-env.nix {
9− inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
9+ inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
1010 inherit nodejs;
1111 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1212 };
pkgs/development/web/newman/node-env.nix+23−23
@@ -1,6 +1,6 @@
11# This file originates from node2nix
22
3−{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
3+{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
44
55let
66 python = if nodejs ? python then nodejs.python else python2;
@@ -38,8 +38,8 @@ let
3838 };
3939
4040 includeDependencies = {dependencies}:
41− stdenv.lib.optionalString (dependencies != [])
42− (stdenv.lib.concatMapStrings (dependency:
41+ lib.optionalString (dependencies != [])
42+ (lib.concatMapStrings (dependency:
4343 ''
4444 # Bundle the dependencies of the package
4545 mkdir -p node_modules
@@ -100,7 +100,7 @@ let
100100 cd "$DIR/${packageName}"
101101 ${includeDependencies { inherit dependencies; }}
102102 cd ..
103− ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
103+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
104104 '';
105105
106106 pinpointDependencies = {dependencies, production}:
@@ -161,12 +161,12 @@ let
161161 ''
162162 node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
163163
164− ${stdenv.lib.optionalString (dependencies != [])
164+ ${lib.optionalString (dependencies != [])
165165 ''
166166 if [ -d node_modules ]
167167 then
168168 cd node_modules
169− ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
169+ ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
170170 cd ..
171171 fi
172172 ''}
@@ -183,7 +183,7 @@ let
183183 cd "${packageName}"
184184 ${pinpointDependencies { inherit dependencies production; }}
185185 cd ..
186− ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
186+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
187187 fi
188188 '';
189189
@@ -344,8 +344,8 @@ let
344344 cd "${packageName}"
345345 runHook preRebuild
346346
347− ${stdenv.lib.optionalString bypassCache ''
348− ${stdenv.lib.optionalString reconstructLock ''
347+ ${lib.optionalString bypassCache ''
348+ ${lib.optionalString reconstructLock ''
349349 if [ -f package-lock.json ]
350350 then
351351 echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
@@ -361,14 +361,14 @@ let
361361 node ${addIntegrityFieldsScript}
362362 ''}
363363
364− npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
364+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
365365
366366 if [ "''${dontNpmInstall-}" != "1" ]
367367 then
368368 # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
369369 rm -f npm-shrinkwrap.json
370370
371− npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
371+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
372372 fi
373373 '';
374374
@@ -396,8 +396,8 @@ let
396396 stdenv.mkDerivation ({
397397 name = "node_${name}-${version}";
398398 buildInputs = [ tarWrapper python nodejs ]
399− ++ stdenv.lib.optional (stdenv.isLinux) util-linux
400− ++ stdenv.lib.optional (stdenv.isDarwin) libtool
399+ ++ lib.optional (stdenv.isLinux) util-linux
400+ ++ lib.optional (stdenv.isDarwin) libtool
401401 ++ buildInputs;
402402
403403 inherit nodejs;
@@ -470,8 +470,8 @@ let
470470 name = "node-dependencies-${name}-${version}";
471471
472472 buildInputs = [ tarWrapper python nodejs ]
473− ++ stdenv.lib.optional (stdenv.isLinux) util-linux
474− ++ stdenv.lib.optional (stdenv.isDarwin) libtool
473+ ++ lib.optional (stdenv.isLinux) util-linux
474+ ++ lib.optional (stdenv.isDarwin) libtool
475475 ++ buildInputs;
476476
477477 inherit dontStrip; # Stripping may fail a build for some package deployments
@@ -491,7 +491,7 @@ let
491491 # Create fake package.json to make the npm commands work properly
492492 cp ${src}/package.json .
493493 chmod 644 package.json
494− ${stdenv.lib.optionalString bypassCache ''
494+ ${lib.optionalString bypassCache ''
495495 if [ -f ${src}/package-lock.json ]
496496 then
497497 cp ${src}/package-lock.json .
@@ -500,13 +500,13 @@ let
500500
501501 # Go to the parent folder to make sure that all packages are pinpointed
502502 cd ..
503− ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
503+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
504504
505505 ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
506506
507507 # Expose the executables that were installed
508508 cd ..
509− ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
509+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
510510
511511 mv ${packageName} lib
512512 ln -s $out/lib/node_modules/.bin $out/bin
@@ -516,7 +516,7 @@ let
516516 stdenv.mkDerivation {
517517 name = "node-shell-${name}-${version}";
518518
519− buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
519+ buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
520520 buildCommand = ''
521521 mkdir -p $out/bin
522522 cat > $out/bin/shell <<EOF
@@ -529,14 +529,14 @@ let
529529
530530 # Provide the dependencies in a development shell through the NODE_PATH environment variable
531531 inherit nodeDependencies;
532− shellHook = stdenv.lib.optionalString (dependencies != []) ''
532+ shellHook = lib.optionalString (dependencies != []) ''
533533 export NODE_PATH=${nodeDependencies}/lib/node_modules
534534 export PATH="${nodeDependencies}/bin:$PATH"
535535 '';
536536 };
537537in
538538{
539− buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
540− buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
541− buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
539+ buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
540+ buildNodePackage = lib.makeOverridable buildNodePackage;
541+ buildNodeShell = lib.makeOverridable buildNodeShell;
542542}
pkgs/development/web/remarkjs/nodepkgs.nix+1−1
@@ -6,7 +6,7 @@
66
77let
88 nodeEnv = import ../../node-packages/node-env.nix {
9− inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
9+ inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
1010 inherit nodejs;
1111 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1212 };
pkgs/misc/base16-builder/node-packages.nix+1−1
@@ -10,7 +10,7 @@ let
1010 inherit (pkgs) fetchurl fetchgit;
1111 });
1212 nodeEnv = import ../../development/node-packages/node-env.nix {
13− inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
13+ inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
1414 inherit nodejs;
1515 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1616 };
pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix+1−1
@@ -6,7 +6,7 @@
66
77let
88 nodeEnv = import ../../../development/node-packages/node-env.nix {
9− inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
9+ inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
1010 inherit nodejs;
1111 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1212 };
pkgs/servers/web-apps/cryptpad/node-packages.nix+1−1
@@ -6,7 +6,7 @@
66
77let
88 nodeEnv = import ../../../development/node-packages/node-env.nix {
9− inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
9+ inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
1010 inherit nodejs;
1111 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1212 };
pkgs/servers/web-apps/whitebophir/node-packages.nix+1−1
@@ -6,7 +6,7 @@
66
77let
88 nodeEnv = import ../../../development/node-packages/node-env.nix {
9− inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
9+ inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
1010 inherit nodejs;
1111 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1212 };
pkgs/servers/zigbee2mqtt/node.nix+1−1
@@ -6,7 +6,7 @@
66
77let
88 nodeEnv = import ../../development/node-packages/node-env.nix {
9− inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
9+ inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
1010 inherit nodejs;
1111 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1212 };
pkgs/tools/graphics/ldgallery/viewer/node-composition.nix+1−1
@@ -6,7 +6,7 @@
66
77let
88 nodeEnv = import ../../../../development/node-packages/node-env.nix {
9− inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
9+ inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
1010 inherit nodejs;
1111 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1212 };
pkgs/tools/networking/airfield/node.nix+1−1
@@ -6,7 +6,7 @@
66
77let
88 nodeEnv = import ../../../development/node-packages/node-env.nix {
9− inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
9+ inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
1010 inherit nodejs;
1111 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1212 };
pkgs/tools/package-management/nixui/nixui.nix+1−1
@@ -6,7 +6,7 @@
66
77let
88 nodeEnv = import ../../../development/node-packages/node-env.nix {
9− inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
9+ inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
1010 inherit nodejs;
1111 libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
1212 };