diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-11-18 13:02:01 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-11-24 22:28:04 +0100 |
commit | 2de932188080586ec02e2eac4fee1581c38d247b (patch) | |
tree | cb81e84e5cc421dfdb86359b61f2d713ce7f29d4 /pkgs/development | |
parent | ef981df4452889416d848a6d8afd14f19b16690d (diff) | |
download | nixlib-2de932188080586ec02e2eac4fee1581c38d247b.tar nixlib-2de932188080586ec02e2eac4fee1581c38d247b.tar.gz nixlib-2de932188080586ec02e2eac4fee1581c38d247b.tar.bz2 nixlib-2de932188080586ec02e2eac4fee1581c38d247b.tar.lz nixlib-2de932188080586ec02e2eac4fee1581c38d247b.tar.xz nixlib-2de932188080586ec02e2eac4fee1581c38d247b.tar.zst nixlib-2de932188080586ec02e2eac4fee1581c38d247b.zip |
nodejs: add python to passthru
so nodeEnv uses the exact same version. See also https://github.com/svanderburg/node2nix/issues/25
Diffstat (limited to 'pkgs/development')
-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 |
4 files changed, 9 insertions, 5 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 } |