summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/servers/nosql/hyperdex/default.nix4
-rw-r--r--pkgs/tools/audio/mpdcron/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix5
3 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix
index 036a3412b86..44cc0752088 100644
--- a/pkgs/servers/nosql/hyperdex/default.nix
+++ b/pkgs/servers/nosql/hyperdex/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool,
   python, sodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc,
-  flex, haskellPackages, help2man, autoconf-archive, callPackage }:
+  flex, pandoc, help2man, autoconf-archive, callPackage }:
 
 assert stdenv.isLinux;
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     yacc
     flex
     help2man
-    haskellPackages.pandoc
+    pandoc
   ];
   preConfigure = "autoreconf -fi";
 
diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
index c8f485ed5da..a772feca5c5 100644
--- a/pkgs/tools/audio/mpdcron/default.nix
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon
-, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify, haskellPackages }:
+, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify, pandoc }:
 
 stdenv.mkDerivation rec {
   version = "20130809";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ autoconf automake libtool pkgconfig glib libdaemon haskellPackages.pandoc
+    [ autoconf automake libtool pkgconfig glib libdaemon pandoc
       mpd_clientlib curl sqlite ruby rubyLibs.nokogiri libnotify ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7222a64ccca..14a057ef135 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -709,9 +709,7 @@ let
 
   enca = callPackage ../tools/text/enca { };
 
-  fasd = callPackage ../tools/misc/fasd {
-    inherit (haskellPackages) pandoc;
-  };
+  fasd = callPackage ../tools/misc/fasd { };
 
   fop = callPackage ../tools/typesetting/fop { };
 
@@ -796,7 +794,6 @@ let
 
   bup = callPackage ../tools/backup/bup {
     inherit (pythonPackages) pyxattr pylibacl setuptools fuse;
-    inherit (haskellPackages) pandoc;
     par2Support = (config.bup.par2Support or false);
   };