Peter Simons
600135bba5
Merge remote-tracking branch 'master' into staging.
2015-02-13 22:17:12 +01: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
Eric Seidel
e08b9ab8d3
kill libiconvOr*
...
Conflicts:
pkgs/applications/networking/mailreaders/sup/default.nix
pkgs/development/compilers/ghc/7.8.3-binary.nix
pkgs/development/interpreters/php/5.3.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/poppler/default.nix
pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08: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
Vincent Laporte
58297aa1e7
Why3: build also the Coq tactic.
2015-01-29 08:43:15 +01:00
Peter Simons
e13a30333b
stellarium: update from 0.12.4 to 0.13.2
2015-01-27 14:04:54 +01:00
Peter Simons
e4a58244d8
gravit: update from 0.5.0 to 0.5.1
2015-01-27 14:04:54 +01:00
Peter Simons
96aa27c772
pspp: update from 0.8.2 to 0.8.3
2015-01-27 14:04:54 +01:00
Austin Seipp
d1b06927bc
nixpkgs: z3 4.3.1 -> 4.3.2
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-01-23 11:00:55 -06: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
Eric Seidel
f3c6827373
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
2015-01-14 20:27:55 -08:00
Ludovic Courtès
41b53577a8
unmaintain a bunch of packages
2015-01-13 22:33:49 +01:00
Pavan Rikhi
56ea7c4128
matita_130312: mark as broken
2015-01-07 02:15:26 -05:00
John Wiegley
c4190b4894
abc: export buildFlags in the preBuild
2015-01-03 07:35:36 -05:00
Vincent Laporte
06fea66e7c
alt-ergo: update from 0.95.2 to 0.99.1
2014-12-31 15:48:39 +01: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
Pascal Wittmann
f94580da69
Fix license attribute of many bsd-like licensed packages
2014-12-21 00:00:35 +01:00
John Wiegley
d15cd4875f
coq_HEAD: update to latest Git version
2014-12-19 13:58:07 -06:00
Vladimír Čunát
7ce485ff0f
root: fix build by upstream patch
...
Also refactor the expression a little.
2014-12-10 13:03:01 +01:00
Peter Simons
67ddc8f4b9
R: add meta.platforms attribute
2014-12-03 16:28:28 +01:00
John Wiegley
1825255272
coq_HEAD: update
2014-11-17 17:29:42 -06:00
Vincent Laporte
8227297567
hol_light: update from 199 to 205
2014-11-17 06:53:45 +00:00
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