From 6e61dfb647df78afc65625c057ddef21726b9d28 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 1 Sep 2016 14:58:30 +0000 Subject: [PATCH] Fix evaluation errors by replacing npm2nix generated packages (will provide alternative for dnchain later) --- pkgs/development/node-packages/default-v4.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix index baaadb39160..38f39fe917b 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 d3cd22510c7..ca5b8c626c2 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 { };