unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: pukkamustard <pukkamustard@posteo.net>
To: 47768@debbugs.gnu.org
Cc: pukkamustard <pukkamustard@posteo.net>,
	divoplade <d@divoplade.fr>, Maxime Devos <maximedevos@telenet.be>
Subject: [bug#47768] [PATCH v2 31/43] gnu: Add ocaml-ppx-optional.
Date: Mon, 10 May 2021 05:16:16 +0000	[thread overview]
Message-ID: <20210510051628.15359-32-pukkamustard@posteo.net> (raw)
In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net>

* gnu/packages/ocaml.scm (ocaml-ppx-optional): New variable.
  (ocaml4.07-ppx-optional): Inherit from ocaml-ppx-optional.
---
 gnu/packages/ocaml.scm | 48 ++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index e3856ac3be..b38ce9fcc8 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5538,31 +5538,22 @@ context such as function arguments.")
 @code{|>} and @code{|!}.")
     (license license:asl2.0)))
 
-(define-public ocaml4.07-ppx-optional
+(define-public ocaml-ppx-optional
   (package
-    (name "ocaml4.07-ppx-optional")
-    (version "0.11.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v"
-                                  (version-major+minor version)
-                                  "/files/ppx_optional-v" version ".tar.gz"))
-              (sha256
-               (base32
-                "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h"))))
+    (name "ocaml-ppx-optional")
+    (version "0.14.0")
+    (source
+     (janestreet-origin
+      "ppx_optional" version
+      "1hh6ivlp1qpvyn8l0vhrahkkcp3scf7km254sgplprmk10wnyidz"))
     (build-system dune-build-system)
-    (arguments
-     ;; No tests
-     `(#:tests? #f
-       #:ocaml ,ocaml-4.07
-       #:findlib ,ocaml4.07-findlib
-       #:dune ,ocaml4.07-dune))
+    (arguments `(#:tests? #f)) ; No tests
     (propagated-inputs
-      `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
-        ("ocaml-migrate-parsetree"
-         ,(package-with-ocaml4.07 ocaml-migrate-parsetree))
-        ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))
-    (properties `((upstream-name . "ppx_optional")))
+     `(("ocaml-base" ,ocaml-base)
+       ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)
+       ("ocaml-ppxlib" ,ocaml-ppxlib)))
+    (properties `((upstream-name . "ppx_optional")
+                  (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optional))))
     (home-page "https://github.com/janestreet/ppx_optional")
     (synopsis "Pattern matching on flat options")
     (description
@@ -5570,6 +5561,17 @@ context such as function arguments.")
 else expression.")
     (license license:asl2.0)))
 
