unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Julien Lepiller <julien@lepiller.eu>
To: 35150@debbugs.gnu.org
Subject: [bug#35150] [PATCH 4/9] gnu: ocaml-cmdliner: Update to 1.0.3.
Date: Thu,  4 Apr 2019 21:16:33 +0200	[thread overview]
Message-ID: <20190404191638.31953-4-julien@lepiller.eu> (raw)
In-Reply-To: <20190404191638.31953-1-julien@lepiller.eu>

* gnu/packages/ocaml.scm (ocaml-cmdliner): Update to 1.0.3.
---
 gnu/packages/ocaml.scm | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 3b98de3ed7..839dc9fea1 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1640,32 +1640,28 @@ spans without being subject to operating system calendar time adjustments.")
 (define-public ocaml-cmdliner
   (package
     (name "ocaml-cmdliner")
-    (version "1.0.2")
+    (version "1.0.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://erratique.ch/software/cmdliner/releases/"
                                   "cmdliner-" version ".tbz"))
               (sha256
                (base32
-                "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"))))
+                "0g3w4hvc1cx9x2yp5aqn6m2rl8lf9x1dn754hfq8m1sc1102lxna"))))
     (build-system ocaml-build-system)
     (inputs
      `(("ocaml-result" ,ocaml-result)))
     (native-inputs
-     `(("ocamlbuild" ,ocamlbuild)
-       ("opam" ,opam)))
+     `(("ocamlbuild" ,ocamlbuild)))
     (arguments
      `(#:tests? #f
-       #:build-flags '("native=true" "native-dynlink=true")
+       #:make-flags (list (string-append "LIBDIR=" (assoc-ref %outputs "out")
+                                         "/lib/ocaml/site-lib/cmdliner"))
        #: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))))
+    (properties
+     `((ocaml4.02-variant . ,(delay ocaml4.02-cmdliner))))
     (home-page "http://erratique.ch/software/cmdliner")
     (synopsis "Declarative definition of command line interfaces for OCaml")
     (description "Cmdliner is a module for the declarative definition of command
@@ -1677,7 +1673,17 @@ most of the POSIX and GNU conventions.")
     (license license:bsd-3)))
 
 (define-public ocaml4.02-cmdliner
-  (package-with-ocaml4.02 ocaml-cmdliner))
+  (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-cmdliner))))
+    (package
+      (inherit base)
+      (version "1.0.2")
+      (source (origin
+                (method url-fetch)
+                (uri (string-append "http://erratique.ch/software/cmdliner/releases/"
+                                    "cmdliner-" version ".tbz"))
+                (sha256
+                 (base32
+                  "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1")))))))
 
 (define-public ocaml-fmt
   (package
-- 
2.21.0

  parent reply	other threads:[~2019-04-04 19:18 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-04 18:54 [bug#35150] [PATCH] Unbundle opam dependencies Julien Lepiller
2019-04-04 19:16 ` [bug#35150] [PATCH 1/9] import: opam: Add more patterns to opam file parser Julien Lepiller
2019-04-04 19:16   ` [bug#35150] [PATCH 2/9] import: opam: Use dune-build-system when possible Julien Lepiller
2019-04-04 19:16   ` [bug#35150] [PATCH 3/9] gnu: Add ocaml-opam-file-format Julien Lepiller
2019-04-04 19:16   ` Julien Lepiller [this message]
2019-04-04 19:16   ` [bug#35150] [PATCH 5/9] gnu: Add ocaml-extlib Julien Lepiller
2019-04-04 19:16   ` [bug#35150] [PATCH 6/9] gnu: Add ocaml-cudf Julien Lepiller
2019-04-04 19:16   ` [bug#35150] [PATCH 7/9] gnu: Add ocaml-mccs Julien Lepiller
2019-04-04 19:16   ` [bug#35150] [PATCH 8/9] gnu: Add ocaml-dose3 Julien Lepiller
2019-04-04 19:16   ` [bug#35150] [PATCH 9/9] gnu: opam: Unbundle dependencies Julien Lepiller
2019-04-10 15:08   ` [bug#35150] [PATCH 1/9] import: opam: Add more patterns to opam file parser Ludovic Courtès
2019-04-10 15:09 ` [bug#35150] [PATCH] Unbundle opam dependencies Ludovic Courtès
2019-04-10 19:48   ` bug#35150: " Julien Lepiller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190404191638.31953-4-julien@lepiller.eu \
    --to=julien@lepiller.eu \
    --cc=35150@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).