diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-12-16 22:57:21 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-12-16 22:57:21 +0000 |
| commit | a670a7aca1804a143567011175f052e1f6992fb3 (patch) | |
| tree | 9180d95a4af903281b047fef846bcc03b316c90c /pkgs/applications/science/logic | |
| parent | b077940b3b8c67aa8bbe7fc5e67286acdb2c042a (diff) | |
| parent | 1e74801dc454471e5142c0e2bad4b6168aa7fa91 (diff) | |
| download | nixlib-a670a7aca1804a143567011175f052e1f6992fb3.tar nixlib-a670a7aca1804a143567011175f052e1f6992fb3.tar.gz nixlib-a670a7aca1804a143567011175f052e1f6992fb3.tar.bz2 nixlib-a670a7aca1804a143567011175f052e1f6992fb3.tar.lz nixlib-a670a7aca1804a143567011175f052e1f6992fb3.tar.xz nixlib-a670a7aca1804a143567011175f052e1f6992fb3.tar.zst nixlib-a670a7aca1804a143567011175f052e1f6992fb3.zip | |
merge trunk
A few conflicts due to renames svn path=/nixpkgs/branches/stdenv-updates/; revision=30947
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/hol_light/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 3f161b5249d7..209ba934b9ef 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,20 +1,22 @@ {stdenv, fetchsvn, writeScript, ocaml, findlib, camlp5}: -stdenv.mkDerivation rec { - name = "hol_light-20111106"; - src = fetchsvn { - url = http://hol-light.googlecode.com/svn/trunk; - rev = "112"; - sha256 = "6c7b39ea024b2e8042c1a22a01f778caedaaf82189c9f2c1cfa8c08707151129"; - }; - - buildInputs = [ ocaml findlib camlp5 ]; - +let start_script = '' #!/bin/sh cd "$out/lib/hol_light" exec ${ocaml}/bin/ocaml -I "$(ocamlfind query camlp5)" -init make.ml ''; +in + +stdenv.mkDerivation { + name = "hol_light-20111204"; + src = fetchsvn { + url = http://hol-light.googlecode.com/svn/trunk; + rev = "114"; + sha256 = "a9203a0118caf5d0ca7621abafab4af6245e1c1ae6ba628ead7c6f69aa86d9d3"; + }; + + buildInputs = [ ocaml findlib camlp5 ]; buildPhase = '' make pa_j.ml |