From patchwork Mon May 10 05:15:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29193 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 27ABE27BC83; Mon, 10 May 2021 06:18:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DCB9327BC82 for ; Mon, 10 May 2021 06:18:26 +0100 (BST) Received: from localhost ([::1]:34402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJG-00008a-3O for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyIt-00088I-Vo for guix-patches@gnu.org; Mon, 10 May 2021 01:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45502) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyIt-0003RQ-Oe for guix-patches@gnu.org; Mon, 10 May 2021 01:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyIt-0000RP-Ju for guix-patches@gnu.org; Mon, 10 May 2021 01:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 01/43] gnu: ocaml-integers: Update to 0.4.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238461211 (code B ref 47768); Mon, 10 May 2021 05:18:03 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:26 +0000 Received: from localhost ([127.0.0.1]:56948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyII-0000JO-6d for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:26 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIF-0000Il-Vc for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:24 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 75030240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623838; bh=8xu5bfUs+hd/kQ/bo4snJLhBuUYCoU9MCaHS6iyT9Mo=; h=From:To:Cc:Subject:Date:From; b=r6EW5uMWlIEogDhoG5ARn34+TXUKpPDTVyHGP/cN8l69ql7ol4OD3MEGpag+0whRe GpCHj3P//l9fk20uaMLHPrgGs38D6ydKEIsWAzfU6RKRAW0W/YACrCYL1D7ugL8Hhh c1vtjWO6CafIMUlv7/1R9p9ilT+uQfhjB3cXH9xEzEOJa80bnXj+MqQoz9xJ6Wlad8 c2rEwmkrdrdi1sf2zEnXaNTXtcQ3UeUzbzFMWVQgFNOFbcniK9MEzlxbDRshyyASOP fR85KkhiOWeiHZb+JP985rSKZut+qidlfjWFe7TA/g3U0UxPbgFQjJr3aSTOvT7eet WVVmQFVYlrQYw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7167P0z9rxG; Mon, 10 May 2021 07:17:17 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:46 +0000 Message-Id: <20210510051628.15359-2-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-integers): Update to 0.4.0. --- gnu/packages/ocaml.scm | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 427ea38ccc..8069ad31d8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Simon Tournier ;;; Copyright © 2020 divoplade -;;; Copyright © 2020 pukkamustard +;;; Copyright © 2020, 2021 pukkamustard ;;; Copyright © 2021 aecepoglu ;;; Copyright © 2021 Sharlatan Hellseher ;;; @@ -3810,29 +3810,20 @@ sensitive completion, colors, and more.") (define-public ocaml-integers (package (name "ocaml-integers") - (version "0.3.0") + (version "0.4.0") (home-page "https://github.com/ocamllabs/ocaml-integers") (source (origin - (method url-fetch) - (uri (string-append home-page - "/releases/download/v0.2.2/integers-" - version ".tbz")) - (file-name (string-append name "-" version ".tbz")) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk")))) - (build-system ocaml-build-system) + "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd")))) + (build-system dune-build-system) (arguments - `(#:tests? #f; no tests - #:build-flags (list "build") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs - `(("ocamlbuild" ,ocamlbuild))) - (inputs - `(("topkg" ,ocaml-topkg) - ("opam" ,opam))) + `(#:tests? #f)) ; no tests (synopsis "Various signed and unsigned integer types for OCaml") (description "The ocaml-integers library provides a number of 8-, 16-, 32- and 64-bit signed and unsigned integer types, together with aliases such as From patchwork Mon May 10 05:15:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29190 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 2765027BC82; Mon, 10 May 2021 06:18:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EA07727BC81 for ; Mon, 10 May 2021 06:18:20 +0100 (BST) Received: from localhost ([::1]:33896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJA-0008CZ-1K for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyIt-00088A-Bx for guix-patches@gnu.org; Mon, 10 May 2021 01:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45499) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyIt-0003QT-4t for guix-patches@gnu.org; Mon, 10 May 2021 01:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyIt-0000RB-0f for guix-patches@gnu.org; Mon, 10 May 2021 01:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 02/43] gnu: ocaml-ctypes: Update to 0.18.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238461205 (code B ref 47768); Mon, 10 May 2021 05:18:02 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:26 +0000 Received: from localhost ([127.0.0.1]:56946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIH-0000JK-W6 for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:26 -0400 Received: from mout01.posteo.de ([185.67.36.65]:49139) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIG-0000Im-JL for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:24 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 17397240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623839; bh=jb+cPvo0uXQfspOteUZVjCu6mJlrRv3eqqcSX0jHB3Q=; h=From:To:Cc:Subject:Date:From; b=VUfpjpbyBnjRfOSI7tvbgNNG0t2wdorWqKl2cGxkxfdL2z7Frjo8LMVs7yvHfZAqg gDcDBiy7M8j9fw7hv032b+yutO1XYP6A7lTiPrN2EasUjmn0dQpxRwtIlWFo7DjmJA DjIh0qB7nM0oB8wbMJm5BTrH8D4hONdudDjNDXGUyyJIptj1ra9nY2C2MTNz59HLt4 GKBws7Q10juNQS4/QBa74OqK30GbqfT060C88BbqbAHOHgIDvkg/L700+eNjOczlog G+V2whS3cziEK00yj2RHlpoz8XyL8zNveV8UO9k12oQapmuro/bQaDy+Bb49uzPN+O +6euNdJmNdRHw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7230VKz9rxG; Mon, 10 May 2021 07:17:18 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:47 +0000 Message-Id: <20210510051628.15359-3-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ctypes): Update to 0.18.0. --- gnu/packages/ocaml.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8069ad31d8..46b5542864 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3833,7 +3833,7 @@ long and size_t whose sizes depend on the host platform.") (define-public ocaml-ctypes (package (name "ocaml-ctypes") - (version "0.14.0") + (version "0.18.0") (home-page "https://github.com/ocamllabs/ocaml-ctypes") (source (origin (method git-fetch) @@ -3843,7 +3843,7 @@ long and size_t whose sizes depend on the host platform.") (file-name (git-file-name name version)) (sha256 (base32 - "1b2q3h63ngf4x9qp65qwapf2dg9q0mcdah6qjm2q0c7v2p5vysv9")))) + "03zrbnl16m67ls0yfhq7a4k4238x6x6b3m456g4dw2yqwc153vks")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require an old lwt @@ -3862,6 +3862,8 @@ long and size_t whose sizes depend on the host platform.") (delete 'configure)))) (native-inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("bigarray-compat" ,ocaml-bigarray-compat))) (inputs `(("libffi" ,libffi) ("ounit" ,ocaml-ounit) From patchwork Mon May 10 05:15:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29198 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 73C0127BC82; Mon, 10 May 2021 06:18:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 46C7827BC81 for ; Mon, 10 May 2021 06:18:38 +0100 (BST) Received: from localhost ([::1]:35622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJR-00015z-Dv for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyIu-00088i-K2 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45507) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyIu-0003S5-D4 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyIu-0000Re-94 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 03/43] gnu: ocaml-ctypes: Make ocaml-integers a propagated input. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238501257 (code B ref 47768); Mon, 10 May 2021 05:18:04 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:30 +0000 Received: from localhost ([127.0.0.1]:56956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIL-0000K6-It for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:29 -0400 Received: from mout01.posteo.de ([185.67.36.65]:55469) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIH-0000Io-3H for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:25 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 91939240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623839; bh=u/WcTbJSm1QXJD6mHgZPsPoJiB/XQmzoiSYou/jNRfE=; h=From:To:Cc:Subject:Date:From; b=Yue5qLg5uj60oLOzMOCGJ9oB12vj5YURcp9A2AXT7py2hsYqUB2FADGgqGaZy/Dd/ 8Yu8jTQ3T1dfJ/a6vZT+bJCyH1HItzxxrLc6u5ixwX1vcP/9RJSy8FiW+wUllNVshq tK9mOmksgSa/uTS4hr+5BcTl6ncmWNdo3NTrXp2NLW16qVsUJhXomexszcq14tTEZo SNVn1RbTk32qGiFx5ZXvcY53NWfos4KO+EiKxGAkKeO7ZNFnFUTdPwigIqPwHsRpLA qWBRFv3ZuGlLSxOWFky+jFTkNSrCOjccut7iwKRl037RNEQwPFoMQ7vxXjQkq7xA2+ TCPatFVpmIBdw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq726drZz9rxV; Mon, 10 May 2021 07:17:18 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:48 +0000 Message-Id: <20210510051628.15359-4-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ctypes)[propagated-inputs]: Add ocaml-integers. [inputs]: Remove ocaml-integers. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 46b5542864..7d467b3b70 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3863,11 +3863,11 @@ long and size_t whose sizes depend on the host platform.") (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs - `(("bigarray-compat" ,ocaml-bigarray-compat))) + `(("bigarray-compat" ,ocaml-bigarray-compat) + ("integers" ,ocaml-integers))) (inputs `(("libffi" ,libffi) ("ounit" ,ocaml-ounit) - ("integers" ,ocaml-integers) ("lwt" ,ocaml-lwt) ("topkg" ,ocaml-topkg) ("opam" ,opam))) From patchwork Mon May 10 05:15:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29194 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 8FB5327BC83; Mon, 10 May 2021 06:18:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3E38727BC81 for ; Mon, 10 May 2021 06:18:30 +0100 (BST) Received: from localhost ([::1]:34720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJJ-0000QA-A5 for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyIv-00089T-CK for guix-patches@gnu.org; Mon, 10 May 2021 01:18:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45510) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyIv-0003SB-4s for guix-patches@gnu.org; Mon, 10 May 2021 01:18:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyIv-0000Ry-0o for guix-patches@gnu.org; Mon, 10 May 2021 01:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 04/43] gnu: ocaml-lwt: Make libev a propagated input. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238511274 (code B ref 47768); Mon, 10 May 2021 05:18:04 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:31 +0000 Received: from localhost ([127.0.0.1]:56959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIM-0000KE-15 for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:30 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIJ-0000Ir-0g for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:27 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 7C14824002C for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623841; bh=ATStMxElfUsc4K0EoTTTyGG+eR4uE4kn6l6VufETU4M=; h=From:To:Cc:Subject:Date:From; b=goVowOcfw0dvHGhX+plQ2v9e+asnTOESn598aAXCJIOONbwWkD5pfhPSzCL3zSw2v zdkcNXJKc3kxIFNlSbUM/3I9b67V8r/yX/1wIB5qooOZldhRf0LIf75tnaDbRgFkqc afNDenathm5KFYf7baaSQC7aoHvzXCTctASG+znJ9i4Wp9tqlRf2aza3Q/x7UdBliK 30WDxrWqpWLHOTa9QvJ1BKDsqmQejdjcl5Cn8fmSiO/FfaE3heE4sLt5zZQDHJca7b L6zeH1loOESdeuR+tTgQbP+ZkRw16Ff0033otEOFM5wJk5r/ALBh6VOFJzX2031ae+ ntPNQ9S+oxppg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq733Ddxz9rxG; Mon, 10 May 2021 07:17:19 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:49 +0000 Message-Id: <20210510051628.15359-5-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-lwt) [propagated-inputs]: Add libev. [inputs]: Remove libev. (ocaml-ouint2, ocaml4.07-lambda-term, ocaml-markup) [inputs]: Remove libev. --- gnu/packages/ocaml.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7d467b3b70..5509ff495c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1342,9 +1342,6 @@ compilers that can directly deal with packages.") (base32 "0gxjw1bhmjcjzri6x6psqrkbbyq678b69bqfl9i1zswp7cj2lryg")))) (build-system dune-build-system) - (inputs - ;; XXX Should libev be a propagated-input of ocaml-lwt? - `(("libev" ,libev))) (propagated-inputs `(("lwt" ,ocaml-lwt) ("ocaml-stdlib-shims" ,ocaml-stdlib-shims))) @@ -2318,13 +2315,13 @@ for mapping files in memory. This function is the same as the ("ocaml-cppo" ,ocaml-cppo) ("pkg-config" ,pkg-config))) (inputs - `(("libev" ,libev) - ("glib" ,glib))) + `(("glib" ,glib))) (propagated-inputs `(("ocaml-mmap" ,ocaml-mmap) ("ocaml-ocplib-endian" ,ocaml-ocplib-endian) ("ocaml-result" ,ocaml-result) - ("ocaml-seq" ,ocaml-seq))) + ("ocaml-seq" ,ocaml-seq) + ("libev" ,libev))) (home-page "https://github.com/ocsigen/lwt") (synopsis "Cooperative threads and I/O in monadic style") (description "Lwt provides typed, composable cooperative threads. These @@ -3761,8 +3758,6 @@ connect an engine to your inputs and rendering functions to get an editor.") ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log)) ("ocaml-lwt-react" ,(package-with-ocaml4.07 ocaml-lwt-react)) ("ocaml-zed" ,ocaml4.07-zed))) - (inputs - `(("libev" ,libev))) (home-page "https://github.com/diml/lambda-term") (synopsis "Terminal manipulation library for OCaml") (description "Lambda-Term is a cross-platform library for manipulating the @@ -6011,8 +6006,6 @@ the full Core is not available, such as in Javascript.") (build-system dune-build-system) (arguments `(#:package "markup")) - (inputs - `(("libev" ,libev))) (propagated-inputs `(("ocaml-bisect-ppx" ,ocaml-bisect-ppx) ("ocaml-uchar" ,ocaml-uchar) From patchwork Mon May 10 05:15:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29202 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 86CCE27BC82; Mon, 10 May 2021 06:18:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5F85927BC81 for ; Mon, 10 May 2021 06:18:46 +0100 (BST) Received: from localhost ([::1]:36506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJZ-0001du-Hs for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyIy-0008BZ-7a for guix-patches@gnu.org; Mon, 10 May 2021 01:18:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyIx-0003To-Vr for guix-patches@gnu.org; Mon, 10 May 2021 01:18:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyIx-0000T4-Rm for guix-patches@gnu.org; Mon, 10 May 2021 01:18:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 05/43] gnu: ocaml-lwt: Update to 5.4.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238621480 (code B ref 47768); Mon, 10 May 2021 05:18:07 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:42 +0000 Received: from localhost ([127.0.0.1]:56997 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIY-0000Nh-Io for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:42 -0400 Received: from mout02.posteo.de ([185.67.36.66]:43249) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIK-0000It-Ah for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:29 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 409372400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623842; bh=jtmYSfcX/FNKT+IL/zNaHAb96y2lQ39dC7WDW9kNBTU=; h=From:To:Cc:Subject:Date:From; b=l6mPaqz3tfK16Gn0zKr2+tKMKsW4MlLrwpaCxDGUhVphqyc3RVe6Wz5p35vzBuM5q NX1JTqCeIc0HyXUwaRpYxb/zpr8mDa6wCOS42iQcYu9IgMF3fXDH7jS6xLFWvYJqAu +rjp1EUPZuvQGDwsFREnNnaeC6WefzqdXDeBWGQAQjfmIeh8oLy6Fh8XFAyabkhovv EtxuoV4sqAohG5z9pYURajvcy0mQNG0Cr8QnRe3h4skDW7SJJQlbiQg9VsQmWhz85J DWAGEDIKkCFuiCC88WPDbMfH9su/KDXl0SUmLWiKBSaf8mGPkixKh9f70W/T+Kiz9t gDhoViCSj4IBg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq736xQhz9rxY; Mon, 10 May 2021 07:17:19 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:50 +0000 Message-Id: <20210510051628.15359-6-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-lwt): Update to 5.4.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5509ff495c..85f73b6d69 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2297,7 +2297,7 @@ for mapping files in memory. This function is the same as the (define-public ocaml-lwt (package (name "ocaml-lwt") - (version "5.1.1") + (version "5.4.0") (source (origin (method git-fetch) @@ -2306,7 +2306,7 @@ for mapping files in memory. This function is the same as the (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1nl7rdnwfdhwcsm5zpay1nr9y5cbapd9x1qzily7zk9ab4v52m8g")))) + "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d")))) (build-system dune-build-system) (arguments `(#:package "lwt")) From patchwork Mon May 10 05:15:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29197 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 DF35727BC82; Mon, 10 May 2021 06:18:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B7A5127BC81 for ; Mon, 10 May 2021 06:18:35 +0100 (BST) Received: from localhost ([::1]:35342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJO-0000tX-Tr for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyIx-0008AW-MZ for guix-patches@gnu.org; Mon, 10 May 2021 01:18:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyIv-0003SO-T6 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyIv-0000SE-OV for guix-patches@gnu.org; Mon, 10 May 2021 01:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 06/43] gnu: ocaml4.07-gen: Update to 0.5.3. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238521299 (code B ref 47768); Mon, 10 May 2021 05:18:05 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:32 +0000 Received: from localhost ([127.0.0.1]:56965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIM-0000KV-Sq for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:32 -0400 Received: from mout01.posteo.de ([185.67.36.65]:56599) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIJ-0000Is-KU for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:27 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 1DB32240029 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623842; bh=sXNRZ4oC/MJ7eCA21G3U3NaAMR1d/UcXHAymyaRlOxg=; h=From:To:Cc:Subject:Date:From; b=XZX5LZuH7WgaMBZTR26w9RYeoSFJZXeiVFKKtuq5XPwiXVbl2BXpCUsCe0qGH9HPj BPTvXKR8liNx+a+qcFXOWytR6oK0HXOgdo15q6GVQMIV9HwR+/dTeql2qCKnyZr8Sn NFvQDeKgIqTYEJExKpbAficXMs4MC/j7iX6LBdbc/URBduZVpVWDfKSbT904gxPj3d 0gIJlkxmfIk02a0TGON5AM+hlLacrlGFN6Bm4PMNqTpQxnd66O9DEAghVmRHanNdTt uVd+fOBLeXY0IVF6QRT/Vg33NBcB3mM0TeIMjL0GXJSCgvA/PToSeTpBkBW+6d8M7f hsZZA1usJ4igw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq743M8Qz9rxb; Mon, 10 May 2021 07:17:20 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:51 +0000 Message-Id: <20210510051628.15359-7-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml4.07-gen): Update to 4.07. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 85f73b6d69..34e1b954d2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2511,7 +2511,7 @@ representation of the data.") (define-public ocaml4.07-gen (package (name "ocaml4.07-gen") - (version "0.5.2") + (version "0.5.3") (source (origin (method git-fetch) (uri (git-reference @@ -2520,7 +2520,7 @@ representation of the data.") (file-name (git-file-name name version)) (sha256 (base32 - "1h9g508rnj2j8va5nvhamzscp954vrkh0hdf4pn3d10pcfyslfg2")))) + "1jzrs0nsdk55annkd2zrk5svi61i3b1nk6qyqdc2y26vnzqvzfg8")))) (build-system dune-build-system) (arguments `(#:tests? #f; no tests From patchwork Mon May 10 05:15:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29191 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 9C50827BC82; Mon, 10 May 2021 06:18:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 66D2527BC81 for ; Mon, 10 May 2021 06:18:22 +0100 (BST) Received: from localhost ([::1]:33964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJB-0008Fp-HR for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyIz-0008Ch-Pl for guix-patches@gnu.org; Mon, 10 May 2021 01:18:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45530) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyIz-0003VX-BI for guix-patches@gnu.org; Mon, 10 May 2021 01:18:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyIz-0000TX-7W for guix-patches@gnu.org; Mon, 10 May 2021 01:18:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 07/43] gnu: Add ocaml-gen. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238631494 (code B ref 47768); Mon, 10 May 2021 05:18:09 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:43 +0000 Received: from localhost ([127.0.0.1]:57001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIZ-0000Nw-7b for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:43 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35221) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIM-0000JC-8O for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:31 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 2CF91240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623842; bh=0Uva56yGIO+qAi1+GBDnBMeyZhDwZkcQupmzXLq1vZY=; h=From:To:Cc:Subject:Date:From; b=R/tNK8tCe7mGLEqlLEuDAVmieK5dv+iE03f+M0+o2Xmz4W0Qd4zeG88hc141P8lkw /8+mNuxyKmtlD4iGif12dImS2ZuF4oe6J2Nq4w42hSe/Xa9VTnu8VZ+LEvR3ZpkB0d Irabe155p26GyyXIyDGhTHv0DrXBLTuIm1PFjEnLOgD72AmKGlaQDHkZT6dnN9Akwb ErzXD7+EuWdBj3rkC4ofO1ZyAvuuTDEmOTAu8sfBXMZEGYKaoA0ZfWVFtGHILgFq84 9H2ALP97hFXJ096Ttv37B2TDcLVXrtt7NxdLcp5kjq1B3Rc6BHbf3uSq3v1twoHYlv 7moX/wmLnc8JA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq746ZNtz9rxf; Mon, 10 May 2021 07:17:20 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:52 +0000 Message-Id: <20210510051628.15359-8-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-gen): New variable. (ocaml4.07-gen): Remove variable. (ocaml4.07-sedlex): Replace ocaml4.07-gen with ocaml-gen. --- gnu/packages/ocaml.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 34e1b954d2..877b9284d1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2508,9 +2508,9 @@ format. It can process XML documents without a complete in-memory representation of the data.") (license license:isc))) -(define-public ocaml4.07-gen +(define-public ocaml-gen (package - (name "ocaml4.07-gen") + (name "ocaml-gen") (version "0.5.3") (source (origin (method git-fetch) @@ -2523,16 +2523,13 @@ representation of the data.") "1jzrs0nsdk55annkd2zrk5svi61i3b1nk6qyqdc2y26vnzqvzfg8")))) (build-system dune-build-system) (arguments - `(#:tests? #f; no tests - #:package "gen" - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:package "gen" + #:test-target ".")) (propagated-inputs - `(("ocaml-odoc" ,(package-with-ocaml4.07 ocaml4.07-odoc)))) + `(("ocaml-odoc" ,ocaml-odoc))) (native-inputs - `(("ocaml-qtest" ,(package-with-ocaml4.07 ocaml-qtest)) - ("ocaml-qcheck" ,(package-with-ocaml4.07 ocaml-qcheck)))) + `(("ocaml-qtest" ,ocaml-qtest) + ("ocaml-qcheck" ,ocaml-qcheck))) (home-page "https://github.com/c-cube/gen/") (synopsis "Iterators for OCaml, both restartable and consumable") (description "Gen implements iterators of OCaml, that are both restartable @@ -2577,7 +2574,7 @@ and consumable.") (native-inputs `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) (propagated-inputs - `(("ocaml-gen" ,ocaml4.07-gen) + `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen)) ("ocaml-ppx-tools-versioned" ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned)) ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar)))) From patchwork Mon May 10 05:15:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29196 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 B9F1627BC82; Mon, 10 May 2021 06:18:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D50327BC81 for ; Mon, 10 May 2021 06:18:32 +0100 (BST) Received: from localhost ([::1]:34924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJL-0000Yy-AY for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyIx-0008Aa-NF for guix-patches@gnu.org; Mon, 10 May 2021 01:18:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45518) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyIw-0003T0-Jy for guix-patches@gnu.org; Mon, 10 May 2021 01:18:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyIw-0000SW-DK for guix-patches@gnu.org; Mon, 10 May 2021 01:18:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 08/43] gnu: Add ocaml-stdio. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238531323 (code B ref 47768); Mon, 10 May 2021 05:18:06 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:33 +0000 Received: from localhost ([127.0.0.1]:56968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIO-0000Ku-7f for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:33 -0400 Received: from mout02.posteo.de ([185.67.36.66]:53487) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIK-0000Iv-Aj for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:29 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 58223240101 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623842; bh=8R/u/YaOX+y1seIiq0rhClsy7jBS3Zs2lbkpdvEQebs=; h=From:To:Cc:Subject:Date:From; b=kvijdyCIpBOL76/soRxH34IHiT9/1wL4NJxYFMe+gzG/yJvJisX9sKpb3Q/wlbqvA BD1BWmUdMVVcSUM3zRLMnVYhzdvdQjDemcHdW0HtutYO8OFKpwf84r1zNhPt3aAhB7 ZLpMSyk7nfec0bZENk9pU5tDmnhXRKK2o0tKQ/KAm9wWHV3NLONr7zUdqWbnemQEiH +Wje5iQM6uwvMulZJvKCmd3ogrAbWacMSUDSZzN5aWZNzPYOmg3iT9osSPNaoEnh88 3eZzSk6G66bnYNCgUabeS/pEFmjJ2sLFQclXK+C1I57w4z+k+XPfe1FaOswZQb12jp M61C7W2xixDwg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq752rWzz9rxk; Mon, 10 May 2021 07:17:21 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:53 +0000 Message-Id: <20210510051628.15359-9-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-stdio): New variable. (ocaml4.07-stdio): Inherit from ocaml-stdio. --- gnu/packages/ocaml.scm | 58 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 877b9284d1..95407de74d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1978,7 +1978,7 @@ library.") #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("pkg-config" ,pkg-config))) (inputs `(("sqlite" ,sqlite))) @@ -4086,7 +4086,7 @@ syntax checking on dedukti files.") ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_inline_test"))) (synopsis "Syntax extension for writing in-line tests in ocaml code") @@ -4429,7 +4429,7 @@ Atom.") `(("gsl" ,gsl))) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio))) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://mmottl.github.io/gsl-ocaml") (synopsis "Bindings to the GNU Scientific Library") (description @@ -4714,30 +4714,20 @@ so they don't expose everything at toplevel. For instance, @code{Ast_helper} is now @code{Ocaml_common.Ast_helper}.") (license license:expat))) -(define-public ocaml4.07-stdio +(define-public ocaml-stdio (package - (name "ocaml4.07-stdio") - (version "0.11.0") + (name "ocaml-stdio") + (version "0.14.0") (home-page "https://github.com/janestreet/stdio") (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append home-page ".git")) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1facajqhvq34g2wrg368y0ajxd6lrj5b3lyzyj0jhdmraxajjcwn")))) + (janestreet-origin "stdio" version + "1hj5hraprqy2i90a690l11yjszvb99j818q3d684ryx6p2lddk0l")) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) - (arguments - `(#:tests? #f ;no tests - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(("ocaml-base" ,ocaml-base) + ("ocaml-sexplib0" ,ocaml-sexplib0))) + (arguments `(#:tests? #f)) ;no tests + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-stdio)))) (synopsis "Standard IO library for OCaml") (description "Stdio implements simple input/output functionalities for OCaml. It @@ -4745,6 +4735,16 @@ re-exports the input/output functions of the OCaml standard libraries using a more consistent API.") (license license:expat))) +(define-public ocaml4.07-stdio + (package-with-ocaml4.07 + (package + (inherit ocaml-stdio) + (version "0.11.0") + (source + (janestreet-origin "stdio" version + "0pqbp2wy5fgmc38irwvmj9nlcvclb1ix1mp4y7l39bgvvlz303h9")) + (properties '())))) + (define-public ocaml-ppx-derivers (package (name "ocaml-ppx-derivers") @@ -4794,7 +4794,7 @@ as part of the same ocaml-migrate-parsetree driver.") ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (arguments @@ -5422,7 +5422,7 @@ else expression.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_optcomp"))) (home-page "https://github.com/janestreet/ppx_optcomp") @@ -5551,7 +5551,7 @@ useful errors on failure.") ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib) @@ -5827,7 +5827,7 @@ various Jane Street packages.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio))) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://github.com/janestreet/configurator") (synopsis "Helper library for gathering system configuration") (description "Configurator is a small library that helps writing OCaml @@ -5920,7 +5920,7 @@ thousands of times faster than fork. ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-spawn" ,ocaml4.07-spawn) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -5967,7 +5967,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-splittable-random" ,ocaml4.07-splittable-random) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-typerep" ,ocaml4.07-typerep) ("ocaml-variantslib" ,ocaml4.07-variantslib) ("ocaml-migrate-parsetree" @@ -6251,7 +6251,7 @@ library FFTW.") `(("openblas" ,openblas) ("lapack" ,lapack) ("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio))) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://mmottl.github.io/lacaml/") (synopsis "OCaml-bindings to BLAS and LAPACK") From patchwork Mon May 10 05:15:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29199 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 251BD27BC82; Mon, 10 May 2021 06:18:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AA4DA27BC81 for ; Mon, 10 May 2021 06:18:39 +0100 (BST) Received: from localhost ([::1]:35752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJS-0001BE-Sa for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ0-0008Ci-5n for guix-patches@gnu.org; Mon, 10 May 2021 01:18:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyIz-0003Vl-Ub for guix-patches@gnu.org; Mon, 10 May 2021 01:18:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyIz-0000To-RA for guix-patches@gnu.org; Mon, 10 May 2021 01:18:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 09/43] gnu: Add ocaml-compiler-libs. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238641504 (code B ref 47768); Mon, 10 May 2021 05:18:09 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:44 +0000 Received: from localhost ([127.0.0.1]:57003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIZ-0000O3-IU for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:44 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58977) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIM-0000JB-8G for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:31 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 7B8B4240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623842; bh=mLbSJlGWP8R5rhy02/K7Axi7kXW+e2NVAxHaxTDSc4E=; h=From:To:Cc:Subject:Date:From; b=Ue3s5zCIZWARL53X/ucCS/zPCmm3NLJyBDdEIUHqoBiekMRaFmwLDxjqrF/YHGbz2 JRMgBiDUcJGxTSo8ZMvbF8vICu6oOCqnspTZvohtgmOHmwA40Cl6UwJhVotBuWJ5b5 YlCRFRPB0u1Hqnn+tp8sBCUMpceJ8C9n6enGwB8Mi6Tmc9v8T8XMesNFy7nzHBx+4W EA66PoZqCn2W0WQ3FsE04rws8nXQ/uYq6PuDcsf6hiZfUkOSY7gtK89pt1kFqHM6c0 mYO8It9CnTIfbM2iv1GZ3BMQeHuQ6i4eeCeXWisg+hmSwFBIqm6SaRI03r/2WerKf3 mDhg2HRGIijsw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq756cJYz9rxR; Mon, 10 May 2021 07:17:21 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:54 +0000 Message-Id: <20210510051628.15359-10-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-compiler-libs): New variable. (ocaml4.07-compiler-libs): Inherit from ocaml-compiler-libs. --- gnu/packages/ocaml.scm | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 95407de74d..93cfa8f54b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4084,7 +4084,7 @@ syntax checking on dedukti files.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) + ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4686,34 +4686,50 @@ provided by companion libraries such as #:dune ,ocaml4.07-dune)) (properties '())))) -(define-public ocaml4.07-compiler-libs +(define-public ocaml-compiler-libs (package - (name "ocaml4.07-compiler-libs") - (version "0.11.0") + (name "ocaml-compiler-libs") + (version "0.12.3") (home-page "https://github.com/janestreet/ocaml-compiler-libs") (source (origin (method git-fetch) (uri (git-reference - (url (string-append home-page ".git")) + (url home-page) (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) + "00nrar7h2pyflbdiq6wwwrb4k5jh9iff0jllihzm6ms8d5pspsg5")))) (build-system dune-build-system) - (arguments - `(#:tests? #f ;no tests - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ocaml-compiler-libs"))) + (arguments `(#:tests? #f)) ;no tests + (properties `((upstream-name . "ocaml-compiler-libs") + (ocaml4.07-variant . ,(delay ocaml4.07-compiler-libs)))) (synopsis "Compiler libraries repackaged") (description "This package simply repackages the OCaml compiler libraries so they don't expose everything at toplevel. For instance, @code{Ast_helper} is now @code{Ocaml_common.Ast_helper}.") (license license:expat))) +(define-public ocaml4.07-compiler-libs + (package-with-ocaml4.07 + (package + (inherit ocaml-compiler-libs) + (name "ocaml-compiler-libs") + (version "0.11.0") + (home-page "https://github.com/janestreet/ocaml-compiler-libs") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) + (properties `((upstream-name . "ocaml-compiler-libs")))))) + (define-public ocaml-stdio (package (name "ocaml-stdio") @@ -4790,7 +4806,7 @@ as part of the same ocaml-migrate-parsetree driver.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) + ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) From patchwork Mon May 10 05:15:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29195 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 9A3AA27BC82; Mon, 10 May 2021 06:18:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6CEB527BC81 for ; Mon, 10 May 2021 06:18:31 +0100 (BST) Received: from localhost ([::1]:34822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJK-0000UQ-HS for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyIx-0008Ab-NT for guix-patches@gnu.org; Mon, 10 May 2021 01:18:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyIx-0003T3-77 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyIx-0000So-2z for guix-patches@gnu.org; Mon, 10 May 2021 01:18:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 10/43] gnu: ocaml-migrate-parsetree: Update to 1.8.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238621472 (code B ref 47768); Mon, 10 May 2021 05:18:06 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:42 +0000 Received: from localhost ([127.0.0.1]:56995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIY-0000Nf-Ac for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:42 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIK-0000Iw-JC for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:29 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 005692400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623843; bh=+V+jN9GaTTh2vHwnVFIT/kMQuuBtpHAs82s9fWWwxjo=; h=From:To:Cc:Subject:Date:From; b=bFaBtsLaG8QKfbwzW4Z/5c3aGsFeUDXJrTfNKxi8fP6T9vKt/3pcEAiHdrtDn/7hd ycDVSzgcHBmddUp553dbOZNSXKBl6WuV6ZA7SZSSyHmy/wYsyZkrpdv9fvC8uQwPtY kobBxbBacjI2xn9ARXleZTwSUXBGzEFvkXOYWNRdMvnm5A9PbWE3eBq2nHR6dLQ/G+ UMdQlsi+ID10lzcA7v2f0IGltC+qq8FBoLe/QOvCOW98XQWJ8lZDZE1912Hh8HKB0Q FaYExNqGG3hXqIJH9Q5IP7jn2e+l+Z8LnmmWYpemAAP/+1IeFODMrrfOSiSmIcobBE 6p3WrKUaeW7XQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq762yjrz9rxG; Mon, 10 May 2021 07:17:22 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:55 +0000 Message-Id: <20210510051628.15359-11-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 1.8.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 93cfa8f54b..faa024b261 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1771,7 +1771,7 @@ module of this library is parameterised by the type of S-expressions.") (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree") - (version "1.7.3") + (version "1.8.0") (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (source (origin @@ -1782,7 +1782,7 @@ module of this library is parameterised by the type of S-expressions.") (file-name (git-file-name name version)) (sha256 (base32 - "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx")))) + "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) (build-system dune-build-system) (arguments `(#:tests? #f)) From patchwork Mon May 10 05:15:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29200 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 D642927BC82; Mon, 10 May 2021 06:18:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 60AD027BC81 for ; Mon, 10 May 2021 06:18:40 +0100 (BST) Received: from localhost ([::1]:35848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJT-0001Eh-I6 for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyIz-0008Cg-PU for guix-patches@gnu.org; Mon, 10 May 2021 01:18:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyIy-0003UL-JJ for guix-patches@gnu.org; Mon, 10 May 2021 01:18:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyIy-0000TI-F7 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 11/43] gnu: ocaml-migrate-parsetree: Update to 2.1.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238631487 (code B ref 47768); Mon, 10 May 2021 05:18:08 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:43 +0000 Received: from localhost ([127.0.0.1]:56999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIY-0000No-Rv for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:43 -0400 Received: from mout02.posteo.de ([185.67.36.66]:56835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIL-0000Iy-8R for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:30 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 9D5EA2400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623843; bh=jFoCoYW8TK7GS4D1zMYK4usmsUW0XF56qWb4gFvZtO4=; h=From:To:Cc:Subject:Date:From; b=PBj7IRzeDBt5qzm13Iv4pp2G0uX4/oEYJ8nvCGYbZ+h2UDzne2Yl/LZOToBgST+Ih lj/gR3c7a7fLoqLFK4/nzbwXGAEg5nWcy7LCdonDl52xrE/RlfLeZDEK31m1K+ZSzT fC1RQqvWBWvLgU9tG+q8KR+3a1F6PCvY5/kJ6ZGRul/952gfmK38pgJtoM5hO/fuNq StohnNsYwIZodSeN9Topg5DbFV5CZAYHfGFtLNqGQFC7Gg1AtHuwrPY6t+TFOqW+jZ elrY2qDYskZHOfdzDVHv+rdL8N4p+CqVdksvzVMeMmhJ7Stj1E3rvM92hUPkBjv6LD CSW9YTFdLYjnw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq766btWz9rxG; Mon, 10 May 2021 07:17:22 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:56 +0000 Message-Id: <20210510051628.15359-12-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 2.1.0. (ocaml-migrate-parsetree-1): New variable. --- gnu/packages/ocaml.scm | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index faa024b261..0b606e296c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1771,32 +1771,51 @@ module of this library is parameterised by the type of S-expressions.") (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree") - (version "1.8.0") + (version "2.1.0") (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (source (origin (method git-fetch) (uri (git-reference - (url (string-append home-page ".git")) + (url home-page) (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) + "1cpgdqcs624nd1p271ddakgyibl0ia4f6dzivnz9qdwszsinwr89")))) (build-system dune-build-system) - (arguments - `(#:tests? #f)) + (arguments `(#:tests? #f)) (propagated-inputs `(("ocaml-ppx-derivers" ,ocaml-ppx-derivers) ("ocamlbuild" ,ocamlbuild) ("ocaml-result" ,ocaml-result))) - (properties `((upstream-name . "ocaml-migrate-parsetree"))) + (properties `((upstream-name . "ocaml-migrate-parsetree") + ;; OCaml 4.07 packages require version 1.* + (ocaml4.07-variant . ,(delay (package-with-ocaml4.07 ocaml-migrate-parsetree-1))))) (synopsis "OCaml parsetree converter") (description "This library converts between parsetrees of different OCaml versions. For each version, there is a snapshot of the parsetree and conversion functions to the next and/or previous version.") (license license:lgpl2.1+))) - + +(define-public ocaml-migrate-parsetree-1 + (package + (inherit ocaml-migrate-parsetree) + (name "ocaml-migrate-parsetree-1") + (version "1.8.0") + (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) + (properties '((upstream-name . "ocaml-migrate-parsetree"))))) + (define-public ocaml-ppx-tools-versioned (package (name "ocaml-ppx-tools-versioned") @@ -1815,7 +1834,7 @@ functions to the next and/or previous version.") `(#:test-target "." #:package "ppx_tools_versioned")) (propagated-inputs - `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree))) + `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1))) (properties `((upstream-name . "ppx_tools_versioned"))) (home-page "https://github.com/let-def/ppx_tools_versioned") (synopsis "Variant of ppx_tools") @@ -6121,7 +6140,7 @@ combinators.") "0900vli5kw7s5kdam0n4cqsfsfqb7mdb3azn3i55595gilg1vyn8")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1) ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) ("ocaml-ounit" ,ocaml-ounit))) (arguments @@ -6360,7 +6379,7 @@ variants.") ("ocaml-cmdliner" ,ocaml-cmdliner) ("ocaml-re" ,ocaml-re) ("ocaml-result" ,ocaml-result) - ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1) ("ocaml-odoc" ,ocaml-odoc) ("ocaml-version" ,ocaml-version))) (native-inputs From patchwork Mon May 10 05:15:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29204 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 9296A27BC83; Mon, 10 May 2021 06:18:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4BC1527BC81 for ; Mon, 10 May 2021 06:18:49 +0100 (BST) Received: from localhost ([::1]:36800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJc-0001pK-Gr for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ1-0008FX-MI for guix-patches@gnu.org; Mon, 10 May 2021 01:18:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45538) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ1-0003X7-F1 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ1-0000UN-BH for guix-patches@gnu.org; Mon, 10 May 2021 01:18:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 12/43] gnu: Add ocaml-ppxlib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238671542 (code B ref 47768); Mon, 10 May 2021 05:18:11 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:47 +0000 Received: from localhost ([127.0.0.1]:57010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIb-0000Oa-9L for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:46 -0400 Received: from mout02.posteo.de ([185.67.36.66]:59851) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIL-0000Iz-KR for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:32 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 0C83D2400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623844; bh=26ka1nto6VEbym7wior1XOeHkNryD5/LdrQxGWS6Qac=; h=From:To:Cc:Subject:Date:From; b=I/pibWJcuDTNSANf9Enge3fl4QjBWXVZnKRpHSiwACyNb1YA+NYAScNlyP52DSbqZ pBrRtCtxWJ7/dn3Ph2Z6TP3Dt1d+defLEqIgVpULVrkxz+mTCCDc3Y99PSCtQwCkx4 Hm5ss8Hbvn3EWd5CqBoaf9X2ho66HkUv7HXmRNmmpCyYJVGneGyqJ5K6lP07OtKcLF he2ovgyELdjeq+3L0rjwG4jye7CQFGDfDKKrdkSqQ5hh6Zfife2NoRBuV6/D2C64E3 OXQKfuO2SSUpyuQknXlydqiIsxBXN6MVlL/HZb0aPekhYAukA6dK4wNPvamErDAgfs dgmP97/KuAj8Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7738HLz9rxR; Mon, 10 May 2021 07:17:23 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:57 +0000 Message-Id: <20210510051628.15359-13-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppxlib): New variable. (ocaml4.07-ppxlib): Inherit from ocaml-ppxlib. --- gnu/packages/ocaml.scm | 144 +++++++++++++++++++++++------------------ 1 file changed, 81 insertions(+), 63 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0b606e296c..7fe59c0b95 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4106,7 +4106,7 @@ syntax checking on dedukti files.") ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_inline_test"))) (synopsis "Syntax extension for writing in-line tests in ocaml code") (description "This package contains a syntax extension for writing @@ -4807,54 +4807,32 @@ ppx_deriving and ppx_type_conv to inter-operate gracefully when linked as part of the same ocaml-migrate-parsetree driver.") (license license:bsd-3))) -(define-public ocaml4.07-ppxlib +(define-public ocaml-ppxlib (package - (name "ocaml4.07-ppxlib") - (version "0.6.0") + (name "ocaml-ppxlib") + (version "0.22.0") (home-page "https://github.com/ocaml-ppx/ppxlib") (source (origin (method git-fetch) (uri (git-reference - (url (string-append home-page ".git")) + (url home-page) (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv")))) + "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'set-topfind - (lambda* (#:key inputs #:allow-other-keys) - ;; add the line #directory ".." at the top of each file - ;; using #use "topfind";; to be able to find topfind - (let* ((findlib-path (assoc-ref inputs "findlib")) - (findlib-libdir - (string-append findlib-path "/lib/ocaml/site-lib"))) - (substitute* '("test/base/test.ml" - "test/code_path/test.ml" - "test/deriving/test.ml" - "test/driver/attributes/test.ml" - "test/driver/non-compressible-suffix/test.ml" - "test/driver/transformations/test.ml") - (("#use \"topfind\";;" all) - (string-append "#directory \"" findlib-libdir "\"\n" - all)))) - #t))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(("ocaml-base" ,ocaml-base) + ("ocaml-compiler-libs" ,ocaml-compiler-libs) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-stdlib-shims" ,ocaml-stdlib-shims) + ("ocaml-ppx-derivers" ,ocaml-ppx-derivers) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-result" ,ocaml-result) + ("ocaml-sexplib0" ,ocaml-sexplib0))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-ppxlib)))) (synopsis "Base library and tools for ppx rewriters") (description @@ -4872,6 +4850,46 @@ OCaml AST in the OCaml syntax; @end itemize") (license license:expat))) +(define-public ocaml4.07-ppxlib + (package-with-ocaml4.07 + (package + (inherit ocaml-ppxlib) + (name "ocaml-ppxlib") + (version "0.6.0") + (home-page "https://github.com/ocaml-ppx/ppxlib") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv")))) + (build-system dune-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-topfind + (lambda* (#:key inputs #:allow-other-keys) + ;; add the line #directory ".." at the top of each file + ;; using #use "topfind";; to be able to find topfind + (let* ((findlib-path (assoc-ref inputs "findlib")) + (findlib-libdir + (string-append findlib-path "/lib/ocaml/site-lib"))) + (substitute* '("test/base/test.ml" + "test/code_path/test.ml" + "test/deriving/test.ml" + "test/driver/attributes/test.ml" + "test/driver/non-compressible-suffix/test.ml" + "test/driver/transformations/test.ml") + (("#use \"topfind\";;" all) + (string-append "#directory \"" findlib-libdir "\"\n" + all)))) + #t))))) + (properties '())))) + (define-public ocaml4.07-ppx-compare (package (name "ocaml4.07-ppx-compare") @@ -4890,7 +4908,7 @@ OCaml AST in the OCaml syntax; `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -4929,7 +4947,7 @@ by making sure that you only compare comparable values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "fieldslib"))) (home-page "https://github.com/janestreet/fieldslib") (synopsis "Syntax extension to record fields") @@ -4961,7 +4979,7 @@ of a record and create new record values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "variantslib"))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values") @@ -4987,7 +5005,7 @@ standard library.") ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5019,7 +5037,7 @@ new record values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5050,7 +5068,7 @@ definitions.") ("ocaml-variantslib" ,ocaml4.07-variantslib) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5083,7 +5101,7 @@ variant types.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5183,7 +5201,7 @@ storage of large amounts of data.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5218,7 +5236,7 @@ hash functions from type exrpessions and definitions.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_enumerate"))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") @@ -5250,7 +5268,7 @@ many values).") `(("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_bench"))) (home-page "https://github.com/janestreet/ppx_bench") (synopsis "Syntax extension for writing in-line benchmarks in ocaml code") @@ -5280,7 +5298,7 @@ many values).") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_here"))) (home-page "https://github.com/janestreet/ppx_here") (synopsis "Expands [%here] into its location") @@ -5335,7 +5353,7 @@ many values).") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_sexp_value"))) (home-page "https://github.com/janestreet/ppx_sexp_value") (synopsis "Simplify building s-expressions from ocaml values") @@ -5366,7 +5384,7 @@ ocaml values.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_sexp_message"))) (home-page "https://github.com/janestreet/ppx_sexp_message") (synopsis "A ppx rewriter for easy construction of s-expressions") @@ -5398,7 +5416,7 @@ context such as function arguments.") (propagated-inputs `(("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_pipebang"))) (home-page "https://github.com/janestreet/ppx_pipebang") (synopsis "Inline reverse application operators `|>` and `|!`") @@ -5429,7 +5447,7 @@ context such as function arguments.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_optional"))) (home-page "https://github.com/janestreet/ppx_optional") (synopsis "Pattern matching on flat options") @@ -5458,7 +5476,7 @@ else expression.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_optcomp"))) (home-page "https://github.com/janestreet/ppx_optcomp") (synopsis "Optional compilation for OCaml") @@ -5488,7 +5506,7 @@ size, the version of the compiler, ...") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_let"))) (home-page "https://github.com/janestreet/ppx_let") (synopsis "Monadic let-bindings") @@ -5518,7 +5536,7 @@ match expressions, and if expressions.") ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_fail"))) (home-page "https://github.com/janestreet/ppx_fail") (synopsis "Add location to calls to failwiths") @@ -5550,7 +5568,7 @@ position.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_assert"))) (home-page "https://github.com/janestreet/ppx_assert") (synopsis "Assert-like extension nodes that raise useful errors on failure") @@ -5589,7 +5607,7 @@ useful errors on failure.") ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)) ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)))) (properties `((upstream-name . "ppx_expect"))) (home-page "https://github.com/janestreet/ppx_expect") @@ -5625,7 +5643,7 @@ to denote the expected output.") ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-octavius" ,(package-with-ocaml4.07 ocaml-octavius)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_js_style"))) (home-page "https://github.com/janestreet/ppx_js_style") (synopsis "Code style checker for Jane Street Packages") @@ -5658,7 +5676,7 @@ packages.") ("ocaml-typerep" ,ocaml4.07-typerep) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_typerep_conv"))) (home-page "https://github.com/janestreet/ppx_typerep_conv") (synopsis "Generation of runtime types from type declarations") @@ -5692,7 +5710,7 @@ from type definitions.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_base"))) (home-page "https://github.com/janestreet/ppx_base") (synopsis "Base set of ppx rewriters") @@ -5728,7 +5746,7 @@ verification tool.") ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_bin_prot"))) (home-page "https://github.com/janestreet/ppx_bin_prot") (synopsis "Generation of bin_prot readers and writers from types") @@ -5775,7 +5793,7 @@ functions from type definitions.") ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_jane"))) (home-page "https://github.com/janestreet/ppx_jane") (synopsis "Standard Jane Street ppx rewriters") @@ -5958,7 +5976,7 @@ thousands of times faster than fork. ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (home-page "https://github.com/janestreet/core") (synopsis "Alternative to OCaml's standard library") (description "The Core suite of libraries is an alternative to OCaml's From patchwork Mon May 10 05:15:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29203 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 2E91127BC82; Mon, 10 May 2021 06:18:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AB72127BC81 for ; Mon, 10 May 2021 06:18:47 +0100 (BST) Received: from localhost ([::1]:36666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJa-0001k5-TB for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ1-0008FT-53 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45537) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ0-0003Wx-UH for guix-patches@gnu.org; Mon, 10 May 2021 01:18:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ0-0000U9-PY for guix-patches@gnu.org; Mon, 10 May 2021 01:18:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 13/43] gnu: Add ocaml-sedlex. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238651527 (code B ref 47768); Mon, 10 May 2021 05:18:10 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:45 +0000 Received: from localhost ([127.0.0.1]:57008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIa-0000OL-Fn for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:45 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIM-0000JD-9o for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:32 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 9AD01240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623844; bh=DjReW/kuSKYqk7gSlG9wRrPiMbZcxyA4cffeDB/P4nI=; h=From:To:Cc:Subject:Date:From; b=ctRqDdpHYTfqH1qcY2u9Y7yxKQTOMzDAAksDDGT+E/cLUc3JcjoU+sFgZ+xObUkwO Uzj7ZmnNhJc6vvwFpXOF92gY+P8ajsErXaodurFog3HUziBNjCkQGbmMSD0IZLPgFD s1feEK+9BtXpUQQNs2RbfSzur25l6JYLar0ph+Nja9uw6Vawy5yBxr2Nyz4m6HqVEk aFtiLMKkw1A1g5Kne2idpOLwc2S0pAX9OUHVEEMa4DZAcvPa+gucYQLTwo2bKaUiWX M3uYxai4DRR6JsG2CUWvQU/iv+kTMc5SmnaI10gjYCBO7wWUGMxC5u9ZDJd3+RG4Un QOHJEf4+xCLOg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq776qMZz9rxg; Mon, 10 May 2021 07:17:23 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:58 +0000 Message-Id: <20210510051628.15359-14-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-sedlex): New variable. (ocaml4.07-sedlex): Inherit from ocaml-sedlex. --- gnu/packages/ocaml.scm | 57 ++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7fe59c0b95..605567b996 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2555,10 +2555,10 @@ representation of the data.") and consumable.") (license license:bsd-2))) -(define-public ocaml4.07-sedlex +(define-public ocaml-sedlex (package - (name "ocaml4.07-sedlex") - (version "2.1") + (name "ocaml-sedlex") + (version "2.3") (source (origin (method git-fetch) (uri (git-reference @@ -2567,36 +2567,37 @@ and consumable.") (file-name (git-file-name name version)) (sha256 (base32 - "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26")))) + "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar")))) (build-system dune-build-system) (arguments - `(#:tests? #f; no tests + `(#:tests? #f ; no tests #:package "sedlex" #:phases (modify-phases %standard-phases (add-before 'build 'copy-resources (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "src/generator/data" + ;; Newer versions of dune emit an error if files it wants to + ;; build already exist. Delete the dune file so dune doesn't + ;; complain. + (delete-file "dune") (for-each - (lambda (file) - (copy-file (assoc-ref inputs file) file)) - '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt" - "PropList.txt"))) + (lambda (file) + (copy-file (assoc-ref inputs file) file)) + '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt" + "PropList.txt"))) #t)) (add-before 'build 'chmod (lambda _ (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) - #t))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + #t))))) (native-inputs - `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) + `(("ocamlbuild" ,ocamlbuild))) (propagated-inputs - `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen)) - ("ocaml-ppx-tools-versioned" - ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned)) - ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar)))) + `(("ocaml-gen" ,ocaml-gen) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) + ("ocaml-uchar" ,ocaml-uchar))) ;; These three files are needed by src/generator/data/dune, but would be ;; downloaded using curl at build time. (inputs @@ -2621,11 +2622,29 @@ and consumable.") (sha256 (base32 "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk")))))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sedlex)))) (home-page "https://www.cduce.org/download.html#side") (synopsis "Lexer generator for Unicode and OCaml") (description "Lexer generator for Unicode and OCaml.") (license license:expat))) +(define-public ocaml4.07-sedlex + (package-with-ocaml4.07 + (package + (inherit ocaml-sedlex) + (name "ocaml-sedlex") + (version "2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-community/sedlex") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26")))) + (properties '())))) + (define-public ocaml-uchar (package (name "ocaml-uchar") @@ -3473,7 +3492,7 @@ Format module of the OCaml standard library.") `(("which" ,which))) (propagated-inputs `(("ocaml-xmlm" ,(package-with-ocaml4.07 ocaml-xmlm)) - ("ocaml-sedlex" ,ocaml4.07-sedlex) + ("ocaml-sedlex" ,(package-with-ocaml4.07 ocaml-sedlex)) ("ocaml-easy-format" ,(package-with-ocaml4.07 ocaml-easy-format)) ("ocaml-base64" ,(package-with-ocaml4.07 ocaml-base64)))) (home-page "http://piqi.org") From patchwork Mon May 10 05:15:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29192 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 A3D6E27BC82; Mon, 10 May 2021 06:18:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 692B927BC81 for ; Mon, 10 May 2021 06:18:23 +0100 (BST) Received: from localhost ([::1]:34010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJC-0008IR-Go for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ0-0008EH-JV for guix-patches@gnu.org; Mon, 10 May 2021 01:18:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ0-0003Vz-AS for guix-patches@gnu.org; Mon, 10 May 2021 01:18:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ0-0000Tv-79 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 14/43] gnu: Add ocaml-uunf. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238641513 (code B ref 47768); Mon, 10 May 2021 05:18:10 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:44 +0000 Received: from localhost ([127.0.0.1]:57005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIa-0000OD-2o for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:44 -0400 Received: from mout01.posteo.de ([185.67.36.65]:57341) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIM-0000JJ-Ku for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:31 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 23D15240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623845; bh=YQqvC42UCbUsW3+IWkEUa+HcPhYTlo5MBv/44wj81y0=; h=From:To:Cc:Subject:Date:From; b=FtANNWW9pN8K/BRPU4w0A/T0WEIQPPlCXHvqNcXcWdorLIsJ9ewAhPs3Swr7Yqej8 eQlBg4FGVAroDkXd4NoXQcr3KwuLuN3Y00NehgVqUjfCmwVebG0WatQ2oJ2CgvXZOQ f8pGxmkblx37KNL5JrCcMc71w0ZywtyYNEfoS8TacApIHFkJx7EHDmgATpu89MbKoP jU2Ur7kFMBMj3N68OMqTli8tpPTXq319UxFENdsQFcJnwq1iQ41uHi4qm/1IWn1Lnm +ETFheOE4dquCI/Nswvro/c+MqBiZEt9bid+T38bmR1EsWXyZHVq1bGv7grxswxmHJ xGHMGSLkFd59g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7842N4z9rxG; Mon, 10 May 2021 07:17:24 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:15:59 +0000 Message-Id: <20210510051628.15359-15-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-uunf): New variable. --- gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 605567b996..a320f94097 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2708,6 +2708,38 @@ Functions are also provided to fold over the characters of UTF encoded OCaml string values and to directly encode characters in OCaml Buffer.t values.") (license license:isc))) +(define-public ocaml-uunf + (package + (name "ocaml-uunf") + (version "13.0.0") + (source + (origin + (method url-fetch) + (uri "https://erratique.ch/software/uunf/releases/uunf-13.0.0.tbz") + (sha256 + (base32 + "1qci04nkp24kdls1z4s8kz5dzgky4nwd5r8345nwdrgwmxhw7ksm")))) + (build-system ocaml-build-system) + (arguments + `(#:tests? #f + #:build-flags (list "build") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam) + ("topkg" ,ocaml-topkg))) + (propagated-inputs `(("ocaml-uutf" ,ocaml-uutf))) + (home-page "https://erratique.ch/software/uunf") + (synopsis "Unicode text normalization for OCaml") + (description + "Uunf is an OCaml library for normalizing Unicode text. It supports all +Unicode normalization forms. The library is independent from any +IO mechanism or Unicode text data structure and it can process text +without a complete in-memory representation.") + (license license:isc))) + (define-public ocaml-jsonm (package (name "ocaml-jsonm") From patchwork Mon May 10 05:16:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29201 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 6206527BC82; Mon, 10 May 2021 06:18:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1FBF527BC81 for ; Mon, 10 May 2021 06:18:44 +0100 (BST) Received: from localhost ([::1]:36246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJX-0001Tp-98 for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ2-0008G6-Tc for guix-patches@gnu.org; Mon, 10 May 2021 01:18:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45539) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ1-0003Xr-S7 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ1-0000UU-OH for guix-patches@gnu.org; Mon, 10 May 2021 01:18:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 15/43] gnu: Add ocaml-ppx-sexp-conv. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238681555 (code B ref 47768); Mon, 10 May 2021 05:18:11 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:48 +0000 Received: from localhost ([127.0.0.1]:57014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIc-0000Op-Tv for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:47 -0400 Received: from mout01.posteo.de ([185.67.36.65]:57643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIN-0000JM-9c for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:33 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id C1611240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623845; bh=NXCOhUzQGtBb2+XESbKmxK/X2aG+jolFuHulOPXgOZg=; h=From:To:Cc:Subject:Date:From; b=Acr0JflB6i0Cxy2PwLbAFLcqTwZX7bB2BV85pW+ueZQm9Tl3f+bCq4iSK6NQvMlQO vR5Lsg3DxjMnarZu1NlKlinTpIwt0RTnmg75/uG3OffozMpSjlgJuCh0fEQcPSOhy+ f2ANYrnJnHT8hxekwmNfTv1wIExQ4vMWSK2KOFz7LAvIlVZw3icEBfN2aq6yyRZCYQ ha+mC7k6iZTl0pXLw41scAm8Bs1jhQ4lmg/QN5SwuejMU4WxOWHWCeMn+2Bi/fl7NM St8mW9qo0fWL+ok7sD3cLBhiIZtE5g8gm1oGl7E6S1J2iJfnWj5YOqHdG8mV+WSrwB T1y0JoZptuQPA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq790ZVRz9rxG; Mon, 10 May 2021 07:17:25 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:00 +0000 Message-Id: <20210510051628.15359-16-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-sexp-conv): New variable. (ocaml4.07-ppx-sexp-conv): Inherit from ocaml-ppx-sexp-conv. --- gnu/packages/ocaml.scm | 98 ++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 42 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a320f94097..823cb00afd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3430,7 +3430,7 @@ JSON.") #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-ounit" ,(package-with-ocaml4.07 ocaml-ounit)) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv))) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)))) (propagated-inputs `(("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) @@ -5070,36 +5070,50 @@ and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-sexp-conv +(define-public ocaml-ppx-sexp-conv (package - (name "ocaml4.07-ppx-sexp-conv") - (version "0.11.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_sexp_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) + (name "ocaml-ppx-sexp-conv") + (version "0.14.3") + (home-page "https://github.com/janestreet/ppx_sexp_conv") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dbri9d00ydi0dw1cavswnqdmhjaaz80vap29ns2lr6mhhlvyjmj")))) (build-system dune-build-system) (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)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ppx_sexp_conv"))) - (home-page "https://github.com/janestreet/ppx_sexp_conv") + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_sexp_conv") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-conv)))) (synopsis "Generation of S-expression conversion functions from type definitions") (description "This package generates S-expression conversion functions from type definitions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-sexp-conv + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-sexp-conv) + (name "ocaml-ppx-sexp-conv") + (version "0.11.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_sexp_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) + (properties `((upstream-name . "ppx_sexp_conv")))))) + (define-public ocaml4.07-ppx-variants-conv (package (name "ocaml4.07-ppx-variants-conv") @@ -5107,30 +5121,30 @@ definitions.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/ppx_variants_conv") - (commit (string-append "v" version)))) + (url "https://github.com/janestreet/ppx_variants_conv") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-variantslib" ,ocaml4.07-variantslib) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) + ("ocaml-variantslib" ,ocaml4.07-variantslib) + ("ocaml-migrate-parsetree" + ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (properties - `((upstream-name . "ppx_variants_conv"))) + `((upstream-name . "ppx_variants_conv"))) (home-page - "https://github.com/janestreet/ppx_variants_conv") + "https://github.com/janestreet/ppx_variants_conv") (synopsis "Generation of accessor and iteration functions for OCaml variant types") (description - "This package generates accessors and iteration functions for OCaml + "This package generates accessors and iteration functions for OCaml variant types.") (license license:asl2.0))) @@ -5149,7 +5163,7 @@ variant types.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5182,7 +5196,7 @@ string conversion.") ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) @@ -5249,7 +5263,7 @@ storage of large amounts of data.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5401,7 +5415,7 @@ many values).") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5432,7 +5446,7 @@ ocaml values.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5616,7 +5630,7 @@ position.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5653,7 +5667,7 @@ useful errors on failure.") ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" @@ -5758,7 +5772,7 @@ from type definitions.") ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -6067,7 +6081,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-splittable-random" ,ocaml4.07-splittable-random) From patchwork Mon May 10 05:16:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29223 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 1D87D27BC82; Mon, 10 May 2021 06:19:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DC82627BC81 for ; Mon, 10 May 2021 06:19:36 +0100 (BST) Received: from localhost ([::1]:41714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKO-0004np-3a for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ7-0008Sd-De for guix-patches@gnu.org; Mon, 10 May 2021 01:18:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45552) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ7-0003cs-4B for guix-patches@gnu.org; Mon, 10 May 2021 01:18:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ6-0000W3-WB for guix-patches@gnu.org; Mon, 10 May 2021 01:18:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 16/43] gnu: Add ocaml-bigstringaf. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238821673 (code B ref 47768); Mon, 10 May 2021 05:18:16 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:02 +0000 Received: from localhost ([127.0.0.1]:57040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIs-0000Qj-1y for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:02 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIQ-0000Jx-GF for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:35 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2C6522400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623846; bh=MqjUW5n445BEsgkg5qZznLSWe0GAiA5XtuBGFsztzls=; h=From:To:Cc:Subject:Date:From; b=HVZWmmiAu9BGqe4UboDY7rOvnkmgBCMPvo+NEwecyqqYJl/n3FvjKg8uYRSvQCiNe GeZEuyOZ9O8ECUenvrQXYyB/tyOpbt0oUmYneqSi5kRRoI8FL1Kfze5U8+Rry0UdiO ta52AYXL5WShTluT0FcOCIRWG7Z5Av1TI4JCYVOfT7wBRlW2Zk/gdXzZrLXdy3y73M rfcWfTFihT3WHG1W7vZfqF4ODovE6U6QjxTYMdNiLEt0M1yLqkePeDUHg4LkhtyiY8 0LpNjageqmG4xQcpI3zhoevYYPhXFsJtz1xYwgtSKxNIKccr78N8oKtYuRhf7LnkFW lHfJgZ0lvXkuw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq794C5Rz9rxg; Mon, 10 May 2021 07:17:25 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:01 +0000 Message-Id: <20210510051628.15359-17-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/ocaml/packages.scm (ocaml-bigstringaf): New variable. --- gnu/packages/ocaml.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 823cb00afd..f252fb53fa 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6579,3 +6579,37 @@ provides support to program with time varying values: declarative events and signals. React doesn't define any primitive event or signal, it lets the client chooses the concrete timeline.") (license license:lgpl2.1+))) + +(define-public ocaml-bigstringaf + (package + (name "ocaml-bigstringaf") + (version "0.7.0") + (home-page "https://github.com/inhabitedtype/bigstringaf") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q1sqxzdnlrpl95ccrhl7lwy3zswgd9rbn19ildclh0lyi2vazbj")))) + (build-system dune-build-system) + (arguments + '(#:test-target ".")) + (propagated-inputs + `(("ocaml-bigarray-compat" ,ocaml-bigarray-compat))) + (native-inputs + `(("ocaml-alcotest" ,ocaml-alcotest) + ("pkg-config" ,pkg-config))) + (synopsis + "Bigstring intrinsics and fast blits based on memcpy/memmove") + (description + "The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're +not widely-known, sometimes misused, and so programs that use Bigstrings are +slower than they have to be. And even if a library got that part right and +exposed the intrinsics properly, the compiler doesn't have any fast blits +between Bigstrings and other string-like types. @code{bigstringaf} provides +these missing pieces.") + (license license:bsd-3))) From patchwork Mon May 10 05:16:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29205 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 1CB4427BC82; Mon, 10 May 2021 06:18:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CC75327BC81 for ; Mon, 10 May 2021 06:18:52 +0100 (BST) Received: from localhost ([::1]:37184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJf-00023i-VY for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ5-0008Kj-JA for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ3-0003Zb-RD for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ3-0000V6-NN for guix-patches@gnu.org; Mon, 10 May 2021 01:18:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 17/43] gnu: Add ocaml-ppx-let. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238791600 (code B ref 47768); Mon, 10 May 2021 05:18:13 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:59 +0000 Received: from localhost ([127.0.0.1]:57024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIp-0000Pk-35 for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:59 -0400 Received: from mout02.posteo.de ([185.67.36.66]:49499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIQ-0000Jw-GJ for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:35 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AA9B12400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623846; bh=W8zStKmtVyviV9RDKM3tuqIO7W1u9MuNwnJPGX5TE/Y=; h=From:To:Cc:Subject:Date:From; b=jxTFYuk+Lqq+s0PHEJWexa8YsLxBy3lZDhCzemuVRVp6Yubd5mK+lqSm7tjRzy4Rw mRFWC5D2rh3zZp1dxFFPa+zITaOm8YF97nGG2JdyuDcy62o56lDwyNGCW9gdvRk0VZ OeOy78Hxui2r178nDfnsdRpig+jgdTV3zhvvUUlzxwK2aZRFAFWVebzJ436ilRMqPc +NhmJNI61hGmBQQYPgUFNNyTUf7gByjTYfss3osXdEHmUic+a6JRA8ZLC0KLqE5y+E YhcFDfIHCZ5HaubO6PqxJ1k2ywXZTxIje4GN5OWf+ihbN9mLTRWru/jqglEJM1mLon NZ6CjeG1YY3lQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7B0kG9z9rxd; Mon, 10 May 2021 07:17:26 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:02 +0000 Message-Id: <20210510051628.15359-18-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-let): New variable. (ocaml4.07-ppx-let): Inherit from ocaml-ppx-let. --- gnu/packages/ocaml.scm | 44 ++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f252fb53fa..54a755212e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5550,35 +5550,37 @@ used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) -(define-public ocaml4.07-ppx-let +(define-public ocaml-ppx-let (package - (name "ocaml4.07-ppx-let") - (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_let-v" version ".tar.gz")) - (sha256 - (base32 - "1wdfw6w4xbg97a35yg6bif9gggxniy9ddnrjfw1a0inkl2yamxkj")))) + (name "ocaml-ppx-let") + (version "0.14.0") + (source + (janestreet-origin "ppx_let" version + "1qcrnd86pbr1di5m6z4ps4p15qawwa02jxwz3xfd82hdbjmdwf1s")) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (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_let"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_let") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-let)))) (home-page "https://github.com/janestreet/ppx_let") (synopsis "Monadic let-bindings") (description "A ppx rewriter for monadic and applicative let bindings, match expressions, and if expressions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-let + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-let) + (version "0.11.0") + (source + (janestreet-origin "ppx_let" version + "1wdfw6w4xbg97a35yg6bif9gggxniy9ddnrjfw1a0inkl2yamxkj")) + + (properties `(upstream-name . "ppx_let"))))) + (define-public ocaml4.07-ppx-fail (package (name "ocaml4.07-ppx-fail") @@ -5848,7 +5850,7 @@ functions from type definitions.") ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) - ("ocaml-ppx-let" ,ocaml4.07-ppx-let) + ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,ocaml4.07-ppx-optcomp) ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) From patchwork Mon May 10 05:16:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29210 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 95D3C27BC83; Mon, 10 May 2021 06:19:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AC3C527BC81 for ; Mon, 10 May 2021 06:19:05 +0100 (BST) Received: from localhost ([::1]:38358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJs-0002mU-Ls for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ5-0008Kw-Ju for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45546) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ4-0003Zf-Kz for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ4-0000VL-H4 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 18/43] gnu: Add ocaml-syntax-shims. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238801616 (code B ref 47768); Mon, 10 May 2021 05:18:14 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:00 +0000 Received: from localhost ([127.0.0.1]:57028 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIp-0000Pu-PE for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:59 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIQ-0000KC-PX for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 487D92400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623847; bh=9SCnxNJ3pdRP/KFkXNDtpfOhteVS4PT2xGPpA7gxqzE=; h=From:To:Cc:Subject:Date:From; b=Wpdw+DBrQ91NFyzHFvqtf1ErytvtLOUvlpDoxDszErqmoqeAJmmYojsuw9XBlpwxl tf1OxZ2H3lpYCXVCQ5K1XdVYuqxNvMwioP+UWTw9lmdWcjtrEdVRuw51aNDNc8CvsL 3ZK723ZGFanLCDm9UCw7GJndzFsvDorSfAJlxdSnKkMLZrrYlugz04TqlmBMRGoNOg nUcCgPLPLQoJsbdgQvo3WYdeagKBUX1GMcir84DZ5yZx8MqLOlkD/4P42yEv3qgMEO Ow70ZiFqCh9psJF0r72QhStCIi3DIcIkDrJph7b/us0LFaGXZ6jHH4KZXDwpp5BH7b C/XEHq4VGS2hQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7B4MbYz9rxd; Mon, 10 May 2021 07:17:26 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:03 +0000 Message-Id: <20210510051628.15359-19-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-syntax-shims): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 54a755212e..9289ec88b2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6615,3 +6615,28 @@ exposed the intrinsics properly, the compiler doesn't have any fast blits between Bigstrings and other string-like types. @code{bigstringaf} provides these missing pieces.") (license license:bsd-3))) + +(define-public ocaml-syntax-shims + (package + (name "ocaml-syntax-shims") + (version "1.0.0") + (home-page "https://github.com/ocaml-ppx/ocaml-syntax-shims") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l1i8z95qgb0lxlrv3yb5nkp391hqsiyi4r91p12k3xmggqixagf")))) + (build-system dune-build-system) + (properties + `((upstream-name . "ocaml-syntax-shims"))) + (synopsis + "Backport new syntax to older OCaml versions") + (description + "This packages backports new features of the language to older +compilers, such as let+.") + (license license:expat))) From patchwork Mon May 10 05:16:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29207 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 7324627BC83; Mon, 10 May 2021 06:18:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CAB6B27BC81 for ; Mon, 10 May 2021 06:18:55 +0100 (BST) Received: from localhost ([::1]:37564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJj-0002I5-1a for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ2-0008G8-Tl for guix-patches@gnu.org; Mon, 10 May 2021 01:18:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45540) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ2-0003YJ-88 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ2-0000Uc-4Q for guix-patches@gnu.org; Mon, 10 May 2021 01:18:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 19/43] gnu: Add ocaml-ppx-compare. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238681563 (code B ref 47768); Mon, 10 May 2021 05:18:12 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:48 +0000 Received: from localhost ([127.0.0.1]:57016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyId-0000P2-WB for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:48 -0400 Received: from mout01.posteo.de ([185.67.36.65]:50309) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIP-0000Jm-67 for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:33 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id A57E6240028 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623847; bh=5gFVC+tWGvhpnLv60/rAgvLo/lU0EOZ5ouq7SeJtjhM=; h=From:To:Cc:Subject:Date:From; b=iJvJfpSRZk6xR3qKNViQmjxfvZfi2efxK8YSAwAp78Tp1mfOBl/R3G8DQM/HwReYa L+09WmwTfLar88XiILutgqSB3iyxWC9T2rWDLLS9T5gI9MtLgDX0KW+RlpZX2DVd5W b7FONbnZZACI0+ZkB87h0gJti2GwHtFuRdOKBz9gS/ZtPjrKxLNUn7i6Z+nZ+sdpKZ UF4JLSz9qI6+yaXYNd52XkYZniWymoK9jnWqsSYe3I0+el9nNXtlD4h4qXScnlZgBB 39qNo9XVhBbIWGXyTwZexak3bXZk3CQShspG0n+U1LfZR3ZQcWeL5PJhZkd05kXEhg FGOBmkS2Cla/g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7C0vVLz9rxG; Mon, 10 May 2021 07:17:27 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:04 +0000 Message-Id: <20210510051628.15359-20-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-compare): New variable. (ocaml4.07-ppx-compare): Inherit from ocaml-ppx-compare. --- gnu/packages/ocaml.scm | 64 +++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9289ec88b2..d90b15cbd3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4941,30 +4941,24 @@ OCaml AST in the OCaml syntax; #t))))) (properties '())))) -(define-public ocaml4.07-ppx-compare +(define-public ocaml-ppx-compare (package - (name "ocaml4.07-ppx-compare") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_compare") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) + (name "ocaml-ppx-compare") + (version "0.14.0") + (source + (janestreet-origin "ppx_compare" version + "0mqxa2s194nif7x4fjn1p5gd9i3bakr8nv27gf8x1g5nmi8q9pmp")) (build-system dune-build-system) - (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)))) (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ppx_compare"))) + ;; Tests are currenlty failing + ;; (see https://github.com/janestreet/ppx_compare/issues/10) + '(#:tests? #f)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_compare") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-compare)))) (home-page "https://github.com/janestreet/ppx_compare") (synopsis "Generation of comparison functions from types") (description "Generation of fast comparison functions from type expressions @@ -4975,6 +4969,24 @@ flexibility by allowing you to override them for a specific type and more safety by making sure that you only compare comparable values.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-compare + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-compare) + (name "ocaml-ppx-compare") + (version "0.11.1") + (home-page "https://github.com/janestreet/ppx_compare") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) + (properties `((upstream-name . "ppx_compare")))))) + (define-public ocaml4.07-fieldslib (package (name "ocaml4.07-fieldslib") @@ -5193,7 +5205,7 @@ string conversion.") (build-system dune-build-system) (inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) @@ -5262,7 +5274,7 @@ storage of large amounts of data.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -5630,7 +5642,7 @@ position.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" @@ -5664,7 +5676,7 @@ useful errors on failure.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) - ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) @@ -5770,7 +5782,7 @@ from type definitions.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) From patchwork Mon May 10 05:16:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29211 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 124E427BC81; Mon, 10 May 2021 06:19:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6E8BB27BC82 for ; Mon, 10 May 2021 06:19:06 +0100 (BST) Received: from localhost ([::1]:38470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJt-0002qd-K9 for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ2-0008G7-VA for guix-patches@gnu.org; Mon, 10 May 2021 01:18:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ2-0003YK-KR for guix-patches@gnu.org; Mon, 10 May 2021 01:18:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ2-0000Uk-Gd for guix-patches@gnu.org; Mon, 10 May 2021 01:18:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 20/43] gnu: Add ocaml-ppx-here. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238691570 (code B ref 47768); Mon, 10 May 2021 05:18:12 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:49 +0000 Received: from localhost ([127.0.0.1]:57018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIe-0000PA-I7 for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:49 -0400 Received: from mout01.posteo.de ([185.67.36.65]:59303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIP-0000Jo-PK for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 447C4240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623848; bh=q5wNOYT1sQHZI51tM/0DDOMHbieSYN4tryXWW4ZCgtc=; h=From:To:Cc:Subject:Date:From; b=cyFEmIu9pxAVE+nK90RgMaH6ecJcoAA4K8AcYQ9xuHEOa3RiBtEb9/VSTQYJ/5SJ4 UQNprEN3z4WiLuyS/mLjugb19M6WFManXrRuibH3XdJtcsvle0QWMMa8wACNnFztoT ZhxItwvf0hSxSVrShtftvYdCPtOSExkN1Rw/Uj3ZRpRPaZj1H8tExst8bZ5R0AZCv8 4mFuzkdGQhjk4attaMFJ2spzKW38tMxpn1rWu3EGBTD9woh+ES/L5gp5rFx7QLwyZo 2Y6rI+TJeyHct4THuF54RFUwsSIIx2mcEG2bCunaPvVSomk9aBBh5BugCzd22PL/O9 LIeEsJib4Q54g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7C4XNLz9rxG; Mon, 10 May 2021 07:17:27 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:05 +0000 Message-Id: <20210510051628.15359-21-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-here): New variable. (ocaml4.07-ppx-here): Inherit from ocaml-ppx-here. --- gnu/packages/ocaml.scm | 56 ++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d90b15cbd3..808e3f30fe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5352,37 +5352,39 @@ many values).") (description "Syntax extension for writing in-line benchmarks in ocaml code.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-here +(define-public ocaml-ppx-here (package - (name "ocaml4.07-ppx-here") - (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_here-v" version ".tar.gz")) - (sha256 - (base32 - "0wxcak3ay4jpigm3pfdcpr65qw4hxfa8whhkryhcd8gy71x056z5")))) + (name "ocaml-ppx-here") + (version "0.14.0") + (source + (janestreet-origin "ppx_here" version + "0b444djy68v6ji0ypwv5l02pkl151qzrgg96lyhl8dxfrzvj1zkj")) (build-system dune-build-system) (arguments ;; broken tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (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_here"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_here") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-here)))) (home-page "https://github.com/janestreet/ppx_here") (synopsis "Expands [%here] into its location") (description "Part of the Jane Street's PPX rewriters collection.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-here + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-here) + (version "0.11.0") + (source + (janestreet-origin "ppx_here" version + "0wxcak3ay4jpigm3pfdcpr65qw4hxfa8whhkryhcd8gy71x056z5")) + (properties `((upstream-name . "ppx_here")))))) + (define-public ocaml4.07-typerep (package (name "ocaml4.07-typerep") @@ -5426,7 +5428,7 @@ many values).") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -5457,7 +5459,7 @@ ocaml values.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -5612,7 +5614,7 @@ match expressions, and if expressions.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5643,7 +5645,7 @@ position.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -5679,7 +5681,7 @@ useful errors on failure.") ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) @@ -5822,7 +5824,7 @@ verification tool.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5860,7 +5862,7 @@ functions from type definitions.") ("ocaml-ppx-expect" ,ocaml4.07-ppx-expect) ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,ocaml4.07-ppx-optcomp) From patchwork Mon May 10 05:16:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29208 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 03BA927BC82; Mon, 10 May 2021 06:18:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C61EE27BC81 for ; Mon, 10 May 2021 06:18:57 +0100 (BST) Received: from localhost ([::1]:37756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJk-0002Pi-Ud for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ3-0008I7-EH for guix-patches@gnu.org; Mon, 10 May 2021 01:18:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45542) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ3-0003Yb-20 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ2-0000Ur-Tt for guix-patches@gnu.org; Mon, 10 May 2021 01:18:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 21/43] gnu: Add ocaml-ppx-cold. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238691578 (code B ref 47768); Mon, 10 May 2021 05:18:12 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:49 +0000 Received: from localhost ([127.0.0.1]:57020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIf-0000PH-AN for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:49 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIQ-0000Jp-6s for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id AE9F7240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623848; bh=9J4MG2ILFX5cNXX7BHhllBA9znRj1Z2sqiJe0u19R+I=; h=From:To:Cc:Subject:Date:From; b=O9u6UgJ/q1f/9IKDg0kIyUS48PjoK/YL0YDj9tJTZmox+RHmFwcTXo84beWRAL7aQ /NPo4+O81v/ZEeJ8OkWKckklCqzBjoJv9BbMXR0fDTaPmDD39GUbmL27JiR4d0RFlp BGONipd4aw5WFyL7rKUMW4RvDmlIKqzN812X29iOjiMjUFvARW7KZdvE1EiRpD5j06 UkgIRHP7LwWFuTnNwR9AxdrXisRBg1dOEdtct/AM5rEVZjv508e5esWW+jw6yVH2Kq 96vtECtmJvUmDav/7wXdugcx82P/CSyZlR9ySWZDwAiQRf0GKbe00WLFfIoc7Go4P6 tzV33sjKduJaQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7D14kRz9rxR; Mon, 10 May 2021 07:17:28 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:06 +0000 Message-Id: <20210510051628.15359-22-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-cold): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 808e3f30fe..a27a1170ac 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5625,6 +5625,28 @@ match expressions, and if expressions.") position.") (license license:asl2.0))) +(define-public ocaml-ppx-cold + (package + (name "ocaml-ppx-cold") + (version "0.14.0") + (home-page "https://github.com/janestreet/ppx_cold") + (source + (janestreet-origin "ppx_cold" version + "1madfzhpir9amnxmg530n70vll0jrl59vyp71miji73i6b9sy6n2")) + (build-system dune-build-system) + (arguments `(#:test-target "tests")) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_cold"))) + (synopsis "Syntax extension for indicating cold path") + (description + "This package contains an syntax extension to indicate that the code is +on the cold path and should be kept out of the way to avoid polluting the +instruction cache on the hot path. See also +https://github.com/ocaml/ocaml/issues/8563.") + (license license:expat))) + (define-public ocaml4.07-ppx-assert (package (name "ocaml4.07-ppx-assert") From patchwork Mon May 10 05:16:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29209 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 DCA4B27BC82; Mon, 10 May 2021 06:19:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D2C9927BC81 for ; Mon, 10 May 2021 06:19:00 +0100 (BST) Received: from localhost ([::1]:38124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJo-0002dA-0d for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ5-0008Lh-Pc for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45548) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ5-0003Zz-GN for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ5-0000Va-BH for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 22/43] gnu: Add ocaml-ppx-assert. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238801630 (code B ref 47768); Mon, 10 May 2021 05:18:15 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:00 +0000 Received: from localhost ([127.0.0.1]:57032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIq-0000Q8-8F for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:00 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34967) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIQ-0000K7-Nv for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 379B3240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623849; bh=W2eUhXrm4QJZPiU5YMNYPYsho5EjXGHrJ5qsHS/09mA=; h=From:To:Cc:Subject:Date:From; b=NyWo+F4QgPSGw+5zgqGL2Aoo/4wifqV+y4inHI7lrsv2u7Xu6NBLU2/VDMzTjYx1T IaTAyPErCjy8liH17P/O021zaSM5esX1hSS8ocerd7jVopUg71v1fDuCN6aRIx2xDK mqVQa/yWjAYSrN1fwx9VSzvEWSY6Fmx5qN80CBKTXRPjkVFY7vJyNXgQkq6D3sL149 1fTgLCo+R/BdYmFPwkFspGBCU8zSKOGm/+sBdS70LmiSNBgj+DD0YFltYixvbJfgZt 2X+p3M/6ms/WJedWP4Mhr1qSkPp5Hjacki0Ml1keko4DPW0CS8Zw9EigmZXgY972FQ U8+SE5OzMubbA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7D4jgBz9rxR; Mon, 10 May 2021 07:17:28 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:07 +0000 Message-Id: <20210510051628.15359-23-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-assert): New variable. (ocaml4.07-ppx-assert): Inherit from ocaml-ppx-assert. --- gnu/packages/ocaml.scm | 63 ++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a27a1170ac..799bebeba9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5647,38 +5647,47 @@ instruction cache on the hot path. See also https://github.com/ocaml/ocaml/issues/8563.") (license license:expat))) -(define-public ocaml4.07-ppx-assert +(define-public ocaml-ppx-assert (package - (name "ocaml4.07-ppx-assert") - (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_assert-v" version ".tar.gz")) - (sha256 - (base32 - "17kd311n0l9f72gblf9kv8i5rghr106w37x4f0m5qwh6nlgl0j9k")))) + (name "ocaml-ppx-assert") + (version "0.14.0") + (source + (janestreet-origin "ppx_assert" version + "1l2rr4jz2q5b35ryn2z146z7m9v6k8krp5gpn8ilib66mnz5zx15")) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_assert"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-cold" ,ocaml-ppx-cold) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_assert") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-assert)))) (home-page "https://github.com/janestreet/ppx_assert") (synopsis "Assert-like extension nodes that raise useful errors on failure") (description "This package contains assert-like extension nodes that raise useful errors on failure.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-assert + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-assert) + (version "0.11.0") + (source + (janestreet-origin "ppx_assert" version + "17kd311n0l9f72gblf9kv8i5rghr106w37x4f0m5qwh6nlgl0j9k")) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_assert")))))) + (define-public ocaml4.07-ppx-expect (package (name "ocaml4.07-ppx-expect") @@ -5699,7 +5708,7 @@ useful errors on failure.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) + ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) @@ -5876,7 +5885,7 @@ functions from type definitions.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) + `(("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) @@ -6072,7 +6081,7 @@ thousands of times faster than fork. `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-configurator" ,ocaml4.07-configurator) ("ocaml-core-kernel" ,ocaml4.07-core-kernel) - ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) + ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-spawn" ,ocaml4.07-spawn) @@ -6114,7 +6123,7 @@ standard library that was developed by Jane Street.") ("ocaml-configurator" ,ocaml4.07-configurator) ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) - ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) + ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) From patchwork Mon May 10 05:16:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29221 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 AC46027BC82; Mon, 10 May 2021 06:19:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3605D27BC81 for ; Mon, 10 May 2021 06:19:29 +0100 (BST) Received: from localhost ([::1]:40996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKG-0004MH-DB for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ6-0008NP-70 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ5-0003aX-TC for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ5-0000Vh-Ol for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 23/43] gnu: Add ocaml-ppx-custom-printf. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238811638 (code B ref 47768); Mon, 10 May 2021 05:18:15 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:01 +0000 Received: from localhost ([127.0.0.1]:57034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIq-0000QF-KP for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:00 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIR-0000KJ-At for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:37 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id C14492400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623849; bh=H4PjNVdbidQ3nFTlRiqJfs/POltWUMzLjVLH9CVDzJw=; h=From:To:Cc:Subject:Date:From; b=S8FcNZxX1sb29iqzEF4U4dAOM7yHB05uOMsxMzoyQu7+vAa/xgTo78OYdCATLWejk D9IkTgF6rb8KuYXPjMLhAGxYa8YTuM/EO/9BpfuMwwmhELpujLqHiLhjf/FuhExhIW EW4TVBJOR+6JgEGwU30q407ApbcTU7db8wlNMKanRphmKn/DZfkDFhBdY+pKDMf/LY rVH1leKng4FNBGU9KXSIkp/TBl72wfbumQu+ew3Xu6rWO2T7EXIdgvrqQ3hokXrkQb yzTBRw/7OUC6ujO+Kv+YzdEfHhZnciZibQRnEG783fyegMBwzn2oK2I/anBqp/uwe6 gDX0HsRmvsKlg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7F1DfRz9rxR; Mon, 10 May 2021 07:17:29 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:08 +0000 Message-Id: <20210510051628.15359-24-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-custom-printf): New variable. (ocaml4.07-ppx-custom-printf): Inherit from ocaml-ppx-custom-printf. --- gnu/packages/ocaml.scm | 59 ++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 799bebeba9..c4babb30f3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5160,36 +5160,45 @@ definitions.") variant types.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-custom-printf +(define-public ocaml-ppx-custom-printf (package - (name "ocaml4.07-ppx-custom-printf") - (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_custom_printf-v" version ".tar.gz")) - (sha256 - (base32 - "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj")))) + (name "ocaml-ppx-custom-printf") + (version "0.14.1") + (home-page "https://github.com/janestreet/ppx_custom_printf") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0c1m65kn27zvwmfwy7kk46ga76yw2a3ik9jygpy1b6nn6pi026w9")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ppx_custom_printf"))) - (home-page "https://github.com/janestreet/ppx_custom_printf") + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_custom_printf") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-custom-printf)))) (synopsis "Printf-style format-strings for user-defined string conversion") (description "Extensions to printf-style format-strings for user-defined string conversion.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-custom-printf + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-custom-printf) + (version "0.11.0") + (source + (janestreet-origin + "ppx_custom_printf" version + "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj")) + (properties `((upstream-name . "ppx_custom_printf")))))) + (define-public ocaml4.07-bin-prot (package (name "ocaml4.07-bin-prot") @@ -5206,7 +5215,7 @@ string conversion.") (inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) + ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) @@ -5710,7 +5719,7 @@ useful errors on failure.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) + ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) @@ -5889,7 +5898,7 @@ functions from type definitions.") ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) - ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) + ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-expect" ,ocaml4.07-ppx-expect) ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) From patchwork Mon May 10 05:16:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29216 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 8E1D427BC81; Mon, 10 May 2021 06:19:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E119227BC82 for ; Mon, 10 May 2021 06:19:16 +0100 (BST) Received: from localhost ([::1]:39704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyK4-0003Zy-5F for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ7-0008R1-1j for guix-patches@gnu.org; Mon, 10 May 2021 01:18:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ6-0003cS-NP for guix-patches@gnu.org; Mon, 10 May 2021 01:18:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ6-0000Vw-J0 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 24/43] gnu: Add ocaml-ppx-hash. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238821660 (code B ref 47768); Mon, 10 May 2021 05:18:16 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:02 +0000 Received: from localhost ([127.0.0.1]:57038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIr-0000QU-CG for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:02 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35843) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIR-0000KS-TR for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:37 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 5647B2400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623850; bh=hY9Xgv8AlqPoSR1qzsEZrg12Rc8OfxTjCIZjWOB5nbw=; h=From:To:Cc:Subject:Date:From; b=pSxbD+llpwzsY4ltIqaQYHcs2kqoE8va5fQU8y3q1Z7rHAXKamYcgfJ0QcYapMPEm iUWsD2s6PdySxAydvHxdAVAEAhyuI0VgNHkHE7sr6QXXo4FWuj53IBjDTGz02v7Zex Kcb+cSLGuZ/63Cn7c99pdoaUhveodrwJfs0PjQK/VSQeUxdv0WcHRcOr1PebNt3uT9 nVpdUyKju/OVFW1IW5HJWcD8Y0G5iE7N+iXMVO4sP2YwYKKw63VoXoYhQL4PFG3TuD hfkNE8I5DjTndF+1zSEv7zj3c2gwTRX3Oh7XUCXovIXk2zx0YNkIi/ZjAk8pj3z1W+ 1X823RDLtao4g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7F4tq8z9rxR; Mon, 10 May 2021 07:17:29 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:09 +0000 Message-Id: <20210510051628.15359-25-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-hash): New variable. (ocaml4.07-ppx-hash): Inherit from ocaml-ppx-hash. --- gnu/packages/ocaml.scm | 72 +++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 32 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c4babb30f3..792cf38447 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5267,38 +5267,46 @@ storage of large amounts of data.") (description "Octavius is a library to parse the `ocamldoc` comment syntax.") (license license:isc))) -(define-public ocaml4.07-ppx-hash +(define-public ocaml-ppx-hash (package - (name "ocaml4.07-ppx-hash") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_hash") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) + (name "ocaml-ppx-hash") + (version "0.14.0") + (source + (janestreet-origin "ppx_hash" version + "0x4wgdvhgd8a49bzari52jpkykxpv6ncgp5ncda3xgg0a9r49s8n")) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ppx_hash"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_hash") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-hash)))) (home-page "https://github.com/janestreet/ppx_hash") (synopsis "Generation of hash functions from type expressions and definitions") (description "This package is a collection of ppx rewriters that generate hash functions from type exrpessions and definitions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-hash + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-hash) + (name "ocaml-ppx-hash") + (home-page "https://github.com/janestreet/ppx_hash") + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) + (properties `((upstream-name . "ppx_hash")))))) + (define-public ocaml4.07-ppx-enumerate (package (name "ocaml4.07-ppx-enumerate") @@ -5306,23 +5314,23 @@ hash functions from type exrpessions and definitions.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/ppx_enumerate") - (commit (string-append "v" version)))) + (url "https://github.com/janestreet/ppx_enumerate") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) (build-system dune-build-system) (arguments - `(#:tests? #f; no test suite + `(#:tests? #f ; no test suite #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (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)))) + `(("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_enumerate"))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") @@ -5826,7 +5834,7 @@ from type definitions.") (propagated-inputs `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) - ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) + ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" @@ -6134,7 +6142,7 @@ standard library that was developed by Jane Street.") ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) - ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) + ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) From patchwork Mon May 10 05:16:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29226 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 EDFD627BC82; Mon, 10 May 2021 06:19:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7FE3727BC81 for ; Mon, 10 May 2021 06:19:47 +0100 (BST) Received: from localhost ([::1]:42370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKY-0005Dj-P7 for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ8-00005t-Dh for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45554) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ8-0003dh-4T for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ8-0000WI-05 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 25/43] gnu: Add ocaml-ppx-enumerate. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238831695 (code B ref 47768); Mon, 10 May 2021 05:18:17 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:03 +0000 Received: from localhost ([127.0.0.1]:57045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIs-0000R4-OZ for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:03 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIS-0000Ka-Es for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:37 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id DB9082400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623850; bh=UKmIulycFBabQ6rW6xwAlVOgt7x3Ely9KPkMkHrKCqM=; h=From:To:Cc:Subject:Date:From; b=em3TxDqP7jCcBIPSUNhfrOUbGzmHsgXSqPFswOjbc2JSKw6QmNUl2UeksIG/z4axl rVN8IgJYUNFQuP/sFgUYgQNKTxJhwMUJhh5gdC2gLUOOBUmMYAOp9YWey2m7Gui6I2 oblWo1RJr4OstGvQ8FZIHzocYR46SLWs3jADcntqf+5XKb8nBIm0IaUXIJGjPN/zGF ryFlOwc5OxMDygDEBDEa2UOQBx0PNsPBzkR8p5nvlbOS4wyfIQPVzTbWyZ42wvsJ+Z sAlYhYl5CCY3zk/RvuKZHfAC4mytdq21iODi/5CChqR4UDZ/0XsehZHAWX5suZPzyQ 1S7Ab8GJzi/sA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7G1SRkz9rxg; Mon, 10 May 2021 07:17:30 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:10 +0000 Message-Id: <20210510051628.15359-26-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-enumerate): New variable. (ocaml4.07-ppx-enumerate): Inherit from ocaml-ppx-enumerate. --- gnu/packages/ocaml.scm | 54 +++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 792cf38447..8bed1ae1a5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5307,31 +5307,23 @@ hash functions from type exrpessions and definitions.") "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) (properties `((upstream-name . "ppx_hash")))))) -(define-public ocaml4.07-ppx-enumerate +(define-public ocaml-ppx-enumerate (package - (name "ocaml4.07-ppx-enumerate") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_enumerate") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) + (name "ocaml-ppx-enumerate") + (version "0.14.0") + (source + (janestreet-origin + "ppx_enumerate" version + "1ij6sffgqhnjwnj9brhrrw1c6xgxlh0s6r17x1qkgnyrc73gfsz8")) (build-system dune-build-system) (arguments - `(#:tests? #f ; no test suite - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) ; no test suite (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_enumerate"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_enumerate") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-enumerate)))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") (description "Ppx_enumerate is a ppx rewriter which generates a definition @@ -5339,6 +5331,24 @@ for the list of all values of a type (for a type which only has finitely many values).") (license license:asl2.0))) +(define-public ocaml4.07-ppx-enumerate + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-enumerate) + (name "ocaml-ppx-enumerate") + (version "0.11.1") + (home-page "https://github.com/janestreet/ppx_enumerate") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) + (properties `((upstream-name . "ppx_enumerate")))))) + (define-public ocaml4.07-ppx-bench (package (name "ocaml4.07-ppx-bench") @@ -5833,7 +5843,7 @@ from type definitions.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) + ("ocaml-ppx-enumerate" ,(package-with-ocaml4.07 ocaml-ppx-enumerate)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) From patchwork Mon May 10 05:16:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29228 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 2C4DA27BC82; Mon, 10 May 2021 06:20:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DA72C27BC81 for ; Mon, 10 May 2021 06:19:59 +0100 (BST) Received: from localhost ([::1]:42888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKl-0005YK-3Q for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ8-00007i-Qv for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45555) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ8-0003dy-HH for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ8-0000WP-Cb for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 26/43] gnu: Add ocaml-ppx-js-style. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:18 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238841709 (code B ref 47768); Mon, 10 May 2021 05:18:18 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:04 +0000 Received: from localhost ([127.0.0.1]:57048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIt-0000RI-9Z for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:03 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIS-0000Ko-Vt for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 61CDE2400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623851; bh=XGAYmwooBITMRLIhWuUSrJ8L7uJkoek5J5FdoHRY3PE=; h=From:To:Cc:Subject:Date:From; b=d5qJbdSWsDE2106Z32vl+iiExkYiBzgWmuOt/zN7i+e0EzupRc7jj6eLt9eIfIxZJ 3+QGWT37W8738vM/xxAzRQS/gCPLAbQxaZGWHdsVPncSqS1MQfdwDkJjq/OBxG735P NkWNTSfTk64jQVOUdsBKEVh3JSldXtFiRNTACHMsYTmYDY+uuMkMGZrgBR3l65NsM6 2c8XHemFyMjiVdIE9/jfeIs3vbagBr0xeQfc9GgFwThA7w5oKoRSPTIMDD8LKaiIdC nny5GUBtw02GM9sMKSoLHPZRZV/nY0n6eUqw5Dv5xtZ4GUiQkazJdqcsvMHv1LqlNb DW8UNqZIZkgNw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7G5mz7z9rxf; Mon, 10 May 2021 07:17:30 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:11 +0000 Message-Id: <20210510051628.15359-27-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-js-style): New variable. (ocaml4.07-ppx-js-style): Inherit from ocaml-ppx-js-style. --- gnu/packages/ocaml.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8bed1ae1a5..309e9c7601 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5758,32 +5758,22 @@ output-generating code, interleaved with @code{%expect} extension expressions to denote the expected output.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-js-style +(define-public ocaml-ppx-js-style (package - (name "ocaml4.07-ppx-js-style") - (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_js_style-v" version ".tar.gz")) - (sha256 - (base32 - "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2")))) + (name "ocaml-ppx-js-style") + (version "0.14.0") + (source + (janestreet-origin "ppx_js_style" version + "141fgxfipfn5jdaxc946dmp5y4fcnbhxms9maji9ddywgx82ya7l")) (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-octavius" ,(package-with-ocaml4.07 ocaml-octavius)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_js_style"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-octavius" ,ocaml-octavius) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_js_style") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-js-style)))) (home-page "https://github.com/janestreet/ppx_js_style") (synopsis "Code style checker for Jane Street Packages") (description "This package is a no-op ppx rewriter. It is used as a @@ -5791,6 +5781,16 @@ to denote the expected output.") packages.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-js-style + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-js-style) + (version "0.11.0") + (source + (janestreet-origin "ppx_js_style" version + "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2")) + (properties `((upstream-name . "ppx_js_style")))))) + (define-public ocaml4.07-ppx-typerep-conv (package (name "ocaml4.07-ppx-typerep-conv") @@ -5845,7 +5845,7 @@ from type definitions.") `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-enumerate" ,(package-with-ocaml4.07 ocaml-ppx-enumerate)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) - ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) + ("ocaml-ppx-js-style" ,(package-with-ocaml4.07 ocaml4.07-ppx-js-style)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) From patchwork Mon May 10 05:16:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29222 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 50F1B27BC82; Mon, 10 May 2021 06:19:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C5FAD27BC81 for ; Mon, 10 May 2021 06:19:31 +0100 (BST) Received: from localhost ([::1]:41250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKI-0004V9-RI for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJA-0000GG-Eu for guix-patches@gnu.org; Mon, 10 May 2021 01:18:20 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45559) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJA-0003h1-5n for guix-patches@gnu.org; Mon, 10 May 2021 01:18:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJA-0000Wu-1s for guix-patches@gnu.org; Mon, 10 May 2021 01:18:20 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 27/43] gnu: Add ocaml-ppx-base. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:20 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238861760 (code B ref 47768); Mon, 10 May 2021 05:18:20 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:06 +0000 Received: from localhost ([127.0.0.1]:57059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIv-0000S7-9r for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:05 -0400 Received: from mout02.posteo.de ([185.67.36.66]:56161) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIT-0000L4-Lb for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:39 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 020772400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623852; bh=ZPLbEy8aFX4vM6iol8w4SRkCuqqXh8OjKXhVaxXLg0Q=; h=From:To:Cc:Subject:Date:From; b=obZa4eYl7W1E5K7st9U1JtOtyq1+DQVAcBxW5aE/E3QEfIQX2vDxT21Rm08ZHuIRJ /98fB8usWSPYoJ2oU0N21Vc38Cx8ksYONL+R41GqyRf02IkgPa3BaOcou8GFHR+pEQ s07Wen4X3RpRbvO5qpXb+u+tpb5uHowGQXffkuzDEYFimTh5AhJTwqu5VuyAS0gpOq FUV43xgJl9jKnWIUATocEk73CNbQZCInYNBjC1ptuZnlD7xhWZBL6McmG5/XZLcfDw 51cpGxESd6tAW76dPTZXKNA/1iZhccRHEJD0QEqTO26oD4NqyUxCkUE/vj778gLcYb JPTsBuq0x/HRw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7H2LBGz9rxf; Mon, 10 May 2021 07:17:31 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:12 +0000 Message-Id: <20210510051628.15359-28-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-base): New variable. (ocaml4.07-ppx-base): Inherit from ocaml-ppx-base. --- gnu/packages/ocaml.scm | 65 +++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 309e9c7601..458bc117cf 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5823,34 +5823,28 @@ packages.") from type definitions.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-base +(define-public ocaml-ppx-base (package - (name "ocaml4.07-ppx-base") - (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_base-v" version ".tar.gz")) - (sha256 - (base32 - "0aq206pg330jmj7lhcagiiwm3a0b3gsqm801m8ajd4ysyw7idkym")))) + (name "ocaml-ppx-base") + (version "0.14.0") + (source + (janestreet-origin + "ppx_base" version + "0b7a3fmi90jk8paz0g36yzaq670fbnrbi1j8r5ibh9wbcfli7ji6")) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:test-target ".")) (propagated-inputs - `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-enumerate" ,(package-with-ocaml4.07 ocaml-ppx-enumerate)) - ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) - ("ocaml-ppx-js-style" ,(package-with-ocaml4.07 ocaml4.07-ppx-js-style)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_base"))) + `(("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-cold" ,ocaml-ppx-cold) + ("ocaml-ppx-enumerate" ,ocaml-ppx-enumerate) + ("ocaml-ppx-hash" ,ocaml-ppx-hash) + ("ocaml-ppx-js-style" ,ocaml-ppx-js-style) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_base") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-base)))) (home-page "https://github.com/janestreet/ppx_base") (synopsis "Base set of ppx rewriters") (description "Ppx_base is the set of ppx rewriters used for Base. @@ -5859,6 +5853,25 @@ Note that Base doesn't need ppx to build, it is only used as a verification tool.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-base + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-base) + (version "0.11.0") + (source + (janestreet-origin + "ppx_base" version + "0aq206pg330jmj7lhcagiiwm3a0b3gsqm801m8ajd4ysyw7idkym")) + (propagated-inputs + `(("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-enumerate" ,ocaml-ppx-enumerate) + ("ocaml-ppx-hash" ,ocaml-ppx-hash) + ("ocaml-ppx-js-style" ,ocaml-ppx-js-style) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_base")))))) + (define-public ocaml4.07-ppx-bin-prot (package (name "ocaml4.07-ppx-bin-prot") @@ -5913,7 +5926,7 @@ functions from type definitions.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-base" ,ocaml4.07-ppx-base) + ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) @@ -6151,7 +6164,7 @@ standard library that was developed by Jane Street.") ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-base" ,ocaml4.07-ppx-base) + ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) From patchwork Mon May 10 05:16:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29227 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 9E5D927BC82; Mon, 10 May 2021 06:19:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2245227BC81 for ; Mon, 10 May 2021 06:19:54 +0100 (BST) Received: from localhost ([::1]:42602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKf-0005Mh-0q for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJB-0000Ji-9Q for guix-patches@gnu.org; Mon, 10 May 2021 01:18:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJA-0003hN-Vo for guix-patches@gnu.org; Mon, 10 May 2021 01:18:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJA-0000X8-Rd for guix-patches@gnu.org; Mon, 10 May 2021 01:18:20 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 28/43] gnu: Add ocaml-fieldslib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:20 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238871784 (code B ref 47768); Mon, 10 May 2021 05:18:20 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:07 +0000 Received: from localhost ([127.0.0.1]:57064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIw-0000SV-B5 for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54847) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIU-0000LC-2a for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:39 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 7A4192400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623852; bh=oBc54MWhfNDQ8RCQyI4VJdotcVDDZKIHFFz6YqhZbCw=; h=From:To:Cc:Subject:Date:From; b=DxNtCGOvwPQoFkS/jGqdYrvyLMqp4ZM+DmwXxoxmVJoSW/E/nkDOcuRJHy3KkDb1x +xY5CqIuS2wq5Q3m6mVsiXrvBBjGK67tTWNgEjG93xLJIa3Zwohoit6B7Uev68FbW5 FhvPpF51H+upzVB+72sop9BR6hE7RMJa7gbAAoSJjDKlpv9dnmFuobPuXePTwtN5GQ wdThK3dNviUc/9NUFbmZd2BHOXucspCwSv+mkX03EyrdrlcSp3HmdekSw4LY7wz4r5 zROESR+kpajiTbl9QpAh71yyqdK+ymvJZixi1WWhpRELLmNryumWvR+Ia2kgcWWrls v0Dr+eGUdMlxQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7H60sdz9rxg; Mon, 10 May 2021 07:17:31 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:13 +0000 Message-Id: <20210510051628.15359-29-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-fieldslib): New variable. (ocaml4.07-fieldslib): Inherit from ocaml-fieldslib. --- gnu/packages/ocaml.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 458bc117cf..aa8437985e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4987,31 +4987,21 @@ by making sure that you only compare comparable values.") "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) (properties `((upstream-name . "ppx_compare")))))) -(define-public ocaml4.07-fieldslib +(define-public ocaml-fieldslib (package - (name "ocaml4.07-fieldslib") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) "/files/" - "fieldslib-v" version ".tar.gz")) - (sha256 - (base32 - "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")))) + (name "ocaml-fieldslib") + (version "0.14.0") + (source (janestreet-origin + "fieldslib" version + "10n5y376fb5jgqk9h8vq158rm1b36h9lzh6p11q33h6xgvb1v6n3")) (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 . "fieldslib"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "fieldslib") + (ocaml4.07-variant . ,(delay ocaml4.07-fieldslib)))) (home-page "https://github.com/janestreet/fieldslib") (synopsis "Syntax extension to record fields") (description "Syntax extension to define first class values representing @@ -5019,6 +5009,16 @@ record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) +(define-public ocaml4.07-fieldslib + (package-with-ocaml4.07 + (package + (inherit ocaml-fieldslib) + (version "0.11.0") + (source (janestreet-origin + "fieldslib" version + "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")) + (properties `((upstream-name . "fieldslib")))))) + (define-public ocaml4.07-variantslib (package (name "ocaml4.07-variantslib") @@ -5065,7 +5065,7 @@ standard library.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-fieldslib" ,ocaml4.07-fieldslib) + ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -6161,7 +6161,7 @@ standard library that was developed by Jane Street.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) ("ocaml-configurator" ,ocaml4.07-configurator) - ("ocaml-fieldslib" ,ocaml4.07-fieldslib) + ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) From patchwork Mon May 10 05:16:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29229 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 76EB627BC82; Mon, 10 May 2021 06:20:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E01F427BC81 for ; Mon, 10 May 2021 06:20:02 +0100 (BST) Received: from localhost ([::1]:43076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKn-0005fq-Vl for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:20:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJB-0000Ll-Kr for guix-patches@gnu.org; Mon, 10 May 2021 01:18:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45562) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJB-0003hg-Bx for guix-patches@gnu.org; Mon, 10 May 2021 01:18:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJB-0000XG-7z for guix-patches@gnu.org; Mon, 10 May 2021 01:18:21 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 29/43] gnu: Add ocaml-ppx-fields-conv. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:21 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238871799 (code B ref 47768); Mon, 10 May 2021 05:18:21 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:07 +0000 Received: from localhost ([127.0.0.1]:57067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIw-0000Sj-UE for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:07 -0400 Received: from mout02.posteo.de ([185.67.36.66]:48303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIU-0000LO-Kf for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:40 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 06B422400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623853; bh=KBprn7AwU7/ykRFvaa6Qx8LhfC0XpBWruHHfwoYUdh8=; h=From:To:Cc:Subject:Date:From; b=rLAEOHcIWS08KG6Sp/wIoozeoNKnKFc+HBUsvH/QmcU1OdZUxZfsgLXIlod9qJ36G FHNRrQdGSeIeo7E2WvoQ6zdYJ9ilwYYzWIrzhJo+K5+X4oL/4AbhXlI1fZWUro0m2x nFbYAFtJjNOBGyOm0V1WDcEfWgX31mLiqB49KrWjwL506hxWQy1ooIisiaQRlDU3Ha /2mvBAuqqcbNgDyWi9rp/ukTsOO5c9SZR4Gvr8K0/GdZSgQOtGL8/uAewqQWNDawgP 9DeeflalkmtLh/ColjtoxmXXZs49S1CJ1zLwEYCC/7pd5mSD+C0iSoSkb0pQeXrGD4 C3RDLLc9KPLAw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7J2TJrz9rxR; Mon, 10 May 2021 07:17:32 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:14 +0000 Message-Id: <20210510051628.15359-30-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-fields-conv): New variable. (ocaml4.07-ppx-fields-conv): Inherit from ocaml-ppx-fields-conv. --- gnu/packages/ocaml.scm | 58 ++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index aa8437985e..d3fe5b51e9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5050,31 +5050,29 @@ of a record and create new record values.") standard library.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-fields-conv +(define-public ocaml-ppx-fields-conv (package - (name "ocaml4.07-ppx-fields-conv") - (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_fields_conv-v" version ".tar.gz")) - (sha256 - (base32 - "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc")))) + (name "ocaml-ppx-fields-conv") + (version "0.14.2") + (home-page "https://github.com/janestreet/ppx_fields_conv") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zwirwqry24b48bg7d4yc845hvcirxyymzbw95aaxdcck84d30n8")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ppx_fields_conv"))) - (home-page "https://github.com/janestreet/ppx_fields_conv") + `(("ocaml-base" ,ocaml-base) + ("ocaml-fieldslib" ,ocaml-fieldslib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_fields_conv") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-fields-conv)))) (synopsis "Generation of accessor and iteration functions for ocaml records") (description "Ppx_fields_conv is a ppx rewriter that can be used to define first class values representing record fields, and additional routines, to get @@ -5082,6 +5080,16 @@ and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-fields-conv + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-fields-conv) + (version "0.11.0") + (source (janestreet-origin + "ppx_fields_conv" version + "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc")) + (properties `((upstream-name . "ppx_fields_conv")))))) + (define-public ocaml-ppx-sexp-conv (package (name "ocaml-ppx-sexp-conv") @@ -5216,7 +5224,7 @@ string conversion.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) + ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree" @@ -5738,7 +5746,7 @@ useful errors on failure.") ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) + ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) @@ -5932,7 +5940,7 @@ functions from type definitions.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-expect" ,ocaml4.07-ppx-expect) ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) - ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) + ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) From patchwork Mon May 10 05:16:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29215 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 647B427BC81; Mon, 10 May 2021 06:19:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5ACAF27BC82 for ; Mon, 10 May 2021 06:19:14 +0100 (BST) Received: from localhost ([::1]:39402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyK1-0003P9-Hw for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ3-0008J9-N4 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ3-0003Yv-EQ for guix-patches@gnu.org; Mon, 10 May 2021 01:18:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ3-0000Uz-AQ for guix-patches@gnu.org; Mon, 10 May 2021 01:18:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 30/43] gnu: Add ocaml-ppx-optcomp Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238701584 (code B ref 47768); Mon, 10 May 2021 05:18:13 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:50 +0000 Received: from localhost ([127.0.0.1]:57022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIf-0000PP-LJ for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:50 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIP-0000JD-Qt for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 7CBD6240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623853; bh=bZNK9NLv+wZv6ISXwd+PDTc+VCJuQ3gMSrffgiPMnas=; h=From:To:Cc:Subject:Date:From; b=W3Odmpt54CuxSYjRqh95EO3h2a8n/c3HavrIJGZSpjJI0EDhVZIWh770ozsDekyXN 6zsm6eRZ+JVlXr0X731bc5rHi5dSnZxrGCxKNCckBKKUcDOOsNo4IG5d40dq+UF6ll bTi/g/tJX/JZUXxQwPPaT+zP1APgAj58gH7DjHOQL6DG80KD4SpluORp6gQD3h/UWM 3Eg6EX03g/gF7KhNws5AwAi69mMydh0rbOKFAbg8DOCSi1dgP8wSHQoB6PwqLBIa09 I3zZJG1GLAODMfcbDmgFfy7ii5f8wZtanU3+JQ6xMdTZ7NJg365H2v/MlEgd7iiKDr nUZg2A1BzAoDQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7J6672z9rxR; Mon, 10 May 2021 07:17:32 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:15 +0000 Message-Id: <20210510051628.15359-31-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-optcomp): New variable. (ocaml4.07-ppx-optcomp): Inherit from ocaml-ppx-optcomp. --- gnu/packages/ocaml.scm | 52 +++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d3fe5b51e9..e3856ac3be 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5570,35 +5570,45 @@ context such as function arguments.") else expression.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-optcomp +(define-public ocaml-ppx-optcomp (package - (name "ocaml4.07-ppx-optcomp") - (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_optcomp-v" version ".tar.gz")) - (sha256 - (base32 - "1bb52p2j2h4s9f06vrcpla80rj93jinnzq6jzilapyx9q068929i")))) + (name "ocaml-ppx-optcomp") + (version "0.14.1") + (home-page "https://github.com/janestreet/ppx_optcomp") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_optcomp"))) - (home-page "https://github.com/janestreet/ppx_optcomp") + `(("ocaml-base" ,ocaml-base) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_optcomp") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optcomp)))) (synopsis "Optional compilation for OCaml") (description "Ppx_optcomp stands for Optional Compilation. It is a tool used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) +(define-public ocaml4.07-ppx-optcomp + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-optcomp) + (version "0.11.0") + (source + (janestreet-origin + "ppx_optcomp" version + "1bb52p2j2h4s9f06vrcpla80rj93jinnzq6jzilapyx9q068929i")) + (properties `((upstream-name . "ppx_optcomp")))))) + (define-public ocaml-ppx-let (package (name "ocaml-ppx-let") @@ -5944,7 +5954,7 @@ functions from type definitions.") ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) - ("ocaml-ppx-optcomp" ,ocaml4.07-ppx-optcomp) + ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) From patchwork Mon May 10 05:16:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29212 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 9954A27BC83; Mon, 10 May 2021 06:19:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1A5E627BC81 for ; Mon, 10 May 2021 06:19:09 +0100 (BST) Received: from localhost ([::1]:38748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJw-000316-73 for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ6-0008PH-Ix for guix-patches@gnu.org; Mon, 10 May 2021 01:18:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45550) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ6-0003bA-AB for guix-patches@gnu.org; Mon, 10 May 2021 01:18:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ6-0000Vo-5z for guix-patches@gnu.org; Mon, 10 May 2021 01:18:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 31/43] gnu: Add ocaml-ppx-optional. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238811647 (code B ref 47768); Mon, 10 May 2021 05:18:16 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:01 +0000 Received: from localhost ([127.0.0.1]:57036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIr-0000QN-0f for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:01 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIR-0000Jx-HJ for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:37 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 089002400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623854; bh=28OS2CijVGFehefDfoCOPRMbfgGe/hBvEC+AvpzI4cI=; h=From:To:Cc:Subject:Date:From; b=ptgxVDwEYBFxzE8bSgl0vPKqs2iecwCgD26X5D0FYksEXAA8rzYZc2f+TJxmBMYlR F+s5K88Wkoz4VWNyio3yu6N5Xjw3oMF2m/u06UBqoo15ZSyB08+/HB+3CaZp74fPHb lNzJTO6AYK9u7BlU+Ar9uM6spJp7hdcEYwbenWxFCNSd5GTbvaAR1rRO/ZiSVIjEFQ euI68XoiQV1LgB4inOXif6ENbXxf0sqmLxvKXUD6XuKVSVq4i3m2Mue/TPyPW0OPLF H4gK/Wrhw/Jna4SGDUsMfcr0xnx6Izl1XouqwyY2ZjeIZCY1lVYx032rc2vEpy1m4+ KVC3kRXDARsFQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7K3PBVz9rxR; Mon, 10 May 2021 07:17:33 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:16 +0000 Message-Id: <20210510051628.15359-32-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * 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) From patchwork Mon May 10 05:16:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29217 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 D93D727BC82; Mon, 10 May 2021 06:19:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9AB0D27BC81 for ; Mon, 10 May 2021 06:19:21 +0100 (BST) Received: from localhost ([::1]:40288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyK8-0003vk-Qg for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ5-0008Ky-K2 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ4-0003Ze-8b for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ4-0000VE-45 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 32/43] gnu: Add ocaml-jst-config. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238791609 (code B ref 47768); Mon, 10 May 2021 05:18:14 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:59 +0000 Received: from localhost ([127.0.0.1]:57026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIp-0000Pq-Fw for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:59 -0400 Received: from mout01.posteo.de ([185.67.36.65]:57643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIQ-0000JM-Td for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:35 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 91DD0240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623854; bh=dm6POjbp2gVhxQIjd8hjEslyOI5ds4vcTsGW2leYVzo=; h=From:To:Cc:Subject:Date:From; b=gl1h8i90RLiDPXdnHa5Yucdk4uCdeYdqejf6R12Cfdf8H6otoC9hwwmqJnmtfXltV wvYY/x6DjvGLPjeNM5qMlEa5E7y5bGzOruoGlAaT8bbt83noTFC+lwwiwyrCnj2MJ9 t7hLj8gFPoIkii+Md9n7PwB258DR/PgmDw5PjB8zeKc3/4pmR+p6vOnqkloh4fjPBI qXMknNBiC8b4ooK0N98hu8/M2sO3HDU1CIygiVy6s3T/hZ7fDDFGk6pYRfy0EKIzb0 B6JTEmkijSfjY3ade3offBmbxcq/f1fplUo22s3QgWqirKx3HRQRGp1dOR4mcAHett DO3t/8t5o02pg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7K722xz9rxR; Mon, 10 May 2021 07:17:33 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:17 +0000 Message-Id: <20210510051628.15359-33-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-jst-config): New variable. --- gnu/packages/ocaml.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b38ce9fcc8..5334d8530d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4128,6 +4128,30 @@ Dedukti files.") syntax checking on dedukti files.") (license license:cecill-b)))) +(define-public ocaml-jst-config + (package + (name "ocaml-jst-config") + (version "0.14.0") + (source + (janestreet-origin + "jst-config" version + "1fppr29vn91zpqda8jlnp8bcssd4bf3rn36ig8fnd1yhjrsvz8f6")) + (build-system dune-build-system) + (arguments '(#:tests? #f)) ; no tests + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-assert" ,ocaml-ppx-assert) + ("ocaml-stdio" ,ocaml-stdio) + ("dune-configurator" ,dune-configurator))) + (home-page "https://github.com/janestreet/jst-config") + (synopsis "Compile-time configuration for Jane Street libraries") + (description "Defines compile-time constants used in Jane Street libraries +such as Base, Core, and Async. This package has an unstable interface; it is +intended only to share configuration between different packages from Jane +Street. Future updates may not be backward-compatible, and we do not +recommend using this package directly.") + (license license:expat))) + (define-public ocaml4.07-ppx-inline-test (package (name "ocaml4.07-ppx-inline-test") @@ -4145,7 +4169,7 @@ syntax checking on dedukti files.") "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50")))) (build-system dune-build-system) (arguments - ;see home page README for further information + ;see home page README for further information `(#:tests? #f #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib From patchwork Mon May 10 05:16:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29206 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 0350A27BC82; Mon, 10 May 2021 06:18:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C685227BC81 for ; Mon, 10 May 2021 06:18:54 +0100 (BST) Received: from localhost ([::1]:37472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJi-0002Eh-0V for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:18:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ5-0008L0-Kt for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45547) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ5-0003Zg-24 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ4-0000VS-Tr for guix-patches@gnu.org; Mon, 10 May 2021 01:18:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 33/43] gnu: Add ocaml-jane-street-headers. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238801623 (code B ref 47768); Mon, 10 May 2021 05:18:14 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:00 +0000 Received: from localhost ([127.0.0.1]:57030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIq-0000Q1-0t for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:00 -0400 Received: from mout01.posteo.de ([185.67.36.65]:59303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIR-0000Jo-DT for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 184FD240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623855; bh=24+Rz15erF1ZnneB1yN7iQabAguvCPJMRecj029nb9E=; h=From:To:Cc:Subject:Date:From; b=jOGbqD/D3p7SMQAXD2tciw70HWUFbrEs2FQ4WkORnmEfz9MX0PKjCUE0o0uMpMCly k4MMuz+jmLie+RtmBkD83+EF5ufcXnUDxDesYBW0kxzzHEblMcg79B1KyJsONgPuon XsPAN1IaVmrfxMy6YQ1uHQ3LMvaLczq1BmX75h4POWl6jLBDsZSakxh2BQddhZzp+j GarnconoOdFdH5iT5TSJQfrdgzTPZ6O4FOtiAhbPpUs7GXCMzlgjATWEzmnsHmb31h ZyaLz9QgjMIpsL+XsIimsXf24pROQ1HIdxXZERDpAbqsanWwgFyDhpFX/9AdzP23c8 YndHYSyivqdPQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7L3Yyxz9rxg; Mon, 10 May 2021 07:17:34 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:18 +0000 Message-Id: <20210510051628.15359-34-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-jane-street-headers): New variable. --- gnu/packages/ocaml.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5334d8530d..449ff00cf1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4152,6 +4152,22 @@ Street. Future updates may not be backward-compatible, and we do not recommend using this package directly.") (license license:expat))) +(define-public ocaml-jane-street-headers + (package + (name "ocaml-jane-street-headers") + (version "0.14.0") + (source + (janestreet-origin + "jane-street-headers" version + "028yxb4h3iy025iy89v8653m5brh7flrjshghs4x99pd690pmfs7")) + (build-system dune-build-system) + (arguments '(#:tests? #f)) ; no tests + (home-page "https://github.com/janestreet/jane-street-headers") + (synopsis "Jane Street C header files") + (description "C header files shared between the various Jane Street +packages.") + (license license:expat))) + (define-public ocaml4.07-ppx-inline-test (package (name "ocaml4.07-ppx-inline-test") From patchwork Mon May 10 05:16:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29219 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 8AB3627BC82; Mon, 10 May 2021 06:19:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2E55427BC81 for ; Mon, 10 May 2021 06:19:24 +0100 (BST) Received: from localhost ([::1]:40522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKB-00044o-DS for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ8-0008VB-0v for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45553) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ7-0003dP-L6 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ7-0000WB-GL for guix-patches@gnu.org; Mon, 10 May 2021 01:18:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 34/43] gnu: Add ocaml-time-now. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238821681 (code B ref 47768); Mon, 10 May 2021 05:18:17 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:02 +0000 Received: from localhost ([127.0.0.1]:57043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIs-0000Qw-Dc for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:02 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIS-0000JD-NR for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:37 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 64643240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623856; bh=ZrT/cke5x+s8oENbM4G8mf7HzmXPTHWBK8iWNLSFZmg=; h=From:To:Cc:Subject:Date:From; b=bwq4Y64zPdOjHm/R9mC65AZAPdHsywoEdYtTXXPDbKaNsc3tWyjkCJJ1mDlIFEu5d JJ77q/Az1cKz2DtoutzVaUCjitFcRhzrZniNoJ+dPhIbYeZDWG1IXRU5MUKfJ8lFnB fwdmbdnJ4I2o9HU1Dc6pzFxr7T0zE9Uvb+FVsFSKN7W8kv61wcRNkWgHiuDFyopmMj qAS91uPjZ5mN7NvrNZ9zbevnvtCqkG6tJyw08hCwl9uDtU951t6/FsriHYP9BE+J9I fPTBexLa+Czxp7hTBb3eG3ZBRnT1hMj36tNE7jo0r/RJirL0piUEX4XTkC0B/BT7qu SuN5O+TROTctA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7M03xHz9rxf; Mon, 10 May 2021 07:17:34 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:19 +0000 Message-Id: <20210510051628.15359-35-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-time-now): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 449ff00cf1..43c6c7ae0f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4168,6 +4168,31 @@ recommend using this package directly.") packages.") (license license:expat))) +(define-public ocaml-time-now + (package + (name "ocaml-time-now") + (version "0.14.0") + (source + (janestreet-origin + "time_now" version + "0hkn2jw4dz5gflnsblskl5wp6z7zbrahwjmaxmsskfviwjg82cqh")) + (build-system dune-build-system) + (arguments '(#:tests? #f)) ; no tests + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-jane-street-headers" ,ocaml-jane-street-headers) + ("ocaml-jst-config" ,ocaml-jst-config) + ("ocaml-ppx-base" ,ocaml-ppx-base) + ("ocaml-ppx-optcomp" ,ocaml-ppx-optcomp))) + (properties `((upstream-name . "time_now"))) + (home-page + "https://github.com/janestreet/time_now") + (synopsis "Reports the current time") + (description + "Provides a single function to report the current time in nanoseconds +since the start of the Unix epoch.") + (license license:expat))) + (define-public ocaml4.07-ppx-inline-test (package (name "ocaml4.07-ppx-inline-test") From patchwork Mon May 10 05:16:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29230 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 D86A227BC82; Mon, 10 May 2021 06:20:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4A19327BC81 for ; Mon, 10 May 2021 06:20:06 +0100 (BST) Received: from localhost ([::1]:43336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKr-0005pY-HJ for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:20:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJA-0000E7-0K for guix-patches@gnu.org; Mon, 10 May 2021 01:18:20 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ9-0003ga-NG for guix-patches@gnu.org; Mon, 10 May 2021 01:18:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ9-0000Wm-JS for guix-patches@gnu.org; Mon, 10 May 2021 01:18:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 35/43] gnu: Add ocaml-ppx-inline-test. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:19 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238851746 (code B ref 47768); Mon, 10 May 2021 05:18:19 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:05 +0000 Received: from localhost ([127.0.0.1]:57056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIu-0000Rt-OG for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:05 -0400 Received: from mout02.posteo.de ([185.67.36.66]:49499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIT-0000Jw-23 for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 959522400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623856; bh=cD61tqoTXmwAURcENBbp3k7uXZZGWJJ/I6ZJl1P+gtY=; h=From:To:Cc:Subject:Date:From; b=MRnCPmSSXyBI0yUG+H3SrW+2vpJi3modW/dPJBhwAF+kAsH3tG5HDE8hRzHaKHV1+ MWbUcuGYoqoS4kbjCyKg4+VwwvuY/gCGlYFOcX0mARRjHsTtnJ+Om/CMDDesAC9E/Z 7Rr4uf3lhAb4WqjD8z/eItBGjnaCgii/b0S0kEGx05guRL2xWtY6KJ1hYZ7aqYCV/x 0gBPxKIJHA1A62iWC0naqNzW75Xqn4fvtkqh8QGslbYMvmmYiOp3xY5dphRo3cVCzf f9GnigxBHhwTPXItx2gO8UebumPYaJys9zxWIAgO7CoTL2FK5ZTpsm2rfyiTLGUDMu PZxeeIzd3Kysg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7M3ptXz9rxh; Mon, 10 May 2021 07:17:35 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:20 +0000 Message-Id: <20210510051628.15359-36-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-inline-test): New variable. (ocaml4.07-ppx-inline-test): Inherit from ocaml-ppx-inline-test. --- gnu/packages/ocaml.scm | 69 ++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 43c6c7ae0f..e91c2e14b3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4193,10 +4193,10 @@ packages.") since the start of the Unix epoch.") (license license:expat))) -(define-public ocaml4.07-ppx-inline-test +(define-public ocaml-ppx-inline-test (package - (name "ocaml4.07-ppx-inline-test") - (version "0.12.0") + (name "ocaml-ppx-inline-test") + (version "0.14.1") (home-page "https://github.com/janestreet/ppx_inline_test") (source (origin @@ -4207,29 +4207,52 @@ since the start of the Unix epoch.") (file-name (git-file-name name version)) (sha256 (base32 - "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50")))) + "1ajdna1m9l1l3nfigyy33zkfa3yarfr6s086jdw2pcfwlq1fhhl4")))) (build-system dune-build-system) (arguments - ;see home page README for further information - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_inline_test"))) + `(#:tests? #f)) ;see home page README for further information + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-compiler-libs" ,ocaml-compiler-libs) + ("ocaml-sexplib0" ,ocaml-sexplib0) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-time-now" ,ocaml-time-now))) + (properties `((upstream-name . "ppx_inline_test") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-inline-test)))) (synopsis "Syntax extension for writing in-line tests in ocaml code") (description "This package contains a syntax extension for writing in-line tests in ocaml code. It is part of Jane Street's PPX rewriters collection.") (license license:expat))) +(define-public ocaml4.07-ppx-inline-test + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-inline-test) + (name "ocaml-ppx-inline-test") + (version "0.12.0") + (home-page "https://github.com/janestreet/ppx_inline_test") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append home-page ".git")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50")))) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-compiler-libs" ,ocaml-compiler-libs) + ("ocaml-sexplib0" ,ocaml-sexplib0) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_inline_test")))))) + (define-public ocaml-bindlib (package (name "ocaml-bindlib") @@ -4246,7 +4269,7 @@ collection.") "1f8kr81w8vsi4gv61xn1qbc6zrzkjp8l9ix0942vjh4gjxc74v75")))) (build-system ocaml-build-system) (arguments - `(#:tests? #f ;no tests + `(#:tests? #f ;no tests #:use-make? #t #:phases (modify-phases %standard-phases @@ -5442,7 +5465,7 @@ many values).") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) + `(("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5825,7 +5848,7 @@ useful errors on failure.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) + ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) @@ -6019,7 +6042,7 @@ functions from type definitions.") ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) + ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-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" ,(package-with-ocaml4.07 ocaml-ppx-optional)) @@ -6251,7 +6274,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) - ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) + ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) From patchwork Mon May 10 05:16:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29214 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 B3F4427BC83; Mon, 10 May 2021 06:19:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B726B27BC81 for ; Mon, 10 May 2021 06:19:13 +0100 (BST) Received: from localhost ([::1]:39298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyK0-0003LQ-U5 for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46962) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ9-00009n-6q for guix-patches@gnu.org; Mon, 10 May 2021 01:18:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ8-0003ea-Ti for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ8-0000WY-PY for guix-patches@gnu.org; Mon, 10 May 2021 01:18:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 36/43] gnu: Add ocaml-angstrom. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:18 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238841723 (code B ref 47768); Mon, 10 May 2021 05:18:18 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:04 +0000 Received: from localhost ([127.0.0.1]:57051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIt-0000RW-Sl for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:04 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIT-0000KC-Er for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 0AD442400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623857; bh=t3Gpji5qIBzxidODrICjFhJoQckcv7gfWrcgz0vOSqE=; h=From:To:Cc:Subject:Date:From; b=N2L8dbmrp6baW0vr51X34bGQ8d4NzlaQcFqDSfjGyv24CfI2mxLvCv5QG5VUsbH4p CgD4KFPQ603CKwOa7kC3sMWdTOc27BfV1YG8fHBexHe7KA66x5p5Q5JJg3dNdZ/yl4 5wDLyHfWgkxvVHET9USLqVU8/du/8PEI5u9/VvZf5B6Wm5840ywinAordn6zRrvU2W BdWdTJP9OdH2bm+cq9Z2/bUXiToo960/NuPFG/YlD3QiAlxsT81pX587VjD0csBxhw kHKHI1g5/i9gj3xDoyT53/htRwsh/DdPLGOHvi6gbxVxcnTElblP12tmu/Yi4KfGC+ J/EheCe7ZjMuA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7N3Dljz9rxj; Mon, 10 May 2021 07:17:36 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:21 +0000 Message-Id: <20210510051628.15359-37-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-angstrom): New variable. --- gnu/packages/ocaml.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e91c2e14b3..24bfb8cf37 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6833,3 +6833,40 @@ these missing pieces.") "This packages backports new features of the language to older compilers, such as let+.") (license license:expat))) + +(define-public ocaml-angstrom + (package + (name "ocaml-angstrom") + (version "0.15.0") + (home-page "https://github.com/inhabitedtype/angstrom") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh")))) + (build-system dune-build-system) + (arguments + ;; Only build the base angstrom package. + '(#:package "angstrom" + #:test-target ".")) + (propagated-inputs + `(("ocaml-bigstringaf" ,ocaml-bigstringaf))) + (native-inputs + `(("ocaml-alcotest" ,ocaml-alcotest) + ("ocaml-ppx-let" ,ocaml-ppx-let) + ("ocaml-syntax-shims" ,ocaml-syntax-shims))) + (synopsis "Parser combinators built for speed and memory-efficiency") + (description + "Angstrom is a parser-combinator library that makes it easy to write +efficient, expressive, and reusable parsers suitable for high-performance +applications. It exposes monadic and applicative interfaces for composition, +and supports incremental input through buffered and unbuffered interfaces. +Both interfaces give the user total control over the blocking behavior of +their application, with the unbuffered interface enabling zero-copy IO. +Parsers are backtracking by default and support unbounded lookahead.") + (license license:bsd-3))) From patchwork Mon May 10 05:16:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29218 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 85CC727BC82; Mon, 10 May 2021 06:19:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 29F7127BC81 for ; Mon, 10 May 2021 06:19:22 +0100 (BST) Received: from localhost ([::1]:40230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyK8-0003tU-D2 for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ9-0000Bw-K6 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ9-0003fX-AY for guix-patches@gnu.org; Mon, 10 May 2021 01:18:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ9-0000Wf-6T for guix-patches@gnu.org; Mon, 10 May 2021 01:18:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 37/43] gnu: Add ocaml-uri. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:19 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238841732 (code B ref 47768); Mon, 10 May 2021 05:18:19 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:04 +0000 Received: from localhost ([127.0.0.1]:57053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIu-0000Rh-9h for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:04 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIT-0000KJ-V2 for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 879392400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623857; bh=EwGLhflg6J16ObjFFNNKipDgas4y08CQM88lW9CHJ0Y=; h=From:To:Cc:Subject:Date:From; b=hnVvhB4xtGjbxxzo1/N7PlNw5hVrHHawuoPnSxVDxjB1QNg07zGdhxS65jPQPGJCU xRw4kvnUTFmaHS6uQx5HXSdC7ilHJuYp/2z/xGvKp0vvh8G2qgzGWhKo3uVk0ykB9R NXLVleGednzatIW+k4DG/MCwzsUQ3EsNnn2OM0FAD1UTHYub+uy6R4pBeyplGeMp+h SBmuN4r75VYHqEfV6pVeYLeosbTWEk+YH1MPw+Wiygkvs6gYcHJIISShZn+BdiLHu4 DkIhirVCmzNUjgQWnNDWNeIKtgWwyV5yJnVkmvqhg+gWKJU1P61Q7+gJVwTG2O4zZM l/eJOikyGxoLA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7N6rY8z9rxf; Mon, 10 May 2021 07:17:36 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:22 +0000 Message-Id: <20210510051628.15359-38-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-uri): New variable. --- gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 24bfb8cf37..c390a8bce9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3403,6 +3403,35 @@ the need to write signal code, which is useful for quick scripts that manipulate JSON.") (license license:isc))) +(define-public ocaml-uri + (package + (name "ocaml-uri") + (version "4.1.0") + (home-page "https://github.com/mirage/ocaml-uri") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (sha256 + (base32 + "10bf28my1yhj8a2d7bkgbna9j20wq0ghp92k926y29bmjj2qh0l7")))) + (build-system dune-build-system) + (arguments '(#:package "uri" + #:test-target ".")) + (propagated-inputs + `(("ocaml-stringext" ,ocaml-stringext) + ("ocaml-angstrom" ,ocaml-angstrom))) + (native-inputs + `(("ocaml-ounit" ,ocaml-ounit) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv))) + (properties `((upstream-name . "uri") + (ocaml4.07-variant ,(delay ocaml4.07-uri)))) + (synopsis "RFC3986 URI/URL parsing library") + (description "OCaml-uri is a library for parsing URI/URL in the RFC3986 format.") + (license license:isc))) + (define-public ocaml4.07-uri (package (name "ocaml4.07-uri") @@ -3435,6 +3464,7 @@ JSON.") `(("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stringext" ,(package-with-ocaml4.07 ocaml-stringext)))) + (properties `((upstream-name . "uri"))) (home-page "https://github.com/mirage/ocaml-uri") (synopsis "RFC3986 URI/URL parsing library") (description "OCaml-uri is a library for parsing URI/URL in the RFC3986 format.") From patchwork Mon May 10 05:16:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29225 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 55F5627BC82; Mon, 10 May 2021 06:19:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1F92B27BC81 for ; Mon, 10 May 2021 06:19:40 +0100 (BST) Received: from localhost ([::1]:41954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKR-0004xd-An for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJA-0000Hk-Vo for guix-patches@gnu.org; Mon, 10 May 2021 01:18:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJA-0003hD-IS for guix-patches@gnu.org; Mon, 10 May 2021 01:18:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJA-0000X1-El for guix-patches@gnu.org; Mon, 10 May 2021 01:18:20 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 38/43] gnu: Add ocaml-graphics. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:20 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238861771 (code B ref 47768); Mon, 10 May 2021 05:18:20 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:06 +0000 Received: from localhost ([127.0.0.1]:57062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIv-0000SL-UN for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIU-0000Jx-Fw for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:39 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 1D0D62400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623858; bh=DgXZAK57XHQaVBUT/AhbCJh21ugtMmNS5Gel8ottpec=; h=From:To:Cc:Subject:Date:From; b=ogWJ55SNPI6Ex+0+KP9Tdo5IMZRPLLsKu3T9HWMHUE3yc/xL8B9W6ij1rB1RzZl+h 0SUHPcQvcDzPZUGgRySKwmR9DVqDuj3Egj2howWKzcFTE+ub3crpxPRdYeRa9HZlFZ 9NK+F/ARLD1LyqKbMCNjQVu63gYrw/Clp12mvYfYEq7h2TcY6Sv8zmXo5GCOfgyNLo ylXCAkubZ6EUWMkv0kZYXrfghjFoZuqVCmjkC08xoesHicsPdGoXNL+LJFbSuWAWWT +loQiOOcCZ3CDl0fi34aTRDKM6nEyEyrAo5XrdS/10oG78ijjMw+ZEzCuMOJo1ZnzM FyLryU6k101Vw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7P3Lrjz9rxf; Mon, 10 May 2021 07:17:37 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:23 +0000 Message-Id: <20210510051628.15359-39-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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: divoplade * gnu/packages/ocaml.scm (ocaml-graphics): New variable. Co-Authored-By: pukkamustard --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c390a8bce9..4727b294d9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6900,3 +6900,29 @@ Both interfaces give the user total control over the blocking behavior of their application, with the unbuffered interface enabling zero-copy IO. Parsers are backtracking by default and support unbounded lookahead.") (license license:bsd-3))) + +(define-public ocaml-graphics + (package + (name "ocaml-graphics") + (version "5.1.1") + (home-page "https://github.com/ocaml/graphics") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14w07ydji2nbdk366nfp2pzs9484xp9vqv63n345id13v48z8bfi")))) + (build-system dune-build-system) + (propagated-inputs + `(("libx11" ,libx11))) + (synopsis "The OCaml graphics library") + (description + "The graphics library provides a set of portable drawing primitives. +Drawing takes place in a separate window that is created when +Graphics.open_graph is called. This library used to be distributed with OCaml +up to OCaml 4.08.") + (license license:lgpl2.1+))) From patchwork Mon May 10 05:16:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29231 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 6A32B27BC82; Mon, 10 May 2021 06:20:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E3F3127BC81 for ; Mon, 10 May 2021 06:20:17 +0100 (BST) Received: from localhost ([::1]:43684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyL3-00062u-5j for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:20:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJC-0000Rs-TY for guix-patches@gnu.org; Mon, 10 May 2021 01:18:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJC-0003kE-J7 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJC-0000Xc-Eu for guix-patches@gnu.org; Mon, 10 May 2021 01:18:22 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 39/43] gnu: Add ocaml-variantslib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:22 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238891841 (code B ref 47768); Mon, 10 May 2021 05:18:22 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:09 +0000 Received: from localhost ([127.0.0.1]:57076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIy-0000TQ-QP for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:09 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIa-0000Mz-1i for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:44 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 80CE0240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623858; bh=0HG02pElc2iOQRXMuhtmtNTP6uMdzRyR3k6thJSGBAI=; h=From:To:Cc:Subject:Date:From; b=XBUW00eJ4YhgjBSW9QhWRTXCsw5MQvHbi6oBrchZgROjYyxiMOavqnrM6v/PbHaO/ 7zDourOqjoe7fRsPodfS84XtyJjuCYhzhsVe/Fu7wQRLtWl3pOYjjA2Zbwk4p0Wxod 2SEQPBFPwd6gc8ntlPqd2WFG71S5n8yY1i8dobnHAntJEc3BjleWwJdQBgAmfLRgA/ yMfheIJtq3D8tcKVLoqr6aRV7bzo/D+gpIR49RA08+GrWcG0WDjPItMDeUolRAUTPK QTubjL7eHj+zWDMLL+r/AaW1kQjfQ31TGqKqvPToSU3fhBQe5VTsoROE7LLrSIJNgl oWA0F1VDVGX6w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7P6z70z9rxY; Mon, 10 May 2021 07:17:37 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:24 +0000 Message-Id: <20210510051628.15359-40-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-variantslib): New variable. (ocaml4.07-variantslib): Inherit from ocaml-variantslib. --- gnu/packages/ocaml.scm | 52 ++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4727b294d9..e40bc78db2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5137,37 +5137,45 @@ of a record and create new record values.") "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")) (properties `((upstream-name . "fieldslib")))))) -(define-public ocaml4.07-variantslib +(define-public ocaml-variantslib (package - (name "ocaml4.07-variantslib") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/variantslib-v" version ".tar.gz")) - (sha256 - (base32 - "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3")))) + (name "ocaml-variantslib") + (version "0.14.0") + (source + (janestreet-origin "variantslib" version + "11zp27gh282dx9ifbhcp6i7fkc97fvk8amaj58mf1g1hwklc0lm3")) (build-system dune-build-system) (arguments ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (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 . "variantslib"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "variantslib") + (ocaml4.07-variant . ,(delay ocaml4.07-variantslib)))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values") (description "The Core suite of libraries is an alternative to OCaml's standard library.") (license license:asl2.0))) +(define-public ocaml4.07-variantslib + (package-with-ocaml4.07 + (package + (inherit ocaml-variantslib) + (name "ocaml-variantslib") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/variantslib-v" version ".tar.gz")) + (sha256 + (base32 + "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3")))) + (properties `((upstream-name . "variantslib")))))) + (define-public ocaml-ppx-fields-conv (package (name "ocaml-ppx-fields-conv") @@ -5268,7 +5276,7 @@ definitions.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-variantslib" ,ocaml4.07-variantslib) + ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -6312,7 +6320,7 @@ standard library that was developed by Jane Street.") ("ocaml-splittable-random" ,ocaml4.07-splittable-random) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-typerep" ,ocaml4.07-typerep) - ("ocaml-variantslib" ,ocaml4.07-variantslib) + ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (properties `((upstream-name . "core_kernel"))) From patchwork Mon May 10 05:16:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29220 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 0BAE627BC82; Mon, 10 May 2021 06:19:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 89CE327BC81 for ; Mon, 10 May 2021 06:19:28 +0100 (BST) Received: from localhost ([::1]:40934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKF-0004KF-Pq for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJC-0000OE-31 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45563) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJB-0003iT-R7 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJB-0000XN-ME for guix-patches@gnu.org; Mon, 10 May 2021 01:18:21 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 40/43] gnu: Add ocaml-ppx-variants-conv. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:21 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238881813 (code B ref 47768); Mon, 10 May 2021 05:18:21 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:08 +0000 Received: from localhost ([127.0.0.1]:57070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIx-0000Sy-Im for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:08 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIV-0000Ko-Ec for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:40 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 1A35B2400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623859; bh=OlFsz4kzYp5RTsHZCB1v1ugyJTa+l0QefKbyZb2TQtc=; h=From:To:Cc:Subject:Date:From; b=of2p41UfHDtftHMPR94eRvSe0xpZsBMe5reR0Wy7wzqlvt8NYnyfEgX/FGmj6mo1C soObSImZcarcy9QIndNKac/JD4PdmpRdpgGcK4zcCizfOTqBvTkrdpAAaMtwqQ7LGd UjS+8S737WlpeTdIudLqZFsCF8eRxS/pVA0bUlMo8sLQsMm5mzx+hDSx7IrX24TwZo oXP/XrEXRIuXVotzvAgajEOrwu5zORagKmZ/VdiC21C4QrSpfqWNo8Fv+j9cT7qRJB frtD7Z2KHUOOI8EDHwSQ3oCSZfCguWnWR50kYSbj7lkGBR6t00+eVcjfIdXLaqpdSi +TB8tKxmlAZhQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7Q3Znxz9rxR; Mon, 10 May 2021 07:17:38 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:25 +0000 Message-Id: <20210510051628.15359-41-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-variants-conv): New variable. (ocaml4.07-ppx-variants-conv): Inherit from ocaml-ppx-variants-conv. --- gnu/packages/ocaml.scm | 65 ++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e40bc78db2..019bfea9f9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5260,32 +5260,29 @@ definitions.") "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) (properties `((upstream-name . "ppx_sexp_conv")))))) -(define-public ocaml4.07-ppx-variants-conv +(define-public ocaml-ppx-variants-conv (package - (name "ocaml4.07-ppx-variants-conv") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_variants_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) + (name "ocaml-ppx-variants-conv") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_variants_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q6a43zrwqzdz7aja0k44a2llyjjj5xzi2kigwhsnww3g0r5ig84")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(("ocaml-base" ,ocaml-base) + ("ocaml-variantslib" ,ocaml-variantslib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties - `((upstream-name . "ppx_variants_conv"))) + `((upstream-name . "ppx_variants_conv") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-variants-conv)))) (home-page "https://github.com/janestreet/ppx_variants_conv") (synopsis "Generation of accessor and iteration functions for OCaml variant types") @@ -5294,6 +5291,24 @@ definitions.") variant types.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-variants-conv + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-variants-conv) + (name "ocaml-ppx-variants-conv") + (version "0.11.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_variants_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) + (properties `((upstream-name . "ppx_variants_conv")))))) + (define-public ocaml-ppx-custom-printf (package (name "ocaml-ppx-custom-printf") @@ -5352,7 +5367,7 @@ string conversion.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (arguments @@ -5888,7 +5903,7 @@ useful errors on failure.") ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -6088,7 +6103,7 @@ functions from type definitions.") ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value) ("ocaml-ppx-typerep-conv" ,ocaml4.07-ppx-typerep-conv) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) From patchwork Mon May 10 05:16:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29224 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 B011B27BC82; Mon, 10 May 2021 06:19:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 226BA27BC81 for ; Mon, 10 May 2021 06:19:37 +0100 (BST) Received: from localhost ([::1]:41724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKO-0004o7-BH for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJC-0000QB-Fa for guix-patches@gnu.org; Mon, 10 May 2021 01:18:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45564) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJC-0003jQ-71 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJC-0000XV-2o for guix-patches@gnu.org; Mon, 10 May 2021 01:18:22 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 41/43] gnu: Add ocaml-ppx-expect. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:22 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238891828 (code B ref 47768); Mon, 10 May 2021 05:18:22 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:09 +0000 Received: from localhost ([127.0.0.1]:57073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIy-0000TC-7l for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:08 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIV-0000KC-Vp for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:40 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 91ADA2400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623859; bh=dcVDpSu+5fOPgepAGKwa8yI7D9MNmRDyVNCoWFnekHU=; h=From:To:Cc:Subject:Date:From; b=VNiVRbdXQZEikBm5RXrSgQ6/fu8yPspCNb7aCZYLAwUfX58DXWYIJU/4F2AtzmKuA Aj/8KzPP1HRkaql0gUn+ifg38zN4VaYXjku49kvV08GdWDSvluDI8BUk6jBm/Y9FeX fKwrTRoY3Qtdd98hZLy82JOUGdFl/AfGxcYGvFkwuG6zV0xoh4GPwHNi58iBD/MObb JrmHJSbLCXEDuqpeqiKL0ObHcK2d+B840BlWsB41kicfwAq1FSDI7Q7ZBxv/J5zi40 /sexS+zBKlkUTesjwDCadq2Y1mJVciKuUn9aXGyIfkm3riUErRXH4LZ6cjmeBm+1Zw AemyZvnTmoCKA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7R04QDz9rxR; Mon, 10 May 2021 07:17:38 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:26 +0000 Message-Id: <20210510051628.15359-42-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-ppx-expect): New variable. (ocaml4.07-ppx-expect): Inherit from ocaml-ppx-expect. --- gnu/packages/ocaml.scm | 83 +++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 019bfea9f9..c4a024c850 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3791,7 +3791,7 @@ library is currently designed for Unicode Standard 3.2.") `(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)))) (native-inputs - `(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect))) + `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) (properties `((upstream-name . "charInfo_width"))) (home-page "https://bitbucket.org/zandoye/charinfo_width/") @@ -5876,40 +5876,31 @@ useful errors on failure.") ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties `((upstream-name . "ppx_assert")))))) -(define-public ocaml4.07-ppx-expect +(define-public ocaml-ppx-expect (package - (name "ocaml4.07-ppx-expect") - (version "0.12.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_expect") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1wawsbjfkri4sw52n8xqrzihxc3xfpdicv3ahz83a1rsn4lb8j5q")))) + (name "ocaml-ppx-expect") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_expect") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vbbnjrzpyk5p0js21lafr6fcp2wqka89p1876rdf472cmg0l7fv")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) - ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)) - ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)))) - (properties `((upstream-name . "ppx_expect"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-re" ,ocaml-re))) + (properties `((upstream-name . "ppx_expect") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect)))) (home-page "https://github.com/janestreet/ppx_expect") (synopsis "Cram like framework for OCaml") (description "Expect-test is a framework for writing tests in OCaml, similar @@ -5919,6 +5910,30 @@ output-generating code, interleaved with @code{%expect} extension expressions to denote the expected output.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-expect + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-expect) + (version "0.12.0") + (source + (janestreet-origin "ppx_expect" version + "1zpci8c49yn2ixchmwjx1kf9pwybv3dnn4l2dgnd6m36qnkralfk")) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-assert" ,ocaml-ppx-assert) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-custom-printf" ,ocaml-ppx-custom-printf) + ("ocaml-ppx-fields-conv" ,ocaml-ppx-fields-conv) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-ppx-variants-conv" ,ocaml-ppx-variants-conv) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-re" ,ocaml-re))) + (properties `((upstream-name . "ppx_expect")))))) + (define-public ocaml-ppx-js-style (package (name "ocaml-ppx-js-style") @@ -6091,7 +6106,7 @@ functions from type definitions.") ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-expect" ,ocaml4.07-ppx-expect) + ("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)) ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) @@ -6236,7 +6251,7 @@ Configurator allows one to: #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (native-inputs - `(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect))) + `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) (home-page "https://github.com/janestreet/spawn") (synopsis "Spawning sub-processes") (description From patchwork Mon May 10 05:16:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29213 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 2189E27BC82; Mon, 10 May 2021 06:19:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B644927BC83 for ; Mon, 10 May 2021 06:19:12 +0100 (BST) Received: from localhost ([::1]:39190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJz-0003Ht-SV for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJD-0000TJ-6d for guix-patches@gnu.org; Mon, 10 May 2021 01:18:23 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45566) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJC-0003kz-Uo for guix-patches@gnu.org; Mon, 10 May 2021 01:18:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJC-0000Xj-RJ for guix-patches@gnu.org; Mon, 10 May 2021 01:18:22 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 42/43] gnu: ocaml-num: Update to 1.4. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:22 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238901866 (code B ref 47768); Mon, 10 May 2021 05:18:22 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:10 +0000 Received: from localhost ([127.0.0.1]:57079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIz-0000Te-DD for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:10 -0400 Received: from mout01.posteo.de ([185.67.36.65]:60707) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIb-0000NR-Jo for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:46 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 1A121240029 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623860; bh=NxiqEBHAEmKchywe5Dy3qFG0khy+hScQAmsMlgLqAm8=; h=From:To:Cc:Subject:Date:From; b=AjoU19W1A9jAbiHNo+eOnoHd8ESHlFx01uLYuud38PhJOzY6mxjWY23RGbtQ+F1Zs f4Nc/UGjq7e9MesRS5iK1KGVocFJ/WO5kFIx9/ieig+NV7lrPh/z3u11iqdgBeoxt7 8R95pinWCG8m76GN1yo4OfT5Ms3AjyMUI9nbWd/QpcBw39Dbvvmebeb7hvJitlObP7 rPr1vYzebyRQOk4yBYXIvCQWbgEMt/2vvN4Pe1rLpleeLdiYlDxrol4nZ7EdgQ10X1 b5gH/cVaRq27xUgCuUaJZGw7Y+Dfcb+yYv2w4rvW0TofUyq2OTVr3Z8f8TRbCyjR8t /GrDHyD0UCyAA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7R3g1cz9rxR; Mon, 10 May 2021 07:17:39 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:27 +0000 Message-Id: <20210510051628.15359-43-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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 * gnu/packages/ocaml.scm (ocaml-num): Update to 1.4. --- gnu/packages/ocaml.scm | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c4a024c850..349124c99e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -958,7 +958,7 @@ written in Objective Caml.") (define-public ocaml-num (package (name "ocaml-num") - (version "1.1") + (version "1.4") (source (origin (method git-fetch) @@ -967,33 +967,8 @@ written in Objective Caml.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0")))) - (build-system ocaml-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'fix-makefile - (lambda* (#:key outputs #:allow-other-keys) - ;; This package supposes we install to the same directory as - ;; the ocaml package. - (substitute* "src/META" - (("\"\\^\"") (string-append "\"" (assoc-ref outputs "out") - "/lib/ocaml/site-lib\""))) - (substitute* "src/Makefile" - (("\\) \\$\\(STDLIBDIR\\)") - (string-append ") " (assoc-ref outputs "out") - "/lib/ocaml/site-lib"))) - #t)) - (add-after 'install 'fix-stubslib - (lambda* (#:key outputs #:allow-other-keys) - (format #t "~a~%" (find-files "." ".*.so")) - (let ((stubdir (string-append (assoc-ref outputs "out") - "/lib/ocaml/site-lib/stublibs"))) - (delete-file stubdir) - (mkdir-p stubdir) - (install-file "src/dllnums.so" stubdir)) - #t))))) + (base32 "1vzdnvpj5dbj3ifx03v25pj2jj1ccav072v4d29pk1czdba2lzfc")))) + (build-system dune-build-system) (home-page "https://github.com/ocaml/num") (synopsis "Arbitrary-precision integer and rational arithmetic") (description "OCaml-Num contains the legacy Num library for From patchwork Mon May 10 05:16:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29232 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 A97FE27BC82; Mon, 10 May 2021 06:20:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 642FA27BC81 for ; Mon, 10 May 2021 06:20:23 +0100 (BST) Received: from localhost ([::1]:43906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyL8-0006Bd-LA for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:20:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJD-0000V6-KB for guix-patches@gnu.org; Mon, 10 May 2021 01:18:23 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45567) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJD-0003lI-Aw for guix-patches@gnu.org; Mon, 10 May 2021 01:18:23 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJD-0000Xr-70 for guix-patches@gnu.org; Mon, 10 May 2021 01:18:23 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 43/43] gnu: Add ocaml-js-of-ocaml. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238911879 (code B ref 47768); Mon, 10 May 2021 05:18:23 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:11 +0000 Received: from localhost ([127.0.0.1]:57083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyJ0-0000U3-Hr for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:11 -0400 Received: from mout02.posteo.de ([185.67.36.66]:33237) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIc-0000Nc-8O for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:47 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A61732400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623860; bh=4urm4Xjk7WnBDglcwVifBe63hEtPyAcJTr0MLHXOcSo=; h=From:To:Cc:Subject:Date:From; b=Ph2oK3Ek/aG7uI6Jm7G+Q0k0fqbT8oz0sFBSMd6HfZGijh/D576BJRkUAjgDMuvNf yfRqVyw6XaQ/BEOAx1ud0n3QIBtPkvEwKkX21RIK5F+2hL26i3JmspEj8gZF7MRycB 1BKesSJ4eheshRXHn7dZijBGWgbmbwV7yQK60X+aeAW0Y1hDAfl0nk5CRDLGeKj6yS 94wPjWSY0l52uCkY/ya6s4DNmSgR3soY9/4+K7y7nE3hSgwCseWB+wBGsSNPgMuk2t jMrs9ymKERK5nDYhquhGkZlL2TTLeDV6utl743oiS5SQk7diix2LR7owzPnLyN7Ezd nckxWq/m6hbVQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7S0BsHz9rxR; Mon, 10 May 2021 07:17:40 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:28 +0000 Message-Id: <20210510051628.15359-44-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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: divoplade * gnu/packages/ocaml.scm (ocaml-js-of-ocaml): New variable. Co-Authored-By: pukkamustard --- gnu/packages/ocaml.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 349124c99e..24d9e814fa 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) + #:use-module (gnu packages node) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -6939,3 +6940,43 @@ Drawing takes place in a separate window that is created when Graphics.open_graph is called. This library used to be distributed with OCaml up to OCaml 4.08.") (license license:lgpl2.1+))) + +(define-public ocaml-js-of-ocaml + (package + (name "ocaml-js-of-ocaml") + (version "3.9.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocsigen/js_of_ocaml") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00hdjaj94j3nc6f6wbbpx59h4yc79siphs34i1hry11r56paaqyk")))) + (build-system dune-build-system) + (arguments `(#:test-target ".")) + (propagated-inputs + `(("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-uchar" ,ocaml-uchar) + ("ocaml-menhir" ,ocaml-menhir) + ("ocaml-reactivedata" ,ocaml-reactivedata) + ("ocaml-cmdliner" ,ocaml-cmdliner) + ("ocaml-lwt" ,ocaml-lwt) + ("ocaml-tyxml" ,ocaml-tyxml) + ("ocaml-re" ,ocaml-re) + ("ocaml-uutf" ,ocaml-uutf) + ("ocaml-graphics" ,ocaml-graphics) + ("ocaml-yojson" ,ocaml-yojson))) + (native-inputs + ;; for tests + `(("node" ,node) + ("ocaml-ppx-expect" ,ocaml-ppx-expect) + ("ocaml-num" ,ocaml-num))) + (properties `((upstream-name . "js_of_ocaml"))) + (home-page "https://ocsigen.org/js_of_ocaml/") + (synopsis "Compiler from OCaml bytecode to Javascript") + (description "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. +It makes it possible to run pure OCaml programs in JavaScript environment like +browsers and Node.js.") + (license license:lgpl2.1+)))