Unverified Commit 446d4901 authored by Mauricio Collares's avatar Mauricio Collares Committed by GitHub
Browse files

sage: 10.5.rc0 -> 10.5 (#361803)

parents 2b676625 8439c493
Loading
Loading
Loading
Loading
+11 −4
Original line number Diff line number Diff line
@@ -11,14 +11,14 @@
# all get the same sources with the same patches applied.

stdenv.mkDerivation rec {
  version = "10.5.rc0";
  version = "10.5";
  pname = "sage-src";

  src = fetchFromGitHub {
    owner = "sagemath";
    repo = "sage";
    rev = version;
    hash = "sha256-qjgEgyPOpT/g7D8YNhkqO1EHGNftZnuR5ucLNZBa9Sg=";
    hash = "sha256-OiGMc3KyHWnjVWXJ/KiqEQS1skM9nPLYcoMK9kw4718=";
  };

  # contains essential files (e.g., setup.cfg) generated by the bootstrap script.
@@ -26,8 +26,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-d9c38a7c581e6ed54fbe420122b8bba488b16074.tar.gz";
    hash = "sha256-y1EpsuYK9wloptjeiTew+TZaIUZ2K/NKCbSteojFa4s=";
    url = "mirror://sageupstream/configure/configure-f6ad0ecf1f4a269f5954d5487336b13f70624594.tar.gz";
    hash = "sha256-VANtZDUhjOHap9XVEuG/1003E+1XRdXEnuH15hIqJd4=";
  };

  # Patches needed because of particularities of nix or the way this is packaged.
@@ -57,6 +57,13 @@ 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, positively reviewed, to land 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