1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 08:01:14 +00:00
Commit graph

256 commits

Author SHA1 Message Date
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Yury G. Kudryashov 7e320a7043 State qt version (3/4) in packages, not in all-packages.nix
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Yury G. Kudryashov 394fd28e4e svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31280
2012-01-04 15:22:16 +00:00
Michael Raskin 07de46c2fa Update E prover
svn path=/nixpkgs/trunk/; revision=31269
2012-01-04 10:31:49 +00:00
Yury G. Kudryashov 2bca92e32d Merge trunk
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
Yury G. Kudryashov 995d3d3e03 tulip-3.6.1
svn path=/nixpkgs/trunk/; revision=31216
2012-01-02 18:36:04 +00:00
Yury G. Kudryashov 08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Marco Maggesi fd64bc5289 Oops!
svn path=/nixpkgs/trunk/; revision=31126
2011-12-28 12:49:29 +00:00
Marco Maggesi ff3b0ed420 Update HOL Light to r116
svn path=/nixpkgs/trunk/; revision=31125
2011-12-28 12:45:59 +00:00
Yury G. Kudryashov f77741e018 merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Peter Simons c7bed207d8 maxima: updated to version 5.26.0
svn path=/nixpkgs/trunk/; revision=31042
2011-12-22 12:30:19 +00:00
Lluís Batlle i Rossell 25bf67915d Updating kicad.
svn path=/nixpkgs/trunk/; revision=30953
2011-12-18 14:49:39 +00:00
Yury G. Kudryashov a670a7aca1 merge trunk
A few conflicts due to renames

svn path=/nixpkgs/branches/stdenv-updates/; revision=30947
2011-12-16 22:57:21 +00:00
Marco Maggesi 74c3fc3085 Update HOL Light to rev 114
svn path=/nixpkgs/trunk/; revision=30922
2011-12-16 07:44:29 +00:00
Yury G. Kudryashov b077940b3b svn merge https://nixos.org/repos/nix/nixpkgs/trunk
No conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Michael Raskin d5c702939c Update Golly
svn path=/nixpkgs/trunk/; revision=30874
2011-12-13 21:00:42 +00:00
Eelco Dolstra eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Peter Simons c86e037939 wxMaxima: updated to version 11.08.0
svn path=/nixpkgs/trunk/; revision=30774
2011-12-06 14:07:14 +00:00
Peter Simons 1382203c29 maxima: updated to version 5.25.1
svn path=/nixpkgs/trunk/; revision=30773
2011-12-06 14:07:11 +00:00
Lluís Batlle i Rossell a9a03946df Updating gtkwave
svn path=/nixpkgs/trunk/; revision=30738
2011-12-05 10:44:53 +00:00
Marco Maggesi bf394d80ec Update url for Isabelle2011
svn path=/nixpkgs/trunk/; revision=30574
2011-11-26 18:45:15 +00:00
Russell O'Connor 845f2a8658 adding camlp5 as a propogated build input to ulex 0.8
matita and ulex must build against the same version of camlp5, so in an attempt to force them to always be the same I am adding a propgatedBuildInput to ulex.
Granted Matita still requires camlp5_traditional and this is less obvious in the matita file now, so I am not entirely sure this is the right design choice.

