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
Eelco Dolstra
09dc132e04
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Vincent Laporte
9d5be8a757
maxima: update from 5.33.0 to 5.34.1
2014-10-10 21:55:16 +01:00
Eelco Dolstra
a85dcf4a00
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/libav/default.nix
pkgs/shells/bash/bash-4.2-patches.nix
pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Peter Simons
8ee5bd585f
haskell-sloane: update to version 1.9.3
...
This version supports the latest optparse-applicative.
2014-10-06 11:21:39 +02:00
Michael Raskin
50e55fd793
Update PARI
2014-09-24 13:32:46 +04:00
Siarhei Zirukin
00298c7bba
added pcalc package
2014-09-19 13:31:52 +02:00
Eelco Dolstra
91ec6e0d90
Merge remote-tracking branch 'origin/master' into staging
2014-09-18 22:28:35 +02:00
Aristid Breitkreuz
6fc7efa7b3
add mathematica 10 (slightly borked but runs)
2014-09-17 23:25:35 +02:00
Vladimír Čunát
d957b4bd78
Merge recent master into staging
...
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
Peter Simons
b9f7f19820
R: Revert update to version 3.1.1
...
This reverts commit 6e803a684f
. The new version
fails its test suite [1]. The issue has been reported upstream [2].
[1] http://hydra.cryp.to/build/191457/nixlog/1/raw
[2] https://bugs.r-project.org/bugzilla/show_bug.cgi?id=15975
2014-09-13 20:03:44 +02:00
Pascal Wittmann
8d67b9a240
transformed meta.maintainers of some packages into lists
2014-09-13 13:52:02 +02:00
Peter Simons
6e803a684f
R: update to version 3.1.1
2014-09-12 15:20:06 +02:00
Vladimír Čunát
82797f98f2
Merge branch 'staging' into modular-stdenv
...
Conflicts:
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Michael Raskin
bacd3e852d
Update pari
2014-09-02 14:25:17 +04:00
Bjørn Forsman
c9baba9212
Fix many package descriptions
...
(My OCD kicked in today...)
Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.
I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.
I've tried to stay away from generated expressions (and I think I
succeeded).
Some specifics worth mentioning:
* cron, has "Vixie Cron" in its description. The "Vixie" part is not
mentioned anywhere else. I kept it in a parenthesis at the end of the
description.
* ctags description started with "Exuberant Ctags ...", and the
"exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
at the end of description.
* nix has the description "The Nix Deployment System". Since that
doesn't really say much what it is/does (especially after removing
the package name!), I changed that to "Powerful package manager that
makes package management reliable and reproducible" (borrowed from
nixos.org).
* Tons of "GNU Foo, Foo is a [the important bits]" descriptions
is changed to just [the important bits]. If the package name doesn't
contain GNU I don't think it's needed to say it in the description
either.
2014-08-24 22:31:37 +02:00
Eelco Dolstra
e3f7dbbac8
Cleanup: Use += to append to envHooks
2014-08-09 12:47:05 +02:00
Vladimír Čunát
52d9c93abe
Merge 'staging' into master
2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618
Mark a bunch of packages as broken or not supported on Darwin
2014-08-08 17:59:02 +02:00
Peter Simons
9226fbf56a
Merge remote-tracking branch 'origin/master' into staging.
2014-08-08 09:51:01 +02:00
Peter Simons
09ea413e17
haskell-sloane: update to version 1.9.1
2014-08-07 12:41:55 +02:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Peter Simons
d0ca8c237e
Fix broken license references.
2014-07-28 11:43:20 +02:00
Peter Simons
ad934ccc22
singular: cosmetic fix for syntax highlighting
2014-07-28 11:42:49 +02:00
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
Eelco Dolstra
b9d19af3e6
Merge remote-tracking branch 'origin/master' into staging
2014-07-15 12:14:35 +02:00
Peter Simons
5bfb58a8a2
Re-generate Haskell packages with cabal2nix.
2014-07-14 17:33:52 +02:00
Eelco Dolstra
95b828de42
Merge remote-tracking branch 'origin/master' into staging
2014-07-07 13:16:26 +02:00
Peter Simons
0d414a9399
haskell-sloane: update to version 1.8.2
2014-07-04 11:45:43 +02:00
Eelco Dolstra
06fc1ec34d
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df
Another attempt to eradicate ensureDir
...
See c556a6ea46
.
2014-06-30 14:56:10 +02:00
Benno Fünfstück
e10001042d
fetchbzr, fetchdarcs, fetchhg: use rev
attr
...
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
Peter Simons
1380b62fdb
haskell-sloane: update to version 1.8
2014-06-13 15:41:25 +02:00
Ellis Whitehead
a257d14925
R: install lib/libR.so for use by other programs such as RStudio
2014-05-17 21:35:02 +02:00
Peter Simons
ef05fad51a
R: don't restrict meta.platforms to Linux; other architectures should build fine
2014-05-04 22:04:44 +02:00
Peter Simons
a9258080b1
R: don't install the "recommended packages"
...
These packages come with R, but if we install them as part of this build, then
we cannot update them without re-building R as well. Instead, we add those
packages to the R environment through the r-wrapper. This means that
recommended packages can be updated in cran-packgaes.nix, and those updates
have an effect on the installation without re-building R itself.
2014-05-04 21:12:34 +02:00
Peter Simons
4700996bc7
haskell-sloane: update to version 1.7.1
2014-05-01 21:57:03 +02:00
Eelco Dolstra
fe4bc3cc80
Fix evaluation error
...
http://hydra.nixos.org/build/10697257
2014-04-29 20:40:28 +02:00
Peter Simons
6c5d7a63ac
haskell-sloane: update to version 1.7
2014-04-29 01:35:45 +02:00
John Wiegley
7ce39b067a
Add expression for sage
2014-04-22 14:10:36 -05:00
Peter Simons
b5773eeccb
R: update to version 3.1.0
2014-04-11 12:07:00 +02:00