Retain compatibility with both master and 16.09

svanderburg · Jan 7, 2017 · adc0b94 · adc0b94
1 parent e9e641f
commit adc0b94
Show file tree

Hide file tree

Showing 11 changed files with 227 additions and 232 deletions.
diff --git a/default.nix b/default.nix
@@ -1,4 +1,4 @@
-# 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;

diff --git a/nix/node-env.nix b/nix/node-env.nix
@@ -1,9 +1,9 @@
 # This file originates from node2nix
 
-{stdenv, nodejs, utillinux, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, utillinux, runCommand, writeTextFile}:
 
 let
-  inherit (nodejs) python;
+  python = if nodejs ? python then nodejs.python else python2;
 
   # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
   tarWrapper = runCommand "tarWrapper" {} ''

diff --git a/node-packages.nix b/node-packages.nix
@@ -1,4 +1,4 @@
-# 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!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -103,13 +103,13 @@ let
         sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
       };
     };
-    "concat-stream-1.5.2" = {
+    "concat-stream-1.6.0" = {
       name = "concat-stream";
       packageName = "concat-stream";
-      version = "1.5.2";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz";
-        sha1 = "708978624d856af41a5a741defdd261da752c266";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz";
+        sha1 = "0aac662fd52be78964d5532f694784e70110acf7";
       };
     };
     "graceful-fs-4.1.11" = {
@@ -220,13 +220,22 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "readable-stream-2.0.6" = {
+    "readable-stream-2.2.2" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.0.6";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
+        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
+      };
+    };
+    "buffer-shims-1.0.0" = {
+      name = "buffer-shims";
+      packageName = "buffer-shims";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
-        sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
+        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
+        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
       };
     };
     "core-util-is-1.0.2" = {
@@ -526,13 +535,13 @@ let
         sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
       };
     };
-    "uuid-3.0.0" = {
+    "uuid-3.0.1" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
-        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
+        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
       };
     };
     "delayed-stream-1.0.0" = {
@@ -670,13 +679,13 @@ let
         sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
       };
     };
-    "jsonpointer-4.0.0" = {
+    "jsonpointer-4.0.1" = {
       name = "jsonpointer";
       packageName = "jsonpointer";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz";
-        sha1 = "6661e161d2fc445f19f98430231343722e1fcbd5";
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
+        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
       };
     };
     "xtend-4.0.1" = {
@@ -841,13 +850,13 @@ let
         sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
       };
     };
-    "tweetnacl-0.14.3" = {
+    "tweetnacl-0.14.5" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
-      version = "0.14.3";
+      version = "0.14.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz";
-        sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d";
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
     "jodid25519-1.0.2" = {
@@ -1012,24 +1021,6 @@ let
         sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
       };
     };
-    "readable-stream-2.2.2" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz";
-        sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e";
-      };
-    };
-    "buffer-shims-1.0.0" = {
-      name = "buffer-shims";
-      packageName = "buffer-shims";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
-        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
-      };
-    };
     "aproba-1.0.4" = {
       name = "aproba";
       packageName = "aproba";
@@ -1066,13 +1057,13 @@ let
         sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0";
       };
     };
-    "signal-exit-3.0.1" = {
+    "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz";
-        sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
     "string-width-1.0.2" = {
@@ -1156,13 +1147,13 @@ let
         sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
       };
     };
-    "osenv-0.1.3" = {
+    "osenv-0.1.4" = {
       name = "osenv";
       packageName = "osenv";
-      version = "0.1.3";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz";
-        sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217";
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz";
+        sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644";
       };
     };
     "semver-4.3.6" = {
@@ -1313,20 +1304,21 @@ let
   args = {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.1.0";
+    version = "1.1.1";
     src = ./.;
     dependencies = [
       sources."optparse-1.0.5"
       sources."semver-5.3.0"
       (sources."npm-registry-client-7.1.2" // {
         dependencies = [
           sources."chownr-1.0.1"
-          (sources."concat-stream-1.5.2" // {
+          (sources."concat-stream-1.6.0" // {
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.0.6" // {
+              (sources."readable-stream-2.2.2" // {
                 dependencies = [
+                  sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
                   sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
@@ -1421,7 +1413,7 @@ let
                           sources."is-property-1.0.2"
                         ];
                       })
-                      sources."jsonpointer-4.0.0"
+                      sources."jsonpointer-4.0.1"
                       sources."xtend-4.0.1"
                     ];
                   })
@@ -1457,7 +1449,7 @@ let
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
                       sources."jsbn-0.1.0"
-                      sources."tweetnacl-0.14.3"
+                      sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
                       sources."bcrypt-pbkdf-1.0.0"
@@ -1482,7 +1474,7 @@ let
                 ];
               })
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.0"
+              sources."uuid-3.0.1"
             ];
           })
           sources."retry-0.8.0"