svn path=/nixpkgs/trunk/; revision=30552
2011-11-24 19:43:03 +00:00
Marco Maggesi fa47d66e22 Updated HOL Light to revision 112
svn path=/nixpkgs/trunk/; revision=30369
2011-11-10 15:35:53 +00:00
Peter Simons 368ac01473 synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
2011-11-08 10:18:35 +00:00
Peter Simons 4098071398 gravit: cosmetic
svn path=/nixpkgs/trunk/; revision=30314
2011-11-08 10:01:14 +00:00
Peter Simons cf77f59ce9 stellarium: updated to version 0.11.1
svn path=/nixpkgs/trunk/; revision=30289
2011-11-07 10:04:40 +00:00
Peter Simons 7edf0e8eaf synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29870
2011-10-18 08:47:36 +00:00
Russell O'Connor 491c6e43b1 Package for picosat.
svn path=/nixpkgs/trunk/; revision=29869
2011-10-17 22:18:21 +00:00
Peter Simons 8dfef0f4a0 synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29851
2011-10-14 22:06:50 +00:00
Lluís Batlle i Rossell 58e9385e70 Downgrading boinc to the last stable version.
svn path=/nixpkgs/trunk/; revision=29808
2011-10-13 08:58:45 +00:00
Peter Simons e3984c2caf synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29739
2011-10-10 17:01:17 +00:00
Lluís Batlle i Rossell c67c7d49b0 Boinc wanted to be told to link to libX11
svn path=/nixpkgs/trunk/; revision=29713
2011-10-07 19:01:27 +00:00
Lluís Batlle i Rossell 80d397413d Boinc can even run, but only if placed in the proper (writeable) path.
svn path=/nixpkgs/trunk/; revision=29712
2011-10-07 19:01:19 +00:00
Lluís Batlle i Rossell fefaa7a6ea Adding boinc. It installs. I don't know how to use it.
svn path=/nixpkgs/trunk/; revision=29704
2011-10-06 20:25:05 +00:00
Shea Levy 01df54f5cc Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
2011-09-23 16:58:45 +00:00
Yury G. Kudryashov 9ee5230537 Move qt3/qt4 choice to .nix expressions
svn path=/nixpkgs/trunk/; revision=29404
2011-09-20 22:49:13 +00:00
Shea Levy 4d70ba6cc9 Merge from trunk up through r28790
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
Marco Maggesi a9d2f34301 Update HOL Light to release 102
svn path=/nixpkgs/trunk/; revision=28718
2011-08-21 08:41:22 +00:00
Yury G. Kudryashov a660093a4d Fix typo in URL
svn path=/nixpkgs/trunk/; revision=28603
2011-08-15 23:39:11 +00:00
Yury G. Kudryashov 0962beade0 Add avogadro
svn path=/nixpkgs/trunk/; revision=28596
2011-08-15 18:05:39 +00:00
Yury G. Kudryashov 48f1cd549f pari-gp-2.5.0
svn path=/nixpkgs/trunk/; revision=28440
2011-08-09 20:20:58 +00:00
Michael Raskin 946cd2431f Update LEO-II
svn path=/nixpkgs/trunk/; revision=28180
2011-08-05 18:22:40 +00:00
Michael Raskin 3e8a39ea61 Updating Maxima
svn path=/nixpkgs/trunk/; revision=28152
2011-08-04 15:13:15 +00:00
Peter Simons c58754b390 stellarium: build this package on Linux only
Stellarium is supposed to compile on mesaPlatforms, but unfortunately our qt47
expression doesn't support platforms other than Linux.

svn path=/nixpkgs/trunk/; revision=27798
2011-07-15 12:47:20 +00:00
Peter Simons fa99abdc89 gravit, stellarium: build software that depends on mesa only on mesa platforms
svn path=/nixpkgs/trunk/; revision=27790
2011-07-14 20:53:30 +00:00
Peter Simons 7c8871512d wxmaxima: ensure that wxMaxima will find Maxima even if it's not in $PATH
svn path=/nixpkgs/trunk/; revision=27745
2011-07-13 09:56:58 +00:00
Peter Simons 3cd02cd43d maxima: switch from clisp to sbcl, enable tk gui, and fix various impurities
* Build maxima with sbcl for better performance.

 * Enable the regression test suite.

 * Configure $PATH at start-up so that maxima knows how to find sbcl,
   wish, rlwrap, and gnuplot.

 * Move installed documentation and Emacs lisp modules into standard
   locations.

 * Enable parallel building.

svn path=/nixpkgs/trunk/; revision=27743
2011-07-13 09:13:32 +00:00
Peter Simons 8223f67929 Added stellarium 0.11.0.
svn path=/nixpkgs/trunk/; revision=27697
2011-07-10 20:17:44 +00:00
Peter Simons 3806050f60 gravit: enable support for lua 5.0.x
The build doesn't work with the latest version 5.1.x. Upstream is going
to release an update to fix this soon.

