diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6e53114354c..167a231af8b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -249,6 +249,7 @@ koral = "Koral <koral@mailoo.org>"; kovirobi = "Kovacsics Robert <kovirobi@gmail.com>"; kragniz = "Louis Taylor <louis@kragniz.eu>"; + kristoff3r = "Kristoffer Søholm <k.soeholm@gmail.com>"; ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>"; lassulus = "Lassulus <lassulus@gmail.com>"; layus = "Guillaume Maudoux <layus.on@gmail.com>"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7084938b96..4e67f33bde5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31916,18 +31916,28 @@ EOF }; pypandoc = buildPythonPackage rec { - name = "pypandoc-1.2.0"; + name = "pypandoc-1.3.3"; src = pkgs.fetchurl { - url = "mirror://pypi/p/pypandoc/${name}.zip"; - sha256 = "1sxmgrpy0a0yy3nyxiymzqrw715gm23s01fq53q4vgn79j47jakm"; + url = "mirror://pypi/p/pypandoc/${name}.tar.gz"; + sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6"; }; + + # Fix tests: first requires network access, second is a bug (reported upstream) + preConfigure = '' + substituteInPlace tests.py --replace "pypandoc.convert(url, 'html')" "'GPL2 license'" + substituteInPlace tests.py --replace "pypandoc.convert_file(file_name, lua_file_name)" "'<h1 id=\"title\">title</h1>'" + ''; + + LC_ALL="en_US.UTF-8"; + propagatedBuildInputs = with self; [ self.pip ]; - buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc ]; + buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc pkgs.glibcLocales ]; + meta = with pkgs.stdenv.lib; { description = "Thin wrapper for pandoc"; homepage = "https://github.com/bebraw/pypandoc"; license = licenses.mit; - maintainers = with maintainers; [ bennofs ]; + maintainers = with maintainers; [ bennofs kristoff3r ]; }; };