+(define-public ocaml4.07-ppx-optional
+  (package-with-ocaml4.07
+   (package
+     (inherit ocaml-ppx-optional)
+     (version "0.11.0")
+     (source
+      (janestreet-origin
+       "ppx_optional" version
+       "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h"))
+     (properties `((upstream-name . "ppx_optional"))))))
+
 (define-public ocaml-ppx-optcomp
   (package
     (name "ocaml-ppx-optcomp")
@@ -5955,7 +5957,7 @@ functions from type definitions.")
         ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)
         ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let))
         ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp))
-        ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional)
+        ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional))
         ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang)
         ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message)
         ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value)
-- 
2.31.1





  parent reply	other threads:[~2021-05-10  5:19 UTC|newest]

Thread overview: 141+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-14  9:08 [bug#47768] [PATCH 00/37] Assorted OCaml patches pukkamustard
2021-04-14  9:12 ` [bug#47768] [PATCH 01/37] gnu: ocaml-integers: Update to 0.4.0 pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 02/37] gnu: ocaml-ctypes: Update to 0.18.0 pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 03/37] gnu: ocaml-ctypes: Make ocaml-integers a propagated input pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 04/37] gnu: ocaml-lwt: Make libev " pukkamustard
2021-04-14 18:50     ` Maxime Devos
2021-04-20  5:54       ` pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 05/37] gnu: ocaml-lwt: Update to 5.4.0 pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 06/37] gnu: ocaml4.07-gen: Update to 0.5.3 pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 07/37] gnu: Add ocaml-gen pukkamustard
2021-04-14 18:54     ` Maxime Devos
2021-04-20  6:11       ` pukkamustard
2021-04-21 11:29         ` Maxime Devos
2021-04-14  9:12   ` [bug#47768] [PATCH 08/37] gnu: Add ocaml-stdio pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 09/37] gnu: Add ocaml-compiler-libs pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 10/37] gnu: ocaml-migrate-parsetree: Update to 1.8.0 pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 11/37] gnu: ocaml-migrate-parsetree: Update to 2.1.0 pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 12/37] gnu: Add ocaml-ppxlib pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 13/37] gnu: Add ocaml-sedlex pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 14/37] gnu: Add ocaml-uunf pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 15/37] gnu: Add ocaml-ppx-sexp-conv pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 16/37] gnu: Add ocaml-bigstringaf pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 17/37] gnu: Add ocaml-ppx-let pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 18/37] gnu: Add ocaml-syntax-shims pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 19/37] gnu: Add ocaml-ppx-compare pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 20/37] gnu: Add ocaml-ppx-here pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 21/37] gnu: Add ocaml-ppx-cold pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 22/37] gnu: Add ocaml-ppx-assert pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 23/37] gnu: Add ocaml-ppx-custom-printf pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 24/37] gnu: Add ocaml-ppx-hash pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 25/37] gnu: Add ocaml-ppx-enumerate pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 26/37] gnu: Add ocaml-ppx-js-style pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 27/37] gnu: Add ocaml-ppx-base pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 28/37] gnu: Add ocaml-fieldslib pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 29/37] gnu: Add ocaml-ppx-fields-conv pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 30/37] gnu: Add ocaml-ppx-optcomp pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 31/37] gnu: Add ocaml-ppx-optional pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 32/37] gnu: Add ocaml-jst-config pukkamustard
2021-04-14  9:12   ` [bug#47768] [PATCH 33/37] gnu: Add ocaml-jane-street-headers pukkamustard
2021-04-14  9:13   ` [bug#47768] [PATCH 34/37] gnu: Add ocaml-time-now pukkamustard
2021-04-14  9:13   ` [bug#47768] [PATCH 35/37] gnu: Add ocaml-ppx-inline-test pukkamustard
2021-04-14  9:13   ` [bug#47768] [PATCH 36/37] gnu: Add ocaml-angstrom pukkamustard
2021-04-14  9:13   ` [bug#47768] [PATCH 37/37] gnu: Add ocaml-uri pukkamustard
2021-05-10  5:15 ` [bug#47768] [PATCH v2 00/43] Assorted OCaml patches (V2) pukkamustard
2021-05-10  5:15   ` [bug#47768] [PATCH v2 01/43] gnu: ocaml-integers: Update to 0.4.0 pukkamustard
2021-05-10  5:15   ` [bug#47768] [PATCH v2 02/43] gnu: ocaml-ctypes: Update to 0.18.0 pukkamustard
2021-05-10  5:15   ` [bug#47768] [PATCH v2 03/43] gnu: ocaml-ctypes: Make ocaml-integers a propagated input pukkamustard
2021-05-10  5:15   ` [bug#47768] [PATCH v2 04/43] gnu: ocaml-lwt: Make libev " pukkamustard
2021-05-10  5:15   ` [bug#47768] [PATCH v2 05/43] gnu: ocaml-lwt: Update to 5.4.0 pukkamustard
2021-05-10  5:15   ` [bug#47768] [PATCH v2 06/43] gnu: ocaml4.07-gen: Update to 0.5.3 pukkamustard
2021-05-10  5:15   ` [bug#47768] [PATCH v2 07/43] gnu: Add ocaml-gen pukkamustard
2021-05-10  5:15   ` [bug#47768] [PATCH v2 08/43] gnu: Add ocaml-stdio pukkamustard
2021-05-10  5:15   ` [bug#47768] [PATCH v2 09/43] gnu: Add ocaml-compiler-libs pukkamustard
2021-05-10  5:15   ` [bug#47768] [PATCH v2 10/43] gnu: ocaml-migrate-parsetree: Update to 1.8.0 pukkamustard
2021-05-10  5:15   ` [bug#47768] [PATCH v2 11/43] gnu: ocaml-migrate-parsetree: Update to 2.1.0 pukkamustard
2021-05-25 19:18     ` Xinglu Chen
2021-06-01 20:04       ` pukkamustard
2021-06-01 20:19         ` Xinglu Chen
2021-05-10  5:15   ` [bug#47768] [PATCH v2 12/43] gnu: Add ocaml-ppxlib pukkamustard
2021-05-10  5:15   ` [bug#47768] [PATCH v2 13/43] gnu: Add ocaml-sedlex pukkamustard
2021-05-10  5:15   ` [bug#47768] [PATCH v2 14/43] gnu: Add ocaml-uunf pukkamustard
2021-05-25 19:21     ` Xinglu Chen
2021-06-01 19:54       ` pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 15/43] gnu: Add ocaml-ppx-sexp-conv pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 16/43] gnu: Add ocaml-bigstringaf pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 17/43] gnu: Add ocaml-ppx-let pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 18/43] gnu: Add ocaml-syntax-shims pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 19/43] gnu: Add ocaml-ppx-compare pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 20/43] gnu: Add ocaml-ppx-here pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 21/43] gnu: Add ocaml-ppx-cold pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 22/43] gnu: Add ocaml-ppx-assert pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 23/43] gnu: Add ocaml-ppx-custom-printf pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 24/43] gnu: Add ocaml-ppx-hash pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 25/43] gnu: Add ocaml-ppx-enumerate pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 26/43] gnu: Add ocaml-ppx-js-style pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 27/43] gnu: Add ocaml-ppx-base pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 28/43] gnu: Add ocaml-fieldslib pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 29/43] gnu: Add ocaml-ppx-fields-conv pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 30/43] gnu: Add ocaml-ppx-optcomp pukkamustard
2021-05-10  5:16   ` pukkamustard [this message]
2021-05-10  5:16   ` [bug#47768] [PATCH v2 32/43] gnu: Add ocaml-jst-config pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 33/43] gnu: Add ocaml-jane-street-headers pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 34/43] gnu: Add ocaml-time-now pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 35/43] gnu: Add ocaml-ppx-inline-test pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 36/43] gnu: Add ocaml-angstrom pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 37/43] gnu: Add ocaml-uri pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 38/43] gnu: Add ocaml-graphics pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 39/43] gnu: Add ocaml-variantslib pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 40/43] gnu: Add ocaml-ppx-variants-conv pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 41/43] gnu: Add ocaml-ppx-expect pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 42/43] gnu: ocaml-num: Update to 1.4 pukkamustard
2021-05-10  5:16   ` [bug#47768] [PATCH v2 43/43] gnu: Add ocaml-js-of-ocaml pukkamustard
2021-05-25 19:29   ` [bug#47768] [PATCH v2 00/43] Assorted OCaml patches (V2) Xinglu Chen
2021-06-01 20:21     ` [bug#47768] [PATCH v3 00/42] Assorted OCaml patches pukkamustard
2021-06-01 21:46       ` Xinglu Chen
2021-06-02  1:19         ` Julien Lepiller
2021-06-06 12:53           ` Xinglu Chen
2021-06-06 15:19             ` Julien Lepiller
2021-06-13 15:43               ` bug#47768: " Julien Lepiller
2021-06-01 20:22     ` [bug#47768] [PATCH v3 01/42] gnu: ocaml-integers: Update to 0.4.0 pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 02/42] gnu: ocaml-ctypes: Update to 0.18.0 pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 03/42] gnu: ocaml-ctypes: Make ocaml-integers a propagated input pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 04/42] gnu: ocaml-lwt: Make libev " pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 05/42] gnu: ocaml-lwt: Update to 5.4.0 pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 06/42] gnu: ocaml4.07-gen: Update to 0.5.3 pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 07/42] gnu: Add ocaml-gen pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 08/42] gnu: Add ocaml-stdio pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 09/42] gnu: Add ocaml-compiler-libs pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 10/42] gnu: ocaml-migrate-parsetree: Update to 2.1.0 pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 11/42] gnu: Add ocaml-ppxlib pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 12/42] gnu: Add ocaml-sedlex pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 13/42] gnu: Add ocaml-uunf pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 14/42] gnu: Add ocaml-ppx-sexp-conv pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 15/42] gnu: Add ocaml-bigstringaf pukkamustard
2021-06-01 20:22     ` [bug#47768] [PATCH v3 16/42] gnu: Add ocaml-ppx-let pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 17/42] gnu: Add ocaml-syntax-shims pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 18/42] gnu: Add ocaml-ppx-compare pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 19/42] gnu: Add ocaml-ppx-here pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 20/42] gnu: Add ocaml-ppx-cold pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 21/42] gnu: Add ocaml-ppx-assert pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 22/42] gnu: Add ocaml-ppx-custom-printf pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 23/42] gnu: Add ocaml-ppx-hash pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 24/42] gnu: Add ocaml-ppx-enumerate pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 25/42] gnu: Add ocaml-ppx-js-style pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 26/42] gnu: Add ocaml-ppx-base pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 27/42] gnu: Add ocaml-fieldslib pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 28/42] gnu: Add ocaml-ppx-fields-conv pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 29/42] gnu: Add ocaml-ppx-optcomp pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 30/42] gnu: Add ocaml-ppx-optional pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 31/42] gnu: Add ocaml-jst-config pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 32/42] gnu: Add ocaml-jane-street-headers pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 33/42] gnu: Add ocaml-time-now pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 34/42] gnu: Add ocaml-ppx-inline-test pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 35/42] gnu: Add ocaml-angstrom pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 36/42] gnu: Add ocaml-uri pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 37/42] gnu: Add ocaml-graphics pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 38/42] gnu: Add ocaml-variantslib pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 39/42] gnu: Add ocaml-ppx-variants-conv pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 40/42] gnu: Add ocaml-ppx-expect pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 41/42] gnu: ocaml-num: Update to 1.4 pukkamustard
2021-06-01 20:23     ` [bug#47768] [PATCH v3 42/42] gnu: Add ocaml-js-of-ocaml pukkamustard

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

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210510051628.15359-32-pukkamustard@posteo.net \
    --to=pukkamustard@posteo.net \
    --cc=47768@debbugs.gnu.org \
    --cc=d@divoplade.fr \
    --cc=maximedevos@telenet.be \
    /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 public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).