From patchwork Wed Apr 14 09:12:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28489 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 274A727BC75; Wed, 14 Apr 2021 10:14:19 +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 D3FE427BC74 for ; Wed, 14 Apr 2021 10:14:17 +0100 (BST) Received: from localhost ([::1]:37354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbE-0005Qa-IJ for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb2-0005Ps-00 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50212) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb0-00021Y-Hn for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb0-0007D2-CO for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 01/37] gnu: ocaml-integers: Update to 0.4.0. References: <20210414090800.6458-1-pukkamustard@posteo.net> In-Reply-To: <20210414090800.6458-1-pukkamustard@posteo.net> Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839160027205 (code B ref 47768); Wed, 14 Apr 2021 09:14:02 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:20 +0000 Received: from localhost ([127.0.0.1]:33383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaK-00074i-BJ for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:20 -0400 Received: from mout01.posteo.de ([185.67.36.65]:47202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaH-00074K-W2 for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:18 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 1E4991A022C for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391591; bh=uyXpMjIZ0tBFD36ksXPQ95eify450Ql4gXBPLUUUFf4=; h=From:To:Cc:Subject:Date:From; b=NLXp4lP5wRj61/k+Ka0iP9RMXMioN0ORMYuO56FkfR6YRlW4eodu0rkaFhaAhStWp SgBKOQoHqAJSNHJIyLbO0GFzg52MONJbvq3Wyqf3mWRq+IrFKvdz3gQKtg06lXGwG/ EaRWUBv2h36TyjTDbhdh39Li3jFWA/LMK8BQSUwM5ESerIYdNoytlhAmuJvHk5dFar 8zUx2tXbcma37d8y+K953urPtJSptwIr+hz6AbXle/d+5M0b0BGaYfo37khax79j1F NSG8oupx26sUPpDvc3G+/UXHfbZ2R1vSXlfV/qYP4F0tdi4whj0gPfrU1fbe4Ho87Y 5TRJX3VLD1Nlg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbB25G3z9rxg; Wed, 14 Apr 2021 11:13:10 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:27 +0200 Message-Id: <20210414091303.6990-1-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 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 44ca0c67e2..801930696d 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 Wed Apr 14 09:12:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28491 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 1E58727BC75; Wed, 14 Apr 2021 10:14: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 479B027BC74 for ; Wed, 14 Apr 2021 10:14:20 +0100 (BST) Received: from localhost ([::1]:37498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbH-0005W8-8D for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb2-0005Pt-0O for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50215) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb1-00021Z-1g for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb0-0007DB-SM for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 02/37] gnu: ocaml-ctypes: Update to 0.18.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839160327244 (code B ref 47768); Wed, 14 Apr 2021 09:14:02 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:23 +0000 Received: from localhost ([127.0.0.1]:33395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaM-00075F-Lh for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:22 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41073) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaK-00074P-Eh for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:20 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 84A992400FC for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391594; bh=YV/Ch1XCmFfNahjzu2mXcuLyQZ5pDW+q+Hciv/SKMnA=; h=From:To:Cc:Subject:Date:From; b=M+dxpjwwP9QIDm2UlD4MxrufDqzDfJdDx+rBzwtlpo7cyWsasVlTSbsapRUpqsTh2 P7HR6tNzJ0W6S/vsMIGE6wTILprs4fNUNPTk+7LcsDQH6S0dBF/nqvs5LQJ7/whJXK +Z3kbUr1FG4fS1Im8ZfCDoAgkKY4v58iSGtCwmPkOOdRR/ymPBxqrF+26e7ELss5iP LruA1HbJoVICd1AKV/7NtZy9WpoTId7MBdFpSiZ0hDpWh5HOBvTOjUVBrj31nAcHwq kR8Dkwxz31p8PAcPnntYRJ8SqmhBbAI3lQtMo+qLuSIScRKokpZ74HOOvw89zSfYnO CU9w+HPac3+7g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbF5HZPz9rxS; Wed, 14 Apr 2021 11:13:13 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:28 +0200 Message-Id: <20210414091303.6990-2-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 801930696d..f208f86075 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 Wed Apr 14 09:12:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28488 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 DBAFE27BC77; Wed, 14 Apr 2021 10:14: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 5651827BC75 for ; Wed, 14 Apr 2021 10:14:18 +0100 (BST) Received: from localhost ([::1]:37364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbF-0005RF-AY for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb2-0005Pu-0G for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50218) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb1-00021e-NG for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb1-0007DX-IF for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 03/37] gnu: ocaml-ctypes: Make ocaml-integers a propagated input. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839160327252 (code B ref 47768); Wed, 14 Apr 2021 09:14:03 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:23 +0000 Received: from localhost ([127.0.0.1]:33397 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaM-00075K-Ut for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:23 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaK-00074Q-Sg for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:21 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 268691A022E for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391595; bh=BQ4Xc/Rv9+ZTpt7VnglrIdWLMQ6V69odLSc+66fz198=; h=From:To:Cc:Subject:Date:From; b=BRHKttsf1VugvLyZJoRC5N9nKN+vR530PGILpemNfJ/AKZUIdTpfnRut7j0cNlYw9 dDcqx/yCqRKaNOH71XLjnNfqyaahZuALlRKLQ/1vPD9vH9EyKWQxOHOYQ+1LG9QZQU C3zdzKYYxmzybaYug7xRh1blfdD6M8HUisJAO9u9k70p/18ggtPoqZLYUscBVKcXCE 3ucmY5lh5PKWde8m4PsKCnyu6X331xm5OusvYSfe9IkeX07C+6chLBBPx1CmJEZLbK 0y3Bkw0ORg1AXDgp1mM3u6++tMUkqBWkXZM7wo96rexnJBhpA0jv0bnGh4ehV5xftm kriuaRPLhU46Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbG2z5Pz9rxg; Wed, 14 Apr 2021 11:13:14 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:29 +0200 Message-Id: <20210414091303.6990-3-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 f208f86075..0ce74db21c 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 Wed Apr 14 09:12:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28490 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 71B1427BC75; Wed, 14 Apr 2021 10:14:20 +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 78E1327BC76 for ; Wed, 14 Apr 2021 10:14:18 +0100 (BST) Received: from localhost ([::1]:37370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbF-0005RN-BX for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb2-0005QE-IN for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb2-000229-Ab for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb2-0007Dk-6l for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 04/37] gnu: ocaml-lwt: Make libev a propagated input. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839160527285 (code B ref 47768); Wed, 14 Apr 2021 09:14:04 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:25 +0000 Received: from localhost ([127.0.0.1]:33407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaP-00075y-DB for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:25 -0400 Received: from mout02.posteo.de ([185.67.36.66]:44821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaL-00074S-L1 for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:21 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id B48FF2400FC for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391595; bh=0HLjCjWQ1Axh+uMhuVdATBemP+/GOQKBlfymXDjGUBA=; h=From:To:Cc:Subject:Date:From; b=Zg6zUtTIst2Sl3q1ctaiaa7gqoi6etvq5NgRnHR80QpvhmUxOeYAjjI2VlgtCWJ5s HnJqM+5xOXJ2nv4j0o6vUHj+oOpe0NwgdmHGgVyjjVGoVFcLr/h9dvuvEUCoX5rpPf P9hmbbAcqVUNnlYwtrMMZfL0S0ueoPWPBgB7XwW8yJgaNPiA7AnA7CbjTy4QuLqhhs gGyUigoiXFv0uJL1qsxGSCpNSwy0XUeMAaGA4hJOZa61Ghsvsi1g7hD7l7EBkUEtcM kI1EHBJq7YEALeo/BFahO3BVCJEDrnRfZN/dofbnRbeTR1vBrDVsAJ9NtJEzgj7sI6 fCF51xKSG76sw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbH0RXxz9rxq; Wed, 14 Apr 2021 11:13:15 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:30 +0200 Message-Id: <20210414091303.6990-4-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 0ce74db21c..4fc9a45cb0 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 Wed Apr 14 09:12:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28492 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 AB41C27BC74; Wed, 14 Apr 2021 10:14:43 +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 196E727BC75 for ; Wed, 14 Apr 2021 10:14:43 +0100 (BST) Received: from localhost ([::1]:38134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbe-0005rI-9b for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb2-0005QL-Va for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50220) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb2-00022b-O0 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb2-0007Ds-J6 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 05/37] gnu: ocaml-lwt: Update to 5.4.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839160627293 (code B ref 47768); Wed, 14 Apr 2021 09:14:04 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:26 +0000 Received: from localhost ([127.0.0.1]:33411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaP-000762-Mu for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:26 -0400 Received: from mout01.posteo.de ([185.67.36.65]:50663) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaM-00074T-0i for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:22 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 1DADF1A022F for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391596; bh=aipeY/m03HJxT3IhEpgrdOYlXRgijZol08yaH3+Ihww=; h=From:To:Cc:Subject:Date:From; b=V2jsGDeXPfLmA2wSOT+Lh8O2gn+xfHxOqXq0qz4fMti/T6P6oq+AzkfjoF5pA50Uq gpfRxNlF7Em+sIbjpOE5eYuaFfN25DLJLzcaDI1OPY/SY0YZxQpENoinjibyXm+bG0 A4ZGwSz/U0T/05f+kpG0WweuKLmoJz7ysRG+2iRPp0EOjiZpobt2bI6+b24Ed8Whou P3yed8EIjeRH+iPAQTzkIZ4TsTkFHWL3tX1dxCbzM0SEMsNQONVbVRjBJeGdZNooJQ t7FvXkiGGMzM5G7UjskLnyus8IIT6N53bwgY7Pdt/9XwNUj5/IIO7EX2Ud3gzxuNWJ T/fyNimItICjw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbH48Pgz9rxq; Wed, 14 Apr 2021 11:13:15 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:31 +0200 Message-Id: <20210414091303.6990-5-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 4fc9a45cb0..85218b6832 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 Wed Apr 14 09:12:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28496 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 7D66C27BC76; Wed, 14 Apr 2021 10:14:52 +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 E45E127BC75 for ; Wed, 14 Apr 2021 10:14:51 +0100 (BST) Received: from localhost ([::1]:39052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbm-0006QS-W8 for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb3-0005QR-Dh for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50221) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb3-00023B-6Q for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb3-0007Dz-1X for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 06/37] gnu: ocaml4.07-gen: Update to 0.5.3. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839160627307 (code B ref 47768); Wed, 14 Apr 2021 09:14:04 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:26 +0000 Received: from localhost ([127.0.0.1]:33413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaQ-00076A-27 for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:26 -0400 Received: from mout01.posteo.de ([185.67.36.65]:52738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaM-00074U-FT for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:22 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id A2FFD1A022F for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391596; bh=BVhDhl7ceKRsbb31mEGgbnSEseoQUWmX0sfInjA5r7I=; h=From:To:Cc:Subject:Date:From; b=gqFudw1Tfl09WqP8BDaGSlgl7B4YBnTt0TwdEqWmkis6HFiTCM2aAk5JSB4/aP3cV PZV2ZkZCFqPVHvIhbJMxr2mHnNZ81oMzMScFxx2PQi3Puq7EA9H3ZvCP8sFY9Y3NxL sY8OTbBxkxkpNGTLLAspLPfL0FtOW41swRAquHrNyyGio96L6vNSv24eaNReCDk089 KO9l5zjy3oMpr7JpSPVmNQIQT0atWivtNT5SCR+qs2r/u5hbC40MUZCvwWvRCW7Olz BzlK0P95tzkVcSZldxG61i7X39WZbSCxv167GK3CP7LHOQMDllJjg2rFjvueK1MmhE fcnPi56fLBLzQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbJ0VNgz9rxq; Wed, 14 Apr 2021 11:13:16 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:32 +0200 Message-Id: <20210414091303.6990-6-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 85218b6832..503913c8fd 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 Wed Apr 14 09:12:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28495 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 BDDA427BC74; Wed, 14 Apr 2021 10:14:44 +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 B8FAF27BC75 for ; Wed, 14 Apr 2021 10:14:43 +0100 (BST) Received: from localhost ([::1]:38218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbe-0005tk-Td for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb3-0005QZ-Rx for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50222) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb3-00023Y-J0 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb3-0007E6-EQ for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 07/37] gnu: Add ocaml-gen. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839160727314 (code B ref 47768); Wed, 14 Apr 2021 09:14:05 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:27 +0000 Received: from localhost ([127.0.0.1]:33417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaQ-00076O-Jn for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:27 -0400 Received: from mout01.posteo.de ([185.67.36.65]:36201) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaM-00074W-U8 for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:23 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 254011A022C for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391597; bh=4+bMS74/t71Z3sNeXUjxrmXXBidPafAo8CA2I/RzBOE=; h=From:To:Cc:Subject:Date:From; b=iaFbnJ5X/i4ekg6tLRicpKSJvTQMTvddYU5xWlCTazsne/OVUNHtJQYTsf60BU8yb oaSSBnFSyrSpF0fCAC9N5MKuu/w2Rfqenqg/qGTmRrnVdfbyRMJ9H4kae8iLCduIu/ kbAznqN7K0UzkXuSfko8nQ4Bc7yzd5fZ3WW5dZEtpvlhp3pdhpTnmZTMSwrX7Y18Y2 4QDSkVZakCg6pgSbd0qS9x8+17ICu5UvxKpjE7zrSxQ3YqZs9SUxU60vuUgKiIfmcb LxQ5K19AE/odEmUtLMH9veX2S8DfEOso+a0yI1pFQrUKf0wew709zELslRGKvKNS6T +j98NXP0DhJNw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbJ49Grz9rxS; Wed, 14 Apr 2021 11:13:16 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:33 +0200 Message-Id: <20210414091303.6990-7-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 503913c8fd..43a3bc1d40 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) @@ -2524,15 +2524,12 @@ representation of the data.") (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")) (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 Wed Apr 14 09:12:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28501 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 CF9BF27BC7D; Wed, 14 Apr 2021 10:15: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 2D98B27BC74 for ; Wed, 14 Apr 2021 10:15:01 +0100 (BST) Received: from localhost ([::1]:39954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbw-0006m7-Ae for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:15:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb4-0005R0-71 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50223) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb3-00023u-Vg for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb3-0007EE-R0 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 08/37] gnu: Add ocaml-stdio. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839160827330 (code B ref 47768); Wed, 14 Apr 2021 09:14:05 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:28 +0000 Received: from localhost ([127.0.0.1]:33419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaR-00076V-1v for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:27 -0400 Received: from mout02.posteo.de ([185.67.36.66]:48591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaN-00074Y-Pa for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:24 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id EFEC8240100 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391598; bh=mR20YkVLXsM/jjoa7vVRKP+aJH/GwEBogKW1gHIbf1s=; h=From:To:Cc:Subject:Date:From; b=CwufotxsiWgQo3tDu0+HGBdVo6B3YeFpeK+P12YGxSjUctdPDcy0+7iLoY+7qNou+ RRWTnhSphV/CVPfcrjy4Iz4NVzBJkYusMO1ycw9aYhyUs4n/sDYCEuabIhl971QjrS CCKsr2ScohFEK7/R8FHGm7XSN9W31iHELfaKbYKwSYlLqboT04ii6YcIPcklI3v0qF 7mtHojxEXejXaxWJgrzPIQSyvqSckx+8aIlNR/q5t3nu/feW9qC/dQNnpxBTgzz+Fm CoCpGFaF6HDGXifTau6l16bf764RqO2DpKqA995a1mnQbvlrCPigju70RKqW/3AKHL appS7m5wzXI3A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbK0bm5z9rxk; Wed, 14 Apr 2021 11:13:17 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:34 +0200 Message-Id: <20210414091303.6990-8-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 43a3bc1d40..03bcb3d351 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 Wed Apr 14 09:12:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28493 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 60EF027BC74; Wed, 14 Apr 2021 10:14: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 C3A5B27BC77 for ; Wed, 14 Apr 2021 10:14:43 +0100 (BST) Received: from localhost ([::1]:38240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbe-0005ub-V8 for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb4-0005S7-Kj for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb4-000243-Bz for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb4-0007EL-7F for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 09/37] gnu: Add ocaml-compiler-libs. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839160927349 (code B ref 47768); Wed, 14 Apr 2021 09:14:06 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:29 +0000 Received: from localhost ([127.0.0.1]:33425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaR-00076k-Vn for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:28 -0400 Received: from mout01.posteo.de ([185.67.36.65]:37688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaO-00074e-AY for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:24 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 6F3AF1A022C for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391598; bh=xQpzw1BQgopjwyhCNkmnIe/4TUFW58sFoLOp2bZ3V9A=; h=From:To:Cc:Subject:Date:From; b=R7mXriIuDQYn0D9o8jDjI1FXVI46oU3wWnKdqQAJSS9zhKq+D+gGedxmvL0ZofHNB ffSl9adh9TXBwsNWAVpyi1H/A1MDceG2A8iBW/0qxDZLAIl4qekMkyIKCBeaLqrVRZ MEI1GkskyhksOoAMrtN4ljrPkNiZ6lWAPjWOpyqO+Uzq0JAlQv+k9pDnZld0CCQEjm mRw+PrkcujPgbZpvvFbsUxmK9EsUWjNOvF6cbl81s3Nr/lMObTCv3mQe+uRHKYx5m7 hnr+uKUy72agpt4riDMZhsgETq3+GWKSjTRy36JoG9nSZFY0tMVoNgLQeHi9hjOirY mQ64R97hYa9Pw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbK6DJsz9rxr; Wed, 14 Apr 2021 11:13:17 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:35 +0200 Message-Id: <20210414091303.6990-9-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 03bcb3d351..1f47fc4de3 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 Wed Apr 14 09:12:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28497 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 B6F4827BC77; Wed, 14 Apr 2021 10:14: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 C845D27BC76 for ; Wed, 14 Apr 2021 10:14:52 +0100 (BST) Received: from localhost ([::1]:39122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbn-0006S7-Tv for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb5-0005TS-1D for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50225) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb4-00024A-PF for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb4-0007ET-Jr for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 10/37] gnu: ocaml-migrate-parsetree: Update to 1.8.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839161627433 (code B ref 47768); Wed, 14 Apr 2021 09:14:06 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:36 +0000 Received: from localhost ([127.0.0.1]:33453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaZ-00078O-VX for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:36 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53013) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaO-00074f-PP for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:25 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 027561A022E for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391599; bh=WXVpjMnNhLGtk+ftYT99hmoIc2VV7/fQrubTJ1qhl04=; h=From:To:Cc:Subject:Date:From; b=otOKiLvMDYurVwqPJUPI5YFkWmtoc8or89gfhK8PPej/ZibJ36K58tSE0UtheA4lL xuJxYInB2QDLVaC86+LbBpDqDwf2I6JIE2K8DDG2C3l01Zs4QyKxr6/lf+kT8GuK4N eA/u0W6mzfqIOEgiH4Q1O6t83YY3pC8bcpws8yDh+1x/GsfR0y8JTOO9B9h7zvr+p+ A+UHzwMhWBmFR3IVm2O50HWfJKWlAqx4CUXqotw0mO7ZHGlauV/iIwzdaIyaWXLvHe VhC4Ow5Hi6o40SEMVm6jFEy9agVoIZOZzEFTrNb7SXYG5D7vB5CciCse7l1KB+CMlc yP/sdDHVHExTQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbL2bKBz9rxq; Wed, 14 Apr 2021 11:13:18 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:36 +0200 Message-Id: <20210414091303.6990-10-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 1f47fc4de3..ab9198c3c6 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 Wed Apr 14 09:12:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28499 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 3D1AB27BC74; Wed, 14 Apr 2021 10:14: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 A75FB27BC75 for ; Wed, 14 Apr 2021 10:14:52 +0100 (BST) Received: from localhost ([::1]:39130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbn-0006ST-SD for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb5-0005Ui-Go for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50226) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb5-00024Z-80 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb5-0007Ec-3S for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 11/37] gnu: ocaml-migrate-parsetree: Update to 2.1.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839161727443 (code B ref 47768); Wed, 14 Apr 2021 09:14:07 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:37 +0000 Received: from localhost ([127.0.0.1]:33457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaa-00078Q-70 for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:36 -0400 Received: from mout02.posteo.de ([185.67.36.66]:59341) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaP-00074h-BS for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:26 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 734AE2400FD for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391599; bh=fgYgB7lDxHeiqDcF5qWer85IxW99VTgBe7PxtYehfTI=; h=From:To:Cc:Subject:Date:From; b=Q4XsUdYsu+PKLfi+uBpcTyKVgi4AjK7fof7/b5BVvPEgioqmqCCBxVSBU4zjw5kL4 lvr2qPRBehQSsd1n5R6ExpmzeIcI5jRvyb4OzYYWvNBOaz3B2M6RiIx/126eLvB18w K/qayC6ybEgVlqUxWdo4cxJ+YZd+2pwXTQVJA/JV4Jins+FcfrZruN/uwpG7r2wu+7 itWLTyDepaajakjdPEmF0ppaw9cPBza+OHCJVemNHP3027ehWHWd6TUYTDoz/tb8S2 k3ikF+Vtnsfn4hLMAoed6xyGNpV13nC1+a6fqFETHwvl9C4EuILrPF8eh9P1yLbgcd GpxF1w2CN4Viw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbL6Rjmz9rxH; Wed, 14 Apr 2021 11:13:18 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:37 +0200 Message-Id: <20210414091303.6990-11-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 ab9198c3c6..9b3e6b779c 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 Wed Apr 14 09:12:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28504 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 5F86E27BC79; Wed, 14 Apr 2021 10:15:13 +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 49A4227BC78 for ; Wed, 14 Apr 2021 10:15:02 +0100 (BST) Received: from localhost ([::1]:40036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbx-0006oA-DQ for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:15:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb5-0005Vt-TX for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50227) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb5-000251-Kg for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb5-0007Ej-G3 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 12/37] gnu: Add ocaml-ppxlib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839161827458 (code B ref 47768); Wed, 14 Apr 2021 09:14:07 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:38 +0000 Received: from localhost ([127.0.0.1]:33459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaa-00078Z-Nz for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:37 -0400 Received: from mout02.posteo.de ([185.67.36.66]:56271) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaQ-00074q-2E for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:27 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 3ABFC240101 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391600; bh=piO6fm9ix6N9Hwf2myRJ27eP89hXrAlKR107hZIYQK4=; h=From:To:Cc:Subject:Date:From; b=Jx3Pusc0IdpDY9xZvHhsNhPuBOGlSC9tgldybeftsNhHRcsvSWdHJ/nBC7diLZluK R/LgjzYuQIvIjdp0RYDZrPgZzcLxN4Ay1DnP9m4XanUcwCA9Xrg82g7T2m/lo6ldzd t73a8A5HeigVq5p4ByGL/h3ZQ2bx65Xh1J8duW35UdaV5A1WzCAkq2QZCsMfY0CQ6W 1/JaHFHAdG3oTNxjCpECkTfNhVMD7KFzKeAU9BCtDoobwJdHmOuUPjKNVhTlYrSYIA FBZSzpOsUaIqONu1AQAdnjhxQ3Ldc+5rv0Co/iCm/tvolnQZVxxeSiPVK0CGU9utn6 uTqEyG5WfBayg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbM2YZKz9rxq; Wed, 14 Apr 2021 11:13:19 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:38 +0200 Message-Id: <20210414091303.6990-12-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 9b3e6b779c..7848a2b3e5 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 Wed Apr 14 09:12:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28505 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 1D8BF27BC7A; Wed, 14 Apr 2021 10:15:19 +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 8E3D127BC76 for ; Wed, 14 Apr 2021 10:15:12 +0100 (BST) Received: from localhost ([::1]:40966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbc7-0007Ah-Ku for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:15:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb6-0005XE-BE for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50228) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb6-00025U-1l for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb5-0007Er-Tj for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 13/37] gnu: Add ocaml-sedlex. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839161827466 (code B ref 47768); Wed, 14 Apr 2021 09:14:07 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:38 +0000 Received: from localhost ([127.0.0.1]:33461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbab-00078p-SJ for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:38 -0400 Received: from mout02.posteo.de ([185.67.36.66]:60581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaR-000752-3Q for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:28 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2D53C2400FD for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391601; bh=sK5NHPutVGXLsS9cGhePbjA+dMtxQ+F/bg4jf2DQkao=; h=From:To:Cc:Subject:Date:From; b=DBiEWGpNUb+g2+fd2EW1vpd4B1GYGnbO4XCauMKEt0lXWf3uJGkaFABPzWaUAdDlz xlSSkkBuhi3fIUmEOZt9uK/vkHDFrsvHTJukIoUugWB58mX8pMi5khuXPuS6zcZXbv sbNX6LnGQwLzxhIo6r/TVGRZ/dsgztczA2sw/w43TwHEzVRtps3sPeq6/Ph83TJ2gv h7Qp8MLLqi3Zha3mvQNyBRkzig41tacLDhqhAq7X7j32sMplX18xNnwUbU2gjDS8uW 6h1Dfqy4DrEOCnJzrtdeYWezvd2FKHe79NZRN4ziHQD+EV8pNpYTMiAGL0yKp+dvfI pzxgPiN3/hyMA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbN4JStz9rxF; Wed, 14 Apr 2021 11:13:20 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:39 +0200 Message-Id: <20210414091303.6990-13-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 7848a2b3e5..f6c26b04f4 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 Wed Apr 14 09:12:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28494 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 1B2E927BC74; Wed, 14 Apr 2021 10:14: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 F3E9C27BC75 for ; Wed, 14 Apr 2021 10:14:44 +0100 (BST) Received: from localhost ([::1]:38336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbg-0005x6-3y for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb6-0005YG-OL for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50229) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb6-000264-ES for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb6-0007Ey-9c for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 14/37] gnu: Add ocaml-uunf. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839161827474 (code B ref 47768); Wed, 14 Apr 2021 09:14:08 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:38 +0000 Received: from localhost ([127.0.0.1]:33465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbac-00078x-Df for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:38 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaR-000759-JW for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:28 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A70E02400FD for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391601; bh=f42VlKRjvUM3YvNtFwJfODj2sOSNNGdWLYwGq56XZEE=; h=From:To:Cc:Subject:Date:From; b=q3NQbaoqMicTuL5oxDOe7cgATcAAwkYiZaz+IWViOeGiQwSg+7SpQ7oMNxgLutCoU Hd3AV2wQnr9j+b58i6aU/qzhmT881JWnUsXgdS0H5elK2S1+yJfOC/EwqgVkrTAU2o YLGGiCQTqkcZW9EhYOlbxilQJDlEwzN5+XYCz26ddVkGGPF17pO3T8f5ui7J/1SVBy jXciKLOC+UY8Ab3n60eAnaAIvrlwrs6lvnLeef2dcBEy2JzrevotvXLRgBaWwcmfPT CWGMBCJHRW0/AwDOS+ZvfQSnoPYlbuzMgwalLf0QDixpAGgPVAhMKQS3s5+Qfdk2v/ pupUNWsgWX5Ig== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbP0wpBz9rxq; Wed, 14 Apr 2021 11:13:21 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:40 +0200 Message-Id: <20210414091303.6990-14-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 f6c26b04f4..17f953306d 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 Wed Apr 14 09:12:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28507 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 923B627BC75; Wed, 14 Apr 2021 10:15:20 +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 3796027BC77 for ; Wed, 14 Apr 2021 10:15:12 +0100 (BST) Received: from localhost ([::1]:40926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbc7-00079l-DB for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:15:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb7-0005Z4-4h for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50230) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb6-00026L-Qh for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb6-0007F5-M8 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 15/37] gnu: Add ocaml-ppx-sexp-conv. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163427553 (code B ref 47768); Wed, 14 Apr 2021 09:14:08 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:54 +0000 Received: from localhost ([127.0.0.1]:33467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbad-00079C-RP for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:54 -0400 Received: from mout02.posteo.de ([185.67.36.66]:56523) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaS-00075S-BY for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:29 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 834AB2400FD for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391602; bh=+i4PG0X5Y5Vp0XXNkcZ/3uG4u7tD/kiubsKmlLqk5CI=; h=From:To:Cc:Subject:Date:From; b=B6K9+UcPv/X6EEPpNP0GC+uXd/fU+k2z8YJRf7VqJi6bIfFeEqDMu9v/KxBFeFXnb fRdr/Xhl5iprHwL2ps5a3x2bPlDSlNxyWv/TOfIP36UQIJ3t0NxvTEjqPMpmNBVHZz bgSMdFGS+Jp0M5NWOKSpWv8bqJ0CNzuS5Bc6VHIoAdzWjC9nQJYh/ztYStnTO90TzV PPJhqIiBZQfMHmw35XBsLpIxw+2OQVMcFr9u0SVoT297WIojfI82dg3ClNN2Rgzrw0 Ffn5za+rOgXGk+lcHga2pV1aAtzoLiDqbUNGr1FAfxnW8LfV6DLDZHi6Zy/xX+t69a F5/dkq8N3ntog== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbP4Trzz9rxl; Wed, 14 Apr 2021 11:13:21 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:41 +0200 Message-Id: <20210414091303.6990-15-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 17f953306d..c0d5d8a92a 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 Wed Apr 14 09:12:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28508 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 D8A4327BC78; Wed, 14 Apr 2021 10:15:51 +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 4F45927BC75 for ; Wed, 14 Apr 2021 10:15:51 +0100 (BST) Received: from localhost ([::1]:41938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbck-0007Wj-HR for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:15:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb7-0005aG-Ii for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50231) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb7-000277-70 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb7-0007FD-2E for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 16/37] gnu: Add ocaml-bigstringaf. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163527561 (code B ref 47768); Wed, 14 Apr 2021 09:14:09 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:55 +0000 Received: from localhost ([127.0.0.1]:33487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbas-0007AM-DX for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:54 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaT-00075h-KU for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:30 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id CDE892400FD for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391603; bh=cbF69VSyBZglvi22JNBPc+pg+ZheOrQM8yIMP2x70VQ=; h=From:To:Cc:Subject:Date:From; b=NFvLw0C87w4Y5sxBNPzGsqBYv4ctisZpqYbObU9N6l/7DwSV9NhTRxUjl5uod/KiJ YYoWu2aHJxU2xLkJcuGTTCh9qFher+liSu3+m/EK6Zv50F0Zdj+T6FxL7iUat7vOBV Lwqgtf+hk50OSkpKmaoLozaPHnOe1gc/eCXJ6pIU+gFshXHNxIYwkp+1vBEmhp3+tA SQjVXqWI9yt2hGtTGwZzCktjWWkP5vKd0bwFlTJm8A7zn3gNz9le+zIAggrubBN3eL bIKVKOGncEheOYZ3oxeeP00OWUqrWXg1vpzQ/z/fjbBTUZc7cUTToaLtqK74EAPce0 62rKg8N1kdrpg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbQ5PFQz9rxF; Wed, 14 Apr 2021 11:13:22 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:42 +0200 Message-Id: <20210414091303.6990-16-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 c0d5d8a92a..b979dbd029 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 Wed Apr 14 09:12:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28515 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 33F9327BC76; Wed, 14 Apr 2021 10:16: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 587F227BC74 for ; Wed, 14 Apr 2021 10:16:37 +0100 (BST) Received: from localhost ([::1]:43550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbdU-0008MU-IC for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:16:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb9-0005em-12 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50235) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb8-00028C-Np for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb8-0007Fh-JG for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 17/37] gnu: Add ocaml-ppx-let. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163627597 (code B ref 47768); Wed, 14 Apr 2021 09:14:10 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:56 +0000 Received: from localhost ([127.0.0.1]:33495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbau-0007At-6p for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:56 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41025) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaU-000760-Ts for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:31 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 107CD2400FE for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391605; bh=ElgR5o5EJ/1Bo6hYtftnezNw+wl6djqwl7J2ZziLVto=; h=From:To:Cc:Subject:Date:From; b=MC83kA1lykjyh83fl/ZvKE1nIfNAcIpX/KBjto80Te3vDnV3iA0mXyE7Y1OLRc8md k5udYwRWmdeXPCyYvljKEA8SmrVdY7JrqIkjfM0qqI3cPO2Z+cY3K8SYI5Ocd+1W7H wiqaC4DuDrZt4lxGW3F49IkXEOuZcd8Ua570oWERHaxssc2e+MUwYLY/8/aSQ6EJ6f L7UJwf79pcXIdTTO63s72uIPX+ckhk0iy92Q/0lZREKtO7tn5/JHVm4BB100OfdHDC v9Zy/MlOJ2f2EYnRhIetJPZbOIn0fb7Xxi2sOA95ZeB1PUMQ7BZFPCKf55+3FIZ9bu wz6K6kuh7UH4g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbS0HD0z9rxF; Wed, 14 Apr 2021 11:13:23 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:43 +0200 Message-Id: <20210414091303.6990-17-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 b979dbd029..0658b7ef68 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 Wed Apr 14 09:12:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28503 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 8595F27BC7A; Wed, 14 Apr 2021 10:15: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 E8ED227BC7D for ; Wed, 14 Apr 2021 10:15:12 +0100 (BST) Received: from localhost ([::1]:40998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbc8-0007BP-0D for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:15:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb8-0005df-Ke for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50234) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb8-00027n-B9 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb8-0007FZ-76 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 18/37] gnu: Add ocaml-syntax-shims. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163627590 (code B ref 47768); Wed, 14 Apr 2021 09:14:10 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:56 +0000 Received: from localhost ([127.0.0.1]:33493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbat-0007Al-RY for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:56 -0400 Received: from mout02.posteo.de ([185.67.36.66]:45951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaU-00075z-Tr for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:31 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2583A240101 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391605; bh=BdLrVc+vM522Q9092gOEChWG6Y5r6NydCYKx9oz0seE=; h=From:To:Cc:Subject:Date:From; b=Vdr6bSYVZuhoUOzhKPpLOvYGg7Fg9fDq3uxCxBfyCi6v+XRcYDf5+xMYdl2IPTKVY wnmXgqumWSF5VDq6AR8/UPQAnspbSMIextNYkx3Rt3/ipxs26qgW2NM53FusRc9pZp nWNhSv2vWZHo1yjyxLQx1tpc5u3ZuJT70db4RZyTllTfaTa8xcD0EEaUKnkVJJUbpd qVPAh9JU3Ig9fEgjxpa9JaNXA+Xzt+n7ChgH6FyYqFFKt8MuNhS/SqisPPd3zyNofg /Io9/+LzY0UmGdU6sy8GaFll56C0ppHPt7LbXCzuOh50l7JuU/6by0YeKQibbOOtmJ PchEU27fEV54g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbS3bntz9rxl; Wed, 14 Apr 2021 11:13:24 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:44 +0200 Message-Id: <20210414091303.6990-18-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 0658b7ef68..e5b304fa81 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 Wed Apr 14 09:12:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28498 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 DB13327BC74; Wed, 14 Apr 2021 10:14: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 F0DDD27BC76 for ; Wed, 14 Apr 2021 10:14:53 +0100 (BST) Received: from localhost ([::1]:39250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbp-0006VC-47 for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb9-0005fn-Dp for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50236) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb9-00028i-4e for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb8-0007Fo-Vn for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 19/37] gnu: Add ocaml-ppx-compare. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163727605 (code B ref 47768); Wed, 14 Apr 2021 09:14:10 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:57 +0000 Received: from localhost ([127.0.0.1]:33497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbau-0007B4-Ml for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:57 -0400 Received: from mout01.posteo.de ([185.67.36.65]:56371) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaV-00076F-Gy for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:32 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id B4ABA1A022C for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391605; bh=vzCZynhMVnVKD7CwMqlDrA9Ll+8TyRt2zQZYwV9FEkw=; h=From:To:Cc:Subject:Date:From; b=Sl2mMaTJveBOSqzeYMRY1Q2cBc2HzqcrRxTI/wfuLLf1nfetrOz6KQfQ9OjX65VPk YdJucUaOPctthZ8vIK4qSe3s0lhFzn3uVLT3KcvpQQJJTerPy6chHrFrYbfNIcLLNE abOtJw/DJwJO9TYPNUyDKSgMBIGf08usIRzZgA16cUY9zqqtsvktVzUGxE5FturXHF PaO/Ef0TtvNYkA++JnqEA4s4/U2azbERfdh+GhG5UEKPg0DHgXHzLwpc4JnbL/3Tm8 UdOFr4hshgXvgVS0Lrk1QG/CduyWKaZtjXA7zHUBheZUD0ONrctfRfd5Fi+/P0/xnn yXCGlPpqhfqLw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbT08FWz9rxs; Wed, 14 Apr 2021 11:13:24 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:45 +0200 Message-Id: <20210414091303.6990-19-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 e5b304fa81..271627ff1b 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 Wed Apr 14 09:12:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28518 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 C35BA27BC74; Wed, 14 Apr 2021 10:16:44 +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 0419B27BC75 for ; Wed, 14 Apr 2021 10:16:44 +0100 (BST) Received: from localhost ([::1]:43994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbdb-0000EO-7w for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:16:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0005hp-1u for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbC-0002Ag-6a for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbC-0007Gn-2d for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 20/37] gnu: Add ocaml-ppx-here. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839164027664 (code B ref 47768); Wed, 14 Apr 2021 09:14:14 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:14:00 +0000 Received: from localhost ([127.0.0.1]:33513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbax-0007C1-Ta for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:14:00 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaW-00076a-GP for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:45 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 778F51A022C for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391606; bh=pjV0zaVnIjXNJuN6cA32VkXIfJVmq17UR08QttKLgYI=; h=From:To:Cc:Subject:Date:From; b=PgCTPW7kK3UklUbJTbEpqaPI+TEIJG1407fBjNKyfroYmtydT72SE95kKh49e21gy PmxBkOAG+b9FYK9rJZZ4DXPvO0vE+X0/xNV2hCh/zDlrSsDfr+PSycUir3LW5HWtYW WIhlnzYotratXRQ57NzMzDOzipwv4qp7Msr8y20pALU4BWml5QEWqDTZYFGtYLyhm3 slyq7Tx8IV42aTOTyIWEu/SD7lQnLLaXk/HSac7WlRx+IoL27OUYB83NeYE0ct+GP+ 836bOhLXOS/cApyQtUlZGmZ5geiu2jiblI1gqzi0pKU3oHeOIFOO5dDv9kYkJT381I BUAOYdDlpAuhg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbT46f7z9rxr; Wed, 14 Apr 2021 11:13:25 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:46 +0200 Message-Id: <20210414091303.6990-20-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 271627ff1b..27a985f9b6 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 Wed Apr 14 09:12:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28509 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 343F227BC75; Wed, 14 Apr 2021 10:15: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 6B32327BC77 for ; Wed, 14 Apr 2021 10:15:51 +0100 (BST) Received: from localhost ([::1]:41912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbck-0007WE-Hy for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:15:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbA-0005h3-6T for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50238) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb9-00029l-TZ for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb9-0007G3-Oi for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 21/37] gnu: Add ocaml-ppx-cold. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163827620 (code B ref 47768); Wed, 14 Apr 2021 09:14:11 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:58 +0000 Received: from localhost ([127.0.0.1]:33501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbav-0007BJ-JD for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:57 -0400 Received: from mout01.posteo.de ([185.67.36.65]:50936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaW-00076d-Nd for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 012551A0231 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391607; bh=/D7fASbk7fWnLdsAkKsp9NL4lDFvoCHj6G3odzBabsw=; h=From:To:Cc:Subject:Date:From; b=j6n39L//OEUF3wNo3kbNKn8MonWXtZR/nT9Nst3Hih2wyVb5jyEs6bWWDTX/KtOl7 t9FyKr2g034R0qRSOaXzShi2vnsdv8wvgTP+Zq95AmreyQxDR9AYpaDb5uS6HzcnWn p2vK9WcooHYPW9PYmTB47MIgfr7V6tTm8Zz67cjrS2ujERFJFPCRq7IuiyiqeB8J+t 0cdNIgAHCIvrbAYUknblEhtEy1QqITWGrbMl2vJpR8vAPBEwbdjgEoW6hDVjJECdva C6KS04uE6Qn15wkcG0OeduT4xFcUddBvFCrN+3YYwRkdamibK5YTn/6wfXFyMKkS1n iT0HJ4d8HxzSw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbV31sPz9rxl; Wed, 14 Apr 2021 11:13:26 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:47 +0200 Message-Id: <20210414091303.6990-21-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 27a985f9b6..193a9fcc58 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 Wed Apr 14 09:12:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28510 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 E3A8A27BC75; Wed, 14 Apr 2021 10:15: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 44BFE27BC74 for ; Wed, 14 Apr 2021 10:15:51 +0100 (BST) Received: from localhost ([::1]:41944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbck-0007Wy-F3 for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:15:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbD-0005hM-Us for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbA-0002AG-9f for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbA-0007GA-53 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 22/37] gnu: Add ocaml-ppx-assert. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163827627 (code B ref 47768); Wed, 14 Apr 2021 09:14:12 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:58 +0000 Received: from localhost ([127.0.0.1]:33503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbav-0007BQ-Sp for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:58 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41587) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaX-00076x-Nc for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AFFFF240102 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391607; bh=JHOvSfU7wehtfXXbwuc0Tl6ExDrIBJrmT3qIEgC7zUQ=; h=From:To:Cc:Subject:Date:From; b=L2eFR4NpvChVQo+rMPJ596ZHpx68Ke7Wt20P29v/UJ2O+4tXXMdiUhE0h5C7npSjN SgyinUhzRzr3c+Erx40epNpejrrnifA06TETTO7CstxbkMwRq67c3gHyFVZ64U5hgk WIkHXKuS98S4f5zxHaMLTB4c6nCW6D0+L3iS09eYT7pCn5NhO1/QDovuqmjBYu9cCp jxZC9rqO7pOBLdyHIaLOSjNtHsKeA+k+EnHLc/En3LAX8zuj1Ksx5O9Q6yZlL31abn 6AohkcSPeZFVgIPDR7GAqL160alpYRTPdiMdYzQJJcpxIm3/leUl/tbJ9DzD1/vWDv fyHXq/X9fzZng== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbV6dtfz9rxl; Wed, 14 Apr 2021 11:13:26 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:48 +0200 Message-Id: <20210414091303.6990-22-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 193a9fcc58..7f3599bd3a 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 Wed Apr 14 09:12:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28500 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 B365627BC7B; Wed, 14 Apr 2021 10:15: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, TVD_SPACE_RATIO,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 EC00527BC77 for ; Wed, 14 Apr 2021 10:15:01 +0100 (BST) Received: from localhost ([::1]:40034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbx-0006o4-3f for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:15:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb7-0005bC-Uc for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50232) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb7-00027S-Iq for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb7-0007FK-EU for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 23/37] gnu: Add ocaml-ppx-custom-printf. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163527569 (code B ref 47768); Wed, 14 Apr 2021 09:14:09 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:55 +0000 Received: from localhost ([127.0.0.1]:33489 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbas-0007AU-TU for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:55 -0400 Received: from mout02.posteo.de ([185.67.36.66]:60581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaT-000752-GF for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:30 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id DDF71240100 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391608; bh=/obmy4/ZguoK6dqFTj0rZyo8fsg+xd9eD8YtKRqW1q4=; h=From:To:Cc:Subject:Date:From; b=qeUPVGmi73Eyd75HZDcNPjOiPNfzwOElWD3VAXY10jVBCij+0XdNrgUToyIqpcDwD 2qEqPW2BCxFPcKoKF+fPi41MFaSZk33iG5L1ld/rR5a2UHzOg+l5Fc7sWAGleEyc/v ouUpoeRKO7yyoEbGixcgrvNT7VmOLCLw5FO0dKtHg+PoVTxIRHCUMo8LQK1P2qH8ED hHcjlipxvaCzU/LKpDDj9l7hlkWxEfo9ZkwlxJqZvney33iVfgxfTn/DHbclxxhKru zY/XA3fRKrnr2qUvRNxRO1hazrokVQC3w1g/eiWL5SyFQplA++AcalxNnG+BALP+Xb Bjphfa9vgkByw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbW6rVNz9rxl; Wed, 14 Apr 2021 11:13:27 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:49 +0200 Message-Id: <20210414091303.6990-23-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 7f3599bd3a..ae6f393130 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 Wed Apr 14 09:12:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28514 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 3CDF827BC74; Wed, 14 Apr 2021 10:16: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 02B3627BC76 for ; Wed, 14 Apr 2021 10:16:13 +0100 (BST) Received: from localhost ([::1]:42816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbd6-00083r-4i for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:16:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb8-0005cQ-7M for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50233) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb7-00027f-VV for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb7-0007FR-Qo for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 24/37] gnu: Add ocaml-ppx-hash. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163627578 (code B ref 47768); Wed, 14 Apr 2021 09:14:09 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:56 +0000 Received: from localhost ([127.0.0.1]:33491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbat-0007Ab-Am for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:55 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaU-000759-6p for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:30 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 7C2A82400FC for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391609; bh=xyMcz2a9n5hv7ToKgMfYc51/eXv0q5i0d5p1mxJdy2s=; h=From:To:Cc:Subject:Date:From; b=RPeoIFwKkLq02AI2RrMXMAXk0XRHSLWblwhNa2Vl8gFcZMPHRUFlVXqL0lXehByPs O4jNh4+JhlBMU3tYUfoGNcpQZmcgNxZZNz1sf3+ioHt6ZwF4CgOz+uIIbIvX3kkD0h GebJLwOPb9M7BKwkuC6ys7+2pbakoNRamisd0poiSYspNrQbOWnqGIVyd6NzC9Qk1X C/TUOTIQJsfacutIIo6wW7LVfdLqng5FX2+Uo6uWYUnidM+K5g0VUF5kBA24fulqQM /vgMMgfBiFZ09B/PAU12L8N/Yx6ui1eh910choca2dFwqIyHmbp9GDXrKeQYIHpCEd kPcJhlAvrq62g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbX5sx5z9rxP; Wed, 14 Apr 2021 11:13:28 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:50 +0200 Message-Id: <20210414091303.6990-24-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 ae6f393130..fd85e2614e 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 Wed Apr 14 09:12:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28512 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 F12F327BC77; Wed, 14 Apr 2021 10:16:13 +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 C6D2627BC74 for ; Wed, 14 Apr 2021 10:16:12 +0100 (BST) Received: from localhost ([::1]:42812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbd5-00083m-Tz for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:16:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0005hk-4Q for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50242) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbB-0002Ad-Eg for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbB-0007GX-AR for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 25/37] gnu: Add ocaml-ppx-enumerate. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163927649 (code B ref 47768); Wed, 14 Apr 2021 09:14:13 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:59 +0000 Received: from localhost ([127.0.0.1]:33509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbax-0007Bn-38 for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:59 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34293) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaZ-00077M-RX for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 0CD801A0231 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391610; bh=CnpsiAMYG5+eex8Cck+0ln7OFfjTHBMJS7Gvb0WfGQw=; h=From:To:Cc:Subject:Date:From; b=U62v5jfde5z9fXeJyNq4fxVjA4TBVmEWOgj+ekj+tGocRZHRLGVphkx7o4yKMTRN0 3wXql0ArouPO8BTDQ3PSYw0pplGDay3OpiXVOQwr0E6Ptop1sV6Zug3c1cvnCz/9+n LHufAoXLHzUPqHYtIMabFBDXQff5bZhbqIVK0J65CJR4EsnNfNHekoYMdfUjCXyUGd eWIcHLf0h2J/G9PoBC7zKaRlij8soPnywKKOQup5hbX/NVxyaGk43/DYbW1HnWkTVw uvsy6cx2TP5NbDt/SS+O8qKN/vpL/ZVc0P3daZKT5CU4O7yU6XkxtAoNxsH4RWDrPQ LLGqEikkgxazg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbY2V2qz9rxq; Wed, 14 Apr 2021 11:13:29 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:51 +0200 Message-Id: <20210414091303.6990-25-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 fd85e2614e..0e2b632ae2 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 Wed Apr 14 09:12:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28521 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 37FA727BC76; Wed, 14 Apr 2021 10:17: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 2706D27BC74 for ; Wed, 14 Apr 2021 10:17:22 +0100 (BST) Received: from localhost ([::1]:44898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbeD-0000cw-Cc for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:17:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb9-0005gW-Qb for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50237) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb9-00029H-H3 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb9-0007Fw-Bw for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 26/37] gnu: Add ocaml-ppx-js-style. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163727612 (code B ref 47768); Wed, 14 Apr 2021 09:14:11 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:57 +0000 Received: from localhost ([127.0.0.1]:33499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbav-0007BC-64 for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:57 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaV-00075h-MS for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:32 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 1D9562400FC for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391611; bh=6JdCSWVnPCPVJJHQ+RlN+UjXFZMduOrbbtbyugGcDjU=; h=From:To:Cc:Subject:Date:From; b=FG9IhfLGUzu8pyDSVTaWHyfnguzhfZsXOG13kv609v1AtAuCTlQm0+hjA+XNuu8oH cdcdDHAQ94RAt5PWbkdppDTlF+OtoJ5++OArzgsGyZqbODwUn/QmpuJDeCNdZhxFJr idHuoSF9rB2mB4xz8C8uw/rAgtTyWr0cr7HGf02fTaqOi43YMNp5fcKijxiy/3prVi 3KNwpLdxJK+rBsF5j6+4UcfLIjRgqC1HDpfQbWC97ibO4o/Jro4DPKhV19N8rZxBng ugmIkqPmjahab6IsMN2fJjZ88mmquMfV2ejqf18SdKFnXB75Z3mSiSU98hbXHwZ36z NQHgLyKoKCFOQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbZ33Tmz9rxP; Wed, 14 Apr 2021 11:13:30 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:52 +0200 Message-Id: <20210414091303.6990-26-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 0e2b632ae2..1fb620faa6 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 Wed Apr 14 09:12:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28516 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 AD09827BC74; Wed, 14 Apr 2021 10:16: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 5E60327BC75 for ; Wed, 14 Apr 2021 10:16:37 +0100 (BST) Received: from localhost ([::1]:43512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbdU-0008LR-GB for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:16:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0005ha-5g for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbB-0002Ae-R6 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbB-0007Gf-MW for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 27/37] gnu: Add ocaml-ppx-base. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839164027656 (code B ref 47768); Wed, 14 Apr 2021 09:14:13 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:14:00 +0000 Received: from localhost ([127.0.0.1]:33511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbax-0007Bu-GI for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:59 -0400 Received: from mout01.posteo.de ([185.67.36.65]:60774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbab-00077u-Q0 for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id DF77A1A0231 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391611; bh=s48QBWYblRXMtRQW+H/Spm0tuy/zDemG4083+61VuSo=; h=From:To:Cc:Subject:Date:From; b=p1bm1/EZ+TyabgZjogJPwm6VzS6VC59n5AnjaDcdltnv8ZzF1DkEtoBtSJ6fv1io+ lRi4fSfTC6OR8UUO2yXAwg+Ih8/yXP9jIiX+W4kOXxJXZjfwJcu4FwZWjcktN3Ff3+ 81RMBbNPoxPA0jNCp9Rs/iHickE9EApxgbSqs8MQjd90NcNYIeXe87DA8WB6XeCk6W 54SsDlFfRhIRuFG3a9TFp2KQ5w5eLH6ij4+Qig+MzOdF56n1KsP3gVLHhYSInyAP1X zX9TLVqKxHHv3mfNVvgkoS2pLZqNNU2ikky5PLTGdOBC5qG7C/U3qwrRmwmGP54AR6 I+fX0gSH9lbXw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbZ6WgRz9rxY; Wed, 14 Apr 2021 11:13:30 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:53 +0200 Message-Id: <20210414091303.6990-27-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 1fb620faa6..b4640037f5 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 Wed Apr 14 09:12:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28513 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 43A1727BC74; Wed, 14 Apr 2021 10:16: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 E5F9E27BC75 for ; Wed, 14 Apr 2021 10:16:12 +0100 (BST) Received: from localhost ([::1]:42830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbd6-00084B-1z for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:16:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0005hm-4C for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbA-0002Ab-Lr for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbA-0007GJ-H2 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 28/37] gnu: Add ocaml-fieldslib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163827634 (code B ref 47768); Wed, 14 Apr 2021 09:14:12 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:58 +0000 Received: from localhost ([127.0.0.1]:33505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaw-0007BY-Bb for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:58 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaW-000759-TT for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 5CC682400FC for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391612; bh=yCb4qHzYZrC5lK9A57Jr7nAu7j7Fek0nUa1Y0NPTo4w=; h=From:To:Cc:Subject:Date:From; b=IrJG89V3wTJk7U08nusHQp7aZZmCleZ+kybNqbdO01JmzPERqmXPMw1KrUOLP0Zy9 0koJWHFqcegzp7XkLypIaP/irHmrO8eKWPBRAmJomju6d7ygV4RnNraO+XiqjaMEg9 Uub4Rb6zk+Uklnoif+35k/emBPnQI294qZBCr3RgxY+N+3bC8ilNxSMwtCyTfq7D51 /GoaxFOBKrIN+1alkDTU4cTwe1k8z0SY3lTxOXnyXVtsmaP6RxskSTv7X42WDC5cEv IwU+OWoZQK7X5BCrYSEzg9hLH6Q23lM3vrgazj0iGbUBdSdFis3Mg5DRD0sQgppvEy mwhAV3EM6POgA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbb60y4z9rxP; Wed, 14 Apr 2021 11:13:31 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:54 +0200 Message-Id: <20210414091303.6990-28-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 b4640037f5..6415e27ff9 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 Wed Apr 14 09:12:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28522 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 E40CA27BC74; Wed, 14 Apr 2021 10:17: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 65BA427BC75 for ; Wed, 14 Apr 2021 10:17:22 +0100 (BST) Received: from localhost ([::1]:44924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbeD-0000dV-Jj for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:17:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbF-0005nd-VD for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50252) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbF-0002E5-Fq for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbF-0007Hm-Bh for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 29/37] gnu: Add ocaml-ppx-fields-conv. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839164427757 (code B ref 47768); Wed, 14 Apr 2021 09:14:17 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:14:04 +0000 Received: from localhost ([127.0.0.1]:33531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbb1-0007DW-GD for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:14:03 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53995) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbad-00077x-Pd for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:56 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 04C471A0238 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391613; bh=WlUgW/jX9k7SNIKFz8ET4QTY+tSWUMlADZz/uY1aVoE=; h=From:To:Cc:Subject:Date:From; b=BmNGCc/NiLATRYzjhxP/ma/OakoedzFrjYZaqFPkjkKU0Wq4eqQ9zTBUMXHzL693q zZlMsxkDSRvFOFciQcr6GMFNvgLpxFC64vdWGncXyuVGVEPAuf9WxhC4xUwSnY+bzi I/URlBWtcCQfy5pkLdvINwJtHRl1Ah5H1mBJsyFFR4DxyJcAx76rAljcXRYJ9m5SAq G6TBWjavaYgONFuFVEvrNkTOq4MS9R/eeEYvGbwVfKKK5K4fdLRsSUAO5b/oAtVB+O mblhI970vx/uzh+7t4guAPe52+c5BX4boT9pHpL8BVw8pOT5AOkHfwaFxdbypt0akX zVKTbvk0bTBRw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbc2P4xz9rxr; Wed, 14 Apr 2021 11:13:32 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:55 +0200 Message-Id: <20210414091303.6990-29-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 6415e27ff9..66cec49a79 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 Wed Apr 14 09:12:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28502 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 A5CAB27BC7D; Wed, 14 Apr 2021 10:15: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 52ADC27BC75 for ; Wed, 14 Apr 2021 10:15:03 +0100 (BST) Received: from localhost ([::1]:40166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbby-0006rE-Ex for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:15:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0005hc-3e for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50245) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbC-0002Ai-Jp for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbC-0007Gu-Fs for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 30/37] gnu: Add ocaml-ppx-optcomp Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839164027671 (code B ref 47768); Wed, 14 Apr 2021 09:14:14 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:14:00 +0000 Received: from localhost ([127.0.0.1]:33515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbay-0007C9-DJ for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:14:00 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41613) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbad-000786-Rx for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:46 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A4D232400FE for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391613; bh=4AKNzxo616zUq9pZRow8dgB9kXm3xKS8Gmli62bw8+s=; h=From:To:Cc:Subject:Date:From; b=ieu/iMscxrHimklDsn4eNNmgTmEFt7nDOpOfDGR/1IGlcIpm8OIyF+jSPD5U6+LJe IpNhP/3coLdsTZarKULtBUaj3j1faVk0xQl0KdzEE/c1T8HCHxEsGBQxYs2otD4kIO 6AHnea6vkYn1bgVDApzHJdHBWWT3fIDJHpyPsdcq2tdSgRfjUy8TzeB681vqivODWo fi2pHk/tXCRL1EOpcYLvfM+ZXnAFOqrRy8vHcWp+v89yWGbzxQ44Icf8QulZg2TNu7 G9q7J+9sQf8x0wIr+o0ouUnFGqji5MeT72o6HgiHH4SNrTAo9ccmeI9poTdTzQ6BKm 7EMKYFp0VxfDw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbc6qxtz9rxk; Wed, 14 Apr 2021 11:13:32 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:56 +0200 Message-Id: <20210414091303.6990-30-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 66cec49a79..77827e6ece 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 Wed Apr 14 09:12:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28511 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 3CA9027BC75; Wed, 14 Apr 2021 10:15:59 +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 9990327BC74 for ; Wed, 14 Apr 2021 10:15:58 +0100 (BST) Received: from localhost ([::1]:42100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbcr-0007ai-Pk for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:15:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0005hb-6c for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50247) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbD-0002Aq-Bz for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbD-0007H9-7g for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 31/37] gnu: Add ocaml-ppx-optional. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839164127694 (code B ref 47768); Wed, 14 Apr 2021 09:14:15 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:14:01 +0000 Received: from localhost ([127.0.0.1]:33519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaz-0007CN-1M for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:14:01 -0400 Received: from mout01.posteo.de ([185.67.36.65]:52670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbae-00078C-0E for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:46 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 30D191A023C for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391614; bh=TnyqDarqp1rhtgpu9wBK0DAEJpRFKOmxVob4hRwqMzg=; h=From:To:Cc:Subject:Date:From; b=qvBQ/FjdLXpNSVXcJ4KWZ9jE8Vvvmk02HvKzVmCGNO3uAAZ2zyFrJnX3jXkRb58wY bKfyUu610ztbmp1t1Rj66j4YeEN2EDSwXe5QH7oCfs9oiHZxy7BH8kq78EgmvVvwNs hR4HlGILiBa2oe078DrVOE2v2lOXND9AXufMPLRZUkRvm7nq2R8G3L7y+t28VK0S9M ldI50P0Sywe9yczJCYgUv6Yal5B4vxPxkP+fMF8Xl6QSkA7PUznQ75GXWpsBig2wI1 t1fIYAJneicEIWO4tpHO9rq1pVUiePWMC2nDNxcNCXoeVPPdMHTFg5TcpMsLqsQnWk awkzNj+HUw67g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbd47Rmz9rxl; Wed, 14 Apr 2021 11:13:33 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:57 +0200 Message-Id: <20210414091303.6990-31-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 77827e6ece..515cc3984c 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 Wed Apr 14 09:12:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28517 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 6517627BC76; Wed, 14 Apr 2021 10:16:44 +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 0396127BC74 for ; Wed, 14 Apr 2021 10:16:44 +0100 (BST) Received: from localhost ([::1]:43990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbdb-0000EJ-72 for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:16:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0005he-2H for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50241) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbB-0002Ac-26 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbA-0007GQ-TA for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 32/37] gnu: Add ocaml-jst-config. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163927642 (code B ref 47768); Wed, 14 Apr 2021 09:14:12 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:59 +0000 Received: from localhost ([127.0.0.1]:33507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaw-0007Bf-Oc for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:59 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41587) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaZ-00076x-BY for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:35 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 9DFD12400FC for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391614; bh=AUW3ODjj6y1rAFKwD+JjEt2Xycmb6gb2ndsskGdG92o=; h=From:To:Cc:Subject:Date:From; b=TV9n+Ol6oPC8Go9yUE/pbTtVlZJPacHYfRdlk3ZmLfOoMLs69XAjeXPFawhVzIUZe Z5pFigWSm6ng1ClU6Eobn7aKcISX/ULpLpOxw4hdFXO6QxPlsKWthpdJ1w7uhUQEKu +5qMZ1vgtdk/Nar19i/R7ZUZ0mBgkGM+D4eeOvjki1/SPs3h8fpJuyMZTJhttLlCZK TMG2T3QPMl2LxvBrkqXnaDG8L+LCKi4SrPgipIkkEHxfc7W1pCid/pYNiDGDMEc+bT OdakWeoBWEP9sUxNBqnS2WAohPaidYDhPnI/OzHqJL9U6nhY5dpwxEFIXwwQN3issq 956irSJ13qE4A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbf0nlzz9rxF; Wed, 14 Apr 2021 11:13:34 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:58 +0200 Message-Id: <20210414091303.6990-32-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 515cc3984c..db6c851186 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 Wed Apr 14 09:12:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28520 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 7156327BC75; Wed, 14 Apr 2021 10:17: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 E96FB27BC74 for ; Wed, 14 Apr 2021 10:17:06 +0100 (BST) Received: from localhost ([::1]:44456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbdy-0000Qr-6E for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:17:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0005iC-8V for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50248) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbD-0002B7-Rk for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbD-0007HG-Kx for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 33/37] gnu: Add ocaml-jane-street-headers. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839164227706 (code B ref 47768); Wed, 14 Apr 2021 09:14:15 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:14:02 +0000 Received: from localhost ([127.0.0.1]:33521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaz-0007Ca-Fy for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:14:01 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40241) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbag-00078l-N6 for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:46 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id B773C2400FE for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391616; bh=MOhtlzUYfoeS38fQvYEdLrP042L2BDLSDlsEItzV/FU=; h=From:To:Cc:Subject:Date:From; b=QzWSTE+IiTO4nyP3+gqEWFkPGBrQ92Rrh83sADWIq0ju89vlVOljn5KERT693X0WU ErgH1dMkF0b6Z2vReau5cpN21fSVkU2j/5MtpRiGpZAI7SyndlyQ6DedHnD/B6HEZa dw0yoBdk1PfqgFq3lmC7RPZcdti2XvSqvyfV5bTjFHd0/mglYbnVkI0QJ91uEUNZ7L GLdVtPJuHcfaSI5pkjW94ZM6td9T2gVyTtxPw196wwRG98AZnjphwZhxsFqAWNnARy h6/v9OQCPTEdGSrzdXztDfEv+mXNeMxwN0PiMrV8EwnSpLT+jWfBk9lhpSBrNoraj6 J5yIyRldqGgGA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbf48jRz9rxl; Wed, 14 Apr 2021 11:13:34 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:59 +0200 Message-Id: <20210414091303.6990-33-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 db6c851186..60bcc0568d 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 Wed Apr 14 09:13:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28506 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 EA77427BC76; Wed, 14 Apr 2021 10:15:20 +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 0759127BC78 for ; Wed, 14 Apr 2021 10:15:14 +0100 (BST) Received: from localhost ([::1]:41090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbc9-0007DL-6D for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:15:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0005hY-5d for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50246) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbC-0002Aj-VT for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbC-0007H2-Rq for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 34/37] gnu: Add ocaml-time-now. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839164127678 (code B ref 47768); Wed, 14 Apr 2021 09:14:14 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:14:01 +0000 Received: from localhost ([127.0.0.1]:33517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbay-0007CG-Ol for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:14:00 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45389) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbag-00078k-H9 for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:46 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id B50E01A023A for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391616; bh=nuhWtZAXYdXl2Hnbq2iYgwtodDd0mFbgXuTYryBoYaM=; h=From:To:Cc:Subject:Date:From; b=hwSpckTUJQ327w+ca4nk2u4RWaJBKOt7WOgOXy6CHHS1M3L+MOZi/KgAAOwdDrZpF Ukoy+v0/VW01wY3/vmx8OLEVvWXzwJ9bx07d7RXyXp77VG98FElep/pN1q7F+R2Y2E v5x916ZV6ELMuZqTAmsisHtbX8CS60IXA5jTQ4wCRRulQLV0LXem43RNItA3qTnf2z MDqZZJtQ9x/yG+akn6FK9v1GgkaltYj+QrKr1dxsRXfYgi6EZOW5BPYVezODwZjIgS wMX0UHPqzUHRzBxfjTGlDjEf9ZE7z9SWFCP+QzJtx7CYey74uL/Wyaf6WqStbTCXbB OULummNB53JuA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbg0bWdz9rxk; Wed, 14 Apr 2021 11:13:35 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:13:00 +0200 Message-Id: <20210414091303.6990-34-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 60bcc0568d..ade6083e16 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 Wed Apr 14 09:13:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28523 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 B8CDA27BC75; Wed, 14 Apr 2021 10:17: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 BA34527BC74 for ; Wed, 14 Apr 2021 10:17:28 +0100 (BST) Received: from localhost ([::1]:45344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbeJ-0000pN-W5 for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:17:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbF-0005lK-1v for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50250) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0002CH-M0 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbE-0007HV-FR for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 35/37] gnu: Add ocaml-ppx-inline-test. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839164327733 (code B ref 47768); Wed, 14 Apr 2021 09:14:16 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:14:03 +0000 Received: from localhost ([127.0.0.1]:33525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbb0-0007Cx-7X for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:14:02 -0400 Received: from mout02.posteo.de ([185.67.36.66]:57689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbag-00078n-S2 for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:47 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 091B9240104 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391617; bh=+f6Zmg689eQqJ3/0fhOH+BeBMnpMaSRap4PwINOKq7U=; h=From:To:Cc:Subject:Date:From; b=jeQCKSUi5mxKmyzgkMhQ7Ob7dWJ6uiY9sMA0oTocjr2XeNB2qj6d2A91sRD/zDs/A icyhxwx+1G41K8vjznoMEXNE8Lnn+sGXEhFRnwPyHNpA47/9BvGnqoz4T6ZX6ed6qf GcHxv3T8OwwvpS3/HrynGjIV5eWiOx3tafLS9NcVl+dRPYZSk98gkpPomh/I52B5dh Yn5qXt58mLLb0I07RnF42EkbpFb1CHH6aBKxqmYUtjZyrCojFCKS8VFGedbdYBGV/D tLbKRrQ3sC/BcCykIJJtQ+TCmq9Ccw/0XHZx1M69zrQqx2KUgq/ONRgTS6BGqCQtdu jrMG5zjD1M0rg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbh2WyDz9rxm; Wed, 14 Apr 2021 11:13:36 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:13:01 +0200 Message-Id: <20210414091303.6990-35-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 ade6083e16..9c457d550d 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 Wed Apr 14 09:13:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28519 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 3725D27BC75; Wed, 14 Apr 2021 10:17:04 +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 EB9A327BC74 for ; Wed, 14 Apr 2021 10:17:03 +0100 (BST) Received: from localhost ([::1]:44428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbdv-0000QB-5p for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:17:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0005jM-Hq for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50249) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0002Bm-6p for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbE-0007HO-2f for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 36/37] gnu: Add ocaml-angstrom. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839164227714 (code B ref 47768); Wed, 14 Apr 2021 09:14:16 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:14:02 +0000 Received: from localhost ([127.0.0.1]:33523 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaz-0007Cn-PI for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:14:02 -0400 Received: from mout02.posteo.de ([185.67.36.66]:37879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbah-00078v-Ll for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:47 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id D0C38240101 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391617; bh=PVH+Vq9WznGpIQ3mrrB579QYPhZNAVX0veajuE1sGOI=; h=From:To:Cc:Subject:Date:From; b=LtzwJgeNpE/wf9Iv8NQ1o7wyKBY6wU1ROLDhcoltcc8CB+J+Y1nH7RFfNX96pXjSV jlwBbMuD8+17P8pjXPM3MwjKW2Fiy1y2Pua5zzs8S+HTaeSXzERQaViHoymclDQsEe ZUdbNXJodHIo/iCEQ0AVJdQKuBjMbmFiSSthIWwZa7jcKj7FGAXwym8Ub7s+Jd9a0G BGEk8Bzq3P15v0/nrhy8ocmZ4/1fSfqEhrl8Zl2wOsz+kDMjaR6ldDCHoinNeLy6BJ AMe2MCOmQ+tZzT3sfEBvKQ0oHB2IT9b72JzzQwmRL7ciYGX8MgPG5plWJ6I+ZLOxCP ljnd1BRgc1+GA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbj1LCzz9rxS; Wed, 14 Apr 2021 11:13:37 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:13:02 +0200 Message-Id: <20210414091303.6990-36-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 9c457d550d..bd01cf1310 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 Wed Apr 14 09:13:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28524 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 C44F327BC75; Wed, 14 Apr 2021 10:17:36 +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 5997927BC74 for ; Wed, 14 Apr 2021 10:17:36 +0100 (BST) Received: from localhost ([::1]:45648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbeR-00012E-Jm for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:17:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbF-0005mK-E3 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50251) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbF-0002Cl-2u for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbE-0007He-UY for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 37/37] gnu: Add ocaml-uri. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839164327742 (code B ref 47768); Wed, 14 Apr 2021 09:14:16 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:14:03 +0000 Received: from localhost ([127.0.0.1]:33528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbb0-0007DF-Tp for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:14:03 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbai-00079B-3o for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:47 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 429712400FF for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391618; bh=SkQTGMr36Ni1xkbW7BBCuOSZpdMsjmjOLUOAhI5WrdA=; h=From:To:Cc:Subject:Date:From; b=FqQHKt7oh0ITS53yaJxC2uhtv+E6PoUES6bARkOJPcI2h/xCrsYP93bHtls0rK3q3 DV5oDaeKn070q4lunEOL1tpYZOvR/gjIDmqrflm4f4SL9x2buNhw1bmeAZJwE/0V0Y fC/+8izjF+5py7OilMs633ktisNc6JcxRyizuW7lo2rTxYjbwVfy8aRSH5iSTgnSpV QQMJI+9BgJdeXPjBPi4ucDCFqYZkmEAEhp3BDmdNAUV71zg03JkBgQV0UyAe1r5N+8 byhSUFmr5WR37qkMBSrnouAM7PKZgLOUGAn5upAyI2tgq5duIslGUhNUlfuieh8DcG +bzAoEV1Kiazg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbj5BzDz9rxl; Wed, 14 Apr 2021 11:13:37 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:13:03 +0200 Message-Id: <20210414091303.6990-37-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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 bd01cf1310..e1003b7e08 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.")