diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2016-09-01 14:58:30 +0000 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2016-09-01 14:58:30 +0000 |
| commit | 6e61dfb647df78afc65625c057ddef21726b9d28 (patch) | |
| tree | d1cbd80e67df5cb28bdaabe17cdcce6fbffbf8f7 | |
| parent | 511bb286892e800827c4add915bb008bd2a82de3 (diff) | |
| download | nixlib-6e61dfb647df78afc65625c057ddef21726b9d28.tar nixlib-6e61dfb647df78afc65625c057ddef21726b9d28.tar.gz nixlib-6e61dfb647df78afc65625c057ddef21726b9d28.tar.bz2 nixlib-6e61dfb647df78afc65625c057ddef21726b9d28.tar.lz nixlib-6e61dfb647df78afc65625c057ddef21726b9d28.tar.xz nixlib-6e61dfb647df78afc65625c057ddef21726b9d28.tar.zst nixlib-6e61dfb647df78afc65625c057ddef21726b9d28.zip | |
Fix evaluation errors by replacing npm2nix generated packages (will provide alternative for dnchain later)
| -rw-r--r-- | pkgs/development/node-packages/default-v4.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix index baaadb39160a..38f39fe917b1 100644 --- a/pkgs/development/node-packages/default-v4.nix +++ b/pkgs/development/node-packages/default-v4.nix @@ -30,4 +30,10 @@ nodePackages // { }} $TMPDIR/webdrvr/chromedriver_linux64.zip ''; }); + + wring = nodePackages.phantomjs.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; + }); + + npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3cd22510c7d..ca5b8c626c27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10268,7 +10268,7 @@ in diod = callPackage ../servers/diod { lua = lua5_1; }; - dnschain = callPackage ../servers/dnschain { }; + #dnschain = callPackage ../servers/dnschain { }; dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; |