all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Julien Lepiller <julien@lepiller.eu>
To: 33079@debbugs.gnu.org
Subject: [bug#33079] [PATCH 06/34] guix: ocaml: Add package-with-ocaml4.02.
Date: Wed, 17 Oct 2018 22:34:14 +0200	[thread overview]
Message-ID: <20181017203442.7075-6-julien@lepiller.eu> (raw)
In-Reply-To: <20181017203442.7075-1-julien@lepiller.eu>

* guix/build-system/ocaml.scm (default-ocaml4.02, default-ocaml4.02-findlib,
package-with-ocaml4.02, strip-ocaml4.02-variant): New variables.
---
 guix/build-system/ocaml.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm
index 34a22ecff..560be0e25 100644
--- a/guix/build-system/ocaml.scm
+++ b/guix/build-system/ocaml.scm
@@ -28,7 +28,9 @@
   #:use-module (srfi srfi-1)
   #:export (%ocaml-build-system-modules
             package-with-ocaml4.01
+            package-with-ocaml4.02
             strip-ocaml4.01-variant
+            strip-ocaml4.02-variant
             ocaml-build
             ocaml-build-system))
 
@@ -82,6 +84,14 @@
   (let ((module (resolve-interface '(gnu packages ocaml))))
     (module-ref module 'ocaml4.01-findlib)))
 
+(define (default-ocaml4.02)
+  (let ((ocaml (resolve-interface '(gnu packages ocaml))))
+    (module-ref ocaml 'ocaml-4.02)))
+
+(define (default-ocaml4.02-findlib)
+  (let ((module (resolve-interface '(gnu packages ocaml))))
+    (module-ref module 'ocaml4.02-findlib)))
+
 (define* (package-with-explicit-ocaml ocaml findlib old-prefix new-prefix
                                        #:key variant-property)
   "Return a procedure of one argument, P.  The procedure creates a package
@@ -139,12 +149,24 @@ pre-defined variants."
                                "ocaml-" "ocaml4.01-"
                                #:variant-property 'ocaml4.01-variant))
 
+(define package-with-ocaml4.02
+  (package-with-explicit-ocaml (delay (default-ocaml4.02))
+                               (delay (default-ocaml4.02-findlib))
+                               "ocaml-" "ocaml4.02-"
+                               #:variant-property 'ocaml4.02-variant))
+
 (define (strip-ocaml4.01-variant p)
   "Remove the 'ocaml4.01-variant' property from P."
   (package
     (inherit p)
     (properties (alist-delete 'ocaml4.01-variant (package-properties p)))))
 
+(define (strip-ocaml4.02-variant p)
+  "Remove the 'ocaml4.02-variant' property from P."
+  (package
+    (inherit p)
+    (properties (alist-delete 'ocaml4.02-variant (package-properties p)))))
+
 (define* (lower name
                 #:key source inputs native-inputs outputs system target
                 (ocaml (default-ocaml))
-- 
2.18.0

  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   ` Julien Lepiller [this message]
2018-10-23 21:10     ` [bug#33079] [PATCH 06/34] guix: ocaml: Add package-with-ocaml4.02 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   ` [bug#33079] [PATCH 25/34] gnu: ocaml-bisect: Update to 1.3.1 Julien Lepiller
2018-10-17 20:34   ` [bug#33079] [PATCH 26/34] " 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-6-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.