svn path=/nixpkgs/trunk/; revision=27693
2011-07-10 14:04:24 +00:00
Peter Simons e7746a78ed gravit: added version 0.4.2
svn path=/nixpkgs/trunk/; revision=27677
2011-07-08 21:23:55 +00:00
Peter Simons 574eb09fa4 xplanet: move expression into new category "astronomy"
svn path=/nixpkgs/trunk/; revision=27676
2011-07-08 21:23:48 +00:00
Peter Simons 947610085d Added Eukleides, a geometry drawing language.
svn path=/nixpkgs/trunk/; revision=27655
2011-07-07 21:53:21 +00:00
Michael Raskin b973f98afa Make tulip run without hassle. Unfortunately, some operations repeatably crash tulip even when built vs Qt4.6
svn path=/nixpkgs/trunk/; revision=27570
2011-07-01 09:53:11 +00:00
Michael Raskin a4be010d31 Update Tulip
svn path=/nixpkgs/trunk/; revision=27566
2011-07-01 07:01:46 +00:00
Michael Raskin d03599f8ce Adding TPTP
svn path=/nixpkgs/trunk/; revision=27468
2011-06-15 10:35:18 +00:00
Marco Maggesi 5b035e093d Update HOL Light to rev 92
svn path=/nixpkgs/trunk/; revision=27459
2011-06-14 17:09:19 +00:00
Marco Maggesi 1298fd8aba Update hol_light and cleanup:
* Update hol_light to rev 90
* Remove dmtcp checkpoint (it doesn't work properly).
* General cleanup and simplification

svn path=/nixpkgs/trunk/; revision=27290
2011-05-21 11:18:35 +00:00
Marco Maggesi 8e5beab31f Fix building of Isabelle2011
svn path=/nixpkgs/trunk/; revision=27253
2011-05-14 21:09:57 +00:00
Peter Simons 1c6d30e2ad wxmaxima: updated to version 11.04.0
svn path=/nixpkgs/trunk/; revision=27171
2011-05-06 07:35:22 +00:00
Peter Simons b4e5853028 maxima: updated to version 5.24.0
svn path=/nixpkgs/trunk/; revision=27170
2011-05-06 07:35:15 +00:00
Eelco Dolstra b61d3ab317 * Typo in attribute. This broke --meta --xml evaluation.
svn path=/nixpkgs/trunk/; revision=27142
2011-05-04 12:45:05 +00:00
Russell O'Connor af59636bf5 adding ecm support to msieve.
svn path=/nixpkgs/trunk/; revision=26931
2011-04-23 12:36:36 +00:00
Russell O'Connor 699261d8df Adding ecm-6.2.3.
svn path=/nixpkgs/trunk/; revision=26930
2011-04-23 12:25:51 +00:00
Marco Maggesi a041cad70a Update HOL Light to r89
svn path=/nixpkgs/trunk/; revision=26916
2011-04-21 14:39:29 +00:00
Russell O'Connor 3db6f63711 Package for msieve.
This would be better if gmp-emc were packaged as well.

svn path=/nixpkgs/trunk/; revision=26915
2011-04-21 12:48:07 +00:00
Michael Raskin b4faf64bae Update Isabelle to an existing tarball...
svn path=/nixpkgs/trunk/; revision=26903
2011-04-20 12:24:34 +00:00
Russell O'Connor bec1a9c44f update coq to 8.3pl1
update ssreflect to 1.3pl1

svn path=/nixpkgs/trunk/; revision=26692
2011-04-05 11:59:25 +00:00
Lluís Batlle i Rossell df786c07dc Updating gtkwave
svn path=/nixpkgs/trunk/; revision=26454
2011-03-22 11:36:58 +00:00
Andres Löh c2090d1be3 Added JAGS.
svn path=/nixpkgs/trunk/; revision=26396
2011-03-17 14:45:36 +00:00
Michael Raskin 662fa0a13b Fix updated maxima build
svn path=/nixpkgs/trunk/; revision=25799
2011-02-08 10:35:58 +00:00
Peter Simons e0d871ba91 maxima: added buildInput 'texinfo' so that the reference documentation can be built
svn path=/nixpkgs/trunk/; revision=25797
2011-02-07 17:37:22 +00:00
Peter Simons 7795e5ec24 pkgs/applications/science/math/wxmaxima/default.nix: fixed the sha256 checksum
svn path=/nixpkgs/trunk/; revision=25796
2011-02-07 14:49:25 +00:00
Peter Simons 80c344d0cf pkgs/applications/science/math/maxima: fixed the sha256 checksum
svn path=/nixpkgs/trunk/; revision=25795
2011-02-07 14:47:42 +00:00
Peter Simons 0c3dcddbf3 pkgs/applications/science/math/wxmaxima: updated to version 0.8.7
svn path=/nixpkgs/trunk/; revision=25787
2011-02-07 11:35:42 +00:00
Peter Simons a4cf1b8456 pkgs/applications/science/math/maxima: updated to version 5.23.2
svn path=/nixpkgs/trunk/; revision=25786
2011-02-07 11:35:35 +00:00
Marco Maggesi 436e1d72a7 * Coq: fix compilation of coqide (path to lablgkt)
svn path=/nixpkgs/trunk/; revision=25360
2011-01-03 13:49:15 +00:00
Michael Raskin e55aa52856 Fix lablgtk reference
svn path=/nixpkgs/trunk/; revision=25341
2011-01-02 17:25:18 +00:00
Russell O'Connor 88ec92d14c Matita and its dependencies.
svn path=/nixpkgs/trunk/; revision=25328
2010-12-31 17:48:55 +00:00
Eelco Dolstra aa6f43149a * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25308
2010-12-28 16:42:00 +00:00
Marco Maggesi 51d6c8df91 * Handle variable createFindlibDestdir correctly in ocaml-findlib
* Fix HOL Light derivation

svn path=/nixpkgs/trunk/; revision=25269
2010-12-23 19:28:06 +00:00
Eelco Dolstra c14382cb45 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25225
2010-12-21 15:14:33 +00:00
Marco Maggesi e7accaf8d3 * Update camlp5
svn path=/nixpkgs/trunk/; revision=25206
2010-12-20 10:32:22 +00:00
Ludovic Courtès e60ba9135a SimGrid 3.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25180
2010-12-17 17:48:12 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Michael Raskin 07dd3f074b Adding MiniSAT
svn path=/nixpkgs/trunk/; revision=24984
2010-12-05 19:54:27 +00:00
Michael Raskin 011d71dcb8 Adding PARI/GP
svn path=/nixpkgs/trunk/; revision=24983
2010-12-05 19:11:21 +00:00
Michael Raskin 7768fa0178 Fix installation layout
svn path=/nixpkgs/trunk/; revision=24982
2010-12-05 19:08:32 +00:00
Michael Raskin 5cb3f8b659 Missing Singular files
svn path=/nixpkgs/trunk/; revision=24981
2010-12-05 18:37:47 +00:00
Michael Raskin 6b8abaa29e Adding OpenSMT
svn path=/nixpkgs/trunk/; revision=24978
2010-12-05 18:22:14 +00:00
Michael Raskin a9f70d542d Adding CVC3 satisfiability modulo theory (SMT) solver
svn path=/nixpkgs/trunk/; revision=24975
2010-12-05 17:28:41 +00:00
Michael Raskin 44ac8c5ea1 Adding iProver
svn path=/nixpkgs/trunk/; revision=24969
2010-12-04 18:39:44 +00:00
Michael Raskin 86e44e72bf Adding SPASS
svn path=/nixpkgs/trunk/; revision=24967
2010-12-04 11:43:01 +00:00
Michael Raskin 64ed7e705d Adding Satallax prover
svn path=/nixpkgs/trunk/; revision=24963
2010-12-03 11:26:34 +00:00
Michael Raskin c32bd62956 Adding LEO2 automated higher-order prover
svn path=/nixpkgs/trunk/; revision=24952
2010-12-01 21:29:42 +00:00
Michael Raskin 373fabf1c0 Fix settings patch for Isabelle
svn path=/nixpkgs/trunk/; revision=24951
2010-12-01 21:29:20 +00:00
Michael Raskin b89881d098 Update Isabelle
svn path=/nixpkgs/trunk/; revision=24950
2010-12-01 21:25:21 +00:00
Lluís Batlle i Rossell d71ad68d43 Fixing the verilog URL (contributed by Antonio Vargas)
svn path=/nixpkgs/trunk/; revision=24935
2010-11-30 11:24:12 +00:00
Lluís Batlle i Rossell ab6627ac0e Fix for the verilog package, from Antonio Vargas Gonzalez
svn path=/nixpkgs/trunk/; revision=24934
2010-11-30 11:23:36 +00:00
Lluís Batlle i Rossell 0e4c970d11 Updating from trunk - I hope I fixed the conflict around gettext - I left it as
it was before merging.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24876
2010-11-26 14:40:39 +00:00
Lluís Batlle i Rossell 4018d18e96 Committing patch adding verilog from Antonio Vargas Gonzalez
From his original, I adapted some spacing, and removed the release.nix reference
(superfluous having set meta.platforms)

svn path=/nixpkgs/trunk/; revision=24860
2010-11-25 22:01:14 +00:00