From: Julien Lepiller <julien@lepiller.eu>
To: 33079@debbugs.gnu.org
Subject: [bug#33079] [PATCH 25/34] gnu: ocaml-bisect: Update to 1.3.1.
Date: Wed, 17 Oct 2018 22:34:33 +0200 [thread overview]
Message-ID: <20181017203442.7075-25-julien@lepiller.eu> (raw)
In-Reply-To: <20181017203442.7075-1-julien@lepiller.eu>
* 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
next prev parent reply other threads:[~2018-10-17 20:36 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-17 20:31 [bug#33079] [WIP] ocaml updates Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 01/34] gnu: ocaml: Update to 4.07.0 Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 02/34] gnu: Add ocamlbuild Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 03/34] gnu: camlp4: Update to 4.07+1 Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 04/34] gnu: ocaml-findlib: Update to 1.8.0 Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 05/34] gnu: Add ocaml4.02-findlib Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 06/34] guix: ocaml: Add package-with-ocaml4.02 Julien Lepiller
2018-10-23 21:10 ` Ludovic Courtès
2018-10-17 20:34 ` [bug#33079] [PATCH 07/34] guix: ocaml-build-system: Replace system* with invoke Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 08/34] gnu: lablgtk: Update to 2.18.6 Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 09/34] gnu: camlp5: Update to 7.06 Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 10/34] gnu: hevea: Update to 2.32 Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 11/34] gnu: Add ocaml-num Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 12/34] gnu: coq: Fix build failure Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 13/34] gnu: opam: Update to 2.0.0 Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 14/34] gnu: ocaml-menhir: Fix build Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 15/34] gnu: Add ocaml4.02-lablgtk Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 16/34] gnu: unison: Build with ocaml-4.02 Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 17/34] gnu: Fix ocaml-ounit Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 18/34] gnu: Add ocaml4.02-camlzip Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 19/34] gnu: ocmalmod: Update to 0.0.9 Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 20/34] gnu: Add ocaml4.02-zarith Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 21/34] gnu: Fix ocaml-frontc Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 22/34] gnu: Fix ocaml-qcheck Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 23/34] gnu: Fix ocaml-qtest Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 24/34] gnu: Fix ocaml-stringext Julien Lepiller
2018-10-17 20:34 ` Julien Lepiller [this message]
2018-10-17 20:34 ` [bug#33079] [PATCH 26/34] gnu: ocaml-bisect: Update to 1.3.1 Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 27/34] gnu: Add dune Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 28/34] gnu: Add ocaml-migrate-parsetree Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 29/34] gnu: Add ocaml-ppx-tools-versioned Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 30/34] gnu: Update ocaml-bitstring to 3.1.0 Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 31/34] gnu: Add ocaml4.02-result Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 32/34] gnu: Fix ocaml-topkg Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 33/34] gnu: Fix ocaml-rresult Julien Lepiller
2018-10-17 20:34 ` [bug#33079] [PATCH 34/34] gnu: Update ocaml packages Julien Lepiller
2018-10-23 21:12 ` Ludovic Courtès
2018-10-23 21:11 ` [bug#33079] [PATCH 01/34] gnu: ocaml: Update to 4.07.0 Ludovic Courtès
2018-11-18 20:11 ` bug#33079: [WIP] ocaml updates 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181017203442.7075-25-julien@lepiller.eu \
--to=julien@lepiller.eu \
--cc=33079@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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.