Switch users of 'pandoc' to the lean version.

Changed files
+5 -8
pkgs
servers
nosql
hyperdex
tools
audio
mpdcron
top-level
+2 -2
pkgs/servers/nosql/hyperdex/default.nix
···
{ 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;
···
yacc
flex
help2man
-
haskellPackages.pandoc
+
pandoc
];
preConfigure = "autoreconf -fi";
+2 -2
pkgs/tools/audio/mpdcron/default.nix
···
{ 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";
···
};
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 = ''
+1 -4
pkgs/top-level/all-packages.nix
···
enca = callPackage ../tools/text/enca { };
-
fasd = callPackage ../tools/misc/fasd {
-
inherit (haskellPackages) pandoc;
-
};
+
fasd = callPackage ../tools/misc/fasd { };
fop = callPackage ../tools/typesetting/fop { };
···
bup = callPackage ../tools/backup/bup {
inherit (pythonPackages) pyxattr pylibacl setuptools fuse;
-
inherit (haskellPackages) pandoc;
par2Support = (config.bup.par2Support or false);
};