GNU bug report logs - #45498
[PATCH 00/12] Add ocaml-merlin.

Previous Next

Full log

View this message in rfc822 format

From: pukkamustard <pukkamustard <at> posteo.net>
To: 45498 <at> debbugs.gnu.org
Cc: pukkamustard <pukkamustard <at> posteo.net>
Subject: [bug#45498] [PATCH 05/12] gnu: Add ocaml-sexplib.
Date: Mon, 28 Dec 2020 13:47:11 +0100

* gnu/packages/ocaml.scm (ocaml-sexplib): New variable.
  (ocaml4.07-sexplib): Inherit from ocaml-sexplib.
---
 gnu/packages/ocaml.scm | 44 ++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index f6488a0e23..09bbc71803 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4119,22 +4119,34 @@ parsexp_io.")
     (inputs
      `(("ocaml-sexplib0" ,ocaml4.07-sexplib0)))))
 
-(define-public ocaml4.07-sexplib
+(define-public ocaml-sexplib
   (package
-    (name "ocaml4.07-sexplib")
-    (version "0.11.0")
+    (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
-         "1qfl0m04rpcjvc4yw1hzh6r16jpwmap0sa9ax6zjji67dz4szpyb"))))
+     (janestreet-origin "sexplib" version
+                        "12rlnc6fcrjfdn3gs2agi418sj54ighhs6dfll37zcv7mgywblm2"))
     (build-system dune-build-system)
+    (propagated-inputs
+     `(("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
+     "This package is part of Jane Street's Core library.  Sexplib contains
+functionality for parsing and pretty-printing s-expressions.")
+    (license license:expat)))
+
+(define-public ocaml4.07-sexplib
+  (package (inherit ocaml-sexplib)
+    (name "ocaml4.07-sexplib")
+    (version "0.11.0")
+    (source
+     (janestreet-origin "sexplib" version
+                        "0ksx62zsxhz8xmdrsn41n2hbc2qbyh3bxxc6946xisvgwh42h3q3"))
     (arguments
      `(#:ocaml ,ocaml-4.07
        #:findlib ,ocaml4.07-findlib
@@ -4142,13 +4154,7 @@ parsexp_io.")
     (propagated-inputs
      `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num))
        ("ocaml-parsexp" ,ocaml4.07-parsexp)
-       ("ocaml-sexplib0" ,ocaml4.07-sexplib0)))
-    (synopsis
-     "Library for serializing OCaml values to and from S-expressions")
-    (description
-     "This package is part of Jane Street's Core library. Sexplib contains
-functionality for parsing and pretty-printing s-expressions.")
-    (license license:expat)))
+       ("ocaml-sexplib0" ,ocaml4.07-sexplib0)))))
 
 (define-public ocaml-base
   (package
-- 
2.29.2

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.