[bug#34265,5/9] gnu: ocaml-base: Update to 0.12-preview.120.18+252.

Message ID 87zhrgwy0p.fsf@gmail.com
State Accepted
Headers show
Series [bug#34265,1/9] gnu: dune: Update to 1.6.3. | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed
cbaines/applying patch fail Apply failed
cbaines/applying patch fail Apply failed
cbaines/applying patch fail Apply failed
cbaines/applying patch success Successfully applied
cbaines/applying patch success Successfully applied
cbaines/applying patch success Successfully applied
cbaines/applying patch success Successfully applied
cbaines/applying patch success Successfully applied
cbaines/applying patch success Successfully applied
cbaines/applying patch success Successfully applied
cbaines/applying patch success Successfully applied
cbaines/applying patch success Successfully applied

Commit Message

Gabriel Hondet Jan. 31, 2019, 4:50 p.m. UTC
* gnu/packages/ocaml.scm (ocaml-base): Update to 0.12-preview.120.18+252.
---
 gnu/packages/ocaml.scm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Patch

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 94b108961..4c2579975 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5011,18 +5011,18 @@  functionality for parsing and pretty-printing s-expressions.")
 (define-public ocaml-base
   (package
     (name "ocaml-base")
-    (version "0.11.1")
+    (version "0.12-preview.120.18+252")
     (home-page "https://github.com/janestreet/base")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url (string-append home-page ".git"))
-             (commit (string-append "v" version))))
+             (commit "170e96604ea81a44354a7508d168eb341a92e060")))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir"))))
+         "166dhrgkwp2iy5cipzalvkyln94f73la1rnqkb07p3wz8yl41gb5"))))
     (build-system dune-build-system)
     (inputs
      `(("ocaml-sexplib0" ,ocaml-sexplib0)))
@@ -5032,7 +5032,14 @@  functionality for parsing and pretty-printing s-expressions.")
          (replace 'build
            ;; make warnings non fatal (jbuilder behaviour)
            (lambda _
-             (invoke "dune" "build" "@install" "--profile=release"))))))
+             (invoke "dune" "build" "@install" "--profile=release")))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (invoke "dune" "install"
+                       (string-append "--prefix=" out)
+                       (string-append "--libdir=" out
+                                      "/lib/ocaml/site-lib"))))))))
   (synopsis
     "Full standard library replacement for OCaml")
   (description