@@ -1538,7 +1530,7 @@ let
                   sources."has-color-0.1.7"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.0"
-                  sources."signal-exit-3.0.1"
+                  sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
                     dependencies = [
                       sources."code-point-at-1.1.0"
@@ -1586,7 +1578,7 @@ let
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."osenv-0.1.3" // {
+          (sources."osenv-0.1.4" // {
             dependencies = [
               sources."os-homedir-1.0.2"
               sources."os-tmpdir-1.0.2"

diff --git a/tests/default-v4.nix b/tests/default-v4.nix
@@ -1,4 +1,4 @@
-# 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;

diff --git a/tests/default-v5.nix b/tests/default-v5.nix
@@ -1,4 +1,4 @@
-# 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;

diff --git a/tests/default-v6.nix b/tests/default-v6.nix
@@ -1,4 +1,4 @@
-# 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;

diff --git a/tests/grunt/default.nix b/tests/grunt/default.nix
@@ -1,4 +1,4 @@
-# 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;

diff --git a/tests/grunt/node-packages.nix b/tests/grunt/node-packages.nix
@@ -1,4 +1,4 @@
-# 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!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -13,13 +13,13 @@ let
         sha1 = "e8778764e944b18f32bb0f10b9078475c9dfb56b";
       };
     };
-    "grunt-contrib-jshint-1.0.0" = {
+    "grunt-contrib-jshint-1.1.0" = {
       name = "grunt-contrib-jshint";
       packageName = "grunt-contrib-jshint";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-1.0.0.tgz";
-        sha1 = "30f405a51de656bfa6eb029b9a464b9fe02a402a";
+        url = "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-1.1.0.tgz";
+        sha1 = "369d909b2593c40e8be79940b21340850c7939ac";
       };
     };
     "grunt-contrib-watch-1.0.0" = {
@@ -301,13 +301,13 @@ let
         sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
       };
     };
-    "signal-exit-3.0.1" = {
+    "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz";
-        sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
     "array-find-index-1.0.2" = {
@@ -1310,7 +1310,7 @@ let
                           sources."array-find-index-1.0.2"
                         ];
                       })
-                      sources."signal-exit-3.0.1"
+                      sources."signal-exit-3.0.2"
                     ];
                   })
                   sources."map-obj-1.0.1"
@@ -1531,7 +1531,7 @@ let
           sources."rimraf-2.2.8"
         ];
       })
-      (sources."grunt-contrib-jshint-1.0.0" // {
+      (sources."grunt-contrib-jshint-1.1.0" // {
         dependencies = [
           (sources."chalk-1.1.3" // {
             dependencies = [

diff --git a/tests/grunt/supplement.nix b/tests/grunt/supplement.nix
@@ -1,4 +1,4 @@
-# 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!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -13,13 +13,13 @@ let
         sha1 = "e8778764e944b18f32bb0f10b9078475c9dfb56b";
       };
     };
-    "grunt-contrib-jshint-1.0.0" = {
+    "grunt-contrib-jshint-1.1.0" = {
       name = "grunt-contrib-jshint";
       packageName = "grunt-contrib-jshint";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-1.0.0.tgz";
-        sha1 = "30f405a51de656bfa6eb029b9a464b9fe02a402a";
+        url = "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-1.1.0.tgz";
+        sha1 = "369d909b2593c40e8be79940b21340850c7939ac";
       };
     };
     "grunt-contrib-watch-1.0.0" = {
@@ -301,13 +301,13 @@ let
         sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
       };
     };
-    "signal-exit-3.0.1" = {
+    "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz";
-        sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81";
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
       };
     };
     "array-find-index-1.0.2" = {