public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nodejs: add python to passthru

Browse Source 
so nodeEnv uses the exact same version.

See also https://github.com/svanderburg/node2nix/issues/25
This commit is contained in:
Frederik Rietdijk 2016-11-18 13:02:01 +01:00
parent ef981df445
commit 2de9321880
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/node-packages/composition-v4.nix
View File

@ -6,11 +6,11 @@
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python utillinux runCommand writeTextFile; inherit (pkgs) stdenv utillinux runCommand writeTextFile;
inherit nodejs; inherit nodejs;
}; };
in in
import ./node-packages-v4.nix { import ./node-packages-v4.nix {
inherit (pkgs) fetchurl fetchgit; inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv; inherit nodeEnv;
} }

4
pkgs/development/node-packages/composition-v6.nix
View File

@ -6,11 +6,11 @@
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python utillinux runCommand writeTextFile; inherit (pkgs) stdenv utillinux runCommand writeTextFile;
inherit nodejs; inherit nodejs;
}; };
in in
import ./node-packages-v6.nix { import ./node-packages-v6.nix {
inherit (pkgs) fetchurl fetchgit; inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv; inherit nodeEnv;
} }

4
pkgs/development/node-packages/node-env.nix
View File

@ -1,8 +1,10 @@
# This file originates from node2nix # This file originates from node2nix
{stdenv, python, nodejs, utillinux, runCommand, writeTextFile}: {stdenv, nodejs, utillinux, runCommand, writeTextFile}:
let let
inherit (nodejs) python;
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
tarWrapper = runCommand "tarWrapper" {} '' tarWrapper = runCommand "tarWrapper" {} ''
mkdir -p $out/bin mkdir -p $out/bin

2
pkgs/development/web/nodejs/nodejs.nix
View File

@ -67,4 +67,6 @@ in
maintainers = with maintainers; [ goibhniu havvy gilligan cko ]; maintainers = with maintainers; [ goibhniu havvy gilligan cko ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
}; };
passthru.python = python2; # to ensure nodeEnv uses the same version
} }

4
pkgs/servers/web-apps/pump.io/composition.nix
View File

@ -6,11 +6,11 @@
let let
nodeEnv = import ../../../development/node-packages/node-env.nix { nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv python utillinux runCommand writeTextFile; inherit (pkgs) stdenv utillinux runCommand writeTextFile;
inherit nodejs; inherit nodejs;
}; };
in in
import ./node-packages.nix { import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit; inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv; inherit nodeEnv;
} }

4
pkgs/tools/package-management/nixui/nixui.nix
View File

@ -6,11 +6,11 @@
let let
nodeEnv = import ../../../development/node-packages/node-env.nix { nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv python utillinux runCommand writeTextFile; inherit (pkgs) stdenv utillinux runCommand writeTextFile;
inherit nodejs; inherit nodejs;
}; };
in in
import ./node-packages.nix { import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit; inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv; inherit nodeEnv;
} }