summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2017-12-29 17:24:02 +0000
committerGitHub <noreply@github.com>2017-12-29 17:24:02 +0000
commitd3297379ad58901e324396d4efb84ee394ae5d7d (patch)
tree61d44d1f6a3fd7af0bc119d982aa9aaefcb4e053
parent805e25988f779476f8aed7d13d9fcfaa47010dab (diff)
parent5b7f9db5c551ad2dbb7165f66275bcd795ab83ee (diff)
downloadnixpkgs-d3297379ad58901e324396d4efb84ee394ae5d7d.tar
nixpkgs-d3297379ad58901e324396d4efb84ee394ae5d7d.tar.gz
nixpkgs-d3297379ad58901e324396d4efb84ee394ae5d7d.tar.bz2
nixpkgs-d3297379ad58901e324396d4efb84ee394ae5d7d.tar.lz
nixpkgs-d3297379ad58901e324396d4efb84ee394ae5d7d.tar.xz
nixpkgs-d3297379ad58901e324396d4efb84ee394ae5d7d.tar.zst
nixpkgs-d3297379ad58901e324396d4efb84ee394ae5d7d.zip
Merge pull request #33175 from johbo/pelican-without-pandoc
pelican: Disable pandoc support for now
-rw-r--r--pkgs/development/python-modules/pelican/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index e48623ef5b3..c13be981f09 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -25,7 +25,10 @@ buildPythonPackage rec {
 
   buildInputs = [
     glibcLocales
-    pandoc
+    # Note: Pelican has to adapt to a changed CLI of pandoc before enabling this
+    # again. Compare https://github.com/getpelican/pelican/pull/2252.
+    # Version 3.7.1 is incompatible with our current pandoc version.
+    # pandoc
     git
     mock
     nose