diff --git a/pkgs/development/compilers/elm/packages/node/node-composition.nix b/pkgs/development/compilers/elm/packages/node/node-composition.nix index f23ba8e11e71..e095e45b97db 100644 --- a/pkgs/development/compilers/elm/packages/node/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node/node-composition.nix @@ -13,7 +13,6 @@ let inherit (pkgs) stdenv lib - python2 runCommand writeTextFile writeShellScript diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix index 659c43a1feec..6d49245bff5d 100644 --- a/pkgs/development/node-packages/composition.nix +++ b/pkgs/development/node-packages/composition.nix @@ -13,7 +13,6 @@ let inherit (pkgs) stdenv lib - python2 runCommand writeTextFile writeShellScript diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 4123ca029664..b1ba5526816d 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -1,9 +1,9 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: +{lib, stdenv, nodejs, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: let - python = if nodejs ? python then nodejs.python else python2; + inherit (nodejs) python; # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise tarWrapper = runCommand "tarWrapper" {} '' diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index b4bd9d9d41d2..1d201f032168 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; + inherit (pkgs) stdenv lib runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/mx-puppet-discord/node-composition.nix b/pkgs/servers/mx-puppet-discord/node-composition.nix index 12460bea17a1..e7922d509acb 100644 --- a/pkgs/servers/mx-puppet-discord/node-composition.nix +++ b/pkgs/servers/mx-puppet-discord/node-composition.nix @@ -13,7 +13,6 @@ let inherit (pkgs) stdenv lib - python2 runCommand writeTextFile writeShellScript diff --git a/pkgs/servers/web-apps/ethercalc/node-packages.nix b/pkgs/servers/web-apps/ethercalc/node-packages.nix index 1042cdba2cb6..0d1f60098bb6 100644 --- a/pkgs/servers/web-apps/ethercalc/node-packages.nix +++ b/pkgs/servers/web-apps/ethercalc/node-packages.nix @@ -13,7 +13,6 @@ let inherit (pkgs) stdenv lib - python2 runCommand writeTextFile writeShellScript diff --git a/pkgs/tools/security/onlykey/onlykey.nix b/pkgs/tools/security/onlykey/onlykey.nix index 05d8f84ddebb..1814e4887f8c 100644 --- a/pkgs/tools/security/onlykey/onlykey.nix +++ b/pkgs/tools/security/onlykey/onlykey.nix @@ -13,7 +13,6 @@ let inherit (pkgs) stdenv lib - python2 runCommand writeTextFile writeShellScript