From patchwork Fri Apr 8 13:22:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38393 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C5FCF27BBEB; Fri, 8 Apr 2022 14:25:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3B30127BBE9 for ; Fri, 8 Apr 2022 14:25:07 +0100 (BST) Received: from localhost ([::1]:58588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncobq-0003gi-Bb for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:25:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoar-0002NN-SQ for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40393) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoap-0001Q3-NS for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoap-0007sP-Jr for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 04/25] gnu: Add ocaml-spawn. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942421930019 (code B ref 53882); Fri, 08 Apr 2022 13:24:03 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:39 +0000 Received: from localhost ([127.0.0.1]:34235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaP-0007nn-Sj for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:38 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:36367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaL-0007lr-6M for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:34 -0400 Received: by mail-wr1-f53.google.com with SMTP id u3so12852597wrg.3 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b0WR+cuwMGuGdS8A+evQ6tLLmsAp0EIkDu2FbrLlZ5s=; b=Wfj3/QMgdQQXpE1Ofc3rAJxmQoxXrd5XT7/qcJXp0X4YZqnFXBRDfyI3yeyKC9w5un so253lkuyN4uKxvSTyVfGJ+GaAKS3pZ0EDAuLrCpDYqWwUZnZi1Fx0s/rsi1cqUqJRuH 9Fkv7vdZgnyH1JFoTMd3E2LEBZK3OHiAimwqvJ9aBmds/I2/ISpdbBzhzjiQuyGOCa09 2VGYuQj/d07b4gM98ShkDg6EFNhqqKQSKgy8/8qvboL9coCnOME2FN6BUqENEaeEsyTW S9LBH6BKUmfsJ3v2Ik5kSVj50EfIlNAZDBJj2p4bY9j+8xD488b2s4kK8aSybPFDivZZ Ms+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b0WR+cuwMGuGdS8A+evQ6tLLmsAp0EIkDu2FbrLlZ5s=; b=oo1JELQsc6UWkGsRYnwqI87p1Jc4xxepTT97GU9ujRdLwZH7QxpiGJYjMNU+DWkN2A cr33hgSTy9/qrwby5JRzCg75+kxmODlIHojzAXpDgXloUjCp+zl3mGi+qSO5dcjlJJTM qtBYa8zePbF4ofSKzmQaMcK2YHVJd1udKHzB0Fa5Oz657n/r1CPMMgFWCDt58Y0CRBod hLYNfIC5oLbQi5MHDISOoYUT83azRrScrPchPKdmk8jZ3JuZrN3op8BlGr40f7opYNvt cH4Bptedr6jEiYFyntriimt5iaKSztW7OM9GKBJyJWvlDxqTUQ9P1te0l5+ITjI/Zt/l k1sg== X-Gm-Message-State: AOAM531KsoDOQJztnbf/C7Zcu9XaH5PJpf0ym9PRRhY8mL4iandknM1H kTe0Xv1jdgae0l1eZn+caAIIBsjCtB8= X-Google-Smtp-Source: ABdhPJzSoiJ4Cfdo4R8CT8cy0Kg2gTMC6YQTSkhnVf/wX47O1Hbt0vJboRo4pLeChd6jMVn5w9o2zQ== X-Received: by 2002:adf:d081:0:b0:1ef:9378:b7cc with SMTP id y1-20020adfd081000000b001ef9378b7ccmr14875836wrh.407.1649424207580; Fri, 08 Apr 2022 06:23:27 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:27 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:44 +0200 Message-Id: <20220408132305.3301350-4-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Julien Lepiller * 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")