Unverified Commit 357c26c3 authored by Mauricio Collares's avatar Mauricio Collares Committed by GitHub
Browse files

Merge pull request #315300 from NixOS/backport-315114-to-release-24.05 

[Backport release-24.05] sageWithDoc: add sphinx 7.3 update patch
parents 32344320 79feebc8

pkgs/applications/science/math/sage/sage-src.nix

+9 −2
Original line number Diff line number Diff line
@@ -61,12 +61,19 @@ stdenv.mkDerivation rec { 
      hash = "sha256-uCXchYx26DdxTjR1k2748KCEHPnekKS2fAM7SpyhNvM=";

    })



    # https://github.com/sagemath/sage/pull/37763

    # https://github.com/sagemath/sage/pull/37763, landed in 10.4.beta2

    (fetchpatch {

      name = "scipy-fault-tolerance.patch";

      url = "https://github.com/sagemath/sage/commit/547d502ed56f9fd44eb5d9b4ee0824746c60fef7.diff";

      url = "https://github.com/sagemath/sage/commit/551139c09f26a5da96b1187c3f0dd17b8d80ef84.diff";

      hash = "sha256-PR4przrZ3ieHaW2nSY7l7VhNfrUupu9yCIrXpeyoAgg=";

    })



    # first two commits from https://github.com/sagemath/sage/pull/38100

    (fetchpatch {

      name = "sphinx-7.3-update.patch";

      url = "https://github.com/sagemath/sage/compare/10.4.beta7...d2932e142991b442a3eee5dc4f8949e3f7e6fe5c.patch";

      hash = "sha256-g6w0ImE0d2ocKnbGMQikcz9eI9r3/gESlA1NrQfGimk=";

    })

  ];



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

pkgs/applications/science/math/sage/sagedoc.nix

+0 −4
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ stdenv.mkDerivation rec { 
    export HOME="$TMPDIR/sage_home"

    mkdir -p "$HOME"



    # adapted from src/doc/Makefile (doc-src target), which tries to call Sage from PATH

    mkdir -p $SAGE_DOC_SRC_OVERRIDE/en/reference/repl

    ${sage-with-env}/bin/sage -advanced > $SAGE_DOC_SRC_OVERRIDE/en/reference/repl/options.txt



    # needed to link them in the sage docs using intersphinx

    export PPLPY_DOCS=${python3.pkgs.pplpy.doc}/share/doc/pplpy