diff options
-rw-r--r-- | pkgs/development/node-packages/composition-v4.nix | 4 | ||||
-rw-r--r-- | pkgs/development/node-packages/composition-v6.nix | 4 | ||||
-rw-r--r-- | pkgs/development/node-packages/node-env.nix | 4 | ||||
-rw-r--r-- | pkgs/development/web/nodejs/nodejs.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/web-apps/pump.io/composition.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixui/nixui.nix | 4 |
6 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix index 1c0f5f0626ed..ad8c76b4e6ed 100644 --- a/pkgs/development/node-packages/composition-v4.nix +++ b/pkgs/development/node-packages/composition-v4.nix @@ -6,11 +6,11 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit (pkgs) stdenv utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages-v4.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 289a8ab1201e..57bd88bd2a19 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -6,11 +6,11 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit (pkgs) stdenv utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages-v6.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 5819fd1c2e78..389ccae2fe52 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -1,8 +1,10 @@ # This file originates from node2nix -{stdenv, python, nodejs, utillinux, runCommand, writeTextFile}: +{stdenv, nodejs, utillinux, runCommand, writeTextFile}: let + inherit (nodejs) python; + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise tarWrapper = runCommand "tarWrapper" {} '' mkdir -p $out/bin diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index b71f39ca420f..eccdffab4c6e 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -67,4 +67,6 @@ in maintainers = with maintainers; [ goibhniu havvy gilligan cko ]; platforms = platforms.linux ++ platforms.darwin; }; + + passthru.python = python2; # to ensure nodeEnv uses the same version } diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix index 36815198d67b..644d9e6e9e55 100644 --- a/pkgs/servers/web-apps/pump.io/composition.nix +++ b/pkgs/servers/web-apps/pump.io/composition.nix @@ -6,11 +6,11 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit (pkgs) stdenv utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index b6d7606f6cce..fea6de2ea7c5 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -6,11 +6,11 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit (pkgs) stdenv utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} |