From b09967d8128ef117a55fed27276dc8666f5fce50 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 16 Dec 2018 21:33:28 +0100 Subject: [PATCH] sage: 8.5.rc0 -> 8.5.rc1 --- pkgs/applications/science/math/sage/sage-src.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 4685ee61957d..b8e8a39c84b4 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -9,14 +9,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.5.beta6"; + version = "8.5.rc1"; name = "sage-src-${version}"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "0b3f7m1mxqh2sjb8q2bci7202gw8qi1kin13fzsmvfd3caxvxzcy"; + sha256 = "0pb0x5ay2xr5ywpnq0av7p6gf9mifg31yq645phyc8wc4vnhmz7z"; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -79,13 +79,6 @@ stdenv.mkDerivation rec { stripLen = 1; }) - # https://trac.sagemath.org/ticket/26360 - (fetchpatch { - name = "arb-2.15.1.patch"; - url = "https://git.sagemath.org/sage.git/patch/?id=30cc778d46579bd0c7537ed33e8d7a4f40fd5c31"; - sha256 = "13vc2q799dh745sm59xjjabllfj0sfjzcacf8k59kwj04x755d30"; - }) - # https://trac.sagemath.org/ticket/26326 # needs to be split because there is a merge commit in between (fetchSageDiff {