diff options
| author | Marco Maggesi <maggesi@math.unifi.it> | 2010-11-03 22:20:05 +0000 |
|---|---|---|
| committer | Marco Maggesi <maggesi@math.unifi.it> | 2010-11-03 22:20:05 +0000 |
| commit | 078587a84611de78159a88847cb4a28286cb197f (patch) | |
| tree | 6759e6e76ad5105bdf19c537953e01bd09b2fb54 /pkgs/applications/science/logic/hol_light | |
| parent | ce39b02f35a68dfbe86a1a04d0dff363d1e00485 (diff) | |
| download | nixlib-078587a84611de78159a88847cb4a28286cb197f.tar nixlib-078587a84611de78159a88847cb4a28286cb197f.tar.gz nixlib-078587a84611de78159a88847cb4a28286cb197f.tar.bz2 nixlib-078587a84611de78159a88847cb4a28286cb197f.tar.lz nixlib-078587a84611de78159a88847cb4a28286cb197f.tar.xz nixlib-078587a84611de78159a88847cb4a28286cb197f.tar.zst nixlib-078587a84611de78159a88847cb4a28286cb197f.zip | |
Update HOL Light
svn path=/nixpkgs/trunk/; revision=24591
Diffstat (limited to 'pkgs/applications/science/logic/hol_light')
| -rw-r--r-- | pkgs/applications/science/logic/hol_light/parser_setup.patch | 9 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/hol_light/sources.nix | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/applications/science/logic/hol_light/parser_setup.patch b/pkgs/applications/science/logic/hol_light/parser_setup.patch index e327527882d6..0ad17ca1a0b0 100644 --- a/pkgs/applications/science/logic/hol_light/parser_setup.patch +++ b/pkgs/applications/science/logic/hol_light/parser_setup.patch @@ -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");; diff --git a/pkgs/applications/science/logic/hol_light/sources.nix b/pkgs/applications/science/logic/hol_light/sources.nix index 497c3d8ff5fd..b45ca4a90349 100644 --- a/pkgs/applications/science/logic/hol_light/sources.nix +++ b/pkgs/applications/science/logic/hol_light/sources.nix @@ -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 = '' |