Commit graph

67 commits

Author SHA1 Message Date
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Marco Maggesi
7c90b6a9bc Update HOL Light to rev 122.
svn path=/nixpkgs/trunk/; revision=31956
2012-02-01 14:37:50 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Yury G. Kudryashov
0c79434ccb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
Marco Maggesi
97d48a5426 Update HOL Light to rev 118
svn path=/nixpkgs/trunk/; revision=31468
2012-01-10 16:12:11 +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
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
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
Eelco Dolstra
eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +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
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
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
Michael Raskin
946cd2431f Update LEO-II
svn path=/nixpkgs/trunk/; revision=28180
2011-08-05 18:22:40 +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
Marco Maggesi
a041cad70a Update HOL Light to r89
svn path=/nixpkgs/trunk/; revision=26916
2011-04-21 14:39:29 +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
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
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
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
Michael Raskin
3c452363ce Use a patch to fix make 3.82 build of Coq
svn path=/nixpkgs/branches/stdenv-updates/; revision=24817
2010-11-23 05:54:58 +00:00
Marco Maggesi
0430167083 Update Coq
svn path=/nixpkgs/trunk/; revision=24597
2010-11-04 11:24:27 +00:00
Marco Maggesi
078587a846 Update HOL Light
svn path=/nixpkgs/trunk/; revision=24591
2010-11-03 22:20:05 +00:00
Marco Maggesi
4e5db40581 Update HOL Light to version 20100820 (rev57 on google code).
Also replace the monolitic derivation hol_light_binaries with smaller
derivations.  Now the installation works as follows:

# Install the base system and a script "start_hol_light"
$ nix-env -i hol_light_sources hol_light

# Install a checkpointed executable with the core library preloaded
$ nix-env -i hol_light_core_dmtcp

# Install HOL Light binaries preloaded with other specific libraries:
$ nix-env -i hol_light_multivariate_dmtcp
$ nix-env -i hol_light_complex_dmtcp
$ nix-env -i hol_light_sosa_dmtcp
$ nix-env -i hol_light_card_dmtcp


svn path=/nixpkgs/trunk/; revision=23815
2010-09-15 21:41:18 +00:00
Marco Maggesi
44f2d4439f Change the name of the coq derivation to coq-devel-8.3pre1
i.e., remove the version from the name.  Nix has its own mechanism to
prevent a packages to be upgraded.  Instead we distinguish development
version (coq-dev-VERSION) from stable versions (coq-VERSION).

Also remove derivation for coq-8.3-beta0-1 which is now superseded by
coq-devel-8.3pre1.


svn path=/nixpkgs/trunk/; revision=23813
2010-09-15 19:39:48 +00:00