summaryrefslogtreecommitdiff
path: root/gnu/packages/ocaml.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-04-10 00:42:22 -0400
committerMark H Weaver <mhw@netris.org>2018-04-10 00:42:22 -0400
commitf89aa1521af69b0e1a1350c2380579788b0f8945 (patch)
tree5009cca687ac669ef846920877cbfb6fffdd9893 /gnu/packages/ocaml.scm
parent169c658f7f286efae397fa3eda55b1c56fa92a01 (diff)
parent60e1de6d95bd32b4996c199708541781b8f828fd (diff)
downloadpatches-f89aa1521af69b0e1a1350c2380579788b0f8945.tar
patches-f89aa1521af69b0e1a1350c2380579788b0f8945.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/ocaml.scm')
-rw-r--r--gnu/packages/ocaml.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 0fdad6a34f..4809aa0971 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3498,13 +3498,13 @@ XML and Protocol Buffers formats.")
(build-system ocaml-build-system)
(native-inputs
`(("oasis" ,ocaml-oasis)
- ("clang" ,clang)
+ ("clang" ,clang-3.8)
("ounit" ,ocaml-ounit)))
(propagated-inputs
`(("core-kernel" ,ocaml-core-kernel)
("ppx-driver" ,ocaml-ppx-driver)
("uri" ,ocaml-uri)
- ("llvm" ,llvm)
+ ("llvm" ,llvm-3.8)
("gmp" ,gmp)
("clang-runtime" ,clang-runtime)
("fileutils" ,ocaml-fileutils)
@@ -3520,7 +3520,7 @@ XML and Protocol Buffers formats.")
("bitstring" ,ocaml-bitstring)
("ppx-jane" ,ocaml-ppx-jane)
("re" ,ocaml-re)))
- (inputs `(("llvm" ,llvm)))
+ (inputs `(("llvm" ,llvm-3.8)))
(arguments
`(#:use-make? #t
#:phases