colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update HOL Light

Browse Source 
svn path=/nixpkgs/trunk/; revision=24591
This commit is contained in:
Marco Maggesi 2010-11-03 22:20:05 +00:00
parent ce39b02f35
commit 078587a846
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/science/logic/hol_light/parser_setup.patch
View File

@ -1,6 +1,6 @@
diff -Nuar hol_light/hol.ml hol_light.nixos/hol.ml
--- hol_light/hol.ml 2010-09-12 18:57:28.000000000 +0200
+++ hol_light.nixos/hol.ml 2010-09-12 19:09:09.000000000 +0200
--- hol_light/hol.ml 2010-11-03 23:09:01.000000000 +0100
+++ hol_light.nixos/hol.ml 2010-11-03 23:10:31.000000000 +0100
@@ -11,8 +11,8 @@
let hol_version = "2.20++";;
@ -12,7 +12,7 @@ diff -Nuar hol_light/hol.ml hol_light.nixos/hol.ml
(* ------------------------------------------------------------------------- *)
(* Should eventually change to "ref(Filename.temp_dir_name)". *)
@@ -23,20 +23,6 @@
@@ -23,19 +23,6 @@
let temp_path = ref "/tmp";;
(* ------------------------------------------------------------------------- *)
@ -21,8 +21,7 @@ diff -Nuar hol_light/hol.ml hol_light.nixos/hol.ml
-(* and for Ocaml >= 3.10, use camlp5 instead. *)
-(* ------------------------------------------------------------------------- *)
-
-if let v = String.sub Sys.ocaml_version 0 4 in
- v = "3.10" or v = "3.11"
-if let v = String.sub Sys.ocaml_version 0 4 in v >= "3.10"
-then (Topdirs.dir_directory "+camlp5";
- Topdirs.dir_load Format.std_formatter "camlp5o.cma")
-else (Topdirs.dir_load Format.std_formatter "camlp4o.cma");;

6
pkgs/applications/science/logic/hol_light/sources.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "hol_light_sources-${version}";
version = "20100820";
version = "20101029";
src = fetchsvn {
url = http://hol-light.googlecode.com/svn/trunk;
rev = "57";
sha256 = "d1372744abca6c9978673850977d3e1577fd8cfd8298826eb713b3681c10cccd";
rev = "64";
sha256 = "91e9cac62586039b13c11af245f85a743e299892b24b39d3c7b2ee13157e87c9";
};
buildCommand = ''