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

Commits on Mar 17, 2019

  1. sage: backport bugfix (#57794)

    @timokau
    timokau authored Mar 17, 2019
    Copy the full SHA
    5fc5881 View commit details
Showing with 14 additions and 1 deletion.
  1. +14 −1 pkgs/applications/science/math/sage/sage-src.nix
15 changes: 14 additions & 1 deletion pkgs/applications/science/math/sage/sage-src.nix
View file
Original file line number Diff line number Diff line change
@@ -61,6 +61,19 @@ stdenv.mkDerivation rec {
})
];

# Since sage unfortunately does not release bugfix releases, packagers must
# fix those bugs themselves. This is for critical bugfixes, where "critical"
# == "causes (transient) doctest failures / somebody complained".
bugfixPatches = [
# Transient doctest failure in src/sage/modular/abvar/torsion_subgroup.py
# https://trac.sagemath.org/ticket/27477
(fetchpatch {
name = "sig_on_in_matrix_sparce.patch";
url = "https://git.sagemath.org/sage.git/patch?id2=10407524b18659e14e184114b61c043fb816f3c2&id=c9b0cc9d0b8748ab85e568f8f57f316c5e8cbe54";
sha256 = "0wgp7yvn9sm1ynlhcr4l0hzmvr2n28llg4xc01p6k1zz4im64c17";
})
];

# Patches needed because of package updates. We could just pin the versions of
# dependencies, but that would lead to rebuilds, confusion and the burdons of
# maintaining multiple versions of dependencies. Instead we try to make sage
@@ -126,7 +139,7 @@ stdenv.mkDerivation rec {
./patches/ignore-pip-deprecation.patch
];

patches = nixPatches ++ packageUpgradePatches;
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

postPatch = ''
# make sure shebangs etc are fixed, but sage-python23 still works