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
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
* 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