Thomas Tuegel
1fe28a1132
Merge remote-tracking branch 'upstream/master' into staging
2015-04-29 11:33:28 -05:00
Pascal Wittmann
f99d5cf2fc
Fixed some descriptions
2015-04-28 10:55:20 +02:00
William A. Kennington III
d8c949cc26
Make tcl and tk versions generic
2015-04-26 21:30:01 -07:00
John Wiegley
9402a56620
coq_8_5: New expression
2015-04-26 22:29:15 -05:00
Vladimír Čunát
30f31c9afc
Merge 'master' into staging
...
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Peter Simons
f82a287c20
R: update to 3.2.0
2015-04-17 20:02:46 +02:00
Remy Goldschmidt
de02110903
Added K Framework package.
...
Closes https://github.com/NixOS/nixpkgs/pull/7419 .
2015-04-17 16:05:00 +02:00
Vincent Laporte
4b9c90c64e
coq: update from 8.4pl5 to 8.4pl6
2015-04-15 07:18:08 +02:00
Thomas Tuegel
88918e10e9
Merge branch 'master' into staging
2015-04-10 07:45:38 -05:00
Aristid Breitkreuz
a7e0cb38c2
update Mathematica to 10.0.2
2015-04-09 21:53:51 +02:00
Eric Seidel
6ec373d776
Merge branch master into staging
2015-04-06 18:58:08 -07:00
Austin Seipp
31f4c0c7d1
nixpkgs: abc-verifier 20140509 -> 20150406
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-06 07:57:27 -05:00
lethalman
b4824ffc5d
Merge pull request #7103 from gebner/verit
...
Add veriT, an SMT solver.
2015-03-31 12:31:26 +02:00
Gabriel Ebner
20428cd90f
Add veriT.
2015-03-31 09:14:38 +02:00
Ben Darwin
54dab782be
twelf: fix by actually including the Twelf SML heap image in the package and referencing the SML interpreter so the smlnj package won't be gc'd
2015-03-31 01:11:57 -04:00
William A. Kennington III
fa2e5b25ba
Merge branch 'master' into staging
2015-03-29 14:25:48 -07:00
Austin Seipp
a6813ca62d
nixpkgs: add lean-20150328, a theorem prover.
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-28 01:47:39 -05:00
Austin Seipp
75ab87edc8
nixpkgs: z3 is now MIT licensed.
...
It's also been moved to GitHub, meaning we can avoid some of the
hackiness in the original expression. This updates the Git revision, but
only so that it contains the proper license (it's otherwise equivalent
to Z3 v4.3.2)
Also, make sure the python API .py files exist besides the .pyc files.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-28 01:04:06 -05:00
William A. Kennington III
767c179a94
Merge branch 'master' into staging
2015-03-26 14:44:05 -07:00
Eric Seidel
eff828a275
z3: copy all headers into nix store
2015-03-26 13:19:41 -07:00
William A. Kennington III
2e815a7444
Merge pull request #6961 from bcdarwin/abella
...
new package: abella 2.0.2
2015-03-25 22:14:10 -07:00
Thomas Tuegel
5d1f6ad57c
qt5: make qt-5.4.1 default
2015-03-24 17:14:56 -05:00
Siarhei Zirukin
f4cd5a68f7
pcalc: 20120812 -> 20141224
2015-03-24 18:27:42 +01:00
Ben Darwin
172167c937
new package: abella 2.0.2
2015-03-24 00:54:03 -04: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
aa188a27a2
Updating gtkwave to 3.3.64
2015-02-26 10:36:10 +01:00
Damien Cassou
bc58f50eab
Merge pull request #6338 from DamienCassou/plm-2.5
...
New package PLM: Programmer's Learning Machine
2015-02-20 09:17:27 +01:00
Shea Levy
2f061ff16b
Merge remote-tracking branch 'origin/staging'
...
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Marco
5f6e6b1661
Update HOL Light to r218
2015-02-17 10:23:51 +01:00
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
Damien Cassou
e7a161d4f2
New package PLM: Programmer's Learning Machine
2015-02-13 16:06:19 +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