Commit graph

188 commits

Author SHA1 Message Date
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Erik Rybakken
64c1a9a2e2 perseus: init at 4-beta 2015-09-19 00:56:24 +02:00
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Russell O'Connor
772ec9cae3 csdp: init at 6.1.1 2015-09-10 11:50:18 -04:00
Vladimír Čunát
8f33b8cc93 mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02:00
Eelco Dolstra
8fc039188e Mark some packages with undownloadable source as broken 2015-09-01 12:00:04 +02:00
Gabriel Ebner
6b42cd852a qalculate-gtk: init at 0.9.7 2015-08-31 19:20:29 +02:00
Eelco Dolstra
f423ba3863 cbc: Enable on Darwin 2015-08-19 11:53:10 +02:00
Eelco Dolstra
80c137c7a2 Add cbc, a mixed ILP solver 2015-08-12 18:39:28 +02:00
Arseniy Seroka
e9b5deb973 Merge pull request #8964 from vbgl/ecm
ecm: 6.2.3 -> 6.4.4
2015-07-26 20:09:10 +03:00
Sergey Mironov
dcdd7a37f6 lp_solve: add the expression 2015-07-23 20:42:35 +02:00
Vincent Laporte
08750f988a ecm: 6.2.3 -> 6.4.4 2015-07-23 19:22:03 +02:00
William Casarin
8ead9cf0c5 caffe: init at rev 77d66dfc
Initial version of the Caffe deep learning framework from Berkeley
2015-07-08 10:07:10 -07:00
Michael Raskin
d7dae65b5c pari: update 2.7.3 -> 2.7.4 2015-07-05 00:32:53 +03:00
Vincent Laporte
5beebaca58 fix glsurf 2015-06-25 08:55:29 +02:00
Michel Kuhlmann
46d46fd05a R: update to 3.2.1 2015-06-18 14:00:29 +02:00
Thomas Tuegel
4fb98dd6a7 jags: build with openblas 2015-06-12 07:56:04 -05:00
Thomas Tuegel
e729a88474 R: build with openblas
Fixes #6393.
2015-06-04 17:42:04 -05:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Peter Simons
c1e62e9e8b maxima: update to version 5.36.1 2015-05-13 12:17:16 +02:00
Peter Simons
645b1cea6e wxmaxima: update to 15.04.0 2015-05-13 12:17:01 +02:00
Peter Simons
324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Peter Simons
f82a287c20 R: update to 3.2.0 2015-04-17 20:02:46 +02:00
Aristid Breitkreuz
a7e0cb38c2 update Mathematica to 10.0.2 2015-04-09 21:53:51 +02:00
Siarhei Zirukin
f4cd5a68f7 pcalc: 20120812 -> 20141224 2015-03-24 18:27:42 +01:00
Peter Simons
3f7de179f5 R: update to version 3.1.3 2015-03-09 16:37:05 +01:00
Michael Raskin
0394ce7627 Update pari 2015-03-09 01:03:00 +03:00
Lluís Batlle i Rossell
569a02b725 Updating weka to 3.6.12.
(cherry picked from commit cd417206f93be49dd848ce1b3633e335faed941f)
2015-02-13 16:22:39 +01:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Peter Simons
96aa27c772 pspp: update from 0.8.2 to 0.8.3 2015-01-27 14:04:54 +01:00
Eric Seidel
f272730399 rename <gcc-frontend>.gcc to <gcc-frontend>.cc 2015-01-14 20:59:10 -08:00
Eric Seidel
88eae46455 rename occurrences of gcc.gcc to gcc.cc 2015-01-14 20:47:49 -08:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Peter Simons
a9d779aa5d wxmaxima: update to version 14.12.1 2014-12-22 11:20:59 +01:00
Peter Simons
0dd52aba89 maxima: update to version 5.35.1 2014-12-22 11:20:58 +01:00
Peter Simons
67ddc8f4b9 R: add meta.platforms attribute 2014-12-03 16:28:28 +01:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Vincent Laporte
6e8a9b8145 wxmaxima: update from 13.04.2 to 14.09.0 2014-11-06 01:41:02 +00:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Joachim Fasting
71a443c1b2 Add mirrors for sage 2014-11-03 23:04:44 +01:00
Peter Simons
109f19d749 Merge pull request #4788 from joachifm/sage
sage fixes
2014-11-03 11:16:56 +01:00
Joachim Fasting
6f7822ddda sage: fix download url for version 6.1.1 2014-11-02 20:55:08 +01:00
Joachim Fasting
82ec13eaa3 sage: fix meta information
Correct homagepage, description, and license.
2014-11-02 20:55:02 +01:00
Peter Simons
a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Peter Simons
ead6bc4a57 R: run the test suite only when recommended packages are built 2014-11-01 21:08:05 +01:00
Peter Simons
12e26d47b7 R: update to version R-3.1.2 2014-11-01 13:43:48 +01:00