>From aa809e99776de22f1c959958d5089520e14a76a3 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 31 Dec 2020 11:36:57 -0800 Subject: [PATCH 3/9] gnu: Add ocaml-sexplib0. * gnu/packages/ocaml.scm (ocaml-sexplib0): New variable. * gnu/packages/ocaml.scm (ocaml4.07-sexplib0): Inherit from ocaml-sexplib0. --- gnu/packages/ocaml.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 601b52648c..d86555906b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4119,10 +4119,10 @@ an arbitrary number of processes. Cache coherence protocols and mutual exclusion algorithms are typical examples of such systems.") (license license:asl2.0))) -(define-public ocaml4.07-sexplib0 +(define-public ocaml-sexplib0 (package - (name "ocaml4.07-sexplib0") - (version "0.11.0") + (name "ocaml-sexplib0") + (version "0.14.0") (home-page "https://github.com/janestreet/sexplib0") (source (origin @@ -4133,25 +4133,23 @@ exclusion algorithms are typical examples of such systems.") (file-name (git-file-name name version)) (sha256 (base32 - "07v3ggyss7xhfv14bjk1n87sr42iqwj4cgjiv2lcdfkqk49i2bmi")))) + "06sb3zqhb3dwqsmn15d769hfgqwqhxnm52iqim9l767gvlwpmibb")))) (build-system dune-build-system) (arguments - `(#:tests? #f ;no tests - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (synopsis "Library containing the definition of S-expressions and some base converters") (description "Part of Jane Street's Core library The Core suite of libraries is an industrial strength alternative to OCaml's standard library that was developed by Jane Street, the largest industrial user of OCaml.") -(license license:expat))) + (license license:expat))) -(define-public ocaml4.07-parsexp +(define-public ocaml4.07-sexplib0 (package - (name "ocaml4.07-parsexp") + (inherit ocaml-sexplib0) + (name "ocaml4.07-sexplib0") (version "0.11.0") - (home-page "https://github.com/janestreet/parsexp") + (home-page "https://github.com/janestreet/sexplib0") (source (origin (method git-fetch) @@ -4161,12 +4159,13 @@ that was developed by Jane Street, the largest industrial user of OCaml.") (file-name (git-file-name name version)) (sha256 (base32 - "1nyq23s5igd8cf3n4qxprjvhbmb6ighb3fy5mw7hxl0mdgsw5fvz")))) - (build-system dune-build-system) + "07v3ggyss7xhfv14bjk1n87sr42iqwj4cgjiv2lcdfkqk49i2bmi")))) (arguments - `(#:ocaml ,ocaml-4.07 + `(#:tests? #f ;no tests + #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + #:dune ,ocaml4.07-dune)))) + (inputs `(("ocaml-sexplib0" ,ocaml4.07-sexplib0))) (synopsis "S-expression parsing library") -- 2.29.2