Commit Graph

72 Commits

Author SHA1 Message Date
Frederik Rietdijk
53d00c3351 Merge master into staging-next 2018-11-10 11:08:54 +01:00
Timo Kaufmann
efe6322ce4 pythonPackages.networkx: 2.1 -> 2.2 2018-11-07 20:15:37 +01:00
Timo Kaufmann
72e6e792f6 sage: add fetchSageDiff utility function 2018-11-07 20:15:37 +01:00
Tuomas Tynkkynen
067d1cf330 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/science/math/sage/sage-src.nix
2018-10-27 19:58:03 +03:00
Timo Kaufmann
2513747356 sage: fix attrname
This is a minimal change mainly to make sure repology recognizes this
package as sage. I plan a bit more refactoring later, but this is
intentionally kept minimally invasive so that it won't break anything
and can be backported to 18.09.
2018-10-27 14:18:08 +02:00
Timo Kaufmann
fbea2cd77a arb: 2.14.0 -> 2.15.1 2018-10-27 11:27:03 +02:00
Timo Kaufmann
2ce2fcfc30 pythonPackages.cython: 0.28.5 -> 0.29
Needs a sage patch from
https://trac.sagemath.org/ticket/25292
2018-10-24 20:05:44 +02:00
Timo Kaufmann
db75fe7313 sage: fix doctest
The test is depending on the "py2" tag always being added. I patched
that recently to make it possible to test sagedoc individually. Somehow
I missed this doctest.
2018-10-22 14:52:19 +02:00
Timo Kaufmann
b39142cd1f sage: fix dochtml tests 2018-10-21 19:17:07 +02:00
Timo Kaufmann
38c2be5ffe sage: fix docbuild
This is only a hotfix without really knowing the issue. See
https://groups.google.com/forum/#!msg/sage-packaging/VU4h8IWGFLA/mrmCMocYBwAJ
2018-10-21 14:16:06 +02:00
Timo Kaufmann
7ca1c31dfa sage: 8.4.rc1 -> 8.4 2018-10-18 09:58:36 +02:00
Timo Kaufmann
f89df0b556 sage: 8.4.rc0 -> 8.4.rc1 2018-10-13 13:27:10 +02:00
Timo Kaufmann
27919e06f1 sage: 8.4.beta7 -> 8.4.rc0 2018-10-07 12:23:10 +02:00
Timo Kaufmann
a13eb29485 sage: 8.4.beta6 -> 8.4.beta7 2018-10-01 17:38:20 +02:00
Timo Kaufmann
0be6ca9e71 sage: 8.4.beta5 -> 8.4.beta6 2018-09-27 12:08:15 +02:00
Timo Kaufmann
1217882907 sage: 8.4.beta4 -> 8.4.beta5 2018-09-15 17:23:14 +02:00
Timo Kaufmann
c3f652d5a8 Merge remote-tracking branch 'upstream/master' into sage-8.4 2018-09-15 17:22:11 +02:00
Timo Kaufmann
db784d883c sage: re-add pkg-config aliases
Those were removed because they were added to openblas itself. There was
an error with that however and it will take some time until the fix
makes its way through staging. For the time being, reverting this part
of 26d5d030fe will fix the sage build.
This commit should be reverted once
408eacbc89 is in master.
2018-09-07 21:55:41 +02:00
Timo Kaufmann
770c5b8a69 sage: 8.4.beta3 -> 8.4.beta4 2018-09-07 20:56:37 +02:00
Timo Kaufmann
4ab832d6e7 Merge remote-tracking branch 'upstream/master' into sage-8.4 2018-09-07 20:54:09 +02:00
Timo Kaufmann
7521f2863d sage: fix numpy and scipy integration 2018-09-07 18:36:52 +02:00
Timo Kaufmann
46e653673e sage: 8.4.beta2 -> 8.4.beta3 2018-09-02 12:42:44 +02:00
Frederik Rietdijk
7945295410 Merge master into staging 2018-08-27 08:21:50 +02:00
Timo Kaufmann
0e4160a3a1 pythonPackages.sympy: 1.1.1 -> 1.2 2018-08-26 19:56:44 +02:00
Timo Kaufmann
1b42a1ba1e sage: 8.4.beta1 -> 8.4.beta2 2018-08-26 13:09:22 +02:00
Timo Kaufmann
26d5d030fe openblas: add pkg-config aliases 2018-08-21 16:39:57 +02:00
Timo Kaufmann
52b9217b50 sage: 8.4.beta0 -> 8.4.beta1 2018-08-16 00:17:14 +02:00
Timo Kaufmann
df97127114 Merge remote-tracking branch 'upstream/master' into sage-8.4 2018-08-15 13:51:07 +02:00
Timo Kaufmann
291018b34e arb: 2.13.0 -> 2.14.0 (#44600) 2018-08-07 16:38:34 +02:00
Timo Kaufmann
a8b048c686 sage: 8.3 -> 8.4.beta0 2018-08-05 21:09:56 +02:00
Michael Raskin
75cb04672f
Merge pull request #44508 from timokau/cddlib-0.94j
cddlib: 0.94i -> 0.94j
2018-08-05 19:03:47 +00:00
Timo Kaufmann
0a44ff7676 cddlib: 0.94i -> 0.94j
cddlib was autotoolized, incorporated equivalents to the sage patches
and moved to GitHub.
2018-08-05 19:02:45 +02:00
Timo Kaufmann
30c822189d sage: don't override pari
Sage assumes that pari does not use threads. However instead of
disabling them at compile time, we can diable them at runtime instead.
As a result, sage doesn't need its own version of pari anymore. That
means less rebuilds, less complexity and easier debugging.
2018-08-05 13:48:14 +02:00
Timo Kaufmann
834a24e0ff sage: don't pin ntl
Now possible because of the lcalc c++11 patch.
2018-08-04 14:22:58 +02:00
Timo Kaufmann
e550e5d0c7 lcalc: apply c++11 patch 2018-08-04 14:22:29 +02:00
Timo Kaufmann
fa34f6d41c sage: don't pin pari 2018-08-04 14:22:28 +02:00
Timo Kaufmann
e82c26af9b sage: don't pin singular 2018-08-04 14:22:28 +02:00
Timo Kaufmann
840b64fdb8 sage: 8.2 -> 8.3 2018-08-04 14:22:21 +02:00
Timo Kaufmann
ae821e09e7 glpk: adopt error recovery patch (#44201)
This makes it possible to use "vanilla" glpk for sage and shouldn't
affect anything else.
2018-07-29 20:53:56 +02:00
Jörg Thalheim
218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth
6d2857a311 [bot] treewide: remove unused 'inherit' in let blocks 2018-07-20 19:38:19 +00:00
Matthew Bauer
fddd90e9ea
Merge pull request #43538 from timokau/fetchpatch-fix
fetchpatch: quote excludes
2018-07-19 00:35:09 -04:00
Timo Kaufmann
cad446513e ntl: 9.11.0 -> 11.2.1
ntl hasn't been updated in a while. So I'm doing that and adding myself
as the maintainer. I'm also adding some options and pinning the sage
dependency, since it is unfortunately not compatible with the latest ntl
yet.

I've also enabled the tests, since they don't take terribly long and are
worth the time in my opinion.
2018-07-18 14:58:38 +02:00
Timo Kaufmann
3058513941 fetchpatch: add option to revert a patch 2018-07-16 22:46:54 +02:00
Timo Kaufmann
c77d1e5b31 eclib: 20171219 -> 20180710
Also includes the necessary sage compatibility patch, borrowed from
ArchLinux.
2018-07-15 14:59:28 +02:00
Timo Kaufmann
85f7fa93bc pythonPackages.cypari2: 1.1.4 -> 1.2.1 (#43496) 2018-07-14 00:17:55 +02:00
Timo Kaufmann
35896e3506 sage: replace flask-babel version pin by patch 2018-07-12 22:55:16 +02:00
Timo Kaufmann
dcc1013f6b pythonPackages.backports_shutil_get_terminal_size: 1.0 -> 2016-02-21 (#42840) 2018-07-02 18:03:05 +02:00
Timo Kaufmann
70ba695777 sage: replace JUPYTER_PATH patch by upstream patch
The patch was replaced by a better upstream patch that doesn't mvoe the
jupyter dir to the user's home.
2018-06-30 22:30:30 +02:00