Commit graph

656 commits

Author SHA1 Message Date
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
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
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