GNU bug report logs - #51358
[PATCH] Getting rid of some ocaml4.07-* packages.

Previous Next

Full log

View this message in rfc822 format

From: Julien Lepiller <julien <at> lepiller.eu>
To: 51358 <at> debbugs.gnu.org
Subject: [bug#51358] [PATCH 4/4] gnu: Add ocaml-charinfo-width.
Date: Tue, 26 Oct 2021 00:06:42 +0200

* gnu/packages/ocaml.scm (ocaml4.07-charinfo-width): Replace with...
(ocaml-charinfo-width): ...this. Use latest ocaml package.
---
 gnu/packages/ocaml.scm | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index a6e8af8bcf..c0bb1675a2 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3882,9 +3882,9 @@ (define-public ocaml-camomile
     ;; with an exception for linked libraries to use a different license
     (license license:lgpl2.0+)))
 
-(define-public ocaml4.07-charinfo-width
+(define-public ocaml-charinfo-width
   (package
-    (name "ocaml4.07-charinfo-width")
+    (name "ocaml-charinfo-width")
     (version "1.1.0")
     (source (origin
               (method url-fetch)
@@ -3895,15 +3895,11 @@ (define-public ocaml4.07-charinfo-width
                (base32
                 "00bv4p1yqs8y0z4z07wd9w9yyv669dikp9b04dcjbwpiy2wy0086"))))
     (build-system dune-build-system)
-    (arguments
-     `(#:ocaml ,ocaml-4.07
-       #:findlib ,ocaml4.07-findlib
-       #:dune ,ocaml4.07-dune))
     (propagated-inputs
-     `(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result))
-       ("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile))))
+     `(("ocaml-result" ,ocaml-result)
+       ("ocaml-camomile" ,ocaml-camomile)))
     (native-inputs
-     `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect))))
+     `(("ocaml-ppx-expect" ,ocaml-ppx-expect)))
     (properties
      `((upstream-name . "charInfo_width")))
     (home-page "https://bitbucket.org/zandoye/charinfo_width/")
@@ -3933,7 +3929,7 @@ (define-public ocaml4.07-zed
        #:dune ,ocaml4.07-dune))
     (propagated-inputs
      `(("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile))
-       ("ocaml-charinfo-width" ,ocaml4.07-charinfo-width)
+       ("ocaml-charinfo-width" ,(package-with-ocaml4.07 ocaml-charinfo-width))
        ("ocaml-react" ,(package-with-ocaml4.07 ocaml-react))))
     (home-page "https://github.com/diml/zed")
     (synopsis "Abstract engine for text editing in OCaml")
-- 
2.33.0

Previous Next

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