Skip to content

Commit

Permalink
nodePackages: regenerate with node2nix 1.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@svanderburg
svanderburg committed Mar 12, 2018
1 parent ef90ff2 commit 40e3ad6
Show file tree
Hide file tree
Showing 5 changed files with 1,579 additions and 1,475 deletions.
3 changes: 2 additions & 1 deletion pkgs/development/node-packages/composition-v6.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.5.2. Do not edit!
# This file has been generated by node2nix 1.5.3. Do not edit!

{pkgs ? import <nixpkgs> {
inherit system;
Expand All @@ -8,6 +8,7 @@ let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages-v6.nix {
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/node-packages/composition-v8.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.5.2. Do not edit!
# This file has been generated by node2nix 1.5.3. Do not edit!

{pkgs ? import <nixpkgs> {
inherit system;
Expand All @@ -8,6 +8,7 @@ let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages-v8.nix {
Expand Down
12 changes: 9 additions & 3 deletions pkgs/development/node-packages/node-env.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file originates from node2nix

{stdenv, nodejs, python2, utillinux, runCommand, writeTextFile}:
{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:

let
python = if nodejs ? python then nodejs.python else python2;
Expand Down Expand Up @@ -316,7 +316,10 @@ let
in
stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // {
name = "node-${name}-${version}";
buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
buildInputs = [ tarWrapper python nodejs ]
++ stdenv.lib.optional (stdenv.isLinux) utillinux
++ stdenv.lib.optional (stdenv.isDarwin) libtool
++ args.buildInputs or [];
dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments

inherit dontNpmInstall preRebuild;
Expand Down Expand Up @@ -413,7 +416,10 @@ let
nodeDependencies = stdenv.mkDerivation {
name = "node-dependencies-${name}-${version}";

buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
buildInputs = [ tarWrapper python nodejs ]
++ stdenv.lib.optional (stdenv.isLinux) utillinux
++ stdenv.lib.optional (stdenv.isDarwin) libtool
++ args.buildInputs or [];

includeScript = includeDependencies { inherit dependencies; };
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
Expand Down

6 comments on commit 40e3ad6

@fpletz
Copy link
Member

@fpletz fpletz commented on 40e3ad6 Mar 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This broke nixpkgs evaluation. Fixed in 2c9d2d6.

@bjornfor
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to cherry-pick the fix to release-17.09 but it didn't apply cleanly.

@fpletz
Copy link
Member

@fpletz fpletz commented on 40e3ad6 Mar 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On 17.09 another package needed the fix: 1bb0ecd

@bjornfor
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fpletz: Thanks!

@bjornfor
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, there is more breakage:

$ nix-check-before-push.sh 
+ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace
error: while querying the derivation named ‘nixui-0.2.1’:
while evaluating the attribute ‘installPhase’ of the derivation ‘nixui-0.2.1’ at /home/bfo/proj/code/forks/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating the attribute ‘text’ of the derivation ‘nixui’ at /home/bfo/proj/code/forks/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating the attribute ‘"nixui-git://github.com/matejc/nixui.git#0.2.1"’ at /home/bfo/proj/code/forks/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix:73:3:
anonymous function at /home/bfo/proj/code/forks/nixpkgs/pkgs/development/node-packages/node-env.nix:3:1 called without required argument ‘libtool’, at /home/bfo/proj/code/forks/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix:8:13

CC @svanderburg.

@svanderburg
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bjornfor I just searched for all packages in the non-conventional locations and fixed the parameter propagations.

Please sign in to comment.