Switch users of 'pandoc' to the lean version.
This commit is contained in:
parent
c2b1ff33fe
commit
8235e8c544
|
@ -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";
|
||||
|
||||
|
|
|
@ -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 = ''
|
||||
|
|
|
@ -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);
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue