diff --git a/pkgs/development/node-packages/composition-v5.nix b/pkgs/development/node-packages/composition-v6.nix similarity index 92% rename from pkgs/development/node-packages/composition-v5.nix rename to pkgs/development/node-packages/composition-v6.nix index be9201677ce..289a8ab1201 100644 --- a/pkgs/development/node-packages/composition-v5.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -10,7 +10,7 @@ let inherit nodejs; }; in -import ./node-packages-v5.nix { +import ./node-packages-v6.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; } \ No newline at end of file diff --git a/pkgs/development/node-packages/default-v0_10.nix b/pkgs/development/node-packages/default-v0_10.nix deleted file mode 100644 index baaadb39160..00000000000 --- a/pkgs/development/node-packages/default-v0_10.nix +++ /dev/null @@ -1,33 +0,0 @@ -{pkgs, system, nodejs}: - -let - nodePackages = import ./composition-v4.nix { - inherit pkgs system nodejs; - }; -in -nodePackages // { - node-inspector = nodePackages.node-inspector.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; - }); - - phantomjs = nodePackages.phantomjs.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - }); - - webdrvr = nodePackages.webdrvr.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - - preRebuild = '' - mkdir $TMPDIR/webdrvr - - ln -s ${pkgs.fetchurl { - url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; - sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; - }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar - ln -s ${pkgs.fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; - sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; - }} $TMPDIR/webdrvr/chromedriver_linux64.zip - ''; - }); -} diff --git a/pkgs/development/node-packages/default-v5.nix b/pkgs/development/node-packages/default-v5.nix deleted file mode 100644 index 00dce5966aa..00000000000 --- a/pkgs/development/node-packages/default-v5.nix +++ /dev/null @@ -1,44 +0,0 @@ -{pkgs, system, nodejs}: - -let - nodePackages = import ./composition-v5.nix { - inherit pkgs system nodejs; - }; -in -nodePackages // { - node-inspector = nodePackages.node-inspector.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; - }); - - phantomjs = nodePackages.phantomjs.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); - - webdrvr = nodePackages.webdrvr.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - - preRebuild = '' - mkdir $TMPDIR/webdrvr - - ln -s ${pkgs.fetchurl { - url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; - sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; - }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar - ln -s ${pkgs.fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; - sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; - }} $TMPDIR/webdrvr/chromedriver_linux64.zip - ''; - - dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. - }); - - bower2nix = nodePackages.bower2nix.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; - postInstall = '' - for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" - done - ''; - }); -} diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 00dce5966aa..12fbaced770 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -1,7 +1,7 @@ {pkgs, system, nodejs}: let - nodePackages = import ./composition-v5.nix { + nodePackages = import ./composition-v6.nix { inherit pkgs system nodejs; }; in diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 385463423ea..613293e850b 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -2,4 +2,5 @@ rm -f node-env.nix node2nix -i node-packages.json -o node-packages-v4.nix -c composition-v4.nix -node2nix -5 -i node-packages.json -o node-packages-v5.nix -c composition-v5.nix +# node2nix doesn't explicitely support node v6 so far +node2nix -5 -i node-packages.json -o node-packages-v6.nix -c composition-v6.nix diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 2a04b3dfba8..c5c69c7d05d 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -6,19 +6,19 @@ let # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise tarWrapper = runCommand "tarWrapper" {} '' mkdir -p $out/bin - + cat > $out/bin/tar < package.json <