[PATCH 1/5] gnu: ocaml-uchar: Update to 0.0.2.

Done

Details

2 participants

Gabriel Hondet
Julien Lepiller

Owner: unassigned

Submitted by: Gabriel Hondet

Severity: normal

Debbugs page

Gabriel Hondet wrote 6 years ago

Recipients:(address . guix-patches@gnu.org)

Message-ID:87bm48zlso.fsf@gmail.com

* gnu/packages/ocaml.scm (ocaml-uchar): Update to 0.0.2.

---

gnu/packages/ocaml.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index deba67c4d..3993424eb 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -2269,14 +2269,14 @@ representation of the data.")
 (define-public ocaml-uchar
   (package
     (name "ocaml-uchar")
-    (version "0.0.1")
+    (version "0.0.2")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "https://github.com/ocaml/uchar/releases/download/v"
                             version "/uchar-" version ".tbz"))
         (sha256 (base32
-                  "0ficw1x7ymbd6m8hqw3w1aycwm1hbwd6bad3c5pspwnzh3qlikhi"))))
+                  "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7"))))
     (build-system ocaml-build-system)
     (arguments
      `(#:tests? #f
-- 
2.20.1

Gabriel Hondet wrote 6 years ago

[PATCH 2/5] gnu: ocaml-fmt: Update to 0.8.5.

Recipients:(address . 34171@debbugs.gnu.org)

Message-ID:87a7jrzvsk.fsf@gmail.com

Date: Tue, 22 Jan 2019 17:17:48 +0100
User-agent: mu4e 1.0; emacs 26.1
* gnu/packages/ocaml.scm (ocaml-fmt): Update to 0.8.5.
---
 gnu/packages/ocaml.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Toggle diff (37 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 3993424eb..f1cc0f3e8 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Peter Kreye <kreyepr@gmail.com>
-;;; Copyright © 2018 Gabriel Hondet <gabrielhondet@gmail.com>
+;;; Copyright © 2018, 2019 Gabriel Hondet <gabrielhondet@gmail.com>
 ;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -1802,18 +1802,19 @@ most of the POSIX and GNU conventions.")
 (define-public ocaml-fmt
   (package
     (name "ocaml-fmt")
-    (version "0.8.0")
+    (version "0.8.5")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "http://erratique.ch/software/fmt/releases/fmt-"
                             version ".tbz"))
         (sha256 (base32
-                  "16y7ibndnairb53j8a6qgipyqwjxncn4pl9jiw5bxjfjm59108px"))))
+                  "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060"))))
     (build-system ocaml-build-system)
     (native-inputs
      `(("ocamlbuild" ,ocamlbuild)
        ("opam" ,opam)
+       ("ocaml-uchar" ,ocaml-uchar)
        ("topkg" ,ocaml-topkg)))
     (propagated-inputs
      `(("result" ,ocaml-result)
-- 
2.20.1

Gabriel Hondet wrote 6 years ago

[PATCH 3/5] gnu: ocaml-cmdliner: Update to 1.0.2.

Recipients:(address . 34171@debbugs.gnu.org)

Message-ID:878szbzvq4.fsf@gmail.com

* gnu/packages/ocaml.scm (ocaml-cmdliner): Update to 1.0.2.

---

gnu/packages/ocaml.scm | 12 ++++++++++--

1 file changed, 10 insertions(+), 2 deletions(-)

Toggle diff (39 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index f1cc0f3e8..e975935d3 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1768,15 +1768,17 @@ spans without being subject to operating system calendar time adjustments.")
 (define-public ocaml-cmdliner
   (package
     (name "ocaml-cmdliner")
-    (version "0.9.8")
+    (version "1.0.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://erratique.ch/software/cmdliner/releases/"
                                   "cmdliner-" version ".tbz"))
               (sha256
                (base32
-                "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx"))))
+                "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"))))
     (build-system ocaml-build-system)
+    (inputs
+     `(("ocaml-result" ,ocaml-result)))
     (native-inputs
      `(("ocamlbuild" ,ocamlbuild)
        ("opam" ,opam)))
@@ -1785,6 +1787,12 @@ spans without being subject to operating system calendar time adjustments.")
        #:build-flags '("native=true" "native-dynlink=true")
        #:phases
        (modify-phases %standard-phases
+         (replace 'install
+           ;; The makefile says 'adjust on cli invocation'
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (invoke "make" "install" (string-append "PREFIX=" out))
+               #t)))
          (delete 'configure))))
     (home-page "http://erratique.ch/software/cmdliner")
     (synopsis "Declarative definition of command line interfaces for OCaml")
-- 
2.20.1

Gabriel Hondet wrote 6 years ago

[PATCH 4/5] gnu: ocaml-logs: Update to 0.6.2.

Recipients:(address . 34171@debbugs.gnu.org)

Message-ID:877eevzvoj.fsf@gmail.com

Date: Tue, 22 Jan 2019 17:39:07 +0100
User-agent: mu4e 1.0; emacs 26.1
* gnu/packages/ocaml.scm (ocaml-logs): Update to 0.6.2.
---
 gnu/packages/ocaml.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index e975935d3..ca8f804ab 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -2119,7 +2119,8 @@ ocaml lwt.")
      `(("ocamlbuild" ,ocamlbuild)
        ("opam" ,opam)))
     (propagated-inputs
-     `(("fmt" ,ocaml-fmt)
+     `(("ocaml-uchar" ,ocaml-uchar)
+       ("fmt" ,ocaml-fmt)
        ("lwt" ,ocaml-lwt)
        ("mtime" ,ocaml-mtime)
        ("result" ,ocaml-result)
-- 
2.20.1

Gabriel Hondet wrote 6 years ago

[PATCH 5/5] gnu: Add ocaml-craml.

Recipients:(address . 34171@debbugs.gnu.org)

Message-ID:875zufzvn9.fsf@gmail.com

Date: Tue, 22 Jan 2019 17:40:01 +0100
User-agent: mu4e 1.0; emacs 26.1
+@code{https://bitheap.org/cram/,Python tool}, which was itself based on
* gnu/packages/ocaml.scm (ocaml-craml): New variable.
---
 gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

Toggle diff (42 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index ca8f804ab..4c3aa36b0 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4760,6 +4760,36 @@ yojson package.  The program @code{atdgen} can be used to derive OCaml-JSON
 serializers and deserializers from type definitions.")
     (license license:bsd-3)))
 
+(define-public ocaml-craml
+  (package
+    (name "ocaml-craml")
+    (version "1.0.0")
+    (home-page "https://github.com/realworldocaml/craml")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append home-page ".git"))
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "197xjp4vmzdymf2ndinw271ihpf45h04mx8gqj8ypspxdr5fj1a5"))))
+    (build-system dune-build-system)
+    (inputs
+     `(("ocaml-fmt" ,ocaml-fmt)
+       ("ocaml-astring" ,ocaml-astring)
+       ("ocaml-logs" ,ocaml-logs)
+       ("ocaml-cmdliner" ,ocaml-cmdliner)))
+    (synopsis
+     "CRAM-testing framework for testing command line applications")
+    (description "CRAM is a is functional testing framework for command line
+applications.  @code{craml} is freely inspired by the
+Mercurial's @code{https://www.selenic.com/blog/?p=663, unified test
+format}.  @code{craml} is released as a single binary (called @code{craml}).")
+    (license license:isc)))
+
 (define-public ocaml-merlin
   (package
     (name "ocaml-merlin")
-- 
2.20.1

Julien Lepiller wrote 6 years ago

Recipients:

Message-ID:0062A22B-81A0-4A19-8081-5F868D7B4357@lepiller.eu

Le 23 janvier 2019 08:21:46 GMT+01:00, Gabriel Hondet <gabrielhondet@gmail.com> a écrit :

Toggle quote (53 lines)>Date: Tue, 22 Jan 2019 17:40:01 +0100
>User-agent: mu4e 1.0; emacs 26.1
>+@code{https://bitheap.org/cram/, Python tool}, which was itself based
>on
>* gnu/packages/ocaml.scm (ocaml-craml): New variable.
>---
> gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
>diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
>index ca8f804ab..4c3aa36b0 100644
>--- a/gnu/packages/ocaml.scm
>+++ b/gnu/packages/ocaml.scm
>@@ -4760,6 +4760,36 @@ yojson package.  The program @code{atdgen} can
>be used to derive OCaml-JSON
> serializers and deserializers from type definitions.")
>     (license license:bsd-3)))
> 
>+(define-public ocaml-craml
>+  (package
>+    (name "ocaml-craml")
>+    (version "1.0.0")
>+    (home-page "https://github.com/realworldocaml/craml")
>+    (source
>+     (origin
>+       (method git-fetch)
>+       (uri (git-reference
>+             (url (string-append home-page ".git"))
>+             (commit version)))
>+       (file-name (git-file-name name version))
>+       (sha256
>+        (base32
>+         "197xjp4vmzdymf2ndinw271ihpf45h04mx8gqj8ypspxdr5fj1a5"))))
>+    (build-system dune-build-system)
>+    (inputs
>+     `(("ocaml-fmt" ,ocaml-fmt)
>+       ("ocaml-astring" ,ocaml-astring)
>+       ("ocaml-logs" ,ocaml-logs)
>+       ("ocaml-cmdliner" ,ocaml-cmdliner)))
>+    (synopsis
>+     "CRAM-testing framework for testing command line applications")
>+    (description "CRAM is a is functional testing framework for
>command line
>+applications.  @code{craml} is freely inspired by the
>+Mercurial's @code{https://www.selenic.com/blog/?p=663, unified test
>+format}.  @code{craml} is released as a single binary (called
>@code{craml}).")
>+    (license license:isc)))
>+
> (define-public ocaml-merlin
>   (package
>     (name "ocaml-merlin")

Hi, thanks for these patches! They lgtm, but please be careful with the headers: there's something strange in the commit message of this and other patches.

I'll check them properly and push later today. Thanks!

Gabriel Hondet wrote 6 years ago

Recipients:(name . Julien Lepiller)(address . julien@lepiller.eu)(address . 34171@debbugs.gnu.org)

Message-ID:874l9zzt57.fsf@gmail.com

Hi,

On Wed 23 Jan 2019 at 08:54 Julien Lepiller wrote:

Toggle quote (8 lines)

>> Date: Tue, 22 Jan 2019

>> User-agent: mu4e 1.0;

>> [...]

> Hi, thanks for these patches! They lgtm, but please be careful with

> the headers: there's something strange in the commit message of this

> and other patches.

Ah, indeed, some commit message contain some email headers... sorry.

Toggle quote (2 lines)

> I'll check them properly and push later today. Thanks!

Great, thanks!

Gabriel

Julien Lepiller wrote 6 years ago

Re: [bug#34171] [PATCH 1/5] gnu: ocaml-uchar: Update to 0.0.2.

Recipients:(address . 34171-done@debbugs.gnu.org)

Message-ID:20190123220147.1c8a7535@lepiller.eu

Pushed as f0dece30b409d4144234b2e60a9422f9b9757eba -

1d209d06edef7b2dfd744862add66aa3fe61f952.

I've moved ocaml-uchar to propagated-inputs of fmt, so it wasn't needed

to add it to logs anymore. Since there was nothing else in that patch,

I've completely removed it. The name "gnu: ocaml-logs: Update to 0.6.2"

was not very good, since ocaml-logs was already at 0.6.2. Maybe "Fix

build" or "Add missing input" would have been better.

Thank you!

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 34171@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 34171

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags

mumi command -t +confirmed -t +easy

Or, remove the moreinfo tag and set the help tag

mumi command -t -moreinfo -t +help

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date