Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1880892b7b76
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c0fa30bbcf45
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 26, 2020

  1. pythonPackages.pypandoc: fix tests for pandoc >= 2.11.2 

    A change in the Markdown output of pandoc breaks the unicode input test
of pypandoc.

See also JessicaTegner/pypandoc#204
    @sternenseemann
    sternenseemann authored and Jonathan Ringer committed Nov 26, 2020
    Copy the full SHA
    c0fa30b View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/development/python-modules/pypandoc/default.nix
10 changes: 9 additions & 1 deletion pkgs/development/python-modules/pypandoc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
, pandoc, haskellPackages, texlive }:

buildPythonPackage rec {
@@ -12,6 +12,14 @@ buildPythonPackage rec {
sha256 = "1lpslfns6zxx7b0xr13bzg921lwrj5am8za0b2dviywk6iiib0ld";
};

# https://github.com/bebraw/pypandoc/pull/204
patches = [
(fetchpatch {
url = "https://github.com/sternenseemann/pypandoc/commit/e422e277dd667c77dae11fad931dbb6015e9a784.patch";
sha256 = "11l11kh2a4k0h1g4yvijb60076kzxlkrvda3x6dc1s8fz352bpg3";
})
];

postPatch = ''
# set pandoc path statically
sed -i '/^__pandoc_path = None$/c__pandoc_path = "${pandoc}/bin/pandoc"' pypandoc/__init__.py