Fix lib parameter propagation

svanderburg · Jan 19, 2021 · 9a5a2dd · 9a5a2dd
1 parent 4011598
commit 9a5a2dd
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 26 deletions.
diff --git a/default.nix b/default.nix
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ./nix/node-env.nix {
-    inherit (pkgs) stdenv python2 runCommand writeTextFile;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/lib/expressions/CompositionExpression.js b/lib/expressions/CompositionExpression.js
@@ -73,6 +73,7 @@ CompositionExpression.prototype.toNixAST = function() {
                 paramExpr: {
                   nodeEnv: new nijs.NixInherit(),
                   stdenv: new nijs.NixInherit("pkgs"),
+                  lib: new nijs.NixInherit("pkgs"),
                   "nix-gitignore": new nijs.NixInherit("pkgs"),
                   fetchurl: new nijs.NixInherit("pkgs"),
                   fetchgit: fetchgitAttr
@@ -106,6 +107,7 @@ CompositionExpression.prototype.toNixAST = function() {
                     funExpr: new nijs.NixImport(new nijs.NixFile({ value: this.nodeEnvNixPath })),
                     paramExpr: {
                         stdenv: new nijs.NixInherit("pkgs"),
+                        lib: new nijs.NixInherit("pkgs"),
                         python2: new nijs.NixInherit("pkgs"),
                         libtool: new nijs.NixIf({
                             ifExpr: new nijs.NixAttrReference({
@@ -137,6 +139,7 @@ CompositionExpression.prototype.toNixAST = function() {
                     fetchurl: new nijs.NixInherit("pkgs"),
                     "nix-gitignore": new nijs.NixInherit("pkgs"),
                     stdenv: new nijs.NixInherit("pkgs"),
+                    lib: new nijs.NixInherit("pkgs"),
                     fetchgit: fetchgitAttr,
                     nodeEnv: new nijs.NixInherit(),
                     globalBuildInputs: globalBuildInputs ? new nijs.NixInherit() : undefined

diff --git a/lib/expressions/OutputExpression.js b/lib/expressions/OutputExpression.js
@@ -41,6 +41,7 @@ OutputExpression.prototype.toNixAST = function() {
             fetchgit: undefined,
             "nix-gitignore": undefined,
             stdenv: undefined,
+            lib: undefined,
             globalBuildInputs: []
         },
         body: new nijs.NixLet({

diff --git a/node-packages.nix b/node-packages.nix
@@ -1,6 +1,6 @@
 # This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {

diff --git a/tests/default-v10.nix b/tests/default-v10.nix
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 runCommand writeTextFile;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-v10.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/tests/default-v12.nix b/tests/default-v12.nix
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 runCommand writeTextFile;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-v12.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/tests/default-v14.nix b/tests/default-v14.nix
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 runCommand writeTextFile;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-v14.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/tests/grunt/default.nix b/tests/grunt/default.nix
@@ -7,15 +7,15 @@
 let
   globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {
     inherit nodeEnv;
-    inherit (pkgs) stdenv nix-gitignore fetchurl fetchgit;
+    inherit (pkgs) stdenv lib nix-gitignore fetchurl fetchgit;
   });
   nodeEnv = import ../../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 runCommand writeTextFile;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv globalBuildInputs;
 }
diff --git a/tests/grunt/node-packages.nix b/tests/grunt/node-packages.nix
@@ -1,6 +1,6 @@
 # This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {

diff --git a/tests/grunt/supplement.nix b/tests/grunt/supplement.nix
@@ -1,6 +1,6 @@
 # This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {

diff --git a/tests/lockfile-v2/default.nix b/tests/lockfile-v2/default.nix
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 runCommand writeTextFile;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/tests/lockfile-v2/node-packages.nix b/tests/lockfile-v2/node-packages.nix
@@ -1,6 +1,6 @@
 # This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {

diff --git a/tests/lockfile/default.nix b/tests/lockfile/default.nix
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 runCommand writeTextFile;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/tests/lockfile/node-packages.nix b/tests/lockfile/node-packages.nix
@@ -1,6 +1,6 @@
 # This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {

diff --git a/tests/node-packages-v10.nix b/tests/node-packages-v10.nix
@@ -1,6 +1,6 @@
 # This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {

diff --git a/tests/node-packages-v12.nix b/tests/node-packages-v12.nix
@@ -1,6 +1,6 @@
 # This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {

diff --git a/tests/node-packages-v14.nix b/tests/node-packages-v14.nix
@@ -1,6 +1,6 @@
 # This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {

diff --git a/tests/scoped/default.nix b/tests/scoped/default.nix
@@ -6,12 +6,12 @@
 
 let
   nodeEnv = import ../../nix/node-env.nix {
-    inherit (pkgs) stdenv python2 runCommand writeTextFile;
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
-  inherit (pkgs) fetchurl nix-gitignore stdenv fetchgit;
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
   inherit nodeEnv;
 }
diff --git a/tests/scoped/node-packages.nix b/tests/scoped/node-packages.nix
@@ -1,6 +1,6 @@
 # This file has been generated by node2nix 1.9.0. Do not edit!
 
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, globalBuildInputs ? []}:
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
 
 let
   sources = {};