nodePackages: upgrade node2nix to version 1.1.1, regenerate the packa…

…ge set and remove v5 expressions
NixOS · Jan 20, 2017 · a5de88d · a5de88d
1 parent 71b715a
commit a5de88d
Show file tree

Hide file tree

Showing 16 changed files with 14,415 additions and 13,877 deletions.
diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
@@ -1,12 +1,12 @@
-# This file has been generated by node2nix 1.1.0. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
   }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}:
 
 let
   nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv python utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
   };
 in

diff --git a/pkgs/development/node-packages/composition-v5.nix b/pkgs/development/node-packages/composition-v5.nix
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
@@ -0,0 +1,16 @@
+# This file has been generated by node2nix 1.1.1. Do not edit!
+
+{pkgs ? import <nixpkgs> {
+    inherit system;
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
+
+let
+  nodeEnv = import ./node-env.nix {
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit nodejs;
+  };
+in
+import ./node-packages-v6.nix {
+  inherit (pkgs) fetchurl fetchgit;
+  inherit nodeEnv;
+}
diff --git a/pkgs/development/node-packages/default-v0_10.nix b/pkgs/development/node-packages/default-v0_10.nix
diff --git a/pkgs/development/node-packages/default-v5.nix b/pkgs/development/node-packages/default-v5.nix
diff --git 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
@@ -2,4 +2,4 @@
 
 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 -6 -i node-packages.json -o node-packages-v6.nix -c composition-v6.nix