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.
2019-02-10 14:20:49 +01:00
parent b8d7c0cab5 64edccb463
commit c40f211499
243 changed files with 1333 additions and 657 deletions
@@ -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 = ''