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
base: 3bf5bf6dd012
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0b7fe7290acf
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 12, 2020

  1. sage: fix test suite with docutils 0.15 

    The better way to fix this would be to backport the upstream sphinx
patch:

sphinx-doc/sphinx@faedcc4

Unfortunately it doesn't apply cleanly and isn't worth the effort
of backporting. Let's hope we can switch to python3 sage and the recent
sphinx version that comes with it before this becomes a problem.

(cherry picked from commit 7133577)
    @timokau
    timokau committed Mar 12, 2020
    Copy the full SHA
    b9cbb44 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #82416 from timokau/sage-docutils-0.15-fix-20.03 

    [20.03] sage: fix test suite with docutils 0.15
    @timokau
    timokau committed Mar 12, 2020
    Copy the full SHA
    0b7fe72 View commit details
    Browse the repository at this point in the history