diff options
| author | Peter Simons <simons@cryp.to> | 2015-01-02 14:56:24 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-01-02 14:56:24 +0100 |
| commit | 8235e8c5448c784d8be915ec4f1539163ca26bbc (patch) | |
| tree | 67506b45e2c05b146271d234fc58e6a9a0bc0dad | |
| parent | c2b1ff33fec3a02df288c3b749f487f885582f92 (diff) | |
| download | nixlib-8235e8c5448c784d8be915ec4f1539163ca26bbc.tar nixlib-8235e8c5448c784d8be915ec4f1539163ca26bbc.tar.gz nixlib-8235e8c5448c784d8be915ec4f1539163ca26bbc.tar.bz2 nixlib-8235e8c5448c784d8be915ec4f1539163ca26bbc.tar.lz nixlib-8235e8c5448c784d8be915ec4f1539163ca26bbc.tar.xz nixlib-8235e8c5448c784d8be915ec4f1539163ca26bbc.tar.zst nixlib-8235e8c5448c784d8be915ec4f1539163ca26bbc.zip | |
Switch users of 'pandoc' to the lean version.
| -rw-r--r-- | pkgs/servers/nosql/hyperdex/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/audio/mpdcron/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix index 036a3412b864..44cc0752088a 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 c8f485ed5daf..a772feca5c5b 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 7222a64ccca3..14a057ef1358 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); }; |