From 924c321e8aca912733e7b6f7af1e65d73667c560 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 2 Jul 2019 22:03:53 +0200 Subject: sage: 8.8 -> 8.9.beta0 --- .../patches/sphinx-docbuild-subprocesses.patch | 13 +++-- .../math/sage/patches/threejs-offline.patch | 64 ---------------------- pkgs/applications/science/math/sage/sage-src.nix | 8 +-- 3 files changed, 9 insertions(+), 76 deletions(-) delete mode 100644 pkgs/applications/science/math/sage/patches/threejs-offline.patch (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch index 933344aa5591..56f092796229 100644 --- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch +++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch @@ -1,8 +1,8 @@ diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py -index 0f2700168a..60f71357d2 100644 +index 73a078e619..059125c59f 100644 --- a/src/sage_setup/docbuild/__init__.py +++ b/src/sage_setup/docbuild/__init__.py -@@ -86,26 +86,6 @@ def builder_helper(type): +@@ -86,27 +86,6 @@ def builder_helper(type): """ Returns a function which builds the documentation for output type ``type``. @@ -19,7 +19,8 @@ index 0f2700168a..60f71357d2 100644 - ....: raise BaseException("abort pool operation") - sage: original_runsphinx, sage_setup.docbuild.sphinxbuild.runsphinx = sage_setup.docbuild.sphinxbuild.runsphinx, raiseBaseException - -- sage: from sage_setup.docbuild import builder_helper, build_many, build_ref_doc +- sage: from sage_setup.docbuild import builder_helper, build_ref_doc +- sage: from sage_setup.docbuild import _build_many as build_many - sage: helper = builder_helper("html") - sage: try: - ....: build_many(build_ref_doc, [("docname", "en", "html", {})]) @@ -29,7 +30,7 @@ index 0f2700168a..60f71357d2 100644 """ def f(self, *args, **kwds): output_dir = self._output_dir(type) -@@ -127,10 +107,9 @@ def builder_helper(type): +@@ -128,10 +107,9 @@ def builder_helper(type): logger.debug(build_command) # Run Sphinx with Sage's special logger @@ -43,10 +44,10 @@ index 0f2700168a..60f71357d2 100644 if ABORT_ON_ERROR: raise diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py -index 9a2fba79bc..77c8ed3592 100644 +index fe7eba43b2..463790965c 100644 --- a/src/sage_setup/docbuild/sphinxbuild.py +++ b/src/sage_setup/docbuild/sphinxbuild.py -@@ -318,3 +318,8 @@ def runsphinx(): +@@ -321,3 +321,8 @@ def runsphinx(): sys.stderr = saved_stderr sys.stdout.flush() sys.stderr.flush() diff --git a/pkgs/applications/science/math/sage/patches/threejs-offline.patch b/pkgs/applications/science/math/sage/patches/threejs-offline.patch deleted file mode 100644 index 62b2f114bd62..000000000000 --- a/pkgs/applications/science/math/sage/patches/threejs-offline.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/build/pkgs/threejs/spkg-src b/build/pkgs/threejs/spkg-src -index 91780d813c..254b850a24 100755 ---- a/build/pkgs/threejs/spkg-src -+++ b/build/pkgs/threejs/spkg-src -@@ -20,9 +20,17 @@ URL3="https://raw.githubusercontent.com/mrdoob/three.js/${GIT_VERSION}/LICENSE" - echo "Downloading $URL3" - curl -OL "$URL3" - -+# Set up directory structure -+ -+mkdir build -+mv three.min.js build -+ -+mkdir -p examples/js/controls -+mv OrbitControls.js examples/js/controls -+ - # Package --tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" 'three.min.js' 'OrbitControls.js' 'LICENSE' --rm -rf 'three.min.js' 'OrbitControls.js' 'LICENSE' -+tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" build examples 'LICENSE' -+rm -rf 'build' 'examples' 'LICENSE' - - # Update package info - echo "${GIT_VERSION}" > 'package-version.txt' -diff --git a/src/sage/repl/rich_output/backend_ipython.py b/src/sage/repl/rich_output/backend_ipython.py -index 7c27d48a21..8bf4861a35 100644 ---- a/src/sage/repl/rich_output/backend_ipython.py -+++ b/src/sage/repl/rich_output/backend_ipython.py -@@ -411,10 +411,15 @@ class BackendIPythonCommandline(BackendIPython): - sage: backend.threejs_offline_scripts() - '... -- -+ -+ - diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 51460154c5de..2cb7649500a4 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.8"; + version = "8.9.beta0"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "0jm7zdkz8wfgrmf6620jfr8kgvprrz3qfl8gzx6rl5z5cm734b6x"; + sha256 = "1bp6sdfk6h966y9jcpqnsrjfs0f5xgc1xmjw75h2y18hdgiadiy6"; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -49,10 +49,6 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/27660#ticket ./patches/do-not-test-find-library.patch - - # https://trac.sagemath.org/ticket/28007 - ./patches/threejs-offline.patch - # Parallelize docubuild using subprocesses, fixing an isolation issue. See # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE ./patches/sphinx-docbuild-subprocesses.patch -- cgit 1.4.1 From 56bd506e4291a921c023e7d6d602ce109747283f Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 11 Jul 2019 19:42:01 +0200 Subject: sage: 8.9.beta0 -> 8.9.beta2 --- pkgs/applications/science/math/sage/sage-src.nix | 4 ++-- pkgs/applications/science/math/sage/sagelib.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 2cb7649500a4..e2e1e1d0647a 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9.beta0"; + version = "8.9.beta2"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "1bp6sdfk6h966y9jcpqnsrjfs0f5xgc1xmjw75h2y18hdgiadiy6"; + sha256 = "1cyfdkam9inai7ps1jblagb9kl9wd8kk06m4vhbjmfymvk36q4jf"; }; # Patches needed because of particularities of nix or the way this is packaged. diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 1040d6d4ba15..bf0ab30c7e4c 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -138,8 +138,8 @@ buildPythonPackage rec { mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython" mkdir -p "var/lib/sage/installed" + source build/bin/sage-dist-helpers cd src - source bin/sage-dist-helpers ${python.interpreter} -u setup.py --no-user-cfg build ''; -- cgit 1.4.1 From b884552c35f872c9b4d4ff64327fd7fdd28cfc78 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 2 Aug 2019 01:03:33 +0200 Subject: sage: 8.9.beta2 -> 8.9.beta3 --- pkgs/applications/science/math/sage/sage-src.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index e2e1e1d0647a..3fd1601fe5ef 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9.beta2"; + version = "8.9.beta3"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "1cyfdkam9inai7ps1jblagb9kl9wd8kk06m4vhbjmfymvk36q4jf"; + sha256 = "035nzyhiibfxhvxp0s6pijfy1612ah64qgli5p4pwqfdc76f7rnj"; }; # Patches needed because of particularities of nix or the way this is packaged. -- cgit 1.4.1 From f6a1fe64ebcc4d534f1736a572601d43ab04f924 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 2 Aug 2019 23:50:45 +0200 Subject: sage: 8.9.beta3 -> 8.9.beta4 --- pkgs/applications/science/math/sage/sage-src.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 3fd1601fe5ef..26ca0dd3e005 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9.beta3"; + version = "8.9.beta4"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "035nzyhiibfxhvxp0s6pijfy1612ah64qgli5p4pwqfdc76f7rnj"; + sha256 = "0vvvip5xx0f7h7w0nv82dfkm7jgs79cibb8x2yx7azdc0v7zws69"; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -57,7 +57,14 @@ 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 = [ ]; + bugfixPatches = [ + (fetchpatch { + name = "no-qqbar-timeout-check.patch"; + url = "https://git.sagemath.org/sage.git/patch?id=d5105b625060d4b2a9cfe9cee4316d8b7c96ea46"; + revert = true; + sha256 = "10dm0yjxdydf1wch5b7gkkkzrc8c8d5hlyascvb9r5pkyr0ak947"; + }) + ]; # 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 -- cgit 1.4.1 From ddd3faf08ef3a3857ae22e89058e5979cbf67e71 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 7 Aug 2019 15:33:15 +0200 Subject: sage: 8.9.beta4 -> 8.9.beta5 --- pkgs/applications/science/math/sage/sage-src.nix | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 26ca0dd3e005..99c415974d91 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9.beta4"; + version = "8.9.beta5"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "0vvvip5xx0f7h7w0nv82dfkm7jgs79cibb8x2yx7azdc0v7zws69"; + sha256 = "1nysal4h108clrf08l8wax25q3agh74l4l327vwm93z9k9c2i6i8"; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -57,14 +57,7 @@ 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 = [ - (fetchpatch { - name = "no-qqbar-timeout-check.patch"; - url = "https://git.sagemath.org/sage.git/patch?id=d5105b625060d4b2a9cfe9cee4316d8b7c96ea46"; - revert = true; - sha256 = "10dm0yjxdydf1wch5b7gkkkzrc8c8d5hlyascvb9r5pkyr0ak947"; - }) - ]; + bugfixPatches = [ ]; # 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 @@ -95,14 +88,6 @@ stdenv.mkDerivation rec { sha256 = "0b9293v73wb4x13wv5zwyjgclc01zn16msccfzzi6znswklgvddp"; stripLen = 1; }) - - # https://trac.sagemath.org/ticket/26932 - (fetchSageDiff { - name = "givaro-4.1.0_fflas-ffpack-2.4.0_linbox-1.6.0.patch"; - base = "8.8.beta4"; - rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504"; - sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi"; - }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; -- cgit 1.4.1 From e8436f5e23dfdfc157736db937ef8633a2e0a3ca Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 18 Aug 2019 21:52:27 +0200 Subject: sage: 8.9.beta5 -> 8.9.beta6 --- pkgs/applications/science/math/sage/sage-src.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 99c415974d91..f7c1e50386b7 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9.beta5"; + version = "8.9.beta6"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "1nysal4h108clrf08l8wax25q3agh74l4l327vwm93z9k9c2i6i8"; + sha256 = "0zk3wb9nlb6mrspgabiqdh3rjmcj3y70fg02dmpvhjssdblpkiqi"; }; # Patches needed because of particularities of nix or the way this is packaged. -- cgit 1.4.1 From 071a4db33e46766f8d7dd9243f44cc33256ab04f Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 19 Aug 2019 00:16:06 +0200 Subject: sage: 8.9.beta6 -> 8.9.beta7 --- pkgs/applications/science/math/sage/sage-src.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index f7c1e50386b7..ce8cf026db8a 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9.beta6"; + version = "8.9.beta7"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "0zk3wb9nlb6mrspgabiqdh3rjmcj3y70fg02dmpvhjssdblpkiqi"; + sha256 = "1craag7kf8kl4s52y2ba52pci0amc0kz0gf67d8spxlawjx78dff"; }; # Patches needed because of particularities of nix or the way this is packaged. -- cgit 1.4.1 From 84578046aad4168af3d7f738864c578c2cefba41 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 3 Sep 2019 15:34:28 +0200 Subject: sage: 8.9.beta7 -> 8.9.beta8 --- pkgs/applications/science/math/sage/sage-src.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index ce8cf026db8a..e4f38265c41c 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9.beta7"; + version = "8.9.beta8"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "1craag7kf8kl4s52y2ba52pci0amc0kz0gf67d8spxlawjx78dff"; + sha256 = "0aw19qx4z23vfqp5dyqsff5ng968ipjxsw1j45i9va3cpabm6j49"; }; # Patches needed because of particularities of nix or the way this is packaged. -- cgit 1.4.1 From 5aba3be6f913a9051adff85b0744d847b3fa2bb7 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 23 Sep 2019 18:50:59 +0200 Subject: sage: 8.9.beta8 -> 8.9.beta9 --- pkgs/applications/science/math/sage/sage-src.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 09edd2addfab..e85a1f7239db 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9.beta8"; + version = "8.9.beta9"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "0aw19qx4z23vfqp5dyqsff5ng968ipjxsw1j45i9va3cpabm6j49"; + sha256 = "0axiazlr24rc98784i68hzkzjx7rvrf3qiqz2g6w120a2ls7f1qm"; }; # Patches needed because of particularities of nix or the way this is packaged. -- cgit 1.4.1 From 1797c9c295a1ffe53866fdfc379afdb37efef09e Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 24 Sep 2019 17:51:09 +0200 Subject: sage: 8.9.beta9 -> 8.9.rc0 Sage now by default expects the lcalc library to be named Lfunction (instead of libLfunction). This could be changed by an environment variable (https://trac.sagemath.org/ticket/28224), but various distros seem to agree on this standard (https://groups.google.com/forum/#!topic/sage-packaging/xvh55IxHTZg) so it's best just to follow it. The old standard was set by sage anyway and sage is the only consumer of lcalc in nixpkgs. --- pkgs/applications/science/math/sage/sage-src.nix | 4 ++-- pkgs/development/libraries/science/math/lcalc/makefile.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index e85a1f7239db..cf333b315311 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9.beta9"; + version = "8.9.rc0"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "0axiazlr24rc98784i68hzkzjx7rvrf3qiqz2g6w120a2ls7f1qm"; + sha256 = "112lgdnl11azhpvr8xsrw848l7axijfklcnx19byb0f0vkqd1n3j"; }; # Patches needed because of particularities of nix or the way this is packaged. diff --git a/pkgs/development/libraries/science/math/lcalc/makefile.patch b/pkgs/development/libraries/science/math/lcalc/makefile.patch index f55bbe3f24fa..5c22cf0b84e8 100644 --- a/pkgs/development/libraries/science/math/lcalc/makefile.patch +++ b/pkgs/development/libraries/science/math/lcalc/makefile.patch @@ -104,10 +104,10 @@ index 84e4e88..56ca676 100644 - cp -rf ../include $(INSTALL_DIR)/include/Lfunction + install -d $(INSTALL_DIR)/bin + install -d $(INSTALL_DIR)/$(LIB_DIR) -+ install -d $(INSTALL_DIR)/include/libLfunction ++ install -d $(INSTALL_DIR)/include/Lfunction + install lcalc $(INSTALL_DIR)/bin + install libLfunction.so $(INSTALL_DIR)/$(LIB_DIR) -+ install -m 644 -t $(INSTALL_DIR)/include/libLfunction ../include/*.h ++ install -m 644 -t $(INSTALL_DIR)/include/Lfunction ../include/*.h SRCS = Lcommandline.cc Lcommandline_elliptic.cc Lcommandline_globals.cc Lcommandline_misc.cc Lcommandline_numbertheory.cc Lcommandline_twist.cc Lcommandline_values_zeros.cc Lgamma.cc Lglobals.cc Lmisc.cc Lriemannsiegel.cc Lriemannsiegel_blfi.cc cmdline.c -- cgit 1.4.1 From 78741fc40986746bed0f16d13a3f4a9e5738d35d Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 25 Sep 2019 10:19:04 +0200 Subject: sage: 8.9.rc0 -> 8.9.rc1 --- pkgs/applications/science/math/sage/sage-src.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index cf333b315311..03c1e07439fe 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9.rc0"; + version = "8.9.rc1"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "112lgdnl11azhpvr8xsrw848l7axijfklcnx19byb0f0vkqd1n3j"; + sha256 = "04ryxwgdrm2gwbwrcv7akm97933hlpvglywydy6q6gpy0dvshdah"; }; # Patches needed because of particularities of nix or the way this is packaged. -- cgit 1.4.1 From d9176bee708b1b4d9d60b4a4b00d35245c9a23db Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 30 Sep 2019 11:10:10 +0200 Subject: sage: 8.9.rc1 -> 8.9 --- pkgs/applications/science/math/sage/sage-src.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 03c1e07439fe..5a0f4b97c515 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9.rc1"; + version = "8.9"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "04ryxwgdrm2gwbwrcv7akm97933hlpvglywydy6q6gpy0dvshdah"; + sha256 = "1bwga58x3s8z42w5h51c232f91ndsc1861dlb1glhax3pn0rhn3a"; }; # Patches needed because of particularities of nix or the way this is packaged. -- cgit 1.4.1