guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/15: gnu: Add ocaml4.01-bisect.


From: Ben Woodcroft
Subject: 04/15: gnu: Add ocaml4.01-bisect.
Date: Wed, 10 May 2017 16:15:05 -0400 (EDT)

benwoodcroft pushed a commit to branch master
in repository guix.

commit 1345231cc21725e9866edb1b4c2366a038d4b5f3
Author: Ben Woodcroft <address@hidden>
Date:   Sat Mar 18 08:59:01 2017 +1000

    gnu: Add ocaml4.01-bisect.
    
    * gnu/packages/ocaml.scm (ocaml4.01-bisect): New variable.
    (ocaml-bisect)[properties]: New field.
---
 gnu/packages/ocaml.scm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index c7c473a..b3fee16 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -59,7 +59,8 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix svn-download)
-  #:use-module (guix utils))
+  #:use-module (guix utils)
+  #:use-module (srfi srfi-1))
 
 ;; A shortcut for files from ocaml forge. Downloaded files are computed from
 ;; their number, not their name.
@@ -1126,8 +1127,22 @@ 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))))
     (license license:gpl3+)))
 
+(define-public ocaml4.01-bisect
+  (let ((base (package-with-ocaml4.01 (strip-ocaml4.01-variant ocaml-bisect))))
+    (package
+      (inherit base)
+      (arguments
+       `(#:ocaml ,ocaml-4.01
+         ;; Camlp4 is included with OCaml 4.01, so do not include it as a
+         ;; separate input.
+         ,@(strip-keyword-arguments '(#:make-flags) (package-arguments base))))
+      (native-inputs `(,@(alist-delete "camlp4" (package-native-inputs base))))
+      (propagated-inputs
+       `(,@(alist-delete "camlp4" (package-propagated-inputs base)))))))
+
 (define-public ocaml-bitstring
   (package
     (name "ocaml-bitstring")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]