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: cf00818ba295
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 72aa6e382c6a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 10, 2019

  1. sage: fix docbuild (#57297) 

    The docbuild (or rather its tests) failed because sphinx built some
English parts of the documentation in Russian. The added debian patch
fixes that by isolating docbuilding threads in sphinx using
proper subprocesses.

(cherry picked from commit 33c23ce)
    @timokau
    timokau authored Mar 10, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    72aa6e3 View commit details
Showing with 9 additions and 0 deletions.
  1. +9 −0 pkgs/applications/science/math/sage/sage-src.nix
9 changes: 9 additions & 0 deletions pkgs/applications/science/math/sage/sage-src.nix
View file
Original file line number Diff line number Diff line change
@@ -50,6 +50,15 @@ stdenv.mkDerivation rec {

# Fixes a potential race condition which can lead to transient doctest failures.
./patches/fix-ecl-race.patch

# Parallelize docubuild using subprocesses, fixing an isolation issue. See
# https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
(fetchpatch {
name = "sphinx-docbuild-subprocesses.patch";
url = "https://salsa.debian.org/science-team/sagemath/raw/8a215b17e6f791ddfae6df8ce6d01dfb89acb434/debian/patches/df-subprocess-sphinx.patch";
sha256 = "07p9i0fwjgapmfvmi436yn6v60p8pvmxqjc93wsssqgh5kd8qw3n";
stripLen = 1;
})
];

# Patches needed because of package updates. We could just pin the versions of