Commit Graph

2484 Commits

Author SHA1 Message Date
Sophie Taylor
59338fb99d Fix sc2-headless map hash (#56320) 2019-02-25 01:08:12 +01:00
markuskowa
0b00338eb9
Merge pull request #56178 from luzpaz/gmsh-4.1.5
gmsh: 4.1.3 -> 4.1.5
2019-02-22 11:26:15 +01:00
Sophie Taylor
c736f9693d Added maps to sc2-headless 2019-02-22 09:01:00 +00:00
luz.paz
add7b20858 gmsh: 4.1.3 -> 4.1.5 2019-02-21 22:55:48 -05:00
Jan Malakhovski
c7675be3c1 sc2-headless: move defaults to package file 2019-02-03 15:33:29 +00:00
Vladimír Čunát
32767d139f
Merge branch 'staging-next'
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
Michael Raskin
446520bb9b
Merge pull request #56026 from oxij/tree/move-defaults-to-package-files-half-cuda
all-packages.nix: move defaults to package files continues^2
2019-02-19 21:54:02 +00:00
Vincent Laporte
e4035c3e0e
Merge pull request #55633 from vbgl/alt-ergo-2.3.0
alt-ergo: 2.2.0 -> 2.3.0
2019-02-19 09:53:57 +01:00
Frederik Rietdijk
815b77cbe6 Merge master into staging-next 2019-02-18 14:18:04 +01:00
Ryan Mulligan
f56693f25a
Merge pull request #55052 from smaret/gildas-update
gildas: 20190101_b -> 20190201_b
2019-02-17 06:46:15 -08: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
Sébastien Maret
a69d2c2e69
gildas: 20190201_a -> 20190201_b 2019-02-15 13:27:57 +01: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
Samuel W. Flint
52a7c4e30e z3: Patch file to get rid of python error
See #55591, Z3Prover/z3#2131
2019-02-14 10:11:15 -06:00
Michael Bishop
ac29d96d25
Merge pull request #55629 from spacekitteh/patch-30
Add maps to SC2
2019-02-13 19:13:14 -04: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
Sophie Taylor
744e344171
Update maps.nix 2019-02-13 08:53:32 +10:00
Sophie Taylor
ce1eb1ea79 Update and rename maps.nix to maps-replays.nix 2019-02-12 10:41:41 +00:00
Vincent Laporte
e4a8af06d1
alt-ergo: 2.2.0 -> 2.3.0 2019-02-12 09:19:06 +00:00
Sarah Brofeldt
c0cfe9bf50
Merge pull request #54991 from FlorianFranzen/sc2-headless
sc2-headless: 3.17 -> 4.7.1
2019-02-12 09:42:56 +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
Matthew Bauer
5c09d977c7 Merge remote-tracking branch 'origin/master' into staging 2019-02-09 12:14:06 -05: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
tbenst
1cb81a69a0 cmtk: init at 3.3.1 (#54016)
* cmtk: init at 3.3.1
2019-02-08 17:41:14 -05:00
Will Dietz
dcfce974d9
Merge pull request #55077 from m-labs/for-upstream
rink: init at 0.4.4
2019-02-07 09:47:46 -06:00
Timo Kaufmann
dbc771f2e1
Merge pull request #55299 from r-ryantm/auto-update/jmol
jmol: 14.29.29 -> 14.29.31
2019-02-06 13:15:46 +01:00
markuskowa
0496c08afd
Merge pull request #55298 from r-ryantm/auto-update/igv
igv: 2.4.16 -> 2.4.17
2019-02-06 12:50:24 +01:00
Markus Kowalewski
64e9f2ad65
jmol: remove redundant name attribute
version and pname are alrady present
2019-02-06 12:25:25 +01:00
R. RyanTM
a1360faba7 jmol: 14.29.29 -> 14.29.31
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jmol/versions
2019-02-05 20:33:46 -08:00
R. RyanTM
da628f0cbd igv: 2.4.16 -> 2.4.17
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/igv/versions
2019-02-05 20:06:55 -08:00
markuskowa
9703765556 molden: 5.8.2 -> 5.9.3 (#55044) 2019-02-05 23:57:29 +02:00
markuskowa
5c7edec7a3
Merge pull request #55152 from r-ryantm/auto-update/star
star: 2.6.1d -> 2.7.0a
2019-02-04 22:53:49 +01:00
R. RyanTM
b015c68def verilator: 4.008 -> 4.010
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/verilator/versions
2019-02-04 11:54:29 -06:00
R. RyanTM
e27eaf6111 star: 2.6.1d -> 2.7.0a
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/star/versions
2019-02-03 17:20:27 -08:00
Jan Malakhovski
4bc66b1994 cntk: move defaults to package file 2019-02-03 15:32:16 +00:00
Jan Malakhovski
31aa884b7f caffe: move defaults to package file 2019-02-03 15:32:15 +00:00
Jan Malakhovski
49148a3ea2 mxnet: move defaults to package file 2019-02-03 15:32:14 +00: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
Sebastien Bourdeauducq
3b03b901fb rink: init at 0.4.4 2019-02-03 13:29:18 +08: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
Sébastien Maret
cb72eec530
gildas: 20190101_b -> 20190201_a 2019-02-01 16:29:30 +01:00
Vladimír Čunát
8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00