From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:50252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hC7sB-000363-U7 for guix-patches@gnu.org; Thu, 04 Apr 2019 15:18:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hC7sA-00043y-Pe for guix-patches@gnu.org; Thu, 04 Apr 2019 15:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59406) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hC7sA-00043i-IQ for guix-patches@gnu.org; Thu, 04 Apr 2019 15:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hC7sA-00009f-B5 for guix-patches@gnu.org; Thu, 04 Apr 2019 15:18:02 -0400 Subject: [bug#35150] [PATCH 4/9] gnu: ocaml-cmdliner: Update to 1.0.3. Resent-Message-ID: From: Julien Lepiller Date: Thu, 4 Apr 2019 21:16:33 +0200 Message-Id: <20190404191638.31953-4-julien@lepiller.eu> In-Reply-To: <20190404191638.31953-1-julien@lepiller.eu> References: <20190404205437.5fe1bd60@lepiller.eu> <20190404191638.31953-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35150@debbugs.gnu.org * 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