Luca Bruno
83221f3886
Merge branch 'master' into staging
...
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Vincent Laporte
fbbd88017f
zarith: propagate build input gmp
2014-11-07 09:50:39 +00:00
Vincent Laporte
3d049938c8
Adds some “branch” meta-data
2014-11-06 19:40:50 +00: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
Mateusz Kowalczyk
007f80c1d0
Turn more licenses into lib.licenses style
...
Should eval cleanly, as far as -A tarball tells me.
Relevant: issue #2999 , issue #739
2014-11-06 00:48:16 +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
b5fed52c43
Merge pull request #4238 from wkennington/master.boost
...
Make boost 156 the default
2014-11-03 23:03:01 +01:00
John Wiegley
d4c3e454a2
coq_HEAD: update to latest commit
2014-11-03 15:27:32 -06:00
John Wiegley
2b9e43b513
coq: 8.4pl4 -> 8.4pl5
2014-11-03 10:49:38 -06:00
Vladimír Čunát
ed867a50eb
iconv: remove usage on Linux in several packages
...
This fixes builds after #4419 . Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.
CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
2014-11-03 12:58:54 +01:00
Peter Simons
109f19d749
Merge pull request #4788 from joachifm/sage
...
sage fixes
2014-11-03 11:16:56 +01:00
William A. Kennington III
aa3e800be7
boost: Remove boost.lib
2014-11-02 17:22:27 -08: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
Peter Simons
b11060d8db
Merge remote-tracking branch 'origin/master' into staging.
2014-10-31 11:14:24 +01:00
Lluís Batlle i Rossell
f7f7a0d0f4
Updating qucs to 0.18
...
Patch by 'emery' on irc.
2014-10-29 10:29:53 +01:00
Jiri Marsik
ceba23605c
Added acgtk-1.1
2014-10-28 14:06:21 +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
Jaka Hudoklin
42da129d34
Merge pull request #4456 from robberer/pkgs/fritzing
...
fritzing: add version 0.9.0b
2014-10-12 22:58:45 +02:00
Vincent Laporte
fe1d8d0015
cvc4: new derivation
...
CVC4 is an efficient open-source automatic theorem prover for
satisfiability modulo theories (SMT) problems.
Homepage: http://cvc4.cs.nyu.edu/web/
2014-10-12 16:21:02 +02:00
Vincent Laporte
531b44562a
why3: update from 0.83 to 0.85
2014-10-12 16:21:02 +02:00
Domen Kožar
b4a7c1a6e2
xplanet: fix giflib update
2014-10-11 19:53:18 +02:00
Vincent Laporte
9d5be8a757
maxima: update from 5.33.0 to 5.34.1
2014-10-10 21:55:16 +01:00
Longrin Wischnewski
56a2f589b8
fritzing: add version 0.9.0b
...
- An open source prototyping tool for Arduino-based projects
2014-10-10 12:43:39 +02:00
John Wiegley
e73aefcf93
coq_HEAD: Update
2014-10-09 14:52:35 -05: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
Mateusz Kowalczyk
3d26ea99dc
Merge pull request #4342 from vbgl/camlp5-6.12
...
Camlp5: update to 6.12; hol-light: update to r199
2014-10-03 18:36:06 +01:00
John Wiegley
10e215a3ae
isabelle: Version 2014 building on Linux and Darwin
2014-09-30 23:15:31 -05:00
Vincent Laporte
c260abbff8
hol_light: update to r199
...
And adds compatibility with camlp5-6.12
2014-10-01 00:44:15 +01:00
John Wiegley
57b292fb1b
isabelle: Another Linux hash change?
2014-09-30 16:44:15 -05:00
John Wiegley
5a7ce1185b
isabelle: Remove Linux patches (is this correct?)
2014-09-30 16:41:47 -05:00
John Wiegley
8d9cd1557b
isabelle: Correct the 2014 sha value for Linux
2014-09-30 16:15:34 -05:00
John Wiegley
db690f28a3
isabelle: 2013 -> 2014, plus add darwin support
2014-09-30 12:57:30 -05:00
Mateusz Kowalczyk
ce4ae2aa1e
Merge pull request #4305 from vbgl/coq-containers
...
Working with Coq
2014-09-30 15:04:30 +01:00
Mateusz Kowalczyk
9440f55ef8
gtkwave: update from 3.3.61 to 3.3.62
...
cc @viric
2014-09-30 11:04:26 +01:00
Vincent Laporte
f3b8d82ce6
Removes duplicate ssreflect
2014-09-28 14:03:15 +01:00
Vincent Laporte
fde68228d9
coq: setup-hook for libraries
...
Adds a hook to automatically populate the $COQPATH variable.
Coq libraries are expected to be installed in
lib/coq/${coq-version}/user-contrib/
2014-09-28 14:03:14 +01:00
Michael Raskin
9ae10b2cac
Update golly
2014-09-24 14:07:00 +04:00
Michael Raskin
50e55fd793
Update PARI
2014-09-24 13:32:46 +04:00
John Wiegley
4eedbfd786
coq_HEAD: update to latest Git HEAD
2014-09-23 13:19:51 -05:00
William A. Kennington III
31220480d8
boost: Update depdendent packages
2014-09-21 17:20:59 -07:00
Peter Simons
ee4a606cdf
Merge pull request #4165 from ftrvxmtrx/pcalc
...
added pcalc package
2014-09-19 14:42:07 +02:00
Siarhei Zirukin
00298c7bba
added pcalc package
2014-09-19 13:31:52 +02:00
Peter Simons
2a54f52b22
coq_HEAD: Revert "update to latest Git version"
...
This reverts commit bf009f87a9
. The update
breaks the build.
2014-09-19 12:29:07 +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
Marco Maggesi
6110679bee
Update hol_light to r198. Add myself as a maintainer
2014-09-16 16:55:56 +02:00
John Wiegley
10afb382b7
ott: 0.25 new expression
2014-09-15 21:50:07 +01: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
John Wiegley
bf009f87a9
coq_HEAD: update to latest Git version
...
In particular, to get the fix for #3585 in the Coq bug tracker
2014-09-09 18:02:32 +01: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
Vladimír Čunát
1e389c976c
merge 'staging' into modular-stdenv
...
In 2c62a36b77
the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.
Conflicts:
pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Moritz Ulrich
0fe866c3a1
gtkwave: update from 3.3.53 to 3.3.61
2014-09-04 19:31:33 +02:00
Michael Raskin
bacd3e852d
Update pari
2014-09-02 14:25:17 +04:00
Pascal Wittmann
038c71a11a
boinc: update from 7.2.42 to 7.4.14 (fixes CVE-2013-2298)
2014-09-01 22:51:04 +02:00
Michael Raskin
979f0e1d67
Update TPTP
2014-08-31 19:25:32 +04:00
John Wiegley
686fa594ab
coq_HEAD: update to latest Git HEAD
2014-08-26 16:36:50 -05: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
ce6b86cc68
Fix various evaluation problems
...
http://hydra.nixos.org/build/13616685
2014-08-22 11:57:40 +02:00
John Wiegley
708e16e675
ssreflect: 1.4 -> 1.5
2014-08-19 16:03:33 -05:00
John Wiegley
cfc70c60ab
coq_HEAD: 8.5pre-fff9e2f7 -> 8.5pre-8bc01590
2014-08-16 00:13:15 -05:00
Thomas Strobel
58b4b98377
Add application for scientific data analysis: fityk
2014-08-14 01:57:27 +02:00
Michael Raskin
cee539cc9c
Allow optional functionality in SimGrid
2014-08-12 14:09:54 +04:00
Michael Raskin
2e84472d60
Update SimGrid
2014-08-12 05:26:33 +04:00
Michael Raskin
f1f0f0cf19
Update and fix LEO2 prover
2014-08-12 03:57:52 +04:00
Eelco Dolstra
e3f7dbbac8
Cleanup: Use += to append to envHooks
2014-08-09 12:47:05 +02:00
John Wiegley
83cf279452
Add an expression for building Coq HEAD
2014-08-08 18:11:00 -05: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
f64d84698e
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/applications/audio/espeak/edit.nix
pkgs/applications/audio/lmms/default.nix
pkgs/desktops/e18/enlightenment.nix
pkgs/games/exult/default.nix
pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Eelco Dolstra
6f11a6681d
arb: Mark as broken
2014-07-22 15:12:21 +02:00
Eelco Dolstra
4f7289eec9
Don't use ensureDir
2014-07-22 11:01:32 +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
Michael Raskin
01d9778625
Update boinc
2014-07-04 22:18:49 +04: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
John Wiegley
34de04149e
twelf: Fix the source URL
2014-06-27 10:46:24 -07:00
John Wiegley
ad96cc8bf9
twelf: new expression; prover for PL theory and logic
2014-06-26 15:54:45 -07:00
Peter Simons
1380b62fdb
haskell-sloane: update to version 1.8
2014-06-13 15:41:25 +02:00
Austin Seipp
fe9133d522
verifast: 14.5, x86_64 linux only
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-10 16:38:45 -05:00
John Wiegley
c6261157f8
prooftree: new expression 0.12
2014-06-08 05:35:49 +00:00