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
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
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
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
Note: In this version we introduce a new schema for the name of the coq
derivations where the coq version is included in the name (i.e.,
"coq8.3-8.3pre1" instead of "coq-8.3pre1"). The reason for this is that often
coq releases introduce several incompatibilities. Thus I argue that, in
general, users do not want nix-env to upgrade automatically form one release to
another. Also version string "8.3pre1" is used instead of "8.3-rc1" to trigger
the nix mechanism for versions comparison.
svn path=/nixpkgs/trunk/; revision=23803
* Upgrade hol_light to the latest svn version on google code (r57).
* Improve and semplify the mechanism for the generation of checkpointed binaries.
* Make hol to work with camlp5 and thus with recent version of ocaml (>=3.10, <=3.11).
* Remove ocaml_with_sources which is not needed anymore.
svn path=/nixpkgs/trunk/; revision=23685
Add pkgs/applications/science/logic/hol_light
and pkgs/applications/science/emacs-modes/hol_light
Some functionalities of HOL Light requires the compiled sources of
OCaml. For now we provide a new package ocaml_with_sources. After
this shuold be merged with the current version of OCaml already
present in nixpkgs.
svn path=/nixpkgs/trunk/; revision=20008
Add expression for ssreflect, an extension to the Coq Proof Assistant.
Still has some clitches (see TODO in default.nix) but is usable anyway.
svn path=/nixpkgs/trunk/; revision=18145