From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCsYB-0007Fx-71 for guix-patches@gnu.org; Wed, 17 Oct 2018 16:36:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCsY9-0003Id-Pb for guix-patches@gnu.org; Wed, 17 Oct 2018 16:36:15 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51567) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCsY9-0003IO-K2 for guix-patches@gnu.org; Wed, 17 Oct 2018 16:36:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gCsY9-0006uh-Ch for guix-patches@gnu.org; Wed, 17 Oct 2018 16:36:13 -0400 Subject: [bug#33079] [PATCH 25/34] gnu: ocaml-bisect: Update to 1.3.1. Resent-Message-ID: From: Julien Lepiller Date: Wed, 17 Oct 2018 22:34:33 +0200 Message-Id: <20181017203442.7075-25-julien@lepiller.eu> In-Reply-To: <20181017203442.7075-1-julien@lepiller.eu> References: <20181017223130.775b25fc@lepiller.eu> <20181017203442.7075-1-julien@lepiller.eu> 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: 33079@debbugs.gnu.org * gnu/packages/ocaml.scm (ocaml-bisect): Update to 1.3.1. (ocaml4.02-bisect): New variable. --- gnu/packages/ocaml.scm | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fc8c59838..196e0d219 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1400,13 +1400,15 @@ full_split, cut, rcut, etc..") (define-public ocaml-bisect (package (name "ocaml-bisect") - (version "1.3") + (version "1.3.1") (source (origin (method url-fetch) - (uri (ocaml-forge-uri "bisect" version 1051)) + (uri (string-append "https://github.com/gasche/bisect/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0kcg2rh0qlkfpbv3nhcb75n62b04gbrz0zasq15ynln91zd5qrg0")) + "0p67fppk5ifb63b00kxwrb1xg75hrqhknng3bsdyw3gxxqyjlpmx")) (patches (search-patches "ocaml-bisect-fix-camlp4-in-another-directory.patch")))) @@ -1414,6 +1416,7 @@ full_split, cut, rcut, etc..") (native-inputs `(("camlp4" ,camlp4) ("libxml2" ,libxml2) + ("ocamlbuild" ,ocamlbuild) ("which" ,which))) (propagated-inputs `(("camlp4" ,camlp4))) @@ -1426,9 +1429,10 @@ full_split, cut, rcut, etc..") #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "./configure" "-prefix" - (assoc-ref outputs "out")))))))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (invoke "./configure" "-prefix" (assoc-ref outputs "out") + "-ocaml-prefix" (assoc-ref inputs "ocaml") + "-camlp4-prefix" (assoc-ref inputs "camlp4"))))))) (home-page "http://bisect.x9c.fr") (synopsis "Code coverage tool for the OCaml language") (description "Bisect is a code coverage tool for the OCaml language. It is @@ -1436,7 +1440,9 @@ a camlp4-based tool that allows to instrument your application before running tests. After application execution, it is possible to generate a report in HTML format that is the replica of the application source code annotated with code coverage information.") - (properties `((ocaml4.01-variant . ,(delay ocaml4.01-bisect)))) + (properties + `((ocaml4.01-variant . ,(delay ocaml4.01-bisect)) + (ocaml4.02-variant . ,(delay ocaml4.02-bisect)))) (license license:gpl3+))) (define-public ocaml4.01-bisect @@ -1452,6 +1458,17 @@ coverage information.") (propagated-inputs `(,@(alist-delete "camlp4" (package-propagated-inputs base))))))) +(define-public ocaml4.02-bisect + (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-bisect)))) + (package + (inherit base) + (native-inputs + `(("camlp4" ,camlp4-4.02) + ("libxml2" ,libxml2) + ("which" ,which))) + (propagated-inputs + `(("camlp4" ,camlp4-4.02)))))) + (define-public ocaml-bitstring (package (name "ocaml-bitstring") -- 2.18.0