gador/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
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
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;
}
}

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

@@ -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;
}
}

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

@@ -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