Make all node-env functions entirely overridable, not mkDerivation

svanderburg · Jun 25, 2018 · 475247f · 475247f
1 parent 9284da3
commit 475247f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -374,9 +374,9 @@ let
   };
 in
 nodePackages // {
-  floomatic = nodePackages.floomatic.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.pkgconfig pkgs.qt4 ];
-  });
+  floomatic = nodePackages.floomatic.override {
+    buildInputs = [ pkgs.pkgconfig pkgs.qt4 ];
+  };
 }
 ```
 
@@ -428,11 +428,11 @@ let
   };
 in
 nodePackages // {
-  dnschain = nodePackages.floomatic.override (oldAttrs: {
+  dnschain = nodePackages.floomatic.override {
     preRebuild = ''
       wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
     '';
-  });
+  };
 }
 ```
 
@@ -644,9 +644,9 @@ let
   };
 in
 nodePackages // {
-  express = nodePackages.express.override (oldAttrs: {
+  express = nodePackages.express.override {
     dontNpmInstall = true;
-  });
+  };
 }
 ```
 

diff --git a/nix/node-env.nix b/nix/node-env.nix
@@ -329,7 +329,7 @@ let
       forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
       extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
     in
-    stdenv.lib.makeOverridable stdenv.mkDerivation ({
+    stdenv.mkDerivation ({
       name = "node-${name}-${version}";
       buildInputs = [ tarWrapper python nodejs ]
         ++ stdenv.lib.optional (stdenv.isLinux) utillinux
@@ -514,7 +514,7 @@ let
         '';
       } // extraArgs);
     in
-    stdenv.lib.makeOverridable stdenv.mkDerivation {
+    stdenv.mkDerivation {
       name = "node-shell-${name}-${version}";
 
       buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
@@ -535,4 +535,8 @@ let
       '';
     };
 in
-{ inherit buildNodeSourceDist buildNodePackage buildNodeShell; }
+{
+  buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
+  buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
+  buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
+}
diff --git a/tests/override-v10.nix b/tests/override-v10.nix
@@ -8,7 +8,7 @@ let
   };
 in
 nodePackages // {
-  floomatic = nodePackages.floomatic.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.pkgconfig pkgs.qt4 ];
-  });
+  floomatic = nodePackages.floomatic.override {
+    buildInputs = [ pkgs.pkgconfig pkgs.qt4 ];
+  };
 }
diff --git a/tests/override-v4.nix b/tests/override-v4.nix
@@ -8,7 +8,7 @@ let
   };
 in
 nodePackages // {
-  floomatic = nodePackages.floomatic.override (oldAttrs: {
+  floomatic = nodePackages.floomatic.override {
     buildInputs = oldAttrs.buildInputs ++ [ pkgs.pkgconfig pkgs.qt4 ];
-  });
+  };
 }
diff --git a/tests/override-v6.nix b/tests/override-v6.nix
@@ -8,7 +8,7 @@ let
   };
 in
 nodePackages // {
-  floomatic = nodePackages.floomatic.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.pkgconfig pkgs.qt4 ];
-  });
+  floomatic = nodePackages.floomatic.override {
+    buildInputs = [ pkgs.pkgconfig pkgs.qt4 ];
+  };
 }
diff --git a/tests/override-v8.nix b/tests/override-v8.nix
@@ -8,7 +8,7 @@ let
   };
 in
 nodePackages // {
-  floomatic = nodePackages.floomatic.override (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [ pkgs.pkgconfig pkgs.qt4 ];
-  });
+  floomatic = nodePackages.floomatic.override {
+    buildInputs = [ pkgs.pkgconfig pkgs.qt4 ];
+  };
 }