all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: zimoun <zimon.toutoune@gmail.com>
To: 53882@debbugs.gnu.org
Cc: Julien Lepiller <julien@lepiller.eu>
Subject: [bug#53882] [PATCH v2 04/25] gnu: Add ocaml-spawn.
Date: Fri,  8 Apr 2022 15:22:44 +0200	[thread overview]
Message-ID: <20220408132305.3301350-4-zimon.toutoune@gmail.com> (raw)
In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com>

From: Julien Lepiller <julien@lepiller.eu>

* gnu/packages/ocaml.scm (ocaml-spawn): New variable.
(ocaml4.07-spawn): Inherit from it.
---
 gnu/packages/ocaml.scm | 55 ++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index cb461bf257..6690fab76d 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6446,10 +6446,10 @@ (define-public ocaml4.07-configurator
 @end itemize")
     (license license:asl2.0)))
 
-(define-public ocaml4.07-spawn
+(define-public ocaml-spawn
   (package
-    (name "ocaml4.07-spawn")
-    (version "0.13.0")
+    (name "ocaml-spawn")
+    (version "0.15.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -6458,22 +6458,12 @@ (define-public ocaml4.07-spawn
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf"))))
+                "1fjr91psas5zmk1hxvxh0dchhn0pkyzlr4gg232f5g9vdgissi0p"))))
     (build-system dune-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'fix-tests
-           (lambda _
-             (substitute* "test/tests.ml"
-               (("/bin/pwd") (which "pwd"))
-               (("/bin/echo") (which "echo")))
-             #t)))
-       #:ocaml ,ocaml-4.07
-       #:findlib ,ocaml4.07-findlib
-       #:dune ,ocaml4.07-dune))
-    (native-inputs
-     `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect))))
+    (propagated-inputs (list ocaml-odoc))
+    (native-inputs (list ocaml-ppx-expect))
+    (properties
+     `((ocaml4.07-variant . ,(delay ocaml4.07-spawn))))
     (home-page "https://github.com/janestreet/spawn")
     (synopsis "Spawning sub-processes")
     (description
@@ -6495,6 +6485,35 @@ (define-public ocaml4.07-spawn
 @end itemize")
     (license license:asl2.0)))
 
+(define-public ocaml4.07-spawn
+  (package-with-ocaml4.07
+    (package
+      (inherit ocaml-spawn)
+      (version "0.13.0")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://github.com/janestreet/spawn")
+                       (commit (string-append "v" version))))
+                (file-name (git-file-name "ocaml4.07-spawn" version))
+                (sha256
+                 (base32
+                  "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf"))))
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-before 'check 'fix-tests
+             (lambda _
+               (substitute* "test/tests.ml"
+                 (("/bin/pwd") (which "pwd"))
+                 (("/bin/echo") (which "echo")))
+               #t)))
+         #:ocaml ,ocaml-4.07
+         #:findlib ,ocaml4.07-findlib
+         #:dune ,ocaml4.07-dune))
+      (propagated-inputs '())
+      (properties '()))))
+
 (define-public ocaml4.07-core
   (package
     (name "ocaml4.07-core")
-- 
2.34.0





  parent reply	other threads:[~2022-04-08 13:25 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-08 20:08 [bug#53882] [PATCH] gnu: Add ocaml-core Julien Lepiller
2022-02-08 20:14 ` [bug#53882] [PATCH 01/24] import: opam: Accept tabulations Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 02/24] import: opam: Factor out source import Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 03/24] gnu: Add ocaml-spawn Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 04/24] gnu: Add ocaml-typerep Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 05/24] gnu: Add ocaml-ppx-typerep-conv Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 06/24] gnu: Add ocaml-ppx-string Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 07/24] gnu: Add ocaml-ppx-stable Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 08/24] gnu: Add ocmal-ppx-pipebang Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 09/24] gnu: Add ocaml-ppx-module-timer Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 10/24] gnu: Add ocaml-ppx-fixed-literal Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 11/24] gnu: Add ocaml-bin-prot Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 12/24] gnu: Add ocaml-ppx-bin-prot Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 13/24] gnu: Add ocaml-ppx-bench Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 14/24] gnu: Add ocaml-ppx-sexp-value Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 15/24] gnu: Add ocaml-ppx-sexp-message Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 16/24] gnu: Add ocaml-splittable-random Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 17/24] gnu: Add ocaml-base-quickcheck Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 18/24] gnu: Add ocaml-ppx-fail Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 19/24] gnu: Add ocmal-ppx-jane Julien Lepiller
2022-02-23 16:12     ` zimoun
2022-03-15 14:14       ` [bug#53882] [PATCH] gnu: Add ocaml-core zimoun
2022-04-05 16:07         ` Ludovic Courtès
2022-04-06 19:00           ` zimoun
2022-04-07 10:04             ` pukkamustard
2022-02-08 20:14   ` [bug#53882] [PATCH 20/24] gnu: Add ocaml-base-bigstring Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 21/24] gnu: Add ocaml-core-kernel Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 22/24] gnu: Add ocaml-timezone Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 23/24] gnu: ocaml-jane-street-headers: Add variant Julien Lepiller
2022-02-08 20:14   ` [bug#53882] [PATCH 24/24] gnu: Add ocaml-core Julien Lepiller
2022-02-23 18:09   ` [bug#53882] [PATCH 01/24] import: opam: Accept tabulations Maxime Devos
2022-04-08 13:21 ` [bug#53882] [PATCH v2 00/25] Add ocaml-core zimoun
2022-04-11 10:19   ` bug#53882: [PATCH] gnu: " Ludovic Courtès
2022-04-08 13:22 ` [bug#53882] [PATCH v2 01/25] gnu: ocaml-odoc: Update to 2.2.0-alpha zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 02/25] import: opam: Accept tabulations zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 03/25] import: opam: Factor out source import zimoun
2022-04-08 13:22   ` zimoun [this message]
2022-04-08 13:22   ` [bug#53882] [PATCH v2 05/25] gnu: Add ocaml-typerep zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 06/25] gnu: Add ocaml-ppx-typerep-conv zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 07/25] gnu: Add ocaml-ppx-string zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 08/25] gnu: Add ocaml-ppx-stable zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 09/25] gnu: Add ocaml-ppx-pipebang zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 10/25] gnu: Add ocaml-ppx-module-timer zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 11/25] gnu: Add ocaml-ppx-fixed-literal zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 12/25] gnu: Add ocaml-bin-prot zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 13/25] gnu: Add ocaml-ppx-bin-prot zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 14/25] gnu: Add ocaml-ppx-bench zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 15/25] gnu: Add ocaml-ppx-sexp-value zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 16/25] gnu: Add ocaml-ppx-sexp-message zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 17/25] gnu: Add ocaml-splittable-random zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 18/25] gnu: Add ocaml-base-quickcheck zimoun
2022-04-08 13:22   ` [bug#53882] [PATCH v2 19/25] gnu: Add ocaml-ppx-fail zimoun
2022-04-08 13:23   ` [bug#53882] [PATCH v2 20/25] gnu: Add ocaml-ppx-jane zimoun
2022-04-08 13:23   ` [bug#53882] [PATCH v2 21/25] gnu: Add ocaml-base-bigstring zimoun
2022-04-08 13:23   ` [bug#53882] [PATCH v2 22/25] gnu: Add ocaml-core-kernel zimoun
2022-04-08 13:23   ` [bug#53882] [PATCH v2 23/25] gnu: Add ocaml-timezone zimoun
2022-04-08 13:23   ` [bug#53882] [PATCH v2 24/25] gnu: ocaml-jane-street-headers: Add variant zimoun
2022-04-08 13:23   ` [bug#53882] [PATCH v2 25/25] gnu: Add ocaml-core zimoun

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=20220408132305.3301350-4-zimon.toutoune@gmail.com \
    --to=zimon.toutoune@gmail.com \
    --cc=53882@debbugs.gnu.org \
    --cc=julien@lepiller.eu \
    /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.