From 50a03f863277e40611108192935e1c3e216edcb8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 30 Mar 2019 15:29:33 +0000 Subject: [PATCH] hol_light: 2018-09-30 -> 2019-03-27 --- pkgs/applications/science/logic/hol_light/default.nix | 6 +++--- pkgs/top-level/ocaml-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 099e2102c51..40b0115dc1b 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation { - name = "hol_light-2018-09-30"; + name = "hol_light-2019-03-27"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "27e09dd27834de46e917057710e9d8ded51a4c9f"; - sha256 = "1p0rm08wnc2lsrh3xzhlq3zdhzqcv1lbqnkwx3aybrqhbg1ixc1d"; + rev = "a2b487b38d9da47350f1b4316e34a8fa4cf7a40a"; + sha256 = "1qlidl15qi8w4si8wxcmj8yg2srsb0q4k1ad9yd91sgx9h9aq8fk"; }; buildInputs = [ ocaml camlp5 ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5907b0099dd..68e7fde3a52 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1059,9 +1059,7 @@ let enableX11 = config.unison.enableX11 or true; }; - hol_light = callPackage ../applications/science/logic/hol_light { - camlp5 = callPackage ../development/tools/ocaml/camlp5 { legacy = true; }; - }; + hol_light = callPackage ../applications/science/logic/hol_light { }; })).overrideScope' liftJaneStreet;