public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch users of 'pandoc' to the lean version.

Browse Source
This commit is contained in:
Peter Simons 2015-01-02 14:56:24 +01:00
parent c2b1ff33fe
commit 8235e8c544
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/nosql/hyperdex/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool, { stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool,
python, sodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc, 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; assert stdenv.isLinux;
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
yacc yacc
flex flex
help2man help2man
haskellPackages.pandoc pandoc
]; ];
preConfigure = "autoreconf -fi"; preConfigure = "autoreconf -fi";

4
pkgs/tools/audio/mpdcron/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon { 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 { stdenv.mkDerivation rec {
version = "20130809"; version = "20130809";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ autoconf automake libtool pkgconfig glib libdaemon haskellPackages.pandoc [ autoconf automake libtool pkgconfig glib libdaemon pandoc
mpd_clientlib curl sqlite ruby rubyLibs.nokogiri libnotify ]; mpd_clientlib curl sqlite ruby rubyLibs.nokogiri libnotify ];
preConfigure = '' preConfigure = ''

5
pkgs/top-level/all-packages.nix
View File

@ -709,9 +709,7 @@ let
enca = callPackage ../tools/text/enca { }; enca = callPackage ../tools/text/enca { };
fasd = callPackage ../tools/misc/fasd { fasd = callPackage ../tools/misc/fasd { };
inherit (haskellPackages) pandoc;
};
fop = callPackage ../tools/typesetting/fop { }; fop = callPackage ../tools/typesetting/fop { };
@ -796,7 +794,6 @@ let
bup = callPackage ../tools/backup/bup { bup = callPackage ../tools/backup/bup {
inherit (pythonPackages) pyxattr pylibacl setuptools fuse; inherit (pythonPackages) pyxattr pylibacl setuptools fuse;
inherit (haskellPackages) pandoc;
par2Support = (config.bup.par2Support or false); par2Support = (config.bup.par2Support or false);
}; };