Commit graph

736 commits

Author SHA1 Message Date
Frederik Rietdijk 815b77cbe6 Merge master into staging-next 2019-02-18 14:18:04 +01:00
Frederik Rietdijk 4b2336ea28 python.pkgs.caffe: fix build, closes #8749 2019-02-17 10:13:22 +01:00
Vladimír Čunát f7f1a2f54e
Merge branch 'master' into staging-next
A mass darwin rebuild from master (#55784).
2019-02-17 08:05:24 +01:00
Gabriel Ebner 7cbc76a3e6 Merge branch 'auto-update/qalculate-gtk' 2019-02-16 17:25:47 +01:00
Frederik Rietdijk 6fe10d2779 Merge master into staging-next 2019-02-16 09:29:54 +01:00
R. RyanTM ef405c5b67 qalculate-gtk: 2.8.2 -> 2.9.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qalculate-gtk/versions
2019-02-15 11:39:04 -08:00
Timo Kaufmann 9243e85fbc
sage: fix fetchSageDiff (#55783)
For some reason I changed it to use `cgit`s `rawdiff` instead of `patch`
in the update to sage 8.6. Probably commited that by accident, at least
I can't remember the reason. Also changed the excludes filter, the
leading slash prevented it from working.

As a result, the cypari2 patch changed. Only didn't notice because it
was cached.

Fixes #55780
2019-02-14 21:48:03 +01:00
Michael Raskin 8384cfe455
Merge pull request #55129 from oxij/tree/move-defaults-to-package-files
all-packages.nix: move defaults to package files
2019-02-13 20:04:08 +00:00
Frederik Rietdijk 7257dedd7c Merge master into staging-next 2019-02-13 12:33:29 +01:00
Timo Kaufmann 5728028916 sage: add numpy 1.16 compatibility patch
https://trac.sagemath.org/ticket/27000
2019-02-11 21:43:56 +01:00
Timo Kaufmann 342333c0ab
sage: add compatibility for sphinx 1.8.3 (#55078) (#55560)
Since https://github.com/NixOS/nixpkgs/pull/48841 was replaced by
https://github.com/NixOS/nixpkgs/pull/54186, this needs to be done
separately.

(cherry picked from commit 33db01e6d9)
2019-02-11 13:18:16 +01:00
Florian Franzen f470720aa8 Merge branch 'staging-next' into staging 2019-02-10 14:37:31 +01:00
Vladimír Čunát d2c4b5777b
sagelib: fix missing pkgs.pkgconfig
Again: eb3f0aef43 #54306
Apparently the derivation needs both pkgconfigs
(it fails when missing either).
2019-02-09 10:36:47 +01:00
Jan Malakhovski 88ca6dd78a cplex: move defaults to package file 2019-02-03 15:30:47 +00:00
Jan Malakhovski ec2452dac1 scilab: move defaults to package file 2019-02-03 15:30:45 +00:00
Timo Kaufmann 33db01e6d9
sage: add compatibility for sphinx 1.8.3 (#55078)
Since https://github.com/NixOS/nixpkgs/pull/48841 was replaced by
https://github.com/NixOS/nixpkgs/pull/54186, this needs to be done
separately.
2019-02-02 13:02:07 +01:00
Vladimír Čunát 8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Robert Schütz 052acfe930 sage: python-openid: move django and twill to checkInputs (#54949)
A search through the source code
(https://github.com/openid/python-openid/search?q=django and
https://github.com/openid/python-openid/search?q=twill) reveals
that they are only used in examples and tests.
2019-01-31 10:14:36 +01:00
markuskowa ca13dc163b
Merge pull request #49871 from wucke13/getdp
getdp: init at 3.0.4
2019-01-31 00:43:08 +01:00
R. RyanTM 2b03ef0521 gmsh: 4.1.0 -> 4.1.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gmsh/versions
2019-01-28 10:33:36 -08:00
wucke13 4f40b5e00e getdp: init at 3.0.4 2019-01-28 16:45:13 +01:00
Matthew Bauer 92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
Artemis Tosini 51a2a08d6e
mathematica: 11.2.0 -> 11.3.0
Note that this only affects the English version, as I do not have access
to the hash for the Japanese version.
2019-01-25 15:29:02 +00:00
worldofpeace 78da8d668b pantheon: init a 5.0 2019-01-24 20:54:14 +00:00
Timo Kaufmann d34f44db45
sage: fix transient ecl error (#54285)
Sometimes the doctests fail because ecl races to create a directory.
This should fix that by making sure each process has its own directory.
2019-01-18 23:02:03 +01:00
markuskowa 4545aaa671
Merge pull request #54209 from r-ryantm/auto-update/gmsh
gmsh: 4.0.7 -> 4.1.0
2019-01-18 11:40:48 +01:00
R. RyanTM 55ea7b1bbe gmsh: 4.0.7 -> 4.1.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gmsh/versions
2019-01-17 12:55:54 -08:00
Timo Kaufmann e379ee67c3 sage: 8.5 -> 8.6 2019-01-17 20:39:02 +01:00
Timo Kaufmann 29e150d85f
Merge pull request #54127 from timokau/gap-improvements
gap: install libgap, add packageSet option
2019-01-17 20:38:38 +01:00
Timo Kaufmann cf63a8c94c gap: add packageSet option
Two reasons for this:

- more fine-grained space/functionality tradeoff

- preparation for the sage 8.6 update, which finally doesn't need a
  downgraded gap anymore but does break when unexpected (non-standard)
  packages are installed. Details: https://trac.sagemath.org/ticket/26983

The proper way to deal with gap packages would be to create a package
set, package each one individually and have something like gap
equivalent of `python.withPackages`. I am not willing to do that
however.
2019-01-17 10:10:24 +01:00
Timo Kaufmann bb173ec8e3 gap: install libgap
There are some starts of a `make install`, but nothing complete yet.
Upstream now ships a `libgap` as a replacement of the custom one used by
sagemath.
2019-01-17 10:10:21 +01:00
Timo Kaufmann 6bbd0596dd gap: add timokau as maintainer
So that I'll be notified on changes which likely impact sage.
2019-01-16 23:41:31 +01:00
Timo Kaufmann a8dbc5e313
python.pkgs.cypari2: 1.3.1 -> 2.0.3 (#54093)
Upstream issues should be fixed now, see https://trac.sagemath.org/ticket/26442.
Sage needs a patch to adapt.
2019-01-16 22:15:40 +01:00
Johannes Frankenau bebf305c1b gurobi: 8.0.1 -> 8.1 (#53884) 2019-01-13 23:22:55 +01:00
R. RyanTM bd7eec5d9c pynac: 0.7.22 -> 0.7.23 (#53559)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pynac/versions
2019-01-07 14:52:18 +01:00
Timo Kaufmann 7abdacc4f2
Merge pull request #51039 from timokau/sage-8.5
sage: 8.4 -> 8.5
2018-12-29 16:15:38 +01:00
Timo Kaufmann 8cd7b5aab3
gap: 4r8p10 -> 4.10.0 (#53037)
This new version also has a libgap replacement, so after the next sage
update gap-libgap-compatible and libgap won't be necessary anymore.
2018-12-29 16:05:56 +01:00
Timo Kaufmann 22c16ed300 Merge remote-tracking branch 'upstream/master' into sage-8.5 2018-12-29 12:16:02 +01:00
Timo Kaufmann 95909d4fb6 Revert "sage: preload openblasCompat"
This reverts commit 4900bbee17.

The issue that was supposed to fix is now fixed by lazy-loading rpy2 and
makign sure scipy is loaded before that.
That is not quite as nice, but preloading is now causing its own issues
with openblas 0.3.4:
https://github.com/xianyi/OpenBLAS/issues/1936
2018-12-28 23:06:05 +01:00
Timo Kaufmann 360eddd3a3 sage: remove outdated patch files 2018-12-28 23:06:05 +01:00
Timo Kaufmann 6f0f06ec89 sage: 8.5.rc1 -> 8.5 2018-12-28 23:06:05 +01:00
Alex Branham a5fc513079 R: 3.5.1 -> 3.5.2
Closes https://github.com/NixOS/nixpkgs/pull/52571.
2018-12-21 13:59:36 +01:00
Gabriel Ebner 21597583f9
Merge pull request #52067 from r-ryantm/auto-update/qalculate-gtk
qalculate-gtk: 2.8.1 -> 2.8.2
2018-12-17 09:46:32 +01:00
Timo Kaufmann b09967d812 sage: 8.5.rc0 -> 8.5.rc1 2018-12-16 21:33:28 +01:00
Jörg Thalheim 33c227c23b
Merge pull request #52392 from r-ryantm/auto-update/calc
calc: 2.12.7.1 -> 2.12.7.2
2018-12-16 17:33:43 +00:00
R. RyanTM 67536060ac calc: 2.12.7.1 -> 2.12.7.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/calc/versions
2018-12-16 07:44:09 -08:00
Michael Raskin 2f0cbb34cf
Merge pull request #52171 from r-ryantm/auto-update/pari
pari: 2.11.0 -> 2.11.1
2018-12-15 12:08:50 +00:00
R. RyanTM 943e6fa283 pari: 2.11.0 -> 2.11.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pari/versions
2018-12-14 22:17:15 -08:00
R. RyanTM a7e1717d4b qalculate-gtk: 2.8.1 -> 2.8.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qalculate-gtk/versions
2018-12-14 07:37:22 -08:00
luz.paz ab9532b1fe gmsh: 4.0.5 -> 4.0.7 2018-12-14 08:01:20 -05:00