>From 81f930085e185efa330f92f5cf88529880a72b10 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 31 Dec 2020 11:39:49 -0800 Subject: [PATCH 6/9] gnu: Add ocaml-sexplib. * gnu/packages/ocaml.scm (ocaml-sexplib): New variable. * gnu/packages/ocaml.scm (ocaml4.07-sexplib): Inherit from ocaml-sexplib. --- gnu/packages/ocaml.scm | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b708f9398e..4774a70d46 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4277,10 +4277,27 @@ parsexp_io.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)))) +(define-public ocaml-sexplib + (package + (name "ocaml-sexplib") + (version "0.14.0") + (home-page "https://github.com/janestreet/sexplib") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append home-page ".git")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03c3j1ihx4pjbb0x3arrcif3wvp3iva2ivnywhiak4mbbslgsnzr")))) + (build-system dune-build-system) (propagated-inputs - `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) - ("ocaml-parsexp" ,ocaml4.07-parsexp) - ("ocaml-sexplib0" ,ocaml4.07-sexplib0))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-num" ,ocaml-num) + ("ocaml-parsexp" ,ocaml-parsexp) + ("ocaml-sexplib0" ,ocaml-sexplib0))) (synopsis "Library for serializing OCaml values to and from S-expressions") (description @@ -4288,10 +4305,20 @@ parsexp_io.") functionality for parsing and pretty-printing s-expressions.") (license license:expat))) -(define-public ocaml4.07-base +(define-public ocaml4.07-sexplib (package - (name "ocaml4.07-base") - (version "0.11.1") + (inherit ocaml-sexplib) + (name "ocaml4.07-sexplib") + (version "0.11.0") + (arguments + `(#:ocaml ,ocaml-4.07 + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) + (propagated-inputs + `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) + ("ocaml-parsexp" ,ocaml4.07-parsexp) + ("ocaml-sexplib0" ,ocaml4.07-sexplib0))))) + (home-page "https://github.com/janestreet/base") (source (origin -- 2.29.2