Eelco Dolstra
f33fa1b66b
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Michael Raskin
98878bc5a0
Link Golly against libperl and libpython so it finds them in runtime
2014-11-10 12:31:29 +03:00
Luca Bruno
6af0d6974f
Merge branch 'master' into staging
2014-11-10 10:03:52 +01:00
Mateusz Kowalczyk
57a84615c6
vite: fix and update package
2014-11-09 12:59:51 +00:00
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