diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-03-19 12:05:24 +0100 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-03-19 18:04:14 -0700 |
commit | 8dddd8a07f3694cdc21abe884ca7ac52d2b01a17 (patch) | |
tree | 0c8af260126ff58d32b6d43d13c557a96ff41404 /pkgs | |
parent | 1161c96a203ebd7be334fec975b654f16617df7f (diff) | |
download | nixlib-8dddd8a07f3694cdc21abe884ca7ac52d2b01a17.tar nixlib-8dddd8a07f3694cdc21abe884ca7ac52d2b01a17.tar.gz nixlib-8dddd8a07f3694cdc21abe884ca7ac52d2b01a17.tar.bz2 nixlib-8dddd8a07f3694cdc21abe884ca7ac52d2b01a17.tar.lz nixlib-8dddd8a07f3694cdc21abe884ca7ac52d2b01a17.tar.xz nixlib-8dddd8a07f3694cdc21abe884ca7ac52d2b01a17.tar.zst nixlib-8dddd8a07f3694cdc21abe884ca7ac52d2b01a17.zip |
ocamlPackages.camlp5: 7.10 → 7.11
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/science/logic/hol_light/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/camlp5/default.nix | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index d799b52d115e..69ffb87e7670 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runtimeShell, fetchFromGitHub, ocaml, num, camlp5 }: +{ stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, num, camlp5 }: let load_num = @@ -30,6 +30,11 @@ stdenv.mkDerivation { sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6"; }; + patches = [(fetchpatch { + url = https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch; + sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr"; + })]; + buildInputs = [ ocaml camlp5 ]; propagatedBuildInputs = [ num ]; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index c3fbb5863497..e0bd0e4ac676 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "camlp5-7.10"; + name = "camlp5-7.11"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel710.tar.gz"; - sha256 = "1a1lgsc8350afdwmsznsys7m0c0cks4nw6irqz2f92g8g4vkk9b7"; + url = "https://github.com/camlp5/camlp5/archive/rel711.tar.gz"; + sha256 = "1s1f9i0r0czxlbnsaz4kvs2ahknmqxcm5ypl75g7scjcbl0an2x4"; }; buildInputs = [ ocaml ]; |