Commit faff103d authored by Mauricio Collares's avatar Mauricio Collares
Browse files

sageWithDoc: 10.5 -> 10.6.rc1

parent 698214a3

pkgs/by-name/sa/sage/sage-src.nix

+8 −36
Original line number Diff line number Diff line
@@ -12,14 +12,14 @@ 
# all get the same sources with the same patches applied.



stdenv.mkDerivation rec {

  version = "10.5";

  version = "10.6.rc1";

  pname = "sage-src";



  src = fetchFromGitHub {

    owner = "sagemath";

    repo = "sage";

    rev = version;

    hash = "sha256-OiGMc3KyHWnjVWXJ/KiqEQS1skM9nPLYcoMK9kw4718=";

    hash = "sha256-fhCKe0mz3Rwz+HQJWkMj6/0gbvpVW1/ENCMNWkK5ngQ=";

  };



  # contains essential files (e.g., setup.cfg) generated by the bootstrap script.
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec { 
  configure-src = fetchurl {

    # the hash below is the tagged commit's _parent_. it can also be found by looking for

    # the "configure" asset at https://github.com/sagemath/sage/releases/tag/${version}

    url = "mirror://sageupstream/configure/configure-f6ad0ecf1f4a269f5954d5487336b13f70624594.tar.gz";

    hash = "sha256-VANtZDUhjOHap9XVEuG/1003E+1XRdXEnuH15hIqJd4=";

    url = "mirror://sageupstream/configure/configure-8dab37468c9feb4a5a1fcc22bbccc12321aaa475.tar.gz";

    hash = "sha256-WqaUbmqZ7qwrgp8hRjOO7vhTejE0tCiQeMhBcJLsqvI=";

  };



  # Patches needed because of particularities of nix or the way this is packaged.
@@ -60,13 +60,6 @@ stdenv.mkDerivation rec { 
    # compile libs/gap/element.pyx with -O1

    # a more conservative version of https://github.com/sagemath/sage/pull/37951

    ./patches/gap-element-crash.patch



    # https://github.com/sagemath/sage/pull/38940, landed in 10.6.beta0

    (fetchpatch {

      name = "simplicial-sets-flaky-test.patch";

      url = "https://github.com/sagemath/sage/commit/1830861c5130d30b891e8c643308e1ceb91ce2b5.diff";

      hash = "sha256-6MbZ+eJPFBEtnJsJX0MgO2AykPXSeuya0W0adiIH+KE=";

    })

  ];



  # Patches needed because of package updates. We could just pin the versions of
@@ -76,32 +69,11 @@ stdenv.mkDerivation rec { 
  # should come from or be proposed to upstream. This list will probably never

  # be empty since dependencies update all the time.

  packageUpgradePatches = [

    # https://github.com/sagemath/sage/pull/38887, landed in 10.6.beta0

    (fetchpatch {

      name = "libbraiding-1.3-update.patch";

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

      hash = "sha256-xB0xg8dGLnSMdFK3/B5hkI9yzI5N3lUMhPZ89lDsp3s=";

    })



    # https://github.com/sagemath/sage/pull/39261, landed in 10.6.beta4

    (fetchpatch {

      name = "scipy-1.15-update.patch";

      url = "https://github.com/sagemath/sage/commit/545f5bf75084a7467aae0c0b34bc000ca996df78.diff";

      hash = "sha256-CMwwZLPalU4jWyRf4jnYncEQbw980gt+7xtAtqypDG4=";

    })



    # https://github.com/sagemath/sage/pull/38749, to land in 10.6.beta6

    (fetchpatch {

      name = "pari-2.17.1-update.patch";

      url = "https://github.com/sagemath/sage/compare/10.6.beta2...26f411e5939718d4439325ff669635e5a72d50e5.diff";

      hash = "sha256-Z4JwCuUDpqktAzNtVKRUbrJEh7TmCtFI7PJnOrcEbr4=";

    })



    # https://github.com/sagemath/sage/pull/38962, landed in 10.6.beta7

    # https://github.com/sagemath/sage/pull/39737, positively reviewed

    (fetchpatch {

      name = "eclib-update.patch";

      url = "https://github.com/sagemath/sage/commit/5289298248a1d6ab11ccf169e636d951f1d77c41.diff";

      hash = "sha256-iQNqvywvtnvqAA9o8zn4il/XIFBiuEX+vSFZHPaPzcs=";

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

      url = "https://github.com/sagemath/sage/pull/39737/commits/4e485497fb5e20a056ffd2178360b88f482447d8.patch";

      hash = "sha256-oIcFeol0SW5dE/iE6mbYyas3kXIjOwsG1k+h99R94x8=";

    })

  ];