diff options
author | Kristoffer Søholm <k.soeholm@gmail.com> | 2017-02-15 16:28:23 +0100 |
---|---|---|
committer | zimbatm <zimbatm@zimbatm.com> | 2017-02-15 15:28:23 +0000 |
commit | 0ed06bcce7f48aa42d1c8dbc633b9f8195ac132e (patch) | |
tree | 6a767fe900cec312b410756868b175c5ce3d9537 /pkgs | |
parent | 8978a9ee4819024778b609b79de4f5f0c439487f (diff) | |
download | nixlib-0ed06bcce7f48aa42d1c8dbc633b9f8195ac132e.tar nixlib-0ed06bcce7f48aa42d1c8dbc633b9f8195ac132e.tar.gz nixlib-0ed06bcce7f48aa42d1c8dbc633b9f8195ac132e.tar.bz2 nixlib-0ed06bcce7f48aa42d1c8dbc633b9f8195ac132e.tar.lz nixlib-0ed06bcce7f48aa42d1c8dbc633b9f8195ac132e.tar.xz nixlib-0ed06bcce7f48aa42d1c8dbc633b9f8195ac132e.tar.zst nixlib-0ed06bcce7f48aa42d1c8dbc633b9f8195ac132e.zip |
pypandoc: 1.2.0 (broken) -> 1.3.3 (#22782)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7084938b965..4e67f33bde50 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 ]; }; }; |