diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-10 14:20:49 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-10 14:20:49 +0100 |
| commit | c40f2114992f7387013a6113ebfd99ae63ec4f91 (patch) | |
| tree | 3d3a6f7427fb44f33e30e300a0da2da3e58f7065 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | b8d7c0cab5e5e5ea8002ce4ad38f336df12841fe (diff) | |
| parent | 64edccb463432a937f00943db22a8cd36245ec27 (diff) | |
| download | nixlib-c40f2114992f7387013a6113ebfd99ae63ec4f91.tar nixlib-c40f2114992f7387013a6113ebfd99ae63ec4f91.tar.gz nixlib-c40f2114992f7387013a6113ebfd99ae63ec4f91.tar.bz2 nixlib-c40f2114992f7387013a6113ebfd99ae63ec4f91.tar.lz nixlib-c40f2114992f7387013a6113ebfd99ae63ec4f91.tar.xz nixlib-c40f2114992f7387013a6113ebfd99ae63ec4f91.tar.zst nixlib-c40f2114992f7387013a6113ebfd99ae63ec4f91.zip | |
Merge branch 'staging-next'
It's not completely without regressions, but ATM it seems to bring more upsides than downsides and the iteration is too long already.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0061c318bce1..4391f7b6f46a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -747,6 +747,10 @@ self: super: { rev = "v${ver}"; sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l"; }}/doc"; + # Needed after sphinx 1.7.9 -> 1.8.3 + postPatch = '' + substituteInPlace conf.py --replace "'.md': CommonMarkParser," "" + ''; nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; makeFlags = "html"; installPhase = '' |