From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:09:09 2021 Received: (at submit) by debbugs.gnu.org; 14 Apr 2021 09:09:09 +0000 Received: from localhost ([127.0.0.1]:33377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbWG-0006yD-Lp for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:09:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:33958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbWF-0006y6-JA for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:09:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbWE-0002fx-LD for guix-patches@gnu.org; Wed, 14 Apr 2021 05:09:07 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41343) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbW2-0007m7-Su for guix-patches@gnu.org; Wed, 14 Apr 2021 05:09:05 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 5BD062400E5 for ; Wed, 14 Apr 2021 11:08:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391327; bh=LfEajbIGMo5UIlZZGYZ36Qwvov7TRK7liKuT+xM3SUI=; h=From:To:Cc:Subject:Date:From; b=U7KYoAONOL5gEDT8fCvBn++IYRWaIUBDzRp1Msk/HVEHDE1PDZfDbxYjsM99IEpJ6 zLZGhL0MeGv0aVudZX9PviyL1HarSH1wATxcAzB/3mGMBAX19drdDzA6RyRlU30j6/ 4K95H1Y5MJ/q9qMcgguO/y1ZjrDpLkT4m40VJu5MYafC2fzGeUWTG7otGeNADCc9p3 lDZg0uIpEx8KjTtp43BZMF3zwt8VYKewcvyToglPR+XSGH20PbpOj7EOgkeCGfN+Qv lGvEOgGKBW9ULbeNPaZu1stHFIA/x1US+ka/PpgK37UNxqdXU4OYrTompotIcv5/pF Yd0j85tjCv+fw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxV63kDwz6tmP; Wed, 14 Apr 2021 11:08:46 +0200 (CEST) From: pukkamustard To: guix-patches@gnu.org Subject: [PATCH 00/37] Assorted OCaml patches Date: Wed, 14 Apr 2021 11:08:00 +0200 Message-Id: <20210414090800.6458-1-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.66; envelope-from=pukkamustard@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello Guix, I have been collecting some patches to the OCaml packaging in Guix. It has got a bit long, sorry for that. The main theme of this series is to provide basic OCaml packages in Guix that also work with more recent version of OCaml. Currently most OCaml packages in Guix are only for OCaml 4.07. Most patches are of following form: - Add new ocaml-X package with latest upstream verison of X - Make existing ocaml4.07-X package inherit from new ocaml-X Some packages are newly added because I am using them (ocaml-uunf and ocaml-angstrom) or because they are dependencies of newer version of packages already in Guix (e.g. ocaml-time-now). There are still quite a few packages in Guix that are only available for OCaml 4.07 (ocaml4.07-X but no ocaml-X). Eventually adding them would be nice for OCaml hackers working with recent version of the compiler. As I understand we want to keep the ocaml4.07-* packages for bootstrapping purposes. Thanks, pukkamustard pukkamustard (37): gnu: ocaml-integers: Update to 0.4.0. gnu: ocaml-ctypes: Update to 0.18.0. gnu: ocaml-ctypes: Make ocaml-integers a propagated input. gnu: ocaml-lwt: Make libev a propagated input. gnu: ocaml-lwt: Update to 5.4.0. gnu: ocaml4.07-gen: Update to 0.5.3. gnu: Add ocaml-gen. gnu: Add ocaml-stdio. gnu: Add ocaml-compiler-libs. gnu: ocaml-migrate-parsetree: Update to 1.8.0. gnu: ocaml-migrate-parsetree: Update to 2.1.0. gnu: Add ocaml-ppxlib. gnu: Add ocaml-sedlex. gnu: Add ocaml-uunf. gnu: Add ocaml-ppx-sexp-conv. gnu: Add ocaml-bigstringaf. gnu: Add ocaml-ppx-let. gnu: Add ocaml-syntax-shims. gnu: Add ocaml-ppx-compare. gnu: Add ocaml-ppx-here. gnu: Add ocaml-ppx-cold. gnu: Add ocaml-ppx-assert. gnu: Add ocaml-ppx-custom-printf. gnu: Add ocaml-ppx-hash. gnu: Add ocaml-ppx-enumerate. gnu: Add ocaml-ppx-js-style. gnu: Add ocaml-ppx-base. gnu: Add ocaml-fieldslib. gnu: Add ocaml-ppx-fields-conv. gnu: Add ocaml-ppx-optcomp gnu: Add ocaml-ppx-optional. gnu: Add ocaml-jst-config. gnu: Add ocaml-jane-street-headers. gnu: Add ocaml-time-now. gnu: Add ocaml-ppx-inline-test. gnu: Add ocaml-angstrom. gnu: Add ocaml-uri. gnu/packages/ocaml.scm | 1476 ++++++++++++++++++++++++++-------------- 1 file changed, 949 insertions(+), 527 deletions(-) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:20 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 01/37] gnu: ocaml-integers: Update to 0.4.0. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:23 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 02/37] gnu: ocaml-ctypes: Update to 0.18.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:23 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 03/37] gnu: ocaml-ctypes: Make ocaml-integers a propagated input. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:25 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 04/37] gnu: ocaml-lwt: Make libev a propagated input. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:26 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 05/37] gnu: ocaml-lwt: Update to 5.4.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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")) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:26 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 06/37] gnu: ocaml4.07-gen: Update to 0.5.3. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:27 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 07/37] gnu: Add ocaml-gen. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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)))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:28 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 08/37] gnu: Add ocaml-stdio. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:28 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 09/37] gnu: Add ocaml-compiler-libs. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:36 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 10/37] gnu: ocaml-migrate-parsetree: Update to 1.8.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:36 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 11/37] gnu: ocaml-migrate-parsetree: Update to 2.1.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:37 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 12/37] gnu: Add ocaml-ppxlib. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:38 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 13/37] gnu: Add ocaml-sedlex. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:38 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 14/37] gnu: Add ocaml-uunf. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:54 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 15/37] gnu: Add ocaml-ppx-sexp-conv. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:54 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 16/37] gnu: Add ocaml-bigstringaf. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:55 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 23/37] gnu: Add ocaml-ppx-custom-printf. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:55 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 24/37] gnu: Add ocaml-ppx-hash. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:56 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 18/37] gnu: Add ocaml-syntax-shims. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:56 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 17/37] gnu: Add ocaml-ppx-let. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:57 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 19/37] gnu: Add ocaml-ppx-compare. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:57 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 26/37] gnu: Add ocaml-ppx-js-style. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:57 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 21/37] gnu: Add ocaml-ppx-cold. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:58 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 22/37] gnu: Add ocaml-ppx-assert. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:58 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 28/37] gnu: Add ocaml-fieldslib. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:59 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 32/37] gnu: Add ocaml-jst-config. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:59 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 25/37] gnu: Add ocaml-ppx-enumerate. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:13:59 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 27/37] gnu: Add ocaml-ppx-base. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:14:00 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 20/37] gnu: Add ocaml-ppx-here. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:14:00 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 30/37] gnu: Add ocaml-ppx-optcomp 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:14:01 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 34/37] gnu: Add ocaml-time-now. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:14:01 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 31/37] gnu: Add ocaml-ppx-optional. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:14:01 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 33/37] gnu: Add ocaml-jane-street-headers. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:14:02 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 36/37] gnu: Add ocaml-angstrom. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:14:02 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 35/37] gnu: Add ocaml-ppx-inline-test. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:14:03 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 37/37] gnu: Add ocaml-uri. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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.") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 05:14:04 2021 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 To: 47768@debbugs.gnu.org Subject: [PATCH 29/37] gnu: Add ocaml-ppx-fields-conv. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 14:51:04 2021 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 18:51:04 +0000 Received: from localhost ([127.0.0.1]:35716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWkbP-0001jm-8n for submit@debbugs.gnu.org; Wed, 14 Apr 2021 14:51:04 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:33726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWkbM-0001jK-4d for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 14:51:01 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id siqw2400Y0mfAB406iqxXy; Wed, 14 Apr 2021 20:50:58 +0200 Message-ID: <1043b7177b01f6708c742851b36e351141c1a70a.camel@telenet.be> Subject: Re: [bug#47768] [PATCH 04/37] gnu: ocaml-lwt: Make libev a propagated input. From: Maxime Devos To: pukkamustard , 47768@debbugs.gnu.org Date: Wed, 14 Apr 2021 20:50:56 +0200 In-Reply-To: <20210414091303.6990-4-pukkamustard@posteo.net> References: <20210414091303.6990-1-pukkamustard@posteo.net> <20210414091303.6990-4-pukkamustard@posteo.net> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-fZSYkafvAUcOa/YiTuxa" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1618426258; bh=CoEvQczvMBZIAZWpqj2ET0IZ8/MSn1d3nefKDHSJ3IQ=; h=Subject:From:To:Date:In-Reply-To:References; b=rKkzxoIKVvT7ra+NipHMf58fWrFKTspHXmwOSbE+XkodOjevvcQZQg3ZzKqKRWtsK h7uTzdRuQmeJEm21LsWO0xcmjIDloDejSMPhu+wfi0RYqdwN0sIK5dBVMkLSE7bZQ5 g3BBid26SUwr15aBX2/B0QR0na/eLKXACm7kzdRpWXuL0SlAZah8r59VZ7Xcd1XWrs vblUMYZYHvySe4fovyFl0gI2+CoeboMeaqyQQC54SiLotxtpyoJwoUwVfLGOcGQmfq tk3ET6R40nKyWchjTYdM+qh7PNPF24DDLhrIE+SAa9WSK3dkSyB4FLCJ2VWwRyXaE2 qz+kpDD9xnXBw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-fZSYkafvAUcOa/YiTuxa Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2021-04-14 at 11:12 +0200, pukkamustard wrote: > * gnu/packages/ocaml.scm (ocaml-lwt) [propagated-inputs]: Add libev. > [inputs]: Remove libev. > (ocaml-ouint2, ocaml4.07-lambda-term, ocaml-markup) [inputs]: Remove li= bev. > --- What's the reason libev has been moved from inputs to propagated-inputs? Note: I know practically nothing about ocaml packaging. Greetings, Maxime. --=-fZSYkafvAUcOa/YiTuxa Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYHc5kBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7lxWAP4hFuY4UXUxUrA/xchkPFtyVV4L Nh79pnYRNKv7ncvprAEAsa9H/vvqCe912I0zHqP76Eo94IVMAas1vaBZSDA3ZwY= =VJuf -----END PGP SIGNATURE----- --=-fZSYkafvAUcOa/YiTuxa-- From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 14 14:54:30 2021 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 18:54:30 +0000 Received: from localhost ([127.0.0.1]:35727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWkek-0001ol-7N for submit@debbugs.gnu.org; Wed, 14 Apr 2021 14:54:30 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:40146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWkei-0001oc-4P for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 14:54:29 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id siuT2400G0mfAB406iuT64; Wed, 14 Apr 2021 20:54:27 +0200 Message-ID: <561883a08955c370309c5149812950d6387d5df5.camel@telenet.be> Subject: Re: [bug#47768] [PATCH 07/37] gnu: Add ocaml-gen. From: Maxime Devos To: pukkamustard , 47768@debbugs.gnu.org Date: Wed, 14 Apr 2021 20:54:26 +0200 In-Reply-To: <20210414091303.6990-7-pukkamustard@posteo.net> References: <20210414091303.6990-1-pukkamustard@posteo.net> <20210414091303.6990-7-pukkamustard@posteo.net> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-Gpe7ijz9bru0mmy0NeHl" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1618426467; bh=e+JKyM5ng04tZmdT9w6gO4TaTCkV6dgFvd9DL5KthGM=; h=Subject:From:To:Date:In-Reply-To:References; b=hJe/I1wW8Oh0yH5m9fCZ+RKvGfuOLwqwdPwP8HPCKXjoxdVqVpXn1U8x8Dmp30I8C lSTJKg8uhIVVIyb4+uu/YX/Qul5lnI/WdNzFdAoytgKJ1/OM0q2GFv5xDE51pVVpBh iu4th0MjmO2GJsNvb/6UqVWvWVSHw/Q11hVyAGNhONt58CFUqN7ozc/JRMJc2XKIjq a7EeMkhwlziCLWtl790oDJI8zHTf+oymdx+Jr5Mqm0OQHPyVpD3I4oPKG9NGE840p2 gul2ekv0VmKptsBrJDO3VEMmbLJlV789aKOdtNuWPd0wpkG3c3dOnS/9Yhxw62BU5F 20Jrf2u0yspxg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-Gpe7ijz9bru0mmy0NeHl Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable > -(define-public ocaml4.07-gen > +(define-public ocaml-gen > [...] > `(#: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))) I'm confused what's going on here. ocaml-qtest is for unit tests (https://opam.ocaml.org/packages/qtest/qtest.= 2.1.0/), but for this package we have =E2=80=98#:tests? #f; no tests?=E2=80=99? That seems contradictory. Greetings, Maxime. --=-Gpe7ijz9bru0mmy0NeHl Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYHc6YhccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7r6ZAP4oGMjmh/GyvcH5VOCG6WZUoYQe nRtUT9N2u+Mk1l4kqAD9FA3EsA9IUOcOlUtCH6OCYvljjsq2O2AwuPEJk/kyZAo= =mB76 -----END PGP SIGNATURE----- --=-Gpe7ijz9bru0mmy0NeHl-- From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 20 02:10:30 2021 Received: (at 47768) by debbugs.gnu.org; 20 Apr 2021 06:10:31 +0000 Received: from localhost ([127.0.0.1]:52755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYjag-0000Tr-O4 for submit@debbugs.gnu.org; Tue, 20 Apr 2021 02:10:30 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41457) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYjab-0000TX-K4 for 47768@debbugs.gnu.org; Tue, 20 Apr 2021 02:10:29 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 65F152400FC for <47768@debbugs.gnu.org>; Tue, 20 Apr 2021 08:10:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618899019; bh=sMM/ZfbOWZH/czJ1kPU0PRBWvahfKP2v5IVKjXY4R7w=; h=From:To:Cc:Subject:Date:From; b=OSJ2eeTV+HhdnXdHMAc7FncUb3kmhjNpifSVVSsHH1Zzkm0wCY4BLi0UAfXuMcVju xZx3Z7XiTAZqOZ9RL1gmwQscUikbTKo4rJGELol6+zH1omhLQcswMj0frTMMeWtAIo f2UPaIOdfNiR1SwG8KpPJQPY1mHDDd6IdS7ueT171so7+blkmAEcZKsEe3v3ifMknu rDDUbspuxuOap2cXKdSpa2Od1a70Jp0HH0Qwkh+dIr1X9ZKX7JF3m5wYytiKK/UP6Y hqSD8TQK1HvYMdSx9KTWE6Nnqpcfh46JbfR9CVAMMRFGssSO/eIPEQ31fpAHGxCuTL KDmZR6toB4x7g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FPYFQ3ybWz6tmS; Tue, 20 Apr 2021 08:10:18 +0200 (CEST) References: <20210414091303.6990-1-pukkamustard@posteo.net> <20210414091303.6990-4-pukkamustard@posteo.net> <1043b7177b01f6708c742851b36e351141c1a70a.camel@telenet.be> From: pukkamustard To: Maxime Devos Subject: Re: [bug#47768] [PATCH 04/37] gnu: ocaml-lwt: Make libev a propagated input. Date: Tue, 20 Apr 2021 05:54:56 +0000 In-reply-to: <1043b7177b01f6708c742851b36e351141c1a70a.camel@telenet.be> Message-ID: <864kg1fpvc.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 47768 Cc: 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) Hi Maxime, Thanks for your review! Maxime Devos writes: > On Wed, 2021-04-14 at 11:12 +0200, pukkamustard wrote: >> * gnu/packages/ocaml.scm (ocaml-lwt) [propagated-inputs]: Add >> libev. >> [inputs]: Remove libev. >> (ocaml-ouint2, ocaml4.07-lambda-term, ocaml-markup) [inputs]: >> Remove libev. >> --- > > What's the reason libev has been moved from inputs to > propagated-inputs? > As far as I understand libev is a runtime/build time dependency of lwt. Before this patch it was necessary for packages using lwt to also add libev as input (e.g. ocaml4.07-lambda-term or ocaml-markup). This was even worse when using lwt indirectly (e.g. by including ocaml-markup somewhere): build would fail but it was not clear what needs to be done as lwt was not directly included as input (but as propagated-input of ocaml-markup). Adding libev as propagate-input makes packages using lwt "just work". -pukkamustard From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 20 02:19:06 2021 Received: (at 47768) by debbugs.gnu.org; 20 Apr 2021 06:19:06 +0000 Received: from localhost ([127.0.0.1]:52768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYjiz-0000hh-Rr for submit@debbugs.gnu.org; Tue, 20 Apr 2021 02:19:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:47105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYjix-0000hC-8x for 47768@debbugs.gnu.org; Tue, 20 Apr 2021 02:19:04 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 24FE32400E5 for <47768@debbugs.gnu.org>; Tue, 20 Apr 2021 08:18:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618899536; bh=UtmY64bnKdnOZER7qc/oAUDiUhJvQCGbDo4cOJ+1hnI=; h=From:To:Cc:Subject:Date:From; b=mR4A8DUSn8MEiqo/PNHUXnNhgCcIfxalFA9w2SVsdW1UoUkA/Qmym+lvrXLejS4Z8 9WRxI1RyZGgDaGl1JchBaEIUKkOf3KlnQODQ+8/S/Ib4NRjImI19SqNCXveNbdb5N6 PtYJwgOcZvyGYQXJ75NmznpY7cCIohccb3B4xK9p4oFabMZmRWN+yvQHzqVHRe1f9y fjGB1/+kPWOhYvigJOTmrQ0yBxpGNPReCpJkjkEfBv6YvikTB94/op6uL7wJVSM6KS y5iA8Dh66zzighaGz/I3UN+sl6LZIDc7l7lkx04xJaySqNDO8tQaETPNpI4iF7jXVC B+ll3tRaEeP2A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FPYRL4HwBz9rxL; Tue, 20 Apr 2021 08:18:54 +0200 (CEST) References: <20210414091303.6990-1-pukkamustard@posteo.net> <20210414091303.6990-7-pukkamustard@posteo.net> <561883a08955c370309c5149812950d6387d5df5.camel@telenet.be> From: pukkamustard To: Maxime Devos Subject: Re: [bug#47768] [PATCH 07/37] gnu: Add ocaml-gen. Date: Tue, 20 Apr 2021 06:11:29 +0000 In-reply-to: <561883a08955c370309c5149812950d6387d5df5.camel@telenet.be> Message-ID: <8635vlfpgy.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 47768 Cc: 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Maxime Devos writes: >> -(define-public ocaml4.07-gen >> +(define-public ocaml-gen >> [...] >> `(#: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=20 >> ocaml4.07-odoc)))) >> + `(("ocaml-odoc" ,ocaml-odoc))) >> (native-inputs >> - `(("ocaml-qtest" ,(package-with-ocaml4.07 ocaml-qtest)) >> - ("ocaml-qcheck" ,(package-with-ocaml4.07=20 >> ocaml-qcheck)))) >> + `(("ocaml-qtest" ,ocaml-qtest) >> + ("ocaml-qcheck" ,ocaml-qcheck))) > > I'm confused what's going on here. > ocaml-qtest is for unit tests=20 > (https://opam.ocaml.org/packages/qtest/qtest.2.1.0/), > but for this package we have =E2=80=98#:tests? #f; no tests?=E2=80=99? Excellent catch! There are in fact tests and they also pass.=20 Please find attached updated patch that enables tests (I can also resend the=20 entire patch series as v2 if that is easier). The `#tests? #f` was introduced with commit 5a4003f453ee8afdfe21d959e105250bfc876063 in 2019 and I blindly=20 copied it. -pukkamustard --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-ocaml-gen.patch >From 3036a81329f65c6c9ffe2117744590a7e52aee01 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Fri, 9 Apr 2021 14:59:36 +0200 Subject: [PATCH] gnu: Add ocaml-gen. * gnu/packages/ocaml.scm (ocaml-gen): New variable. (ocaml4.07-gen): Remove variable. (ocaml4.07-sedlex): Replace ocaml4.07-gen with ocaml-gen. --- gnu/packages/ocaml.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 503913c8fd..1acde9c0ee 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2508,9 +2508,9 @@ format. It can process XML documents without a complete in-memory representation of the data.") (license license:isc))) -(define-public ocaml4.07-gen +(define-public ocaml-gen (package - (name "ocaml4.07-gen") + (name "ocaml-gen") (version "0.5.3") (source (origin (method git-fetch) @@ -2523,16 +2523,13 @@ representation of the data.") "1jzrs0nsdk55annkd2zrk5svi61i3b1nk6qyqdc2y26vnzqvzfg8")))) (build-system dune-build-system) (arguments - `(#:tests? #f; no tests - #:package "gen" - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:package "gen" + #:test-target ".")) (propagated-inputs - `(("ocaml-odoc" ,(package-with-ocaml4.07 ocaml4.07-odoc)))) + `(("ocaml-odoc" ,ocaml-odoc))) (native-inputs - `(("ocaml-qtest" ,(package-with-ocaml4.07 ocaml-qtest)) - ("ocaml-qcheck" ,(package-with-ocaml4.07 ocaml-qcheck)))) + `(("ocaml-qtest" ,ocaml-qtest) + ("ocaml-qcheck" ,ocaml-qcheck))) (home-page "https://github.com/c-cube/gen/") (synopsis "Iterators for OCaml, both restartable and consumable") (description "Gen implements iterators of OCaml, that are both restartable @@ -2577,7 +2574,7 @@ and consumable.") (native-inputs `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) (propagated-inputs - `(("ocaml-gen" ,ocaml4.07-gen) + `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen)) ("ocaml-ppx-tools-versioned" ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned)) ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar)))) -- 2.31.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 21 07:30:05 2021 Received: (at 47768) by debbugs.gnu.org; 21 Apr 2021 11:30:05 +0000 Received: from localhost ([127.0.0.1]:57059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZB3U-0002Ev-MB for submit@debbugs.gnu.org; Wed, 21 Apr 2021 07:30:04 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:60938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZB3S-0002Bn-RI for 47768@debbugs.gnu.org; Wed, 21 Apr 2021 07:30:03 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id vPW02400F0mfAB406PW10X; Wed, 21 Apr 2021 13:30:01 +0200 Message-ID: Subject: Re: [bug#47768] [PATCH 07/37] gnu: Add ocaml-gen. From: Maxime Devos To: pukkamustard Date: Wed, 21 Apr 2021 13:29:55 +0200 In-Reply-To: <8635vlfpgy.fsf@posteo.net> References: <20210414091303.6990-1-pukkamustard@posteo.net> <20210414091303.6990-7-pukkamustard@posteo.net> <561883a08955c370309c5149812950d6387d5df5.camel@telenet.be> <8635vlfpgy.fsf@posteo.net> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-Hz6EVaTGsqNMxweakM8y" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1619004601; bh=duxKgvDUhS8H9d35yJVugG/QFIutEGF9Q0qR0kx82Rk=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=L3TJwrG95tNuw0afXwqbl72cj1OtMMfsyo0EitOR4Jlg3USdkhUoxRaF4v3HIIXVa pYrmCUtbkc/Prs+cBv2RDbVnUbjTPTSdewC7bsoKjB3lxkL729BNqBgY7HVrZPhImK N3b8jHgpru803KAQ8XQIVLDQEpt3l4KKdTYalzTShuH5WE0TQyBGwl4PWWhgQG8Js9 Vkxu1P5Z71L/yX/Wg+jR/xSGGF8DM1jrPAjiaC1MISJ+WVYyq0NEhvIPPc1A3KjRJW Ay3qZ3EkJawQLctNYCfWh7T8NQL8zuurNut/0Cglla+u3I57OnoU0MPHX9WLTLtzZo ctQGctwsqR85Q== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-Hz6EVaTGsqNMxweakM8y Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable pukkamustard schreef op di 20-04-2021 om 06:11 [+0000]: > [...] > Please find > attached updated patch that enables tests (I can also resend the=20 > entire > patch series as v2 if that is easier). I can confirm all packages you modified still build. But I don't really know anything about ocaml. Greetings, Maxime. --=-Hz6EVaTGsqNMxweakM8y Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYIAMsxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7vLeAQDVIRSFJn5T7ga9OpHBQLI343Bt bEjqDb2UmncTyKTIAwD/V0EbttFk3W2TvKM1h91d6zTzJO6UAyJnMllzzwCxyAo= =7BNe -----END PGP SIGNATURE----- --=-Hz6EVaTGsqNMxweakM8y-- From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:02 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:02 +0000 Received: from localhost ([127.0.0.1]:56941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyHt-0000IB-IF for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:01 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33029) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyHr-0000Ho-EW for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:00 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id DF0BF240028 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:16:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623812; bh=gD4F0y+n9w+Gb/grnMcfWvOqNZPkqSMUifQIYEY7lnk=; h=From:To:Cc:Subject:Date:From; b=XYphQbfEZ1aUPlRLMDJdfrsGCPuv+WlFK/6tZjPr6ZQFbjJq3ln21eeU8swAFPYWt 4+vuTj0awGEmgCzXmwFa0ZrdNkSNKeQydF6bLGMmDyvDpYyEjFWCh+/vbKO22HRYIQ gyiqgf8ZRJBo5r9X1fabvMLXa6VTnTlk/j6VgCMRuoNTzTDWQL+6W7N3j7v+Q6jBEF m45zLjmE/jJIzD5+cQ6pjw7b8bDQT3qauB2TgM3u0aRJTQIWHJCFUySx6yzGf37/BW 4to7CWfjKfDIuE57ONZDsXVXjj/p78sFn1DDHgMNJBQqrmYUnIDiVkNvWcWcw3g3tW A1iYuxEbtfaxg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq6W6935z9rxG; Mon, 10 May 2021 07:16:51 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 00/43] Assorted OCaml patches (V2) Date: Mon, 10 May 2021 05:15:45 +0000 Message-Id: <20210510051628.15359-1-pukkamustard@posteo.net> In-Reply-To: <20210414090800.6458-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello Guix, This is V2 of the patch series which includes the fixes suggested by Maxime for ocaml-gen and merges issue #45558 (Add js_of_ocaml by divoplade; https://issues.guix.gnu.org/45558). This is becoming an even larger series. Please let me know if there is anything I can do to make this easier to review. Thanks! pukkamustard divoplade (2): gnu: Add ocaml-graphics. gnu: Add ocaml-js-of-ocaml. pukkamustard (41): gnu: ocaml-integers: Update to 0.4.0. gnu: ocaml-ctypes: Update to 0.18.0. gnu: ocaml-ctypes: Make ocaml-integers a propagated input. gnu: ocaml-lwt: Make libev a propagated input. gnu: ocaml-lwt: Update to 5.4.0. gnu: ocaml4.07-gen: Update to 0.5.3. gnu: Add ocaml-gen. gnu: Add ocaml-stdio. gnu: Add ocaml-compiler-libs. gnu: ocaml-migrate-parsetree: Update to 1.8.0. gnu: ocaml-migrate-parsetree: Update to 2.1.0. gnu: Add ocaml-ppxlib. gnu: Add ocaml-sedlex. gnu: Add ocaml-uunf. gnu: Add ocaml-ppx-sexp-conv. gnu: Add ocaml-bigstringaf. gnu: Add ocaml-ppx-let. gnu: Add ocaml-syntax-shims. gnu: Add ocaml-ppx-compare. gnu: Add ocaml-ppx-here. gnu: Add ocaml-ppx-cold. gnu: Add ocaml-ppx-assert. gnu: Add ocaml-ppx-custom-printf. gnu: Add ocaml-ppx-hash. gnu: Add ocaml-ppx-enumerate. gnu: Add ocaml-ppx-js-style. gnu: Add ocaml-ppx-base. gnu: Add ocaml-fieldslib. gnu: Add ocaml-ppx-fields-conv. gnu: Add ocaml-ppx-optcomp gnu: Add ocaml-ppx-optional. gnu: Add ocaml-jst-config. gnu: Add ocaml-jane-street-headers. gnu: Add ocaml-time-now. gnu: Add ocaml-ppx-inline-test. gnu: Add ocaml-angstrom. gnu: Add ocaml-uri. gnu: Add ocaml-variantslib. gnu: Add ocaml-ppx-variants-conv. gnu: Add ocaml-ppx-expect. gnu: ocaml-num: Update to 1.4. gnu/packages/ocaml.scm | 1738 ++++++++++++++++++++++++++-------------- 1 file changed, 1120 insertions(+), 618 deletions(-) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:26 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:26 +0000 Received: from localhost ([127.0.0.1]:56946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIH-0000JK-W6 for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:26 -0400 Received: from mout01.posteo.de ([185.67.36.65]:49139) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIG-0000Im-JL for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:24 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 17397240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623839; bh=jb+cPvo0uXQfspOteUZVjCu6mJlrRv3eqqcSX0jHB3Q=; h=From:To:Cc:Subject:Date:From; b=VUfpjpbyBnjRfOSI7tvbgNNG0t2wdorWqKl2cGxkxfdL2z7Frjo8LMVs7yvHfZAqg gDcDBiy7M8j9fw7hv032b+yutO1XYP6A7lTiPrN2EasUjmn0dQpxRwtIlWFo7DjmJA DjIh0qB7nM0oB8wbMJm5BTrH8D4hONdudDjNDXGUyyJIptj1ra9nY2C2MTNz59HLt4 GKBws7Q10juNQS4/QBa74OqK30GbqfT060C88BbqbAHOHgIDvkg/L700+eNjOczlog G+V2whS3cziEK00yj2RHlpoz8XyL8zNveV8UO9k12oQapmuro/bQaDy+Bb49uzPN+O +6euNdJmNdRHw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7230VKz9rxG; Mon, 10 May 2021 07:17:18 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 02/43] gnu: ocaml-ctypes: Update to 0.18.0. Date: Mon, 10 May 2021 05:15:47 +0000 Message-Id: <20210510051628.15359-3-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ctypes): Update to 0.18.0. --- gnu/packages/ocaml.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8069ad31d8..46b5542864 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3833,7 +3833,7 @@ long and size_t whose sizes depend on the host platform.") (define-public ocaml-ctypes (package (name "ocaml-ctypes") - (version "0.14.0") + (version "0.18.0") (home-page "https://github.com/ocamllabs/ocaml-ctypes") (source (origin (method git-fetch) @@ -3843,7 +3843,7 @@ long and size_t whose sizes depend on the host platform.") (file-name (git-file-name name version)) (sha256 (base32 - "1b2q3h63ngf4x9qp65qwapf2dg9q0mcdah6qjm2q0c7v2p5vysv9")))) + "03zrbnl16m67ls0yfhq7a4k4238x6x6b3m456g4dw2yqwc153vks")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require an old lwt @@ -3862,6 +3862,8 @@ long and size_t whose sizes depend on the host platform.") (delete 'configure)))) (native-inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("bigarray-compat" ,ocaml-bigarray-compat))) (inputs `(("libffi" ,libffi) ("ounit" ,ocaml-ounit) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:26 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:26 +0000 Received: from localhost ([127.0.0.1]:56948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyII-0000JO-6d for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:26 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIF-0000Il-Vc for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:24 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 75030240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623838; bh=8xu5bfUs+hd/kQ/bo4snJLhBuUYCoU9MCaHS6iyT9Mo=; h=From:To:Cc:Subject:Date:From; b=r6EW5uMWlIEogDhoG5ARn34+TXUKpPDTVyHGP/cN8l69ql7ol4OD3MEGpag+0whRe GpCHj3P//l9fk20uaMLHPrgGs38D6ydKEIsWAzfU6RKRAW0W/YACrCYL1D7ugL8Hhh c1vtjWO6CafIMUlv7/1R9p9ilT+uQfhjB3cXH9xEzEOJa80bnXj+MqQoz9xJ6Wlad8 c2rEwmkrdrdi1sf2zEnXaNTXtcQ3UeUzbzFMWVQgFNOFbcniK9MEzlxbDRshyyASOP fR85KkhiOWeiHZb+JP985rSKZut+qidlfjWFe7TA/g3U0UxPbgFQjJr3aSTOvT7eet WVVmQFVYlrQYw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7167P0z9rxG; Mon, 10 May 2021 07:17:17 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 01/43] gnu: ocaml-integers: Update to 0.4.0. Date: Mon, 10 May 2021 05:15:46 +0000 Message-Id: <20210510051628.15359-2-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-integers): Update to 0.4.0. --- gnu/packages/ocaml.scm | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 427ea38ccc..8069ad31d8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Simon Tournier ;;; Copyright © 2020 divoplade -;;; Copyright © 2020 pukkamustard +;;; Copyright © 2020, 2021 pukkamustard ;;; Copyright © 2021 aecepoglu ;;; Copyright © 2021 Sharlatan Hellseher ;;; @@ -3810,29 +3810,20 @@ sensitive completion, colors, and more.") (define-public ocaml-integers (package (name "ocaml-integers") - (version "0.3.0") + (version "0.4.0") (home-page "https://github.com/ocamllabs/ocaml-integers") (source (origin - (method url-fetch) - (uri (string-append home-page - "/releases/download/v0.2.2/integers-" - version ".tbz")) - (file-name (string-append name "-" version ".tbz")) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk")))) - (build-system ocaml-build-system) + "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd")))) + (build-system dune-build-system) (arguments - `(#:tests? #f; no tests - #:build-flags (list "build") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs - `(("ocamlbuild" ,ocamlbuild))) - (inputs - `(("topkg" ,ocaml-topkg) - ("opam" ,opam))) + `(#:tests? #f)) ; no tests (synopsis "Various signed and unsigned integer types for OCaml") (description "The ocaml-integers library provides a number of 8-, 16-, 32- and 64-bit signed and unsigned integer types, together with aliases such as -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:30 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:30 +0000 Received: from localhost ([127.0.0.1]:56956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIL-0000K6-It for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:29 -0400 Received: from mout01.posteo.de ([185.67.36.65]:55469) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIH-0000Io-3H for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:25 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 91939240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623839; bh=u/WcTbJSm1QXJD6mHgZPsPoJiB/XQmzoiSYou/jNRfE=; h=From:To:Cc:Subject:Date:From; b=Yue5qLg5uj60oLOzMOCGJ9oB12vj5YURcp9A2AXT7py2hsYqUB2FADGgqGaZy/Dd/ 8Yu8jTQ3T1dfJ/a6vZT+bJCyH1HItzxxrLc6u5ixwX1vcP/9RJSy8FiW+wUllNVshq tK9mOmksgSa/uTS4hr+5BcTl6ncmWNdo3NTrXp2NLW16qVsUJhXomexszcq14tTEZo SNVn1RbTk32qGiFx5ZXvcY53NWfos4KO+EiKxGAkKeO7ZNFnFUTdPwigIqPwHsRpLA qWBRFv3ZuGlLSxOWFky+jFTkNSrCOjccut7iwKRl037RNEQwPFoMQ7vxXjQkq7xA2+ TCPatFVpmIBdw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq726drZz9rxV; Mon, 10 May 2021 07:17:18 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 03/43] gnu: ocaml-ctypes: Make ocaml-integers a propagated input. Date: Mon, 10 May 2021 05:15:48 +0000 Message-Id: <20210510051628.15359-4-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ctypes)[propagated-inputs]: Add ocaml-integers. [inputs]: Remove ocaml-integers. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 46b5542864..7d467b3b70 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3863,11 +3863,11 @@ long and size_t whose sizes depend on the host platform.") (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs - `(("bigarray-compat" ,ocaml-bigarray-compat))) + `(("bigarray-compat" ,ocaml-bigarray-compat) + ("integers" ,ocaml-integers))) (inputs `(("libffi" ,libffi) ("ounit" ,ocaml-ounit) - ("integers" ,ocaml-integers) ("lwt" ,ocaml-lwt) ("topkg" ,ocaml-topkg) ("opam" ,opam))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:30 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:31 +0000 Received: from localhost ([127.0.0.1]:56959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIM-0000KE-15 for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:30 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIJ-0000Ir-0g for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:27 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 7C14824002C for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623841; bh=ATStMxElfUsc4K0EoTTTyGG+eR4uE4kn6l6VufETU4M=; h=From:To:Cc:Subject:Date:From; b=goVowOcfw0dvHGhX+plQ2v9e+asnTOESn598aAXCJIOONbwWkD5pfhPSzCL3zSw2v zdkcNXJKc3kxIFNlSbUM/3I9b67V8r/yX/1wIB5qooOZldhRf0LIf75tnaDbRgFkqc afNDenathm5KFYf7baaSQC7aoHvzXCTctASG+znJ9i4Wp9tqlRf2aza3Q/x7UdBliK 30WDxrWqpWLHOTa9QvJ1BKDsqmQejdjcl5Cn8fmSiO/FfaE3heE4sLt5zZQDHJca7b L6zeH1loOESdeuR+tTgQbP+ZkRw16Ff0033otEOFM5wJk5r/ALBh6VOFJzX2031ae+ ntPNQ9S+oxppg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq733Ddxz9rxG; Mon, 10 May 2021 07:17:19 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 04/43] gnu: ocaml-lwt: Make libev a propagated input. Date: Mon, 10 May 2021 05:15:49 +0000 Message-Id: <20210510051628.15359-5-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-lwt) [propagated-inputs]: Add libev. [inputs]: Remove libev. (ocaml-ouint2, ocaml4.07-lambda-term, ocaml-markup) [inputs]: Remove libev. --- gnu/packages/ocaml.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7d467b3b70..5509ff495c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1342,9 +1342,6 @@ compilers that can directly deal with packages.") (base32 "0gxjw1bhmjcjzri6x6psqrkbbyq678b69bqfl9i1zswp7cj2lryg")))) (build-system dune-build-system) - (inputs - ;; XXX Should libev be a propagated-input of ocaml-lwt? - `(("libev" ,libev))) (propagated-inputs `(("lwt" ,ocaml-lwt) ("ocaml-stdlib-shims" ,ocaml-stdlib-shims))) @@ -2318,13 +2315,13 @@ for mapping files in memory. This function is the same as the ("ocaml-cppo" ,ocaml-cppo) ("pkg-config" ,pkg-config))) (inputs - `(("libev" ,libev) - ("glib" ,glib))) + `(("glib" ,glib))) (propagated-inputs `(("ocaml-mmap" ,ocaml-mmap) ("ocaml-ocplib-endian" ,ocaml-ocplib-endian) ("ocaml-result" ,ocaml-result) - ("ocaml-seq" ,ocaml-seq))) + ("ocaml-seq" ,ocaml-seq) + ("libev" ,libev))) (home-page "https://github.com/ocsigen/lwt") (synopsis "Cooperative threads and I/O in monadic style") (description "Lwt provides typed, composable cooperative threads. These @@ -3761,8 +3758,6 @@ connect an engine to your inputs and rendering functions to get an editor.") ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log)) ("ocaml-lwt-react" ,(package-with-ocaml4.07 ocaml-lwt-react)) ("ocaml-zed" ,ocaml4.07-zed))) - (inputs - `(("libev" ,libev))) (home-page "https://github.com/diml/lambda-term") (synopsis "Terminal manipulation library for OCaml") (description "Lambda-Term is a cross-platform library for manipulating the @@ -6011,8 +6006,6 @@ the full Core is not available, such as in Javascript.") (build-system dune-build-system) (arguments `(#:package "markup")) - (inputs - `(("libev" ,libev))) (propagated-inputs `(("ocaml-bisect-ppx" ,ocaml-bisect-ppx) ("ocaml-uchar" ,ocaml-uchar) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:32 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:32 +0000 Received: from localhost ([127.0.0.1]:56965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIM-0000KV-Sq for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:32 -0400 Received: from mout01.posteo.de ([185.67.36.65]:56599) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIJ-0000Is-KU for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:27 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 1DB32240029 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623842; bh=sXNRZ4oC/MJ7eCA21G3U3NaAMR1d/UcXHAymyaRlOxg=; h=From:To:Cc:Subject:Date:From; b=XZX5LZuH7WgaMBZTR26w9RYeoSFJZXeiVFKKtuq5XPwiXVbl2BXpCUsCe0qGH9HPj BPTvXKR8liNx+a+qcFXOWytR6oK0HXOgdo15q6GVQMIV9HwR+/dTeql2qCKnyZr8Sn NFvQDeKgIqTYEJExKpbAficXMs4MC/j7iX6LBdbc/URBduZVpVWDfKSbT904gxPj3d 0gIJlkxmfIk02a0TGON5AM+hlLacrlGFN6Bm4PMNqTpQxnd66O9DEAghVmRHanNdTt uVd+fOBLeXY0IVF6QRT/Vg33NBcB3mM0TeIMjL0GXJSCgvA/PToSeTpBkBW+6d8M7f hsZZA1usJ4igw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq743M8Qz9rxb; Mon, 10 May 2021 07:17:20 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 06/43] gnu: ocaml4.07-gen: Update to 0.5.3. Date: Mon, 10 May 2021 05:15:51 +0000 Message-Id: <20210510051628.15359-7-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml4.07-gen): Update to 4.07. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 85f73b6d69..34e1b954d2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2511,7 +2511,7 @@ representation of the data.") (define-public ocaml4.07-gen (package (name "ocaml4.07-gen") - (version "0.5.2") + (version "0.5.3") (source (origin (method git-fetch) (uri (git-reference @@ -2520,7 +2520,7 @@ representation of the data.") (file-name (git-file-name name version)) (sha256 (base32 - "1h9g508rnj2j8va5nvhamzscp954vrkh0hdf4pn3d10pcfyslfg2")))) + "1jzrs0nsdk55annkd2zrk5svi61i3b1nk6qyqdc2y26vnzqvzfg8")))) (build-system dune-build-system) (arguments `(#:tests? #f; no tests -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:33 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:33 +0000 Received: from localhost ([127.0.0.1]:56968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIO-0000Ku-7f for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:33 -0400 Received: from mout02.posteo.de ([185.67.36.66]:53487) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIK-0000Iv-Aj for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:29 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 58223240101 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623842; bh=8R/u/YaOX+y1seIiq0rhClsy7jBS3Zs2lbkpdvEQebs=; h=From:To:Cc:Subject:Date:From; b=kvijdyCIpBOL76/soRxH34IHiT9/1wL4NJxYFMe+gzG/yJvJisX9sKpb3Q/wlbqvA BD1BWmUdMVVcSUM3zRLMnVYhzdvdQjDemcHdW0HtutYO8OFKpwf84r1zNhPt3aAhB7 ZLpMSyk7nfec0bZENk9pU5tDmnhXRKK2o0tKQ/KAm9wWHV3NLONr7zUdqWbnemQEiH +Wje5iQM6uwvMulZJvKCmd3ogrAbWacMSUDSZzN5aWZNzPYOmg3iT9osSPNaoEnh88 3eZzSk6G66bnYNCgUabeS/pEFmjJ2sLFQclXK+C1I57w4z+k+XPfe1FaOswZQb12jp M61C7W2xixDwg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq752rWzz9rxk; Mon, 10 May 2021 07:17:21 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 08/43] gnu: Add ocaml-stdio. Date: Mon, 10 May 2021 05:15:53 +0000 Message-Id: <20210510051628.15359-9-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-stdio): New variable. (ocaml4.07-stdio): Inherit from ocaml-stdio. --- gnu/packages/ocaml.scm | 58 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 877b9284d1..95407de74d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1978,7 +1978,7 @@ library.") #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("pkg-config" ,pkg-config))) (inputs `(("sqlite" ,sqlite))) @@ -4086,7 +4086,7 @@ syntax checking on dedukti files.") ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_inline_test"))) (synopsis "Syntax extension for writing in-line tests in ocaml code") @@ -4429,7 +4429,7 @@ Atom.") `(("gsl" ,gsl))) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio))) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://mmottl.github.io/gsl-ocaml") (synopsis "Bindings to the GNU Scientific Library") (description @@ -4714,30 +4714,20 @@ so they don't expose everything at toplevel. For instance, @code{Ast_helper} is now @code{Ocaml_common.Ast_helper}.") (license license:expat))) -(define-public ocaml4.07-stdio +(define-public ocaml-stdio (package - (name "ocaml4.07-stdio") - (version "0.11.0") + (name "ocaml-stdio") + (version "0.14.0") (home-page "https://github.com/janestreet/stdio") (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append home-page ".git")) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1facajqhvq34g2wrg368y0ajxd6lrj5b3lyzyj0jhdmraxajjcwn")))) + (janestreet-origin "stdio" version + "1hj5hraprqy2i90a690l11yjszvb99j818q3d684ryx6p2lddk0l")) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) - (arguments - `(#:tests? #f ;no tests - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(("ocaml-base" ,ocaml-base) + ("ocaml-sexplib0" ,ocaml-sexplib0))) + (arguments `(#:tests? #f)) ;no tests + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-stdio)))) (synopsis "Standard IO library for OCaml") (description "Stdio implements simple input/output functionalities for OCaml. It @@ -4745,6 +4735,16 @@ re-exports the input/output functions of the OCaml standard libraries using a more consistent API.") (license license:expat))) +(define-public ocaml4.07-stdio + (package-with-ocaml4.07 + (package + (inherit ocaml-stdio) + (version "0.11.0") + (source + (janestreet-origin "stdio" version + "0pqbp2wy5fgmc38irwvmj9nlcvclb1ix1mp4y7l39bgvvlz303h9")) + (properties '())))) + (define-public ocaml-ppx-derivers (package (name "ocaml-ppx-derivers") @@ -4794,7 +4794,7 @@ as part of the same ocaml-migrate-parsetree driver.") ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (arguments @@ -5422,7 +5422,7 @@ else expression.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_optcomp"))) (home-page "https://github.com/janestreet/ppx_optcomp") @@ -5551,7 +5551,7 @@ useful errors on failure.") ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib) @@ -5827,7 +5827,7 @@ various Jane Street packages.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio))) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://github.com/janestreet/configurator") (synopsis "Helper library for gathering system configuration") (description "Configurator is a small library that helps writing OCaml @@ -5920,7 +5920,7 @@ thousands of times faster than fork. ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-spawn" ,ocaml4.07-spawn) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -5967,7 +5967,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-splittable-random" ,ocaml4.07-splittable-random) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-typerep" ,ocaml4.07-typerep) ("ocaml-variantslib" ,ocaml4.07-variantslib) ("ocaml-migrate-parsetree" @@ -6251,7 +6251,7 @@ library FFTW.") `(("openblas" ,openblas) ("lapack" ,lapack) ("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio))) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://mmottl.github.io/lacaml/") (synopsis "OCaml-bindings to BLAS and LAPACK") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:42 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:42 +0000 Received: from localhost ([127.0.0.1]:56995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIY-0000Nf-Ac for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:42 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIK-0000Iw-JC for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:29 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 005692400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623843; bh=+V+jN9GaTTh2vHwnVFIT/kMQuuBtpHAs82s9fWWwxjo=; h=From:To:Cc:Subject:Date:From; b=bFaBtsLaG8QKfbwzW4Z/5c3aGsFeUDXJrTfNKxi8fP6T9vKt/3pcEAiHdrtDn/7hd ycDVSzgcHBmddUp553dbOZNSXKBl6WuV6ZA7SZSSyHmy/wYsyZkrpdv9fvC8uQwPtY kobBxbBacjI2xn9ARXleZTwSUXBGzEFvkXOYWNRdMvnm5A9PbWE3eBq2nHR6dLQ/G+ UMdQlsi+ID10lzcA7v2f0IGltC+qq8FBoLe/QOvCOW98XQWJ8lZDZE1912Hh8HKB0Q FaYExNqGG3hXqIJH9Q5IP7jn2e+l+Z8LnmmWYpemAAP/+1IeFODMrrfOSiSmIcobBE 6p3WrKUaeW7XQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq762yjrz9rxG; Mon, 10 May 2021 07:17:22 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 10/43] gnu: ocaml-migrate-parsetree: Update to 1.8.0. Date: Mon, 10 May 2021 05:15:55 +0000 Message-Id: <20210510051628.15359-11-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 1.8.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 93cfa8f54b..faa024b261 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1771,7 +1771,7 @@ module of this library is parameterised by the type of S-expressions.") (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree") - (version "1.7.3") + (version "1.8.0") (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (source (origin @@ -1782,7 +1782,7 @@ module of this library is parameterised by the type of S-expressions.") (file-name (git-file-name name version)) (sha256 (base32 - "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx")))) + "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) (build-system dune-build-system) (arguments `(#:tests? #f)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:42 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:42 +0000 Received: from localhost ([127.0.0.1]:56997 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIY-0000Nh-Io for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:42 -0400 Received: from mout02.posteo.de ([185.67.36.66]:43249) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIK-0000It-Ah for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:29 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 409372400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623842; bh=jtmYSfcX/FNKT+IL/zNaHAb96y2lQ39dC7WDW9kNBTU=; h=From:To:Cc:Subject:Date:From; b=l6mPaqz3tfK16Gn0zKr2+tKMKsW4MlLrwpaCxDGUhVphqyc3RVe6Wz5p35vzBuM5q NX1JTqCeIc0HyXUwaRpYxb/zpr8mDa6wCOS42iQcYu9IgMF3fXDH7jS6xLFWvYJqAu +rjp1EUPZuvQGDwsFREnNnaeC6WefzqdXDeBWGQAQjfmIeh8oLy6Fh8XFAyabkhovv EtxuoV4sqAohG5z9pYURajvcy0mQNG0Cr8QnRe3h4skDW7SJJQlbiQg9VsQmWhz85J DWAGEDIKkCFuiCC88WPDbMfH9su/KDXl0SUmLWiKBSaf8mGPkixKh9f70W/T+Kiz9t gDhoViCSj4IBg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq736xQhz9rxY; Mon, 10 May 2021 07:17:19 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 05/43] gnu: ocaml-lwt: Update to 5.4.0. Date: Mon, 10 May 2021 05:15:50 +0000 Message-Id: <20210510051628.15359-6-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-lwt): Update to 5.4.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5509ff495c..85f73b6d69 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2297,7 +2297,7 @@ for mapping files in memory. This function is the same as the (define-public ocaml-lwt (package (name "ocaml-lwt") - (version "5.1.1") + (version "5.4.0") (source (origin (method git-fetch) @@ -2306,7 +2306,7 @@ for mapping files in memory. This function is the same as the (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1nl7rdnwfdhwcsm5zpay1nr9y5cbapd9x1qzily7zk9ab4v52m8g")))) + "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d")))) (build-system dune-build-system) (arguments `(#:package "lwt")) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:43 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:43 +0000 Received: from localhost ([127.0.0.1]:56999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIY-0000No-Rv for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:43 -0400 Received: from mout02.posteo.de ([185.67.36.66]:56835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIL-0000Iy-8R for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:30 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 9D5EA2400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623843; bh=jFoCoYW8TK7GS4D1zMYK4usmsUW0XF56qWb4gFvZtO4=; h=From:To:Cc:Subject:Date:From; b=PBj7IRzeDBt5qzm13Iv4pp2G0uX4/oEYJ8nvCGYbZ+h2UDzne2Yl/LZOToBgST+Ih lj/gR3c7a7fLoqLFK4/nzbwXGAEg5nWcy7LCdonDl52xrE/RlfLeZDEK31m1K+ZSzT fC1RQqvWBWvLgU9tG+q8KR+3a1F6PCvY5/kJ6ZGRul/952gfmK38pgJtoM5hO/fuNq StohnNsYwIZodSeN9Topg5DbFV5CZAYHfGFtLNqGQFC7Gg1AtHuwrPY6t+TFOqW+jZ elrY2qDYskZHOfdzDVHv+rdL8N4p+CqVdksvzVMeMmhJ7Stj1E3rvM92hUPkBjv6LD CSW9YTFdLYjnw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq766btWz9rxG; Mon, 10 May 2021 07:17:22 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 11/43] gnu: ocaml-migrate-parsetree: Update to 2.1.0. Date: Mon, 10 May 2021 05:15:56 +0000 Message-Id: <20210510051628.15359-12-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 2.1.0. (ocaml-migrate-parsetree-1): New variable. --- gnu/packages/ocaml.scm | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index faa024b261..0b606e296c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1771,32 +1771,51 @@ module of this library is parameterised by the type of S-expressions.") (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree") - (version "1.8.0") + (version "2.1.0") (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (source (origin (method git-fetch) (uri (git-reference - (url (string-append home-page ".git")) + (url home-page) (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) + "1cpgdqcs624nd1p271ddakgyibl0ia4f6dzivnz9qdwszsinwr89")))) (build-system dune-build-system) - (arguments - `(#:tests? #f)) + (arguments `(#:tests? #f)) (propagated-inputs `(("ocaml-ppx-derivers" ,ocaml-ppx-derivers) ("ocamlbuild" ,ocamlbuild) ("ocaml-result" ,ocaml-result))) - (properties `((upstream-name . "ocaml-migrate-parsetree"))) + (properties `((upstream-name . "ocaml-migrate-parsetree") + ;; OCaml 4.07 packages require version 1.* + (ocaml4.07-variant . ,(delay (package-with-ocaml4.07 ocaml-migrate-parsetree-1))))) (synopsis "OCaml parsetree converter") (description "This library converts between parsetrees of different OCaml versions. For each version, there is a snapshot of the parsetree and conversion functions to the next and/or previous version.") (license license:lgpl2.1+))) - + +(define-public ocaml-migrate-parsetree-1 + (package + (inherit ocaml-migrate-parsetree) + (name "ocaml-migrate-parsetree-1") + (version "1.8.0") + (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) + (properties '((upstream-name . "ocaml-migrate-parsetree"))))) + (define-public ocaml-ppx-tools-versioned (package (name "ocaml-ppx-tools-versioned") @@ -1815,7 +1834,7 @@ functions to the next and/or previous version.") `(#:test-target "." #:package "ppx_tools_versioned")) (propagated-inputs - `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree))) + `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1))) (properties `((upstream-name . "ppx_tools_versioned"))) (home-page "https://github.com/let-def/ppx_tools_versioned") (synopsis "Variant of ppx_tools") @@ -6121,7 +6140,7 @@ combinators.") "0900vli5kw7s5kdam0n4cqsfsfqb7mdb3azn3i55595gilg1vyn8")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1) ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) ("ocaml-ounit" ,ocaml-ounit))) (arguments @@ -6360,7 +6379,7 @@ variants.") ("ocaml-cmdliner" ,ocaml-cmdliner) ("ocaml-re" ,ocaml-re) ("ocaml-result" ,ocaml-result) - ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1) ("ocaml-odoc" ,ocaml-odoc) ("ocaml-version" ,ocaml-version))) (native-inputs -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:43 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:43 +0000 Received: from localhost ([127.0.0.1]:57001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIZ-0000Nw-7b for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:43 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35221) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIM-0000JC-8O for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:31 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 2CF91240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623842; bh=0Uva56yGIO+qAi1+GBDnBMeyZhDwZkcQupmzXLq1vZY=; h=From:To:Cc:Subject:Date:From; b=R/tNK8tCe7mGLEqlLEuDAVmieK5dv+iE03f+M0+o2Xmz4W0Qd4zeG88hc141P8lkw /8+mNuxyKmtlD4iGif12dImS2ZuF4oe6J2Nq4w42hSe/Xa9VTnu8VZ+LEvR3ZpkB0d Irabe155p26GyyXIyDGhTHv0DrXBLTuIm1PFjEnLOgD72AmKGlaQDHkZT6dnN9Akwb ErzXD7+EuWdBj3rkC4ofO1ZyAvuuTDEmOTAu8sfBXMZEGYKaoA0ZfWVFtGHILgFq84 9H2ALP97hFXJ096Ttv37B2TDcLVXrtt7NxdLcp5kjq1B3Rc6BHbf3uSq3v1twoHYlv 7moX/wmLnc8JA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq746ZNtz9rxf; Mon, 10 May 2021 07:17:20 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 07/43] gnu: Add ocaml-gen. Date: Mon, 10 May 2021 05:15:52 +0000 Message-Id: <20210510051628.15359-8-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-gen): New variable. (ocaml4.07-gen): Remove variable. (ocaml4.07-sedlex): Replace ocaml4.07-gen with ocaml-gen. --- gnu/packages/ocaml.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 34e1b954d2..877b9284d1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2508,9 +2508,9 @@ format. It can process XML documents without a complete in-memory representation of the data.") (license license:isc))) -(define-public ocaml4.07-gen +(define-public ocaml-gen (package - (name "ocaml4.07-gen") + (name "ocaml-gen") (version "0.5.3") (source (origin (method git-fetch) @@ -2523,16 +2523,13 @@ representation of the data.") "1jzrs0nsdk55annkd2zrk5svi61i3b1nk6qyqdc2y26vnzqvzfg8")))) (build-system dune-build-system) (arguments - `(#:tests? #f; no tests - #:package "gen" - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:package "gen" + #:test-target ".")) (propagated-inputs - `(("ocaml-odoc" ,(package-with-ocaml4.07 ocaml4.07-odoc)))) + `(("ocaml-odoc" ,ocaml-odoc))) (native-inputs - `(("ocaml-qtest" ,(package-with-ocaml4.07 ocaml-qtest)) - ("ocaml-qcheck" ,(package-with-ocaml4.07 ocaml-qcheck)))) + `(("ocaml-qtest" ,ocaml-qtest) + ("ocaml-qcheck" ,ocaml-qcheck))) (home-page "https://github.com/c-cube/gen/") (synopsis "Iterators for OCaml, both restartable and consumable") (description "Gen implements iterators of OCaml, that are both restartable @@ -2577,7 +2574,7 @@ and consumable.") (native-inputs `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) (propagated-inputs - `(("ocaml-gen" ,ocaml4.07-gen) + `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen)) ("ocaml-ppx-tools-versioned" ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned)) ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar)))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:44 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:44 +0000 Received: from localhost ([127.0.0.1]:57003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIZ-0000O3-IU for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:44 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58977) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIM-0000JB-8G for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:31 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 7B8B4240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623842; bh=mLbSJlGWP8R5rhy02/K7Axi7kXW+e2NVAxHaxTDSc4E=; h=From:To:Cc:Subject:Date:From; b=Ue3s5zCIZWARL53X/ucCS/zPCmm3NLJyBDdEIUHqoBiekMRaFmwLDxjqrF/YHGbz2 JRMgBiDUcJGxTSo8ZMvbF8vICu6oOCqnspTZvohtgmOHmwA40Cl6UwJhVotBuWJ5b5 YlCRFRPB0u1Hqnn+tp8sBCUMpceJ8C9n6enGwB8Mi6Tmc9v8T8XMesNFy7nzHBx+4W EA66PoZqCn2W0WQ3FsE04rws8nXQ/uYq6PuDcsf6hiZfUkOSY7gtK89pt1kFqHM6c0 mYO8It9CnTIfbM2iv1GZ3BMQeHuQ6i4eeCeXWisg+hmSwFBIqm6SaRI03r/2WerKf3 mDhg2HRGIijsw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq756cJYz9rxR; Mon, 10 May 2021 07:17:21 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 09/43] gnu: Add ocaml-compiler-libs. Date: Mon, 10 May 2021 05:15:54 +0000 Message-Id: <20210510051628.15359-10-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-compiler-libs): New variable. (ocaml4.07-compiler-libs): Inherit from ocaml-compiler-libs. --- gnu/packages/ocaml.scm | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 95407de74d..93cfa8f54b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4084,7 +4084,7 @@ syntax checking on dedukti files.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) + ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4686,34 +4686,50 @@ provided by companion libraries such as #:dune ,ocaml4.07-dune)) (properties '())))) -(define-public ocaml4.07-compiler-libs +(define-public ocaml-compiler-libs (package - (name "ocaml4.07-compiler-libs") - (version "0.11.0") + (name "ocaml-compiler-libs") + (version "0.12.3") (home-page "https://github.com/janestreet/ocaml-compiler-libs") (source (origin (method git-fetch) (uri (git-reference - (url (string-append home-page ".git")) + (url home-page) (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) + "00nrar7h2pyflbdiq6wwwrb4k5jh9iff0jllihzm6ms8d5pspsg5")))) (build-system dune-build-system) - (arguments - `(#:tests? #f ;no tests - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ocaml-compiler-libs"))) + (arguments `(#:tests? #f)) ;no tests + (properties `((upstream-name . "ocaml-compiler-libs") + (ocaml4.07-variant . ,(delay ocaml4.07-compiler-libs)))) (synopsis "Compiler libraries repackaged") (description "This package simply repackages the OCaml compiler libraries so they don't expose everything at toplevel. For instance, @code{Ast_helper} is now @code{Ocaml_common.Ast_helper}.") (license license:expat))) +(define-public ocaml4.07-compiler-libs + (package-with-ocaml4.07 + (package + (inherit ocaml-compiler-libs) + (name "ocaml-compiler-libs") + (version "0.11.0") + (home-page "https://github.com/janestreet/ocaml-compiler-libs") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) + (properties `((upstream-name . "ocaml-compiler-libs")))))) + (define-public ocaml-stdio (package (name "ocaml-stdio") @@ -4790,7 +4806,7 @@ as part of the same ocaml-migrate-parsetree driver.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) + ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:44 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:44 +0000 Received: from localhost ([127.0.0.1]:57005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIa-0000OD-2o for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:44 -0400 Received: from mout01.posteo.de ([185.67.36.65]:57341) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIM-0000JJ-Ku for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:31 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 23D15240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623845; bh=YQqvC42UCbUsW3+IWkEUa+HcPhYTlo5MBv/44wj81y0=; h=From:To:Cc:Subject:Date:From; b=FtANNWW9pN8K/BRPU4w0A/T0WEIQPPlCXHvqNcXcWdorLIsJ9ewAhPs3Swr7Yqej8 eQlBg4FGVAroDkXd4NoXQcr3KwuLuN3Y00NehgVqUjfCmwVebG0WatQ2oJ2CgvXZOQ f8pGxmkblx37KNL5JrCcMc71w0ZywtyYNEfoS8TacApIHFkJx7EHDmgATpu89MbKoP jU2Ur7kFMBMj3N68OMqTli8tpPTXq319UxFENdsQFcJnwq1iQ41uHi4qm/1IWn1Lnm +ETFheOE4dquCI/Nswvro/c+MqBiZEt9bid+T38bmR1EsWXyZHVq1bGv7grxswxmHJ xGHMGSLkFd59g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7842N4z9rxG; Mon, 10 May 2021 07:17:24 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 14/43] gnu: Add ocaml-uunf. Date: Mon, 10 May 2021 05:15:59 +0000 Message-Id: <20210510051628.15359-15-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-uunf): New variable. --- gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 605567b996..a320f94097 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2708,6 +2708,38 @@ Functions are also provided to fold over the characters of UTF encoded OCaml string values and to directly encode characters in OCaml Buffer.t values.") (license license:isc))) +(define-public ocaml-uunf + (package + (name "ocaml-uunf") + (version "13.0.0") + (source + (origin + (method url-fetch) + (uri "https://erratique.ch/software/uunf/releases/uunf-13.0.0.tbz") + (sha256 + (base32 + "1qci04nkp24kdls1z4s8kz5dzgky4nwd5r8345nwdrgwmxhw7ksm")))) + (build-system ocaml-build-system) + (arguments + `(#:tests? #f + #:build-flags (list "build") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam) + ("topkg" ,ocaml-topkg))) + (propagated-inputs `(("ocaml-uutf" ,ocaml-uutf))) + (home-page "https://erratique.ch/software/uunf") + (synopsis "Unicode text normalization for OCaml") + (description + "Uunf is an OCaml library for normalizing Unicode text. It supports all +Unicode normalization forms. The library is independent from any +IO mechanism or Unicode text data structure and it can process text +without a complete in-memory representation.") + (license license:isc))) + (define-public ocaml-jsonm (package (name "ocaml-jsonm") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:45 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:45 +0000 Received: from localhost ([127.0.0.1]:57008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIa-0000OL-Fn for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:45 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIM-0000JD-9o for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:32 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 9AD01240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623844; bh=DjReW/kuSKYqk7gSlG9wRrPiMbZcxyA4cffeDB/P4nI=; h=From:To:Cc:Subject:Date:From; b=ctRqDdpHYTfqH1qcY2u9Y7yxKQTOMzDAAksDDGT+E/cLUc3JcjoU+sFgZ+xObUkwO Uzj7ZmnNhJc6vvwFpXOF92gY+P8ajsErXaodurFog3HUziBNjCkQGbmMSD0IZLPgFD s1feEK+9BtXpUQQNs2RbfSzur25l6JYLar0ph+Nja9uw6Vawy5yBxr2Nyz4m6HqVEk aFtiLMKkw1A1g5Kne2idpOLwc2S0pAX9OUHVEEMa4DZAcvPa+gucYQLTwo2bKaUiWX M3uYxai4DRR6JsG2CUWvQU/iv+kTMc5SmnaI10gjYCBO7wWUGMxC5u9ZDJd3+RG4Un QOHJEf4+xCLOg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq776qMZz9rxg; Mon, 10 May 2021 07:17:23 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 13/43] gnu: Add ocaml-sedlex. Date: Mon, 10 May 2021 05:15:58 +0000 Message-Id: <20210510051628.15359-14-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-sedlex): New variable. (ocaml4.07-sedlex): Inherit from ocaml-sedlex. --- gnu/packages/ocaml.scm | 57 ++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7fe59c0b95..605567b996 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2555,10 +2555,10 @@ representation of the data.") and consumable.") (license license:bsd-2))) -(define-public ocaml4.07-sedlex +(define-public ocaml-sedlex (package - (name "ocaml4.07-sedlex") - (version "2.1") + (name "ocaml-sedlex") + (version "2.3") (source (origin (method git-fetch) (uri (git-reference @@ -2567,36 +2567,37 @@ and consumable.") (file-name (git-file-name name version)) (sha256 (base32 - "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26")))) + "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar")))) (build-system dune-build-system) (arguments - `(#:tests? #f; no tests + `(#:tests? #f ; no tests #:package "sedlex" #:phases (modify-phases %standard-phases (add-before 'build 'copy-resources (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "src/generator/data" + ;; Newer versions of dune emit an error if files it wants to + ;; build already exist. Delete the dune file so dune doesn't + ;; complain. + (delete-file "dune") (for-each - (lambda (file) - (copy-file (assoc-ref inputs file) file)) - '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt" - "PropList.txt"))) + (lambda (file) + (copy-file (assoc-ref inputs file) file)) + '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt" + "PropList.txt"))) #t)) (add-before 'build 'chmod (lambda _ (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) - #t))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + #t))))) (native-inputs - `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) + `(("ocamlbuild" ,ocamlbuild))) (propagated-inputs - `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen)) - ("ocaml-ppx-tools-versioned" - ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned)) - ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar)))) + `(("ocaml-gen" ,ocaml-gen) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) + ("ocaml-uchar" ,ocaml-uchar))) ;; These three files are needed by src/generator/data/dune, but would be ;; downloaded using curl at build time. (inputs @@ -2621,11 +2622,29 @@ and consumable.") (sha256 (base32 "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk")))))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sedlex)))) (home-page "https://www.cduce.org/download.html#side") (synopsis "Lexer generator for Unicode and OCaml") (description "Lexer generator for Unicode and OCaml.") (license license:expat))) +(define-public ocaml4.07-sedlex + (package-with-ocaml4.07 + (package + (inherit ocaml-sedlex) + (name "ocaml-sedlex") + (version "2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-community/sedlex") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26")))) + (properties '())))) + (define-public ocaml-uchar (package (name "ocaml-uchar") @@ -3473,7 +3492,7 @@ Format module of the OCaml standard library.") `(("which" ,which))) (propagated-inputs `(("ocaml-xmlm" ,(package-with-ocaml4.07 ocaml-xmlm)) - ("ocaml-sedlex" ,ocaml4.07-sedlex) + ("ocaml-sedlex" ,(package-with-ocaml4.07 ocaml-sedlex)) ("ocaml-easy-format" ,(package-with-ocaml4.07 ocaml-easy-format)) ("ocaml-base64" ,(package-with-ocaml4.07 ocaml-base64)))) (home-page "http://piqi.org") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:47 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:47 +0000 Received: from localhost ([127.0.0.1]:57010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIb-0000Oa-9L for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:46 -0400 Received: from mout02.posteo.de ([185.67.36.66]:59851) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIL-0000Iz-KR for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:32 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 0C83D2400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623844; bh=26ka1nto6VEbym7wior1XOeHkNryD5/LdrQxGWS6Qac=; h=From:To:Cc:Subject:Date:From; b=I/pibWJcuDTNSANf9Enge3fl4QjBWXVZnKRpHSiwACyNb1YA+NYAScNlyP52DSbqZ pBrRtCtxWJ7/dn3Ph2Z6TP3Dt1d+defLEqIgVpULVrkxz+mTCCDc3Y99PSCtQwCkx4 Hm5ss8Hbvn3EWd5CqBoaf9X2ho66HkUv7HXmRNmmpCyYJVGneGyqJ5K6lP07OtKcLF he2ovgyELdjeq+3L0rjwG4jye7CQFGDfDKKrdkSqQ5hh6Zfife2NoRBuV6/D2C64E3 OXQKfuO2SSUpyuQknXlydqiIsxBXN6MVlL/HZb0aPekhYAukA6dK4wNPvamErDAgfs dgmP97/KuAj8Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7738HLz9rxR; Mon, 10 May 2021 07:17:23 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 12/43] gnu: Add ocaml-ppxlib. Date: Mon, 10 May 2021 05:15:57 +0000 Message-Id: <20210510051628.15359-13-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppxlib): New variable. (ocaml4.07-ppxlib): Inherit from ocaml-ppxlib. --- gnu/packages/ocaml.scm | 144 +++++++++++++++++++++++------------------ 1 file changed, 81 insertions(+), 63 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0b606e296c..7fe59c0b95 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4106,7 +4106,7 @@ syntax checking on dedukti files.") ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_inline_test"))) (synopsis "Syntax extension for writing in-line tests in ocaml code") (description "This package contains a syntax extension for writing @@ -4807,54 +4807,32 @@ ppx_deriving and ppx_type_conv to inter-operate gracefully when linked as part of the same ocaml-migrate-parsetree driver.") (license license:bsd-3))) -(define-public ocaml4.07-ppxlib +(define-public ocaml-ppxlib (package - (name "ocaml4.07-ppxlib") - (version "0.6.0") + (name "ocaml-ppxlib") + (version "0.22.0") (home-page "https://github.com/ocaml-ppx/ppxlib") (source (origin (method git-fetch) (uri (git-reference - (url (string-append home-page ".git")) + (url home-page) (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv")))) + "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'set-topfind - (lambda* (#:key inputs #:allow-other-keys) - ;; add the line #directory ".." at the top of each file - ;; using #use "topfind";; to be able to find topfind - (let* ((findlib-path (assoc-ref inputs "findlib")) - (findlib-libdir - (string-append findlib-path "/lib/ocaml/site-lib"))) - (substitute* '("test/base/test.ml" - "test/code_path/test.ml" - "test/deriving/test.ml" - "test/driver/attributes/test.ml" - "test/driver/non-compressible-suffix/test.ml" - "test/driver/transformations/test.ml") - (("#use \"topfind\";;" all) - (string-append "#directory \"" findlib-libdir "\"\n" - all)))) - #t))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(("ocaml-base" ,ocaml-base) + ("ocaml-compiler-libs" ,ocaml-compiler-libs) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-stdlib-shims" ,ocaml-stdlib-shims) + ("ocaml-ppx-derivers" ,ocaml-ppx-derivers) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-result" ,ocaml-result) + ("ocaml-sexplib0" ,ocaml-sexplib0))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-ppxlib)))) (synopsis "Base library and tools for ppx rewriters") (description @@ -4872,6 +4850,46 @@ OCaml AST in the OCaml syntax; @end itemize") (license license:expat))) +(define-public ocaml4.07-ppxlib + (package-with-ocaml4.07 + (package + (inherit ocaml-ppxlib) + (name "ocaml-ppxlib") + (version "0.6.0") + (home-page "https://github.com/ocaml-ppx/ppxlib") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv")))) + (build-system dune-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-topfind + (lambda* (#:key inputs #:allow-other-keys) + ;; add the line #directory ".." at the top of each file + ;; using #use "topfind";; to be able to find topfind + (let* ((findlib-path (assoc-ref inputs "findlib")) + (findlib-libdir + (string-append findlib-path "/lib/ocaml/site-lib"))) + (substitute* '("test/base/test.ml" + "test/code_path/test.ml" + "test/deriving/test.ml" + "test/driver/attributes/test.ml" + "test/driver/non-compressible-suffix/test.ml" + "test/driver/transformations/test.ml") + (("#use \"topfind\";;" all) + (string-append "#directory \"" findlib-libdir "\"\n" + all)))) + #t))))) + (properties '())))) + (define-public ocaml4.07-ppx-compare (package (name "ocaml4.07-ppx-compare") @@ -4890,7 +4908,7 @@ OCaml AST in the OCaml syntax; `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -4929,7 +4947,7 @@ by making sure that you only compare comparable values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "fieldslib"))) (home-page "https://github.com/janestreet/fieldslib") (synopsis "Syntax extension to record fields") @@ -4961,7 +4979,7 @@ of a record and create new record values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "variantslib"))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values") @@ -4987,7 +5005,7 @@ standard library.") ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5019,7 +5037,7 @@ new record values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5050,7 +5068,7 @@ definitions.") ("ocaml-variantslib" ,ocaml4.07-variantslib) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5083,7 +5101,7 @@ variant types.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5183,7 +5201,7 @@ storage of large amounts of data.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5218,7 +5236,7 @@ hash functions from type exrpessions and definitions.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_enumerate"))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") @@ -5250,7 +5268,7 @@ many values).") `(("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_bench"))) (home-page "https://github.com/janestreet/ppx_bench") (synopsis "Syntax extension for writing in-line benchmarks in ocaml code") @@ -5280,7 +5298,7 @@ many values).") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_here"))) (home-page "https://github.com/janestreet/ppx_here") (synopsis "Expands [%here] into its location") @@ -5335,7 +5353,7 @@ many values).") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_sexp_value"))) (home-page "https://github.com/janestreet/ppx_sexp_value") (synopsis "Simplify building s-expressions from ocaml values") @@ -5366,7 +5384,7 @@ ocaml values.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_sexp_message"))) (home-page "https://github.com/janestreet/ppx_sexp_message") (synopsis "A ppx rewriter for easy construction of s-expressions") @@ -5398,7 +5416,7 @@ context such as function arguments.") (propagated-inputs `(("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_pipebang"))) (home-page "https://github.com/janestreet/ppx_pipebang") (synopsis "Inline reverse application operators `|>` and `|!`") @@ -5429,7 +5447,7 @@ context such as function arguments.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_optional"))) (home-page "https://github.com/janestreet/ppx_optional") (synopsis "Pattern matching on flat options") @@ -5458,7 +5476,7 @@ else expression.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_optcomp"))) (home-page "https://github.com/janestreet/ppx_optcomp") (synopsis "Optional compilation for OCaml") @@ -5488,7 +5506,7 @@ size, the version of the compiler, ...") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_let"))) (home-page "https://github.com/janestreet/ppx_let") (synopsis "Monadic let-bindings") @@ -5518,7 +5536,7 @@ match expressions, and if expressions.") ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_fail"))) (home-page "https://github.com/janestreet/ppx_fail") (synopsis "Add location to calls to failwiths") @@ -5550,7 +5568,7 @@ position.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_assert"))) (home-page "https://github.com/janestreet/ppx_assert") (synopsis "Assert-like extension nodes that raise useful errors on failure") @@ -5589,7 +5607,7 @@ useful errors on failure.") ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)) ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)))) (properties `((upstream-name . "ppx_expect"))) (home-page "https://github.com/janestreet/ppx_expect") @@ -5625,7 +5643,7 @@ to denote the expected output.") ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-octavius" ,(package-with-ocaml4.07 ocaml-octavius)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_js_style"))) (home-page "https://github.com/janestreet/ppx_js_style") (synopsis "Code style checker for Jane Street Packages") @@ -5658,7 +5676,7 @@ packages.") ("ocaml-typerep" ,ocaml4.07-typerep) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_typerep_conv"))) (home-page "https://github.com/janestreet/ppx_typerep_conv") (synopsis "Generation of runtime types from type declarations") @@ -5692,7 +5710,7 @@ from type definitions.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_base"))) (home-page "https://github.com/janestreet/ppx_base") (synopsis "Base set of ppx rewriters") @@ -5728,7 +5746,7 @@ verification tool.") ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_bin_prot"))) (home-page "https://github.com/janestreet/ppx_bin_prot") (synopsis "Generation of bin_prot readers and writers from types") @@ -5775,7 +5793,7 @@ functions from type definitions.") ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_jane"))) (home-page "https://github.com/janestreet/ppx_jane") (synopsis "Standard Jane Street ppx rewriters") @@ -5958,7 +5976,7 @@ thousands of times faster than fork. ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (home-page "https://github.com/janestreet/core") (synopsis "Alternative to OCaml's standard library") (description "The Core suite of libraries is an alternative to OCaml's -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:48 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:48 +0000 Received: from localhost ([127.0.0.1]:57014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIc-0000Op-Tv for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:47 -0400 Received: from mout01.posteo.de ([185.67.36.65]:57643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIN-0000JM-9c for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:33 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id C1611240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623845; bh=NXCOhUzQGtBb2+XESbKmxK/X2aG+jolFuHulOPXgOZg=; h=From:To:Cc:Subject:Date:From; b=Acr0JflB6i0Cxy2PwLbAFLcqTwZX7bB2BV85pW+ueZQm9Tl3f+bCq4iSK6NQvMlQO vR5Lsg3DxjMnarZu1NlKlinTpIwt0RTnmg75/uG3OffozMpSjlgJuCh0fEQcPSOhy+ f2ANYrnJnHT8hxekwmNfTv1wIExQ4vMWSK2KOFz7LAvIlVZw3icEBfN2aq6yyRZCYQ ha+mC7k6iZTl0pXLw41scAm8Bs1jhQ4lmg/QN5SwuejMU4WxOWHWCeMn+2Bi/fl7NM St8mW9qo0fWL+ok7sD3cLBhiIZtE5g8gm1oGl7E6S1J2iJfnWj5YOqHdG8mV+WSrwB T1y0JoZptuQPA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq790ZVRz9rxG; Mon, 10 May 2021 07:17:25 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 15/43] gnu: Add ocaml-ppx-sexp-conv. Date: Mon, 10 May 2021 05:16:00 +0000 Message-Id: <20210510051628.15359-16-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-sexp-conv): New variable. (ocaml4.07-ppx-sexp-conv): Inherit from ocaml-ppx-sexp-conv. --- gnu/packages/ocaml.scm | 98 ++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 42 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a320f94097..823cb00afd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3430,7 +3430,7 @@ JSON.") #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-ounit" ,(package-with-ocaml4.07 ocaml-ounit)) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv))) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)))) (propagated-inputs `(("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) @@ -5070,36 +5070,50 @@ and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-sexp-conv +(define-public ocaml-ppx-sexp-conv (package - (name "ocaml4.07-ppx-sexp-conv") - (version "0.11.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_sexp_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) + (name "ocaml-ppx-sexp-conv") + (version "0.14.3") + (home-page "https://github.com/janestreet/ppx_sexp_conv") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dbri9d00ydi0dw1cavswnqdmhjaaz80vap29ns2lr6mhhlvyjmj")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ppx_sexp_conv"))) - (home-page "https://github.com/janestreet/ppx_sexp_conv") + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_sexp_conv") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-conv)))) (synopsis "Generation of S-expression conversion functions from type definitions") (description "This package generates S-expression conversion functions from type definitions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-sexp-conv + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-sexp-conv) + (name "ocaml-ppx-sexp-conv") + (version "0.11.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_sexp_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) + (properties `((upstream-name . "ppx_sexp_conv")))))) + (define-public ocaml4.07-ppx-variants-conv (package (name "ocaml4.07-ppx-variants-conv") @@ -5107,30 +5121,30 @@ definitions.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/ppx_variants_conv") - (commit (string-append "v" version)))) + (url "https://github.com/janestreet/ppx_variants_conv") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-variantslib" ,ocaml4.07-variantslib) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) + ("ocaml-variantslib" ,ocaml4.07-variantslib) + ("ocaml-migrate-parsetree" + ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (properties - `((upstream-name . "ppx_variants_conv"))) + `((upstream-name . "ppx_variants_conv"))) (home-page - "https://github.com/janestreet/ppx_variants_conv") + "https://github.com/janestreet/ppx_variants_conv") (synopsis "Generation of accessor and iteration functions for OCaml variant types") (description - "This package generates accessors and iteration functions for OCaml + "This package generates accessors and iteration functions for OCaml variant types.") (license license:asl2.0))) @@ -5149,7 +5163,7 @@ variant types.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5182,7 +5196,7 @@ string conversion.") ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) @@ -5249,7 +5263,7 @@ storage of large amounts of data.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5401,7 +5415,7 @@ many values).") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5432,7 +5446,7 @@ ocaml values.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5616,7 +5630,7 @@ position.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5653,7 +5667,7 @@ useful errors on failure.") ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" @@ -5758,7 +5772,7 @@ from type definitions.") ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -6067,7 +6081,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) + ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-splittable-random" ,ocaml4.07-splittable-random) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:48 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:48 +0000 Received: from localhost ([127.0.0.1]:57016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyId-0000P2-WB for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:48 -0400 Received: from mout01.posteo.de ([185.67.36.65]:50309) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIP-0000Jm-67 for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:33 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id A57E6240028 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623847; bh=5gFVC+tWGvhpnLv60/rAgvLo/lU0EOZ5ouq7SeJtjhM=; h=From:To:Cc:Subject:Date:From; b=iJvJfpSRZk6xR3qKNViQmjxfvZfi2efxK8YSAwAp78Tp1mfOBl/R3G8DQM/HwReYa L+09WmwTfLar88XiILutgqSB3iyxWC9T2rWDLLS9T5gI9MtLgDX0KW+RlpZX2DVd5W b7FONbnZZACI0+ZkB87h0gJti2GwHtFuRdOKBz9gS/ZtPjrKxLNUn7i6Z+nZ+sdpKZ UF4JLSz9qI6+yaXYNd52XkYZniWymoK9jnWqsSYe3I0+el9nNXtlD4h4qXScnlZgBB 39qNo9XVhBbIWGXyTwZexak3bXZk3CQShspG0n+U1LfZR3ZQcWeL5PJhZkd05kXEhg FGOBmkS2Cla/g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7C0vVLz9rxG; Mon, 10 May 2021 07:17:27 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 19/43] gnu: Add ocaml-ppx-compare. Date: Mon, 10 May 2021 05:16:04 +0000 Message-Id: <20210510051628.15359-20-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-compare): New variable. (ocaml4.07-ppx-compare): Inherit from ocaml-ppx-compare. --- gnu/packages/ocaml.scm | 64 +++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9289ec88b2..d90b15cbd3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4941,30 +4941,24 @@ OCaml AST in the OCaml syntax; #t))))) (properties '())))) -(define-public ocaml4.07-ppx-compare +(define-public ocaml-ppx-compare (package - (name "ocaml4.07-ppx-compare") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_compare") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) + (name "ocaml-ppx-compare") + (version "0.14.0") + (source + (janestreet-origin "ppx_compare" version + "0mqxa2s194nif7x4fjn1p5gd9i3bakr8nv27gf8x1g5nmi8q9pmp")) (build-system dune-build-system) - (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ppx_compare"))) + ;; Tests are currenlty failing + ;; (see https://github.com/janestreet/ppx_compare/issues/10) + '(#:tests? #f)) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_compare") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-compare)))) (home-page "https://github.com/janestreet/ppx_compare") (synopsis "Generation of comparison functions from types") (description "Generation of fast comparison functions from type expressions @@ -4975,6 +4969,24 @@ flexibility by allowing you to override them for a specific type and more safety by making sure that you only compare comparable values.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-compare + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-compare) + (name "ocaml-ppx-compare") + (version "0.11.1") + (home-page "https://github.com/janestreet/ppx_compare") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) + (properties `((upstream-name . "ppx_compare")))))) + (define-public ocaml4.07-fieldslib (package (name "ocaml4.07-fieldslib") @@ -5193,7 +5205,7 @@ string conversion.") (build-system dune-build-system) (inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) @@ -5262,7 +5274,7 @@ storage of large amounts of data.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -5630,7 +5642,7 @@ position.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" @@ -5664,7 +5676,7 @@ useful errors on failure.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) - ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) @@ -5770,7 +5782,7 @@ from type definitions.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) + `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:49 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:49 +0000 Received: from localhost ([127.0.0.1]:57018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIe-0000PA-I7 for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:49 -0400 Received: from mout01.posteo.de ([185.67.36.65]:59303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIP-0000Jo-PK for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 447C4240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623848; bh=q5wNOYT1sQHZI51tM/0DDOMHbieSYN4tryXWW4ZCgtc=; h=From:To:Cc:Subject:Date:From; b=cyFEmIu9pxAVE+nK90RgMaH6ecJcoAA4K8AcYQ9xuHEOa3RiBtEb9/VSTQYJ/5SJ4 UQNprEN3z4WiLuyS/mLjugb19M6WFManXrRuibH3XdJtcsvle0QWMMa8wACNnFztoT ZhxItwvf0hSxSVrShtftvYdCPtOSExkN1Rw/Uj3ZRpRPaZj1H8tExst8bZ5R0AZCv8 4mFuzkdGQhjk4attaMFJ2spzKW38tMxpn1rWu3EGBTD9woh+ES/L5gp5rFx7QLwyZo 2Y6rI+TJeyHct4THuF54RFUwsSIIx2mcEG2bCunaPvVSomk9aBBh5BugCzd22PL/O9 LIeEsJib4Q54g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7C4XNLz9rxG; Mon, 10 May 2021 07:17:27 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 20/43] gnu: Add ocaml-ppx-here. Date: Mon, 10 May 2021 05:16:05 +0000 Message-Id: <20210510051628.15359-21-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-here): New variable. (ocaml4.07-ppx-here): Inherit from ocaml-ppx-here. --- gnu/packages/ocaml.scm | 56 ++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d90b15cbd3..808e3f30fe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5352,37 +5352,39 @@ many values).") (description "Syntax extension for writing in-line benchmarks in ocaml code.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-here +(define-public ocaml-ppx-here (package - (name "ocaml4.07-ppx-here") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_here-v" version ".tar.gz")) - (sha256 - (base32 - "0wxcak3ay4jpigm3pfdcpr65qw4hxfa8whhkryhcd8gy71x056z5")))) + (name "ocaml-ppx-here") + (version "0.14.0") + (source + (janestreet-origin "ppx_here" version + "0b444djy68v6ji0ypwv5l02pkl151qzrgg96lyhl8dxfrzvj1zkj")) (build-system dune-build-system) (arguments ;; broken tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_here"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_here") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-here)))) (home-page "https://github.com/janestreet/ppx_here") (synopsis "Expands [%here] into its location") (description "Part of the Jane Street's PPX rewriters collection.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-here + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-here) + (version "0.11.0") + (source + (janestreet-origin "ppx_here" version + "0wxcak3ay4jpigm3pfdcpr65qw4hxfa8whhkryhcd8gy71x056z5")) + (properties `((upstream-name . "ppx_here")))))) + (define-public ocaml4.07-typerep (package (name "ocaml4.07-typerep") @@ -5426,7 +5428,7 @@ many values).") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -5457,7 +5459,7 @@ ocaml values.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -5612,7 +5614,7 @@ match expressions, and if expressions.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5643,7 +5645,7 @@ position.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -5679,7 +5681,7 @@ useful errors on failure.") ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) @@ -5822,7 +5824,7 @@ verification tool.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5860,7 +5862,7 @@ functions from type definitions.") ("ocaml-ppx-expect" ,ocaml4.07-ppx-expect) ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) - ("ocaml-ppx-here" ,ocaml4.07-ppx-here) + ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,ocaml4.07-ppx-optcomp) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:49 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:49 +0000 Received: from localhost ([127.0.0.1]:57020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIf-0000PH-AN for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:49 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIQ-0000Jp-6s for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id AE9F7240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623848; bh=9J4MG2ILFX5cNXX7BHhllBA9znRj1Z2sqiJe0u19R+I=; h=From:To:Cc:Subject:Date:From; b=O9u6UgJ/q1f/9IKDg0kIyUS48PjoK/YL0YDj9tJTZmox+RHmFwcTXo84beWRAL7aQ /NPo4+O81v/ZEeJ8OkWKckklCqzBjoJv9BbMXR0fDTaPmDD39GUbmL27JiR4d0RFlp BGONipd4aw5WFyL7rKUMW4RvDmlIKqzN812X29iOjiMjUFvARW7KZdvE1EiRpD5j06 UkgIRHP7LwWFuTnNwR9AxdrXisRBg1dOEdtct/AM5rEVZjv508e5esWW+jw6yVH2Kq 96vtECtmJvUmDav/7wXdugcx82P/CSyZlR9ySWZDwAiQRf0GKbe00WLFfIoc7Go4P6 tzV33sjKduJaQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7D14kRz9rxR; Mon, 10 May 2021 07:17:28 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 21/43] gnu: Add ocaml-ppx-cold. Date: Mon, 10 May 2021 05:16:06 +0000 Message-Id: <20210510051628.15359-22-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-cold): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 808e3f30fe..a27a1170ac 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5625,6 +5625,28 @@ match expressions, and if expressions.") position.") (license license:asl2.0))) +(define-public ocaml-ppx-cold + (package + (name "ocaml-ppx-cold") + (version "0.14.0") + (home-page "https://github.com/janestreet/ppx_cold") + (source + (janestreet-origin "ppx_cold" version + "1madfzhpir9amnxmg530n70vll0jrl59vyp71miji73i6b9sy6n2")) + (build-system dune-build-system) + (arguments `(#:test-target "tests")) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_cold"))) + (synopsis "Syntax extension for indicating cold path") + (description + "This package contains an syntax extension to indicate that the code is +on the cold path and should be kept out of the way to avoid polluting the +instruction cache on the hot path. See also +https://github.com/ocaml/ocaml/issues/8563.") + (license license:expat))) + (define-public ocaml4.07-ppx-assert (package (name "ocaml4.07-ppx-assert") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:50 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:50 +0000 Received: from localhost ([127.0.0.1]:57022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIf-0000PP-LJ for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:50 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIP-0000JD-Qt for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 7CBD6240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623853; bh=bZNK9NLv+wZv6ISXwd+PDTc+VCJuQ3gMSrffgiPMnas=; h=From:To:Cc:Subject:Date:From; b=W3Odmpt54CuxSYjRqh95EO3h2a8n/c3HavrIJGZSpjJI0EDhVZIWh770ozsDekyXN 6zsm6eRZ+JVlXr0X731bc5rHi5dSnZxrGCxKNCckBKKUcDOOsNo4IG5d40dq+UF6ll bTi/g/tJX/JZUXxQwPPaT+zP1APgAj58gH7DjHOQL6DG80KD4SpluORp6gQD3h/UWM 3Eg6EX03g/gF7KhNws5AwAi69mMydh0rbOKFAbg8DOCSi1dgP8wSHQoB6PwqLBIa09 I3zZJG1GLAODMfcbDmgFfy7ii5f8wZtanU3+JQ6xMdTZ7NJg365H2v/MlEgd7iiKDr nUZg2A1BzAoDQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7J6672z9rxR; Mon, 10 May 2021 07:17:32 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 30/43] gnu: Add ocaml-ppx-optcomp Date: Mon, 10 May 2021 05:16:15 +0000 Message-Id: <20210510051628.15359-31-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-optcomp): New variable. (ocaml4.07-ppx-optcomp): Inherit from ocaml-ppx-optcomp. --- gnu/packages/ocaml.scm | 52 +++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d3fe5b51e9..e3856ac3be 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5570,35 +5570,45 @@ context such as function arguments.") else expression.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-optcomp +(define-public ocaml-ppx-optcomp (package - (name "ocaml4.07-ppx-optcomp") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_optcomp-v" version ".tar.gz")) - (sha256 - (base32 - "1bb52p2j2h4s9f06vrcpla80rj93jinnzq6jzilapyx9q068929i")))) + (name "ocaml-ppx-optcomp") + (version "0.14.1") + (home-page "https://github.com/janestreet/ppx_optcomp") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_optcomp"))) - (home-page "https://github.com/janestreet/ppx_optcomp") + `(("ocaml-base" ,ocaml-base) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_optcomp") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optcomp)))) (synopsis "Optional compilation for OCaml") (description "Ppx_optcomp stands for Optional Compilation. It is a tool used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) +(define-public ocaml4.07-ppx-optcomp + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-optcomp) + (version "0.11.0") + (source + (janestreet-origin + "ppx_optcomp" version + "1bb52p2j2h4s9f06vrcpla80rj93jinnzq6jzilapyx9q068929i")) + (properties `((upstream-name . "ppx_optcomp")))))) + (define-public ocaml-ppx-let (package (name "ocaml-ppx-let") @@ -5944,7 +5954,7 @@ functions from type definitions.") ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) - ("ocaml-ppx-optcomp" ,ocaml4.07-ppx-optcomp) + ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:59 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:59 +0000 Received: from localhost ([127.0.0.1]:57024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIp-0000Pk-35 for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:59 -0400 Received: from mout02.posteo.de ([185.67.36.66]:49499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIQ-0000Jw-GJ for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:35 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AA9B12400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623846; bh=W8zStKmtVyviV9RDKM3tuqIO7W1u9MuNwnJPGX5TE/Y=; h=From:To:Cc:Subject:Date:From; b=jxTFYuk+Lqq+s0PHEJWexa8YsLxBy3lZDhCzemuVRVp6Yubd5mK+lqSm7tjRzy4Rw mRFWC5D2rh3zZp1dxFFPa+zITaOm8YF97nGG2JdyuDcy62o56lDwyNGCW9gdvRk0VZ OeOy78Hxui2r178nDfnsdRpig+jgdTV3zhvvUUlzxwK2aZRFAFWVebzJ436ilRMqPc +NhmJNI61hGmBQQYPgUFNNyTUf7gByjTYfss3osXdEHmUic+a6JRA8ZLC0KLqE5y+E YhcFDfIHCZ5HaubO6PqxJ1k2ywXZTxIje4GN5OWf+ihbN9mLTRWru/jqglEJM1mLon NZ6CjeG1YY3lQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7B0kG9z9rxd; Mon, 10 May 2021 07:17:26 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 17/43] gnu: Add ocaml-ppx-let. Date: Mon, 10 May 2021 05:16:02 +0000 Message-Id: <20210510051628.15359-18-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-let): New variable. (ocaml4.07-ppx-let): Inherit from ocaml-ppx-let. --- gnu/packages/ocaml.scm | 44 ++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f252fb53fa..54a755212e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5550,35 +5550,37 @@ used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) -(define-public ocaml4.07-ppx-let +(define-public ocaml-ppx-let (package - (name "ocaml4.07-ppx-let") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_let-v" version ".tar.gz")) - (sha256 - (base32 - "1wdfw6w4xbg97a35yg6bif9gggxniy9ddnrjfw1a0inkl2yamxkj")))) + (name "ocaml-ppx-let") + (version "0.14.0") + (source + (janestreet-origin "ppx_let" version + "1qcrnd86pbr1di5m6z4ps4p15qawwa02jxwz3xfd82hdbjmdwf1s")) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_let"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_let") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-let)))) (home-page "https://github.com/janestreet/ppx_let") (synopsis "Monadic let-bindings") (description "A ppx rewriter for monadic and applicative let bindings, match expressions, and if expressions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-let + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-let) + (version "0.11.0") + (source + (janestreet-origin "ppx_let" version + "1wdfw6w4xbg97a35yg6bif9gggxniy9ddnrjfw1a0inkl2yamxkj")) + + (properties `(upstream-name . "ppx_let"))))) + (define-public ocaml4.07-ppx-fail (package (name "ocaml4.07-ppx-fail") @@ -5848,7 +5850,7 @@ functions from type definitions.") ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) - ("ocaml-ppx-let" ,ocaml4.07-ppx-let) + ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,ocaml4.07-ppx-optcomp) ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:17:59 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:17:59 +0000 Received: from localhost ([127.0.0.1]:57026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIp-0000Pq-Fw for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:59 -0400 Received: from mout01.posteo.de ([185.67.36.65]:57643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIQ-0000JM-Td for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:35 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 91DD0240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623854; bh=dm6POjbp2gVhxQIjd8hjEslyOI5ds4vcTsGW2leYVzo=; h=From:To:Cc:Subject:Date:From; b=gl1h8i90RLiDPXdnHa5Yucdk4uCdeYdqejf6R12Cfdf8H6otoC9hwwmqJnmtfXltV wvYY/x6DjvGLPjeNM5qMlEa5E7y5bGzOruoGlAaT8bbt83noTFC+lwwiwyrCnj2MJ9 t7hLj8gFPoIkii+Md9n7PwB258DR/PgmDw5PjB8zeKc3/4pmR+p6vOnqkloh4fjPBI qXMknNBiC8b4ooK0N98hu8/M2sO3HDU1CIygiVy6s3T/hZ7fDDFGk6pYRfy0EKIzb0 B6JTEmkijSfjY3ade3offBmbxcq/f1fplUo22s3QgWqirKx3HRQRGp1dOR4mcAHett DO3t/8t5o02pg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7K722xz9rxR; Mon, 10 May 2021 07:17:33 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 32/43] gnu: Add ocaml-jst-config. Date: Mon, 10 May 2021 05:16:17 +0000 Message-Id: <20210510051628.15359-33-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-jst-config): New variable. --- gnu/packages/ocaml.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b38ce9fcc8..5334d8530d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4128,6 +4128,30 @@ Dedukti files.") syntax checking on dedukti files.") (license license:cecill-b)))) +(define-public ocaml-jst-config + (package + (name "ocaml-jst-config") + (version "0.14.0") + (source + (janestreet-origin + "jst-config" version + "1fppr29vn91zpqda8jlnp8bcssd4bf3rn36ig8fnd1yhjrsvz8f6")) + (build-system dune-build-system) + (arguments '(#:tests? #f)) ; no tests + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-assert" ,ocaml-ppx-assert) + ("ocaml-stdio" ,ocaml-stdio) + ("dune-configurator" ,dune-configurator))) + (home-page "https://github.com/janestreet/jst-config") + (synopsis "Compile-time configuration for Jane Street libraries") + (description "Defines compile-time constants used in Jane Street libraries +such as Base, Core, and Async. This package has an unstable interface; it is +intended only to share configuration between different packages from Jane +Street. Future updates may not be backward-compatible, and we do not +recommend using this package directly.") + (license license:expat))) + (define-public ocaml4.07-ppx-inline-test (package (name "ocaml4.07-ppx-inline-test") @@ -4145,7 +4169,7 @@ syntax checking on dedukti files.") "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50")))) (build-system dune-build-system) (arguments - ;see home page README for further information + ;see home page README for further information `(#:tests? #f #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:00 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:00 +0000 Received: from localhost ([127.0.0.1]:57028 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIp-0000Pu-PE for submit@debbugs.gnu.org; Mon, 10 May 2021 01:17:59 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIQ-0000KC-PX for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 487D92400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623847; bh=9SCnxNJ3pdRP/KFkXNDtpfOhteVS4PT2xGPpA7gxqzE=; h=From:To:Cc:Subject:Date:From; b=Wpdw+DBrQ91NFyzHFvqtf1ErytvtLOUvlpDoxDszErqmoqeAJmmYojsuw9XBlpwxl tf1OxZ2H3lpYCXVCQ5K1XdVYuqxNvMwioP+UWTw9lmdWcjtrEdVRuw51aNDNc8CvsL 3ZK723ZGFanLCDm9UCw7GJndzFsvDorSfAJlxdSnKkMLZrrYlugz04TqlmBMRGoNOg nUcCgPLPLQoJsbdgQvo3WYdeagKBUX1GMcir84DZ5yZx8MqLOlkD/4P42yEv3qgMEO Ow70ZiFqCh9psJF0r72QhStCIi3DIcIkDrJph7b/us0LFaGXZ6jHH4KZXDwpp5BH7b C/XEHq4VGS2hQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7B4MbYz9rxd; Mon, 10 May 2021 07:17:26 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 18/43] gnu: Add ocaml-syntax-shims. Date: Mon, 10 May 2021 05:16:03 +0000 Message-Id: <20210510051628.15359-19-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-syntax-shims): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 54a755212e..9289ec88b2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6615,3 +6615,28 @@ exposed the intrinsics properly, the compiler doesn't have any fast blits between Bigstrings and other string-like types. @code{bigstringaf} provides these missing pieces.") (license license:bsd-3))) + +(define-public ocaml-syntax-shims + (package + (name "ocaml-syntax-shims") + (version "1.0.0") + (home-page "https://github.com/ocaml-ppx/ocaml-syntax-shims") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l1i8z95qgb0lxlrv3yb5nkp391hqsiyi4r91p12k3xmggqixagf")))) + (build-system dune-build-system) + (properties + `((upstream-name . "ocaml-syntax-shims"))) + (synopsis + "Backport new syntax to older OCaml versions") + (description + "This packages backports new features of the language to older +compilers, such as let+.") + (license license:expat))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:00 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:00 +0000 Received: from localhost ([127.0.0.1]:57030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIq-0000Q1-0t for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:00 -0400 Received: from mout01.posteo.de ([185.67.36.65]:59303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIR-0000Jo-DT for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 184FD240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623855; bh=24+Rz15erF1ZnneB1yN7iQabAguvCPJMRecj029nb9E=; h=From:To:Cc:Subject:Date:From; b=jOGbqD/D3p7SMQAXD2tciw70HWUFbrEs2FQ4WkORnmEfz9MX0PKjCUE0o0uMpMCly k4MMuz+jmLie+RtmBkD83+EF5ufcXnUDxDesYBW0kxzzHEblMcg79B1KyJsONgPuon XsPAN1IaVmrfxMy6YQ1uHQ3LMvaLczq1BmX75h4POWl6jLBDsZSakxh2BQddhZzp+j GarnconoOdFdH5iT5TSJQfrdgzTPZ6O4FOtiAhbPpUs7GXCMzlgjATWEzmnsHmb31h ZyaLz9QgjMIpsL+XsIimsXf24pROQ1HIdxXZERDpAbqsanWwgFyDhpFX/9AdzP23c8 YndHYSyivqdPQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7L3Yyxz9rxg; Mon, 10 May 2021 07:17:34 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 33/43] gnu: Add ocaml-jane-street-headers. Date: Mon, 10 May 2021 05:16:18 +0000 Message-Id: <20210510051628.15359-34-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-jane-street-headers): New variable. --- gnu/packages/ocaml.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5334d8530d..449ff00cf1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4152,6 +4152,22 @@ Street. Future updates may not be backward-compatible, and we do not recommend using this package directly.") (license license:expat))) +(define-public ocaml-jane-street-headers + (package + (name "ocaml-jane-street-headers") + (version "0.14.0") + (source + (janestreet-origin + "jane-street-headers" version + "028yxb4h3iy025iy89v8653m5brh7flrjshghs4x99pd690pmfs7")) + (build-system dune-build-system) + (arguments '(#:tests? #f)) ; no tests + (home-page "https://github.com/janestreet/jane-street-headers") + (synopsis "Jane Street C header files") + (description "C header files shared between the various Jane Street +packages.") + (license license:expat))) + (define-public ocaml4.07-ppx-inline-test (package (name "ocaml4.07-ppx-inline-test") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:00 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:00 +0000 Received: from localhost ([127.0.0.1]:57032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIq-0000Q8-8F for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:00 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34967) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIQ-0000K7-Nv for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 379B3240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623849; bh=W2eUhXrm4QJZPiU5YMNYPYsho5EjXGHrJ5qsHS/09mA=; h=From:To:Cc:Subject:Date:From; b=NyWo+F4QgPSGw+5zgqGL2Aoo/4wifqV+y4inHI7lrsv2u7Xu6NBLU2/VDMzTjYx1T IaTAyPErCjy8liH17P/O021zaSM5esX1hSS8ocerd7jVopUg71v1fDuCN6aRIx2xDK mqVQa/yWjAYSrN1fwx9VSzvEWSY6Fmx5qN80CBKTXRPjkVFY7vJyNXgQkq6D3sL149 1fTgLCo+R/BdYmFPwkFspGBCU8zSKOGm/+sBdS70LmiSNBgj+DD0YFltYixvbJfgZt 2X+p3M/6ms/WJedWP4Mhr1qSkPp5Hjacki0Ml1keko4DPW0CS8Zw9EigmZXgY972FQ U8+SE5OzMubbA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7D4jgBz9rxR; Mon, 10 May 2021 07:17:28 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 22/43] gnu: Add ocaml-ppx-assert. Date: Mon, 10 May 2021 05:16:07 +0000 Message-Id: <20210510051628.15359-23-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-assert): New variable. (ocaml4.07-ppx-assert): Inherit from ocaml-ppx-assert. --- gnu/packages/ocaml.scm | 63 ++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a27a1170ac..799bebeba9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5647,38 +5647,47 @@ instruction cache on the hot path. See also https://github.com/ocaml/ocaml/issues/8563.") (license license:expat))) -(define-public ocaml4.07-ppx-assert +(define-public ocaml-ppx-assert (package - (name "ocaml4.07-ppx-assert") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_assert-v" version ".tar.gz")) - (sha256 - (base32 - "17kd311n0l9f72gblf9kv8i5rghr106w37x4f0m5qwh6nlgl0j9k")))) + (name "ocaml-ppx-assert") + (version "0.14.0") + (source + (janestreet-origin "ppx_assert" version + "1l2rr4jz2q5b35ryn2z146z7m9v6k8krp5gpn8ilib66mnz5zx15")) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_assert"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-cold" ,ocaml-ppx-cold) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_assert") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-assert)))) (home-page "https://github.com/janestreet/ppx_assert") (synopsis "Assert-like extension nodes that raise useful errors on failure") (description "This package contains assert-like extension nodes that raise useful errors on failure.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-assert + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-assert) + (version "0.11.0") + (source + (janestreet-origin "ppx_assert" version + "17kd311n0l9f72gblf9kv8i5rghr106w37x4f0m5qwh6nlgl0j9k")) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_assert")))))) + (define-public ocaml4.07-ppx-expect (package (name "ocaml4.07-ppx-expect") @@ -5699,7 +5708,7 @@ useful errors on failure.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) + ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) @@ -5876,7 +5885,7 @@ functions from type definitions.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) + `(("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) @@ -6072,7 +6081,7 @@ thousands of times faster than fork. `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-configurator" ,ocaml4.07-configurator) ("ocaml-core-kernel" ,ocaml4.07-core-kernel) - ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) + ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-spawn" ,ocaml4.07-spawn) @@ -6114,7 +6123,7 @@ standard library that was developed by Jane Street.") ("ocaml-configurator" ,ocaml4.07-configurator) ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) - ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) + ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:01 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:01 +0000 Received: from localhost ([127.0.0.1]:57034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIq-0000QF-KP for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:00 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIR-0000KJ-At for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:37 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id C14492400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623849; bh=H4PjNVdbidQ3nFTlRiqJfs/POltWUMzLjVLH9CVDzJw=; h=From:To:Cc:Subject:Date:From; b=S8FcNZxX1sb29iqzEF4U4dAOM7yHB05uOMsxMzoyQu7+vAa/xgTo78OYdCATLWejk D9IkTgF6rb8KuYXPjMLhAGxYa8YTuM/EO/9BpfuMwwmhELpujLqHiLhjf/FuhExhIW EW4TVBJOR+6JgEGwU30q407ApbcTU7db8wlNMKanRphmKn/DZfkDFhBdY+pKDMf/LY rVH1leKng4FNBGU9KXSIkp/TBl72wfbumQu+ew3Xu6rWO2T7EXIdgvrqQ3hokXrkQb yzTBRw/7OUC6ujO+Kv+YzdEfHhZnciZibQRnEG783fyegMBwzn2oK2I/anBqp/uwe6 gDX0HsRmvsKlg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7F1DfRz9rxR; Mon, 10 May 2021 07:17:29 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 23/43] gnu: Add ocaml-ppx-custom-printf. Date: Mon, 10 May 2021 05:16:08 +0000 Message-Id: <20210510051628.15359-24-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-custom-printf): New variable. (ocaml4.07-ppx-custom-printf): Inherit from ocaml-ppx-custom-printf. --- gnu/packages/ocaml.scm | 59 ++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 799bebeba9..c4babb30f3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5160,36 +5160,45 @@ definitions.") variant types.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-custom-printf +(define-public ocaml-ppx-custom-printf (package - (name "ocaml4.07-ppx-custom-printf") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_custom_printf-v" version ".tar.gz")) - (sha256 - (base32 - "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj")))) + (name "ocaml-ppx-custom-printf") + (version "0.14.1") + (home-page "https://github.com/janestreet/ppx_custom_printf") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0c1m65kn27zvwmfwy7kk46ga76yw2a3ik9jygpy1b6nn6pi026w9")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ppx_custom_printf"))) - (home-page "https://github.com/janestreet/ppx_custom_printf") + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_custom_printf") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-custom-printf)))) (synopsis "Printf-style format-strings for user-defined string conversion") (description "Extensions to printf-style format-strings for user-defined string conversion.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-custom-printf + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-custom-printf) + (version "0.11.0") + (source + (janestreet-origin + "ppx_custom_printf" version + "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj")) + (properties `((upstream-name . "ppx_custom_printf")))))) + (define-public ocaml4.07-bin-prot (package (name "ocaml4.07-bin-prot") @@ -5206,7 +5215,7 @@ string conversion.") (inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) + ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) @@ -5710,7 +5719,7 @@ useful errors on failure.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) + ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) @@ -5889,7 +5898,7 @@ functions from type definitions.") ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) - ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) + ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-expect" ,ocaml4.07-ppx-expect) ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:01 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:01 +0000 Received: from localhost ([127.0.0.1]:57036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIr-0000QN-0f for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:01 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIR-0000Jx-HJ for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:37 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 089002400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623854; bh=28OS2CijVGFehefDfoCOPRMbfgGe/hBvEC+AvpzI4cI=; h=From:To:Cc:Subject:Date:From; b=ptgxVDwEYBFxzE8bSgl0vPKqs2iecwCgD26X5D0FYksEXAA8rzYZc2f+TJxmBMYlR F+s5K88Wkoz4VWNyio3yu6N5Xjw3oMF2m/u06UBqoo15ZSyB08+/HB+3CaZp74fPHb lNzJTO6AYK9u7BlU+Ar9uM6spJp7hdcEYwbenWxFCNSd5GTbvaAR1rRO/ZiSVIjEFQ euI68XoiQV1LgB4inOXif6ENbXxf0sqmLxvKXUD6XuKVSVq4i3m2Mue/TPyPW0OPLF H4gK/Wrhw/Jna4SGDUsMfcr0xnx6Izl1XouqwyY2ZjeIZCY1lVYx032rc2vEpy1m4+ KVC3kRXDARsFQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7K3PBVz9rxR; Mon, 10 May 2021 07:17:33 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 31/43] gnu: Add ocaml-ppx-optional. Date: Mon, 10 May 2021 05:16:16 +0000 Message-Id: <20210510051628.15359-32-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-optional): New variable. (ocaml4.07-ppx-optional): Inherit from ocaml-ppx-optional. --- gnu/packages/ocaml.scm | 48 ++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e3856ac3be..b38ce9fcc8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5538,31 +5538,22 @@ context such as function arguments.") @code{|>} and @code{|!}.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-optional +(define-public ocaml-ppx-optional (package - (name "ocaml4.07-ppx-optional") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_optional-v" version ".tar.gz")) - (sha256 - (base32 - "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h")))) + (name "ocaml-ppx-optional") + (version "0.14.0") + (source + (janestreet-origin + "ppx_optional" version + "1hh6ivlp1qpvyn8l0vhrahkkcp3scf7km254sgplprmk10wnyidz")) (build-system dune-build-system) - (arguments - ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + (arguments `(#:tests? #f)) ; No tests (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_optional"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_optional") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optional)))) (home-page "https://github.com/janestreet/ppx_optional") (synopsis "Pattern matching on flat options") (description @@ -5570,6 +5561,17 @@ context such as function arguments.") else expression.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-optional + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-optional) + (version "0.11.0") + (source + (janestreet-origin + "ppx_optional" version + "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h")) + (properties `((upstream-name . "ppx_optional")))))) + (define-public ocaml-ppx-optcomp (package (name "ocaml-ppx-optcomp") @@ -5955,7 +5957,7 @@ functions from type definitions.") ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) - ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional) + ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional)) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:02 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:02 +0000 Received: from localhost ([127.0.0.1]:57038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIr-0000QU-CG for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:02 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35843) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIR-0000KS-TR for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:37 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 5647B2400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623850; bh=hY9Xgv8AlqPoSR1qzsEZrg12Rc8OfxTjCIZjWOB5nbw=; h=From:To:Cc:Subject:Date:From; b=pSxbD+llpwzsY4ltIqaQYHcs2kqoE8va5fQU8y3q1Z7rHAXKamYcgfJ0QcYapMPEm iUWsD2s6PdySxAydvHxdAVAEAhyuI0VgNHkHE7sr6QXXo4FWuj53IBjDTGz02v7Zex Kcb+cSLGuZ/63Cn7c99pdoaUhveodrwJfs0PjQK/VSQeUxdv0WcHRcOr1PebNt3uT9 nVpdUyKju/OVFW1IW5HJWcD8Y0G5iE7N+iXMVO4sP2YwYKKw63VoXoYhQL4PFG3TuD hfkNE8I5DjTndF+1zSEv7zj3c2gwTRX3Oh7XUCXovIXk2zx0YNkIi/ZjAk8pj3z1W+ 1X823RDLtao4g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7F4tq8z9rxR; Mon, 10 May 2021 07:17:29 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 24/43] gnu: Add ocaml-ppx-hash. Date: Mon, 10 May 2021 05:16:09 +0000 Message-Id: <20210510051628.15359-25-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-hash): New variable. (ocaml4.07-ppx-hash): Inherit from ocaml-ppx-hash. --- gnu/packages/ocaml.scm | 72 +++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 32 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c4babb30f3..792cf38447 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5267,38 +5267,46 @@ storage of large amounts of data.") (description "Octavius is a library to parse the `ocamldoc` comment syntax.") (license license:isc))) -(define-public ocaml4.07-ppx-hash +(define-public ocaml-ppx-hash (package - (name "ocaml4.07-ppx-hash") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_hash") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) + (name "ocaml-ppx-hash") + (version "0.14.0") + (source + (janestreet-origin "ppx_hash" version + "0x4wgdvhgd8a49bzari52jpkykxpv6ncgp5ncda3xgg0a9r49s8n")) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ppx_hash"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_hash") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-hash)))) (home-page "https://github.com/janestreet/ppx_hash") (synopsis "Generation of hash functions from type expressions and definitions") (description "This package is a collection of ppx rewriters that generate hash functions from type exrpessions and definitions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-hash + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-hash) + (name "ocaml-ppx-hash") + (home-page "https://github.com/janestreet/ppx_hash") + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) + (properties `((upstream-name . "ppx_hash")))))) + (define-public ocaml4.07-ppx-enumerate (package (name "ocaml4.07-ppx-enumerate") @@ -5306,23 +5314,23 @@ hash functions from type exrpessions and definitions.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/janestreet/ppx_enumerate") - (commit (string-append "v" version)))) + (url "https://github.com/janestreet/ppx_enumerate") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) (build-system dune-build-system) (arguments - `(#:tests? #f; no test suite + `(#:tests? #f ; no test suite #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) + ("ocaml-migrate-parsetree" + ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_enumerate"))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") @@ -5826,7 +5834,7 @@ from type definitions.") (propagated-inputs `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) - ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) + ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" @@ -6134,7 +6142,7 @@ standard library that was developed by Jane Street.") ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) - ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) + ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:02 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:02 +0000 Received: from localhost ([127.0.0.1]:57040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIs-0000Qj-1y for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:02 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIQ-0000Jx-GF for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:35 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2C6522400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623846; bh=MqjUW5n445BEsgkg5qZznLSWe0GAiA5XtuBGFsztzls=; h=From:To:Cc:Subject:Date:From; b=HVZWmmiAu9BGqe4UboDY7rOvnkmgBCMPvo+NEwecyqqYJl/n3FvjKg8uYRSvQCiNe GeZEuyOZ9O8ECUenvrQXYyB/tyOpbt0oUmYneqSi5kRRoI8FL1Kfze5U8+Rry0UdiO ta52AYXL5WShTluT0FcOCIRWG7Z5Av1TI4JCYVOfT7wBRlW2Zk/gdXzZrLXdy3y73M rfcWfTFihT3WHG1W7vZfqF4ODovE6U6QjxTYMdNiLEt0M1yLqkePeDUHg4LkhtyiY8 0LpNjageqmG4xQcpI3zhoevYYPhXFsJtz1xYwgtSKxNIKccr78N8oKtYuRhf7LnkFW lHfJgZ0lvXkuw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq794C5Rz9rxg; Mon, 10 May 2021 07:17:25 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 16/43] gnu: Add ocaml-bigstringaf. Date: Mon, 10 May 2021 05:16:01 +0000 Message-Id: <20210510051628.15359-17-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/ocaml/packages.scm (ocaml-bigstringaf): New variable. --- gnu/packages/ocaml.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 823cb00afd..f252fb53fa 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6579,3 +6579,37 @@ provides support to program with time varying values: declarative events and signals. React doesn't define any primitive event or signal, it lets the client chooses the concrete timeline.") (license license:lgpl2.1+))) + +(define-public ocaml-bigstringaf + (package + (name "ocaml-bigstringaf") + (version "0.7.0") + (home-page "https://github.com/inhabitedtype/bigstringaf") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q1sqxzdnlrpl95ccrhl7lwy3zswgd9rbn19ildclh0lyi2vazbj")))) + (build-system dune-build-system) + (arguments + '(#:test-target ".")) + (propagated-inputs + `(("ocaml-bigarray-compat" ,ocaml-bigarray-compat))) + (native-inputs + `(("ocaml-alcotest" ,ocaml-alcotest) + ("pkg-config" ,pkg-config))) + (synopsis + "Bigstring intrinsics and fast blits based on memcpy/memmove") + (description + "The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're +not widely-known, sometimes misused, and so programs that use Bigstrings are +slower than they have to be. And even if a library got that part right and +exposed the intrinsics properly, the compiler doesn't have any fast blits +between Bigstrings and other string-like types. @code{bigstringaf} provides +these missing pieces.") + (license license:bsd-3))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:02 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:02 +0000 Received: from localhost ([127.0.0.1]:57043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIs-0000Qw-Dc for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:02 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIS-0000JD-NR for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:37 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 64643240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623856; bh=ZrT/cke5x+s8oENbM4G8mf7HzmXPTHWBK8iWNLSFZmg=; h=From:To:Cc:Subject:Date:From; b=bwq4Y64zPdOjHm/R9mC65AZAPdHsywoEdYtTXXPDbKaNsc3tWyjkCJJ1mDlIFEu5d JJ77q/Az1cKz2DtoutzVaUCjitFcRhzrZniNoJ+dPhIbYeZDWG1IXRU5MUKfJ8lFnB fwdmbdnJ4I2o9HU1Dc6pzFxr7T0zE9Uvb+FVsFSKN7W8kv61wcRNkWgHiuDFyopmMj qAS91uPjZ5mN7NvrNZ9zbevnvtCqkG6tJyw08hCwl9uDtU951t6/FsriHYP9BE+J9I fPTBexLa+Czxp7hTBb3eG3ZBRnT1hMj36tNE7jo0r/RJirL0piUEX4XTkC0B/BT7qu SuN5O+TROTctA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7M03xHz9rxf; Mon, 10 May 2021 07:17:34 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 34/43] gnu: Add ocaml-time-now. Date: Mon, 10 May 2021 05:16:19 +0000 Message-Id: <20210510051628.15359-35-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-time-now): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 449ff00cf1..43c6c7ae0f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4168,6 +4168,31 @@ recommend using this package directly.") packages.") (license license:expat))) +(define-public ocaml-time-now + (package + (name "ocaml-time-now") + (version "0.14.0") + (source + (janestreet-origin + "time_now" version + "0hkn2jw4dz5gflnsblskl5wp6z7zbrahwjmaxmsskfviwjg82cqh")) + (build-system dune-build-system) + (arguments '(#:tests? #f)) ; no tests + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-jane-street-headers" ,ocaml-jane-street-headers) + ("ocaml-jst-config" ,ocaml-jst-config) + ("ocaml-ppx-base" ,ocaml-ppx-base) + ("ocaml-ppx-optcomp" ,ocaml-ppx-optcomp))) + (properties `((upstream-name . "time_now"))) + (home-page + "https://github.com/janestreet/time_now") + (synopsis "Reports the current time") + (description + "Provides a single function to report the current time in nanoseconds +since the start of the Unix epoch.") + (license license:expat))) + (define-public ocaml4.07-ppx-inline-test (package (name "ocaml4.07-ppx-inline-test") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:03 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:03 +0000 Received: from localhost ([127.0.0.1]:57045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIs-0000R4-OZ for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:03 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIS-0000Ka-Es for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:37 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id DB9082400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623850; bh=UKmIulycFBabQ6rW6xwAlVOgt7x3Ely9KPkMkHrKCqM=; h=From:To:Cc:Subject:Date:From; b=em3TxDqP7jCcBIPSUNhfrOUbGzmHsgXSqPFswOjbc2JSKw6QmNUl2UeksIG/z4axl rVN8IgJYUNFQuP/sFgUYgQNKTxJhwMUJhh5gdC2gLUOOBUmMYAOp9YWey2m7Gui6I2 oblWo1RJr4OstGvQ8FZIHzocYR46SLWs3jADcntqf+5XKb8nBIm0IaUXIJGjPN/zGF ryFlOwc5OxMDygDEBDEa2UOQBx0PNsPBzkR8p5nvlbOS4wyfIQPVzTbWyZ42wvsJ+Z sAlYhYl5CCY3zk/RvuKZHfAC4mytdq21iODi/5CChqR4UDZ/0XsehZHAWX5suZPzyQ 1S7Ab8GJzi/sA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7G1SRkz9rxg; Mon, 10 May 2021 07:17:30 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 25/43] gnu: Add ocaml-ppx-enumerate. Date: Mon, 10 May 2021 05:16:10 +0000 Message-Id: <20210510051628.15359-26-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-enumerate): New variable. (ocaml4.07-ppx-enumerate): Inherit from ocaml-ppx-enumerate. --- gnu/packages/ocaml.scm | 54 +++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 792cf38447..8bed1ae1a5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5307,31 +5307,23 @@ hash functions from type exrpessions and definitions.") "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) (properties `((upstream-name . "ppx_hash")))))) -(define-public ocaml4.07-ppx-enumerate +(define-public ocaml-ppx-enumerate (package - (name "ocaml4.07-ppx-enumerate") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_enumerate") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) + (name "ocaml-ppx-enumerate") + (version "0.14.0") + (source + (janestreet-origin + "ppx_enumerate" version + "1ij6sffgqhnjwnj9brhrrw1c6xgxlh0s6r17x1qkgnyrc73gfsz8")) (build-system dune-build-system) (arguments - `(#:tests? #f ; no test suite - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) ; no test suite (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_enumerate"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_enumerate") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-enumerate)))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") (description "Ppx_enumerate is a ppx rewriter which generates a definition @@ -5339,6 +5331,24 @@ for the list of all values of a type (for a type which only has finitely many values).") (license license:asl2.0))) +(define-public ocaml4.07-ppx-enumerate + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-enumerate) + (name "ocaml-ppx-enumerate") + (version "0.11.1") + (home-page "https://github.com/janestreet/ppx_enumerate") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) + (properties `((upstream-name . "ppx_enumerate")))))) + (define-public ocaml4.07-ppx-bench (package (name "ocaml4.07-ppx-bench") @@ -5833,7 +5843,7 @@ from type definitions.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) + ("ocaml-ppx-enumerate" ,(package-with-ocaml4.07 ocaml-ppx-enumerate)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:03 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:04 +0000 Received: from localhost ([127.0.0.1]:57048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIt-0000RI-9Z for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:03 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIS-0000Ko-Vt for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 61CDE2400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623851; bh=XGAYmwooBITMRLIhWuUSrJ8L7uJkoek5J5FdoHRY3PE=; h=From:To:Cc:Subject:Date:From; b=d5qJbdSWsDE2106Z32vl+iiExkYiBzgWmuOt/zN7i+e0EzupRc7jj6eLt9eIfIxZJ 3+QGWT37W8738vM/xxAzRQS/gCPLAbQxaZGWHdsVPncSqS1MQfdwDkJjq/OBxG735P NkWNTSfTk64jQVOUdsBKEVh3JSldXtFiRNTACHMsYTmYDY+uuMkMGZrgBR3l65NsM6 2c8XHemFyMjiVdIE9/jfeIs3vbagBr0xeQfc9GgFwThA7w5oKoRSPTIMDD8LKaiIdC nny5GUBtw02GM9sMKSoLHPZRZV/nY0n6eUqw5Dv5xtZ4GUiQkazJdqcsvMHv1LqlNb DW8UNqZIZkgNw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7G5mz7z9rxf; Mon, 10 May 2021 07:17:30 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 26/43] gnu: Add ocaml-ppx-js-style. Date: Mon, 10 May 2021 05:16:11 +0000 Message-Id: <20210510051628.15359-27-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-js-style): New variable. (ocaml4.07-ppx-js-style): Inherit from ocaml-ppx-js-style. --- gnu/packages/ocaml.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8bed1ae1a5..309e9c7601 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5758,32 +5758,22 @@ output-generating code, interleaved with @code{%expect} extension expressions to denote the expected output.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-js-style +(define-public ocaml-ppx-js-style (package - (name "ocaml4.07-ppx-js-style") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_js_style-v" version ".tar.gz")) - (sha256 - (base32 - "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2")))) + (name "ocaml-ppx-js-style") + (version "0.14.0") + (source + (janestreet-origin "ppx_js_style" version + "141fgxfipfn5jdaxc946dmp5y4fcnbhxms9maji9ddywgx82ya7l")) (build-system dune-build-system) - (arguments - ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + (arguments `(#:tests? #f)) ; No tests (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-octavius" ,(package-with-ocaml4.07 ocaml-octavius)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_js_style"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-octavius" ,ocaml-octavius) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_js_style") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-js-style)))) (home-page "https://github.com/janestreet/ppx_js_style") (synopsis "Code style checker for Jane Street Packages") (description "This package is a no-op ppx rewriter. It is used as a @@ -5791,6 +5781,16 @@ to denote the expected output.") packages.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-js-style + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-js-style) + (version "0.11.0") + (source + (janestreet-origin "ppx_js_style" version + "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2")) + (properties `((upstream-name . "ppx_js_style")))))) + (define-public ocaml4.07-ppx-typerep-conv (package (name "ocaml4.07-ppx-typerep-conv") @@ -5845,7 +5845,7 @@ from type definitions.") `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-enumerate" ,(package-with-ocaml4.07 ocaml-ppx-enumerate)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) - ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) + ("ocaml-ppx-js-style" ,(package-with-ocaml4.07 ocaml4.07-ppx-js-style)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:04 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:04 +0000 Received: from localhost ([127.0.0.1]:57051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIt-0000RW-Sl for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:04 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIT-0000KC-Er for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 0AD442400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623857; bh=t3Gpji5qIBzxidODrICjFhJoQckcv7gfWrcgz0vOSqE=; h=From:To:Cc:Subject:Date:From; b=N2L8dbmrp6baW0vr51X34bGQ8d4NzlaQcFqDSfjGyv24CfI2mxLvCv5QG5VUsbH4p CgD4KFPQ603CKwOa7kC3sMWdTOc27BfV1YG8fHBexHe7KA66x5p5Q5JJg3dNdZ/yl4 5wDLyHfWgkxvVHET9USLqVU8/du/8PEI5u9/VvZf5B6Wm5840ywinAordn6zRrvU2W BdWdTJP9OdH2bm+cq9Z2/bUXiToo960/NuPFG/YlD3QiAlxsT81pX587VjD0csBxhw kHKHI1g5/i9gj3xDoyT53/htRwsh/DdPLGOHvi6gbxVxcnTElblP12tmu/Yi4KfGC+ J/EheCe7ZjMuA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7N3Dljz9rxj; Mon, 10 May 2021 07:17:36 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 36/43] gnu: Add ocaml-angstrom. Date: Mon, 10 May 2021 05:16:21 +0000 Message-Id: <20210510051628.15359-37-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-angstrom): New variable. --- gnu/packages/ocaml.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e91c2e14b3..24bfb8cf37 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6833,3 +6833,40 @@ these missing pieces.") "This packages backports new features of the language to older compilers, such as let+.") (license license:expat))) + +(define-public ocaml-angstrom + (package + (name "ocaml-angstrom") + (version "0.15.0") + (home-page "https://github.com/inhabitedtype/angstrom") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh")))) + (build-system dune-build-system) + (arguments + ;; Only build the base angstrom package. + '(#:package "angstrom" + #:test-target ".")) + (propagated-inputs + `(("ocaml-bigstringaf" ,ocaml-bigstringaf))) + (native-inputs + `(("ocaml-alcotest" ,ocaml-alcotest) + ("ocaml-ppx-let" ,ocaml-ppx-let) + ("ocaml-syntax-shims" ,ocaml-syntax-shims))) + (synopsis "Parser combinators built for speed and memory-efficiency") + (description + "Angstrom is a parser-combinator library that makes it easy to write +efficient, expressive, and reusable parsers suitable for high-performance +applications. It exposes monadic and applicative interfaces for composition, +and supports incremental input through buffered and unbuffered interfaces. +Both interfaces give the user total control over the blocking behavior of +their application, with the unbuffered interface enabling zero-copy IO. +Parsers are backtracking by default and support unbounded lookahead.") + (license license:bsd-3))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:04 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:04 +0000 Received: from localhost ([127.0.0.1]:57053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIu-0000Rh-9h for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:04 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIT-0000KJ-V2 for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 879392400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623857; bh=EwGLhflg6J16ObjFFNNKipDgas4y08CQM88lW9CHJ0Y=; h=From:To:Cc:Subject:Date:From; b=hnVvhB4xtGjbxxzo1/N7PlNw5hVrHHawuoPnSxVDxjB1QNg07zGdhxS65jPQPGJCU xRw4kvnUTFmaHS6uQx5HXSdC7ilHJuYp/2z/xGvKp0vvh8G2qgzGWhKo3uVk0ykB9R NXLVleGednzatIW+k4DG/MCwzsUQ3EsNnn2OM0FAD1UTHYub+uy6R4pBeyplGeMp+h SBmuN4r75VYHqEfV6pVeYLeosbTWEk+YH1MPw+Wiygkvs6gYcHJIISShZn+BdiLHu4 DkIhirVCmzNUjgQWnNDWNeIKtgWwyV5yJnVkmvqhg+gWKJU1P61Q7+gJVwTG2O4zZM l/eJOikyGxoLA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7N6rY8z9rxf; Mon, 10 May 2021 07:17:36 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 37/43] gnu: Add ocaml-uri. Date: Mon, 10 May 2021 05:16:22 +0000 Message-Id: <20210510051628.15359-38-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-uri): New variable. --- gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 24bfb8cf37..c390a8bce9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3403,6 +3403,35 @@ the need to write signal code, which is useful for quick scripts that manipulate JSON.") (license license:isc))) +(define-public ocaml-uri + (package + (name "ocaml-uri") + (version "4.1.0") + (home-page "https://github.com/mirage/ocaml-uri") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (sha256 + (base32 + "10bf28my1yhj8a2d7bkgbna9j20wq0ghp92k926y29bmjj2qh0l7")))) + (build-system dune-build-system) + (arguments '(#:package "uri" + #:test-target ".")) + (propagated-inputs + `(("ocaml-stringext" ,ocaml-stringext) + ("ocaml-angstrom" ,ocaml-angstrom))) + (native-inputs + `(("ocaml-ounit" ,ocaml-ounit) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv))) + (properties `((upstream-name . "uri") + (ocaml4.07-variant ,(delay ocaml4.07-uri)))) + (synopsis "RFC3986 URI/URL parsing library") + (description "OCaml-uri is a library for parsing URI/URL in the RFC3986 format.") + (license license:isc))) + (define-public ocaml4.07-uri (package (name "ocaml4.07-uri") @@ -3435,6 +3464,7 @@ JSON.") `(("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stringext" ,(package-with-ocaml4.07 ocaml-stringext)))) + (properties `((upstream-name . "uri"))) (home-page "https://github.com/mirage/ocaml-uri") (synopsis "RFC3986 URI/URL parsing library") (description "OCaml-uri is a library for parsing URI/URL in the RFC3986 format.") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:05 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:05 +0000 Received: from localhost ([127.0.0.1]:57056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIu-0000Rt-OG for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:05 -0400 Received: from mout02.posteo.de ([185.67.36.66]:49499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIT-0000Jw-23 for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 959522400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623856; bh=cD61tqoTXmwAURcENBbp3k7uXZZGWJJ/I6ZJl1P+gtY=; h=From:To:Cc:Subject:Date:From; b=MRnCPmSSXyBI0yUG+H3SrW+2vpJi3modW/dPJBhwAF+kAsH3tG5HDE8hRzHaKHV1+ MWbUcuGYoqoS4kbjCyKg4+VwwvuY/gCGlYFOcX0mARRjHsTtnJ+Om/CMDDesAC9E/Z 7Rr4uf3lhAb4WqjD8z/eItBGjnaCgii/b0S0kEGx05guRL2xWtY6KJ1hYZ7aqYCV/x 0gBPxKIJHA1A62iWC0naqNzW75Xqn4fvtkqh8QGslbYMvmmYiOp3xY5dphRo3cVCzf f9GnigxBHhwTPXItx2gO8UebumPYaJys9zxWIAgO7CoTL2FK5ZTpsm2rfyiTLGUDMu PZxeeIzd3Kysg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7M3ptXz9rxh; Mon, 10 May 2021 07:17:35 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 35/43] gnu: Add ocaml-ppx-inline-test. Date: Mon, 10 May 2021 05:16:20 +0000 Message-Id: <20210510051628.15359-36-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-inline-test): New variable. (ocaml4.07-ppx-inline-test): Inherit from ocaml-ppx-inline-test. --- gnu/packages/ocaml.scm | 69 ++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 43c6c7ae0f..e91c2e14b3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4193,10 +4193,10 @@ packages.") since the start of the Unix epoch.") (license license:expat))) -(define-public ocaml4.07-ppx-inline-test +(define-public ocaml-ppx-inline-test (package - (name "ocaml4.07-ppx-inline-test") - (version "0.12.0") + (name "ocaml-ppx-inline-test") + (version "0.14.1") (home-page "https://github.com/janestreet/ppx_inline_test") (source (origin @@ -4207,29 +4207,52 @@ since the start of the Unix epoch.") (file-name (git-file-name name version)) (sha256 (base32 - "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50")))) + "1ajdna1m9l1l3nfigyy33zkfa3yarfr6s086jdw2pcfwlq1fhhl4")))) (build-system dune-build-system) (arguments - ;see home page README for further information - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_inline_test"))) + `(#:tests? #f)) ;see home page README for further information + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-compiler-libs" ,ocaml-compiler-libs) + ("ocaml-sexplib0" ,ocaml-sexplib0) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-time-now" ,ocaml-time-now))) + (properties `((upstream-name . "ppx_inline_test") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-inline-test)))) (synopsis "Syntax extension for writing in-line tests in ocaml code") (description "This package contains a syntax extension for writing in-line tests in ocaml code. It is part of Jane Street's PPX rewriters collection.") (license license:expat))) +(define-public ocaml4.07-ppx-inline-test + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-inline-test) + (name "ocaml-ppx-inline-test") + (version "0.12.0") + (home-page "https://github.com/janestreet/ppx_inline_test") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append home-page ".git")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50")))) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-compiler-libs" ,ocaml-compiler-libs) + ("ocaml-sexplib0" ,ocaml-sexplib0) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_inline_test")))))) + (define-public ocaml-bindlib (package (name "ocaml-bindlib") @@ -4246,7 +4269,7 @@ collection.") "1f8kr81w8vsi4gv61xn1qbc6zrzkjp8l9ix0942vjh4gjxc74v75")))) (build-system ocaml-build-system) (arguments - `(#:tests? #f ;no tests + `(#:tests? #f ;no tests #:use-make? #t #:phases (modify-phases %standard-phases @@ -5442,7 +5465,7 @@ many values).") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) + `(("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -5825,7 +5848,7 @@ useful errors on failure.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) + ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) @@ -6019,7 +6042,7 @@ functions from type definitions.") ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) + ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional)) @@ -6251,7 +6274,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) - ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) + ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:05 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:06 +0000 Received: from localhost ([127.0.0.1]:57059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIv-0000S7-9r for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:05 -0400 Received: from mout02.posteo.de ([185.67.36.66]:56161) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIT-0000L4-Lb for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:39 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 020772400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623852; bh=ZPLbEy8aFX4vM6iol8w4SRkCuqqXh8OjKXhVaxXLg0Q=; h=From:To:Cc:Subject:Date:From; b=obZa4eYl7W1E5K7st9U1JtOtyq1+DQVAcBxW5aE/E3QEfIQX2vDxT21Rm08ZHuIRJ /98fB8usWSPYoJ2oU0N21Vc38Cx8ksYONL+R41GqyRf02IkgPa3BaOcou8GFHR+pEQ s07Wen4X3RpRbvO5qpXb+u+tpb5uHowGQXffkuzDEYFimTh5AhJTwqu5VuyAS0gpOq FUV43xgJl9jKnWIUATocEk73CNbQZCInYNBjC1ptuZnlD7xhWZBL6McmG5/XZLcfDw 51cpGxESd6tAW76dPTZXKNA/1iZhccRHEJD0QEqTO26oD4NqyUxCkUE/vj778gLcYb JPTsBuq0x/HRw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7H2LBGz9rxf; Mon, 10 May 2021 07:17:31 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 27/43] gnu: Add ocaml-ppx-base. Date: Mon, 10 May 2021 05:16:12 +0000 Message-Id: <20210510051628.15359-28-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-base): New variable. (ocaml4.07-ppx-base): Inherit from ocaml-ppx-base. --- gnu/packages/ocaml.scm | 65 +++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 309e9c7601..458bc117cf 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5823,34 +5823,28 @@ packages.") from type definitions.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-base +(define-public ocaml-ppx-base (package - (name "ocaml4.07-ppx-base") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_base-v" version ".tar.gz")) - (sha256 - (base32 - "0aq206pg330jmj7lhcagiiwm3a0b3gsqm801m8ajd4ysyw7idkym")))) + (name "ocaml-ppx-base") + (version "0.14.0") + (source + (janestreet-origin + "ppx_base" version + "0b7a3fmi90jk8paz0g36yzaq670fbnrbi1j8r5ibh9wbcfli7ji6")) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:test-target ".")) (propagated-inputs - `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-enumerate" ,(package-with-ocaml4.07 ocaml-ppx-enumerate)) - ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) - ("ocaml-ppx-js-style" ,(package-with-ocaml4.07 ocaml4.07-ppx-js-style)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_base"))) + `(("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-cold" ,ocaml-ppx-cold) + ("ocaml-ppx-enumerate" ,ocaml-ppx-enumerate) + ("ocaml-ppx-hash" ,ocaml-ppx-hash) + ("ocaml-ppx-js-style" ,ocaml-ppx-js-style) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_base") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-base)))) (home-page "https://github.com/janestreet/ppx_base") (synopsis "Base set of ppx rewriters") (description "Ppx_base is the set of ppx rewriters used for Base. @@ -5859,6 +5853,25 @@ Note that Base doesn't need ppx to build, it is only used as a verification tool.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-base + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-base) + (version "0.11.0") + (source + (janestreet-origin + "ppx_base" version + "0aq206pg330jmj7lhcagiiwm3a0b3gsqm801m8ajd4ysyw7idkym")) + (propagated-inputs + `(("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-enumerate" ,ocaml-ppx-enumerate) + ("ocaml-ppx-hash" ,ocaml-ppx-hash) + ("ocaml-ppx-js-style" ,ocaml-ppx-js-style) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_base")))))) + (define-public ocaml4.07-ppx-bin-prot (package (name "ocaml4.07-ppx-bin-prot") @@ -5913,7 +5926,7 @@ functions from type definitions.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-base" ,ocaml4.07-ppx-base) + ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) @@ -6151,7 +6164,7 @@ standard library that was developed by Jane Street.") ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-base" ,ocaml4.07-ppx-base) + ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:06 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:06 +0000 Received: from localhost ([127.0.0.1]:57062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIv-0000SL-UN for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIU-0000Jx-Fw for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:39 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 1D0D62400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623858; bh=DgXZAK57XHQaVBUT/AhbCJh21ugtMmNS5Gel8ottpec=; h=From:To:Cc:Subject:Date:From; b=ogWJ55SNPI6Ex+0+KP9Tdo5IMZRPLLsKu3T9HWMHUE3yc/xL8B9W6ij1rB1RzZl+h 0SUHPcQvcDzPZUGgRySKwmR9DVqDuj3Egj2howWKzcFTE+ub3crpxPRdYeRa9HZlFZ 9NK+F/ARLD1LyqKbMCNjQVu63gYrw/Clp12mvYfYEq7h2TcY6Sv8zmXo5GCOfgyNLo ylXCAkubZ6EUWMkv0kZYXrfghjFoZuqVCmjkC08xoesHicsPdGoXNL+LJFbSuWAWWT +loQiOOcCZ3CDl0fi34aTRDKM6nEyEyrAo5XrdS/10oG78ijjMw+ZEzCuMOJo1ZnzM FyLryU6k101Vw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7P3Lrjz9rxf; Mon, 10 May 2021 07:17:37 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 38/43] gnu: Add ocaml-graphics. Date: Mon, 10 May 2021 05:16:23 +0000 Message-Id: <20210510051628.15359-39-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) From: divoplade * gnu/packages/ocaml.scm (ocaml-graphics): New variable. Co-Authored-By: pukkamustard --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c390a8bce9..4727b294d9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6900,3 +6900,29 @@ Both interfaces give the user total control over the blocking behavior of their application, with the unbuffered interface enabling zero-copy IO. Parsers are backtracking by default and support unbounded lookahead.") (license license:bsd-3))) + +(define-public ocaml-graphics + (package + (name "ocaml-graphics") + (version "5.1.1") + (home-page "https://github.com/ocaml/graphics") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14w07ydji2nbdk366nfp2pzs9484xp9vqv63n345id13v48z8bfi")))) + (build-system dune-build-system) + (propagated-inputs + `(("libx11" ,libx11))) + (synopsis "The OCaml graphics library") + (description + "The graphics library provides a set of portable drawing primitives. +Drawing takes place in a separate window that is created when +Graphics.open_graph is called. This library used to be distributed with OCaml +up to OCaml 4.08.") + (license license:lgpl2.1+))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:06 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:07 +0000 Received: from localhost ([127.0.0.1]:57064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIw-0000SV-B5 for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54847) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIU-0000LC-2a for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:39 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 7A4192400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623852; bh=oBc54MWhfNDQ8RCQyI4VJdotcVDDZKIHFFz6YqhZbCw=; h=From:To:Cc:Subject:Date:From; b=DxNtCGOvwPQoFkS/jGqdYrvyLMqp4ZM+DmwXxoxmVJoSW/E/nkDOcuRJHy3KkDb1x +xY5CqIuS2wq5Q3m6mVsiXrvBBjGK67tTWNgEjG93xLJIa3Zwohoit6B7Uev68FbW5 FhvPpF51H+upzVB+72sop9BR6hE7RMJa7gbAAoSJjDKlpv9dnmFuobPuXePTwtN5GQ wdThK3dNviUc/9NUFbmZd2BHOXucspCwSv+mkX03EyrdrlcSp3HmdekSw4LY7wz4r5 zROESR+kpajiTbl9QpAh71yyqdK+ymvJZixi1WWhpRELLmNryumWvR+Ia2kgcWWrls v0Dr+eGUdMlxQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7H60sdz9rxg; Mon, 10 May 2021 07:17:31 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 28/43] gnu: Add ocaml-fieldslib. Date: Mon, 10 May 2021 05:16:13 +0000 Message-Id: <20210510051628.15359-29-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-fieldslib): New variable. (ocaml4.07-fieldslib): Inherit from ocaml-fieldslib. --- gnu/packages/ocaml.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 458bc117cf..aa8437985e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4987,31 +4987,21 @@ by making sure that you only compare comparable values.") "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) (properties `((upstream-name . "ppx_compare")))))) -(define-public ocaml4.07-fieldslib +(define-public ocaml-fieldslib (package - (name "ocaml4.07-fieldslib") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) "/files/" - "fieldslib-v" version ".tar.gz")) - (sha256 - (base32 - "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")))) + (name "ocaml-fieldslib") + (version "0.14.0") + (source (janestreet-origin + "fieldslib" version + "10n5y376fb5jgqk9h8vq158rm1b36h9lzh6p11q33h6xgvb1v6n3")) (build-system dune-build-system) - (arguments - ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + (arguments `(#:tests? #f)) ; No tests (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "fieldslib"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "fieldslib") + (ocaml4.07-variant . ,(delay ocaml4.07-fieldslib)))) (home-page "https://github.com/janestreet/fieldslib") (synopsis "Syntax extension to record fields") (description "Syntax extension to define first class values representing @@ -5019,6 +5009,16 @@ record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) +(define-public ocaml4.07-fieldslib + (package-with-ocaml4.07 + (package + (inherit ocaml-fieldslib) + (version "0.11.0") + (source (janestreet-origin + "fieldslib" version + "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")) + (properties `((upstream-name . "fieldslib")))))) + (define-public ocaml4.07-variantslib (package (name "ocaml4.07-variantslib") @@ -5065,7 +5065,7 @@ standard library.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-fieldslib" ,ocaml4.07-fieldslib) + ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -6161,7 +6161,7 @@ standard library that was developed by Jane Street.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) ("ocaml-configurator" ,ocaml4.07-configurator) - ("ocaml-fieldslib" ,ocaml4.07-fieldslib) + ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:07 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:07 +0000 Received: from localhost ([127.0.0.1]:57067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIw-0000Sj-UE for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:07 -0400 Received: from mout02.posteo.de ([185.67.36.66]:48303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIU-0000LO-Kf for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:40 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 06B422400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623853; bh=KBprn7AwU7/ykRFvaa6Qx8LhfC0XpBWruHHfwoYUdh8=; h=From:To:Cc:Subject:Date:From; b=rLAEOHcIWS08KG6Sp/wIoozeoNKnKFc+HBUsvH/QmcU1OdZUxZfsgLXIlod9qJ36G FHNRrQdGSeIeo7E2WvoQ6zdYJ9ilwYYzWIrzhJo+K5+X4oL/4AbhXlI1fZWUro0m2x nFbYAFtJjNOBGyOm0V1WDcEfWgX31mLiqB49KrWjwL506hxWQy1ooIisiaQRlDU3Ha /2mvBAuqqcbNgDyWi9rp/ukTsOO5c9SZR4Gvr8K0/GdZSgQOtGL8/uAewqQWNDawgP 9DeeflalkmtLh/ColjtoxmXXZs49S1CJ1zLwEYCC/7pd5mSD+C0iSoSkb0pQeXrGD4 C3RDLLc9KPLAw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7J2TJrz9rxR; Mon, 10 May 2021 07:17:32 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 29/43] gnu: Add ocaml-ppx-fields-conv. Date: Mon, 10 May 2021 05:16:14 +0000 Message-Id: <20210510051628.15359-30-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-fields-conv): New variable. (ocaml4.07-ppx-fields-conv): Inherit from ocaml-ppx-fields-conv. --- gnu/packages/ocaml.scm | 58 ++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index aa8437985e..d3fe5b51e9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5050,31 +5050,29 @@ of a record and create new record values.") standard library.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-fields-conv +(define-public ocaml-ppx-fields-conv (package - (name "ocaml4.07-ppx-fields-conv") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_fields_conv-v" version ".tar.gz")) - (sha256 - (base32 - "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc")))) + (name "ocaml-ppx-fields-conv") + (version "0.14.2") + (home-page "https://github.com/janestreet/ppx_fields_conv") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zwirwqry24b48bg7d4yc845hvcirxyymzbw95aaxdcck84d30n8")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ppx_fields_conv"))) - (home-page "https://github.com/janestreet/ppx_fields_conv") + `(("ocaml-base" ,ocaml-base) + ("ocaml-fieldslib" ,ocaml-fieldslib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_fields_conv") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-fields-conv)))) (synopsis "Generation of accessor and iteration functions for ocaml records") (description "Ppx_fields_conv is a ppx rewriter that can be used to define first class values representing record fields, and additional routines, to get @@ -5082,6 +5080,16 @@ and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-fields-conv + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-fields-conv) + (version "0.11.0") + (source (janestreet-origin + "ppx_fields_conv" version + "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc")) + (properties `((upstream-name . "ppx_fields_conv")))))) + (define-public ocaml-ppx-sexp-conv (package (name "ocaml-ppx-sexp-conv") @@ -5216,7 +5224,7 @@ string conversion.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) + ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree" @@ -5738,7 +5746,7 @@ useful errors on failure.") ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) + ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) @@ -5932,7 +5940,7 @@ functions from type definitions.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-expect" ,ocaml4.07-ppx-expect) ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) - ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) + ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:08 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:08 +0000 Received: from localhost ([127.0.0.1]:57070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIx-0000Sy-Im for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:08 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIV-0000Ko-Ec for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:40 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 1A35B2400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623859; bh=OlFsz4kzYp5RTsHZCB1v1ugyJTa+l0QefKbyZb2TQtc=; h=From:To:Cc:Subject:Date:From; b=of2p41UfHDtftHMPR94eRvSe0xpZsBMe5reR0Wy7wzqlvt8NYnyfEgX/FGmj6mo1C soObSImZcarcy9QIndNKac/JD4PdmpRdpgGcK4zcCizfOTqBvTkrdpAAaMtwqQ7LGd UjS+8S737WlpeTdIudLqZFsCF8eRxS/pVA0bUlMo8sLQsMm5mzx+hDSx7IrX24TwZo oXP/XrEXRIuXVotzvAgajEOrwu5zORagKmZ/VdiC21C4QrSpfqWNo8Fv+j9cT7qRJB frtD7Z2KHUOOI8EDHwSQ3oCSZfCguWnWR50kYSbj7lkGBR6t00+eVcjfIdXLaqpdSi +TB8tKxmlAZhQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7Q3Znxz9rxR; Mon, 10 May 2021 07:17:38 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 40/43] gnu: Add ocaml-ppx-variants-conv. Date: Mon, 10 May 2021 05:16:25 +0000 Message-Id: <20210510051628.15359-41-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-ppx-variants-conv): New variable. (ocaml4.07-ppx-variants-conv): Inherit from ocaml-ppx-variants-conv. --- gnu/packages/ocaml.scm | 65 ++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e40bc78db2..019bfea9f9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5260,32 +5260,29 @@ definitions.") "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) (properties `((upstream-name . "ppx_sexp_conv")))))) -(define-public ocaml4.07-ppx-variants-conv +(define-public ocaml-ppx-variants-conv (package - (name "ocaml4.07-ppx-variants-conv") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_variants_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) + (name "ocaml-ppx-variants-conv") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_variants_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q6a43zrwqzdz7aja0k44a2llyjjj5xzi2kigwhsnww3g0r5ig84")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(("ocaml-base" ,ocaml-base) + ("ocaml-variantslib" ,ocaml-variantslib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties - `((upstream-name . "ppx_variants_conv"))) + `((upstream-name . "ppx_variants_conv") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-variants-conv)))) (home-page "https://github.com/janestreet/ppx_variants_conv") (synopsis "Generation of accessor and iteration functions for OCaml variant types") @@ -5294,6 +5291,24 @@ definitions.") variant types.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-variants-conv + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-variants-conv) + (name "ocaml-ppx-variants-conv") + (version "0.11.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_variants_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) + (properties `((upstream-name . "ppx_variants_conv")))))) + (define-public ocaml-ppx-custom-printf (package (name "ocaml-ppx-custom-printf") @@ -5352,7 +5367,7 @@ string conversion.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (arguments @@ -5888,7 +5903,7 @@ useful errors on failure.") ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -6088,7 +6103,7 @@ functions from type definitions.") ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value) ("ocaml-ppx-typerep-conv" ,ocaml4.07-ppx-typerep-conv) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:08 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:09 +0000 Received: from localhost ([127.0.0.1]:57073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIy-0000TC-7l for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:08 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIV-0000KC-Vp for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:40 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 91ADA2400FC for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623859; bh=dcVDpSu+5fOPgepAGKwa8yI7D9MNmRDyVNCoWFnekHU=; h=From:To:Cc:Subject:Date:From; b=VNiVRbdXQZEikBm5RXrSgQ6/fu8yPspCNb7aCZYLAwUfX58DXWYIJU/4F2AtzmKuA Aj/8KzPP1HRkaql0gUn+ifg38zN4VaYXjku49kvV08GdWDSvluDI8BUk6jBm/Y9FeX fKwrTRoY3Qtdd98hZLy82JOUGdFl/AfGxcYGvFkwuG6zV0xoh4GPwHNi58iBD/MObb JrmHJSbLCXEDuqpeqiKL0ObHcK2d+B840BlWsB41kicfwAq1FSDI7Q7ZBxv/J5zi40 /sexS+zBKlkUTesjwDCadq2Y1mJVciKuUn9aXGyIfkm3riUErRXH4LZ6cjmeBm+1Zw AemyZvnTmoCKA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7R04QDz9rxR; Mon, 10 May 2021 07:17:38 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 41/43] gnu: Add ocaml-ppx-expect. Date: Mon, 10 May 2021 05:16:26 +0000 Message-Id: <20210510051628.15359-42-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/ocaml.scm (ocaml-ppx-expect): New variable. (ocaml4.07-ppx-expect): Inherit from ocaml-ppx-expect. --- gnu/packages/ocaml.scm | 83 +++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 019bfea9f9..c4a024c850 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3791,7 +3791,7 @@ library is currently designed for Unicode Standard 3.2.") `(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)))) (native-inputs - `(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect))) + `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) (properties `((upstream-name . "charInfo_width"))) (home-page "https://bitbucket.org/zandoye/charinfo_width/") @@ -5876,40 +5876,31 @@ useful errors on failure.") ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties `((upstream-name . "ppx_assert")))))) -(define-public ocaml4.07-ppx-expect +(define-public ocaml-ppx-expect (package - (name "ocaml4.07-ppx-expect") - (version "0.12.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_expect") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1wawsbjfkri4sw52n8xqrzihxc3xfpdicv3ahz83a1rsn4lb8j5q")))) + (name "ocaml-ppx-expect") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_expect") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vbbnjrzpyk5p0js21lafr6fcp2wqka89p1876rdf472cmg0l7fv")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) - ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)) - ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)))) - (properties `((upstream-name . "ppx_expect"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-re" ,ocaml-re))) + (properties `((upstream-name . "ppx_expect") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect)))) (home-page "https://github.com/janestreet/ppx_expect") (synopsis "Cram like framework for OCaml") (description "Expect-test is a framework for writing tests in OCaml, similar @@ -5919,6 +5910,30 @@ output-generating code, interleaved with @code{%expect} extension expressions to denote the expected output.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-expect + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-expect) + (version "0.12.0") + (source + (janestreet-origin "ppx_expect" version + "1zpci8c49yn2ixchmwjx1kf9pwybv3dnn4l2dgnd6m36qnkralfk")) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-assert" ,ocaml-ppx-assert) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-custom-printf" ,ocaml-ppx-custom-printf) + ("ocaml-ppx-fields-conv" ,ocaml-ppx-fields-conv) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-ppx-variants-conv" ,ocaml-ppx-variants-conv) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-re" ,ocaml-re))) + (properties `((upstream-name . "ppx_expect")))))) + (define-public ocaml-ppx-js-style (package (name "ocaml-ppx-js-style") @@ -6091,7 +6106,7 @@ functions from type definitions.") ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-expect" ,ocaml4.07-ppx-expect) + ("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)) ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) @@ -6236,7 +6251,7 @@ Configurator allows one to: #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (native-inputs - `(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect))) + `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) (home-page "https://github.com/janestreet/spawn") (synopsis "Spawning sub-processes") (description -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:09 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:09 +0000 Received: from localhost ([127.0.0.1]:57076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIy-0000TQ-QP for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:09 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIa-0000Mz-1i for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:44 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 80CE0240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623858; bh=0HG02pElc2iOQRXMuhtmtNTP6uMdzRyR3k6thJSGBAI=; h=From:To:Cc:Subject:Date:From; b=XBUW00eJ4YhgjBSW9QhWRTXCsw5MQvHbi6oBrchZgROjYyxiMOavqnrM6v/PbHaO/ 7zDourOqjoe7fRsPodfS84XtyJjuCYhzhsVe/Fu7wQRLtWl3pOYjjA2Zbwk4p0Wxod 2SEQPBFPwd6gc8ntlPqd2WFG71S5n8yY1i8dobnHAntJEc3BjleWwJdQBgAmfLRgA/ yMfheIJtq3D8tcKVLoqr6aRV7bzo/D+gpIR49RA08+GrWcG0WDjPItMDeUolRAUTPK QTubjL7eHj+zWDMLL+r/AaW1kQjfQ31TGqKqvPToSU3fhBQe5VTsoROE7LLrSIJNgl oWA0F1VDVGX6w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7P6z70z9rxY; Mon, 10 May 2021 07:17:37 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 39/43] gnu: Add ocaml-variantslib. Date: Mon, 10 May 2021 05:16:24 +0000 Message-Id: <20210510051628.15359-40-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-variantslib): New variable. (ocaml4.07-variantslib): Inherit from ocaml-variantslib. --- gnu/packages/ocaml.scm | 52 ++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4727b294d9..e40bc78db2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5137,37 +5137,45 @@ of a record and create new record values.") "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")) (properties `((upstream-name . "fieldslib")))))) -(define-public ocaml4.07-variantslib +(define-public ocaml-variantslib (package - (name "ocaml4.07-variantslib") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/variantslib-v" version ".tar.gz")) - (sha256 - (base32 - "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3")))) + (name "ocaml-variantslib") + (version "0.14.0") + (source + (janestreet-origin "variantslib" version + "11zp27gh282dx9ifbhcp6i7fkc97fvk8amaj58mf1g1hwklc0lm3")) (build-system dune-build-system) (arguments ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "variantslib"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "variantslib") + (ocaml4.07-variant . ,(delay ocaml4.07-variantslib)))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values") (description "The Core suite of libraries is an alternative to OCaml's standard library.") (license license:asl2.0))) +(define-public ocaml4.07-variantslib + (package-with-ocaml4.07 + (package + (inherit ocaml-variantslib) + (name "ocaml-variantslib") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/variantslib-v" version ".tar.gz")) + (sha256 + (base32 + "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3")))) + (properties `((upstream-name . "variantslib")))))) + (define-public ocaml-ppx-fields-conv (package (name "ocaml-ppx-fields-conv") @@ -5268,7 +5276,7 @@ definitions.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-variantslib" ,ocaml4.07-variantslib) + ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -6312,7 +6320,7 @@ standard library that was developed by Jane Street.") ("ocaml-splittable-random" ,ocaml4.07-splittable-random) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-typerep" ,ocaml4.07-typerep) - ("ocaml-variantslib" ,ocaml4.07-variantslib) + ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (properties `((upstream-name . "core_kernel"))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:10 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:10 +0000 Received: from localhost ([127.0.0.1]:57079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIz-0000Te-DD for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:10 -0400 Received: from mout01.posteo.de ([185.67.36.65]:60707) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIb-0000NR-Jo for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:46 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 1A121240029 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623860; bh=NxiqEBHAEmKchywe5Dy3qFG0khy+hScQAmsMlgLqAm8=; h=From:To:Cc:Subject:Date:From; b=AjoU19W1A9jAbiHNo+eOnoHd8ESHlFx01uLYuud38PhJOzY6mxjWY23RGbtQ+F1Zs f4Nc/UGjq7e9MesRS5iK1KGVocFJ/WO5kFIx9/ieig+NV7lrPh/z3u11iqdgBeoxt7 8R95pinWCG8m76GN1yo4OfT5Ms3AjyMUI9nbWd/QpcBw39Dbvvmebeb7hvJitlObP7 rPr1vYzebyRQOk4yBYXIvCQWbgEMt/2vvN4Pe1rLpleeLdiYlDxrol4nZ7EdgQ10X1 b5gH/cVaRq27xUgCuUaJZGw7Y+Dfcb+yYv2w4rvW0TofUyq2OTVr3Z8f8TRbCyjR8t /GrDHyD0UCyAA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7R3g1cz9rxR; Mon, 10 May 2021 07:17:39 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 42/43] gnu: ocaml-num: Update to 1.4. Date: Mon, 10 May 2021 05:16:27 +0000 Message-Id: <20210510051628.15359-43-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-num): Update to 1.4. --- gnu/packages/ocaml.scm | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c4a024c850..349124c99e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -958,7 +958,7 @@ written in Objective Caml.") (define-public ocaml-num (package (name "ocaml-num") - (version "1.1") + (version "1.4") (source (origin (method git-fetch) @@ -967,33 +967,8 @@ written in Objective Caml.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0")))) - (build-system ocaml-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'fix-makefile - (lambda* (#:key outputs #:allow-other-keys) - ;; This package supposes we install to the same directory as - ;; the ocaml package. - (substitute* "src/META" - (("\"\\^\"") (string-append "\"" (assoc-ref outputs "out") - "/lib/ocaml/site-lib\""))) - (substitute* "src/Makefile" - (("\\) \\$\\(STDLIBDIR\\)") - (string-append ") " (assoc-ref outputs "out") - "/lib/ocaml/site-lib"))) - #t)) - (add-after 'install 'fix-stubslib - (lambda* (#:key outputs #:allow-other-keys) - (format #t "~a~%" (find-files "." ".*.so")) - (let ((stubdir (string-append (assoc-ref outputs "out") - "/lib/ocaml/site-lib/stublibs"))) - (delete-file stubdir) - (mkdir-p stubdir) - (install-file "src/dllnums.so" stubdir)) - #t))))) + (base32 "1vzdnvpj5dbj3ifx03v25pj2jj1ccav072v4d29pk1czdba2lzfc")))) + (build-system dune-build-system) (home-page "https://github.com/ocaml/num") (synopsis "Arbitrary-precision integer and rational arithmetic") (description "OCaml-Num contains the legacy Num library for -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:18:11 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:11 +0000 Received: from localhost ([127.0.0.1]:57083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyJ0-0000U3-Hr for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:11 -0400 Received: from mout02.posteo.de ([185.67.36.66]:33237) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIc-0000Nc-8O for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:47 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A61732400E5 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623860; bh=4urm4Xjk7WnBDglcwVifBe63hEtPyAcJTr0MLHXOcSo=; h=From:To:Cc:Subject:Date:From; b=Ph2oK3Ek/aG7uI6Jm7G+Q0k0fqbT8oz0sFBSMd6HfZGijh/D576BJRkUAjgDMuvNf yfRqVyw6XaQ/BEOAx1ud0n3QIBtPkvEwKkX21RIK5F+2hL26i3JmspEj8gZF7MRycB 1BKesSJ4eheshRXHn7dZijBGWgbmbwV7yQK60X+aeAW0Y1hDAfl0nk5CRDLGeKj6yS 94wPjWSY0l52uCkY/ya6s4DNmSgR3soY9/4+K7y7nE3hSgwCseWB+wBGsSNPgMuk2t jMrs9ymKERK5nDYhquhGkZlL2TTLeDV6utl743oiS5SQk7diix2LR7owzPnLyN7Ezd nckxWq/m6hbVQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7S0BsHz9rxR; Mon, 10 May 2021 07:17:40 +0200 (CEST) From: pukkamustard To: 47768@debbugs.gnu.org Subject: [PATCH v2 43/43] gnu: Add ocaml-js-of-ocaml. Date: Mon, 10 May 2021 05:16:28 +0000 Message-Id: <20210510051628.15359-44-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) From: divoplade * gnu/packages/ocaml.scm (ocaml-js-of-ocaml): New variable. Co-Authored-By: pukkamustard --- gnu/packages/ocaml.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 349124c99e..24d9e814fa 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) + #:use-module (gnu packages node) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -6939,3 +6940,43 @@ Drawing takes place in a separate window that is created when Graphics.open_graph is called. This library used to be distributed with OCaml up to OCaml 4.08.") (license license:lgpl2.1+))) + +(define-public ocaml-js-of-ocaml + (package + (name "ocaml-js-of-ocaml") + (version "3.9.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocsigen/js_of_ocaml") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00hdjaj94j3nc6f6wbbpx59h4yc79siphs34i1hry11r56paaqyk")))) + (build-system dune-build-system) + (arguments `(#:test-target ".")) + (propagated-inputs + `(("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-uchar" ,ocaml-uchar) + ("ocaml-menhir" ,ocaml-menhir) + ("ocaml-reactivedata" ,ocaml-reactivedata) + ("ocaml-cmdliner" ,ocaml-cmdliner) + ("ocaml-lwt" ,ocaml-lwt) + ("ocaml-tyxml" ,ocaml-tyxml) + ("ocaml-re" ,ocaml-re) + ("ocaml-uutf" ,ocaml-uutf) + ("ocaml-graphics" ,ocaml-graphics) + ("ocaml-yojson" ,ocaml-yojson))) + (native-inputs + ;; for tests + `(("node" ,node) + ("ocaml-ppx-expect" ,ocaml-ppx-expect) + ("ocaml-num" ,ocaml-num))) + (properties `((upstream-name . "js_of_ocaml"))) + (home-page "https://ocsigen.org/js_of_ocaml/") + (synopsis "Compiler from OCaml bytecode to Javascript") + (description "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. +It makes it possible to run pure OCaml programs in JavaScript environment like +browsers and Node.js.") + (license license:lgpl2.1+))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 10 01:34:14 2021 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:34:15 +0000 Received: from localhost ([127.0.0.1]:57130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyYY-000107-Fk for submit@debbugs.gnu.org; Mon, 10 May 2021 01:34:14 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53373) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyYS-0000zc-61 for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:34:10 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 13C66240026 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:34:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620624842; bh=w9qP788Lz7VMVw3lvyaFdgLKTSwGqcaqMT1vBIk7o+w=; h=From:To:Cc:Subject:Date:From; b=NIDRbRJkidD/InquAGy3sBD2Nv/Jz3+pOzC9bHsanl1UwkO4tqkjnAJVO+6hun2yA ekH1wxiCgKVRjZrhe0p/OLkuphPVNUSU0iaHY8lsd9FXaiiNgY8vsJmcUoHQRnk+t+ +ehoSHRlvMlDQHQY2PYoNyaSUX8JjcXVWQazEjJI1xTiQWAV1Gq/kiBwGXLNbDatJM LOlcbpK/NUMIEi6Eu3MTBvnKc7SIT/LTJWrgj1apu+jSxNry5KXN7QeRTTYnLhGLPn caxd28RyYvAyWGwR+O0j0SMMb7DtOeH3u0PAK2fIH3hC4gz/7UIfpPx59wavoTHUcz AVMbwC0uPsOrQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FdqVK1lcQz6tm5; Mon, 10 May 2021 07:34:00 +0200 (CEST) References: <559a908f91e39af40a1580447a708209785c69b8.camel@divoplade.fr> <86im3z9gdd.fsf@posteo.net> From: pukkamustard To: divoplade Subject: Re: [bug#45558] [PATCH] Add js_of_ocaml Date: Mon, 10 May 2021 05:18:53 +0000 In-reply-to: Message-ID: <86fsyvb1a4.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: 45558-done@debbugs.gnu.org, 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi divoplade, divoplade writes: [...] > So, now, I should your modified 5 patches in this issue on top > of the > 37 patches in the other issue to get js-of-ocaml. Is it correct? > > At this rate, if it is possible, maybe you could just append > these 5 to > the other issue, it would be easier to track. > > What do you think? Yeah, that makes sense. I just submitted a V2 of #47768 (https://issues.guix.gnu.org/47768) that includes your patches for js_of_ocaml, merging the issues. Closing this issue in favor of #47769. -pukkamustard From debbugs-submit-bounces@debbugs.gnu.org Tue May 18 16:38:45 2021 Received: (at 47768) by debbugs.gnu.org; 18 May 2021 20:38:45 +0000 Received: from localhost ([127.0.0.1]:57435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lj6UH-0000eZ-30 for submit@debbugs.gnu.org; Tue, 18 May 2021 16:38:45 -0400 Received: from mout01.posteo.de ([185.67.36.65]:54807) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lj6UD-0000eJ-81 for 47768@debbugs.gnu.org; Tue, 18 May 2021 16:38:43 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 38A2C240026 for <47768@debbugs.gnu.org>; Tue, 18 May 2021 22:38:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1621370314; bh=wlUa+eut8UEXjIkzbw+0646qcZexmN197WVxuUyljZY=; h=From:To:Cc:Subject:Date:From; b=WwXhp1gH+01FO1hkK5iLHrO0/g+xoAPqVyW048g5ScHor4D0x/gfE6YKx2nKqsXRG morEeNZi8CtltN4k9hvuCABFWO4oX6EUOOAYVsIeTffEIEflzWzitnbk3p2w7zhG2z rwZsCPbP6CHv6jaO6PYO3+kXcRJm+WJo2pNdy06uoxALZYTLkuJq7BPfqPWgHgBZ6t +3WdO1Ghewoirup5sLgn7ceJKxIGOKiKNShYY4duO6FxgTgBliiossJTSCURVGweY9 YpbVCN1V+acbEH8kQgchRgoIt+6obffEQ1YW06Y+CMdUsLiapp9aHZBNMMn0Ln+wk3 D6SdB+jSLEOIg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fl7BK0cPMz6tm9; Tue, 18 May 2021 22:38:32 +0200 (CEST) References: From: pukkamustard To: Erik Subject: Re: ocaml - how can we get more recent version of core-kernel and common ppx'es Date: Tue, 18 May 2021 20:29:04 +0000 In-reply-to: Message-ID: <86h7iz7p6f.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: guix-devel@gnu.org, 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Erik, There has been some work towards updating the OCaml packages in Guix (see https://issues.guix.gnu.org/47768). A lot of packages have been updated so that there is a now an updated ocaml-X package for a previously existing ocaml4.07-X package. This includes a lot of ppx'es. However not everything has been updated yet and there are still a few packages missing to be able to update ocaml-core-kernel. But maybe you could use the #47768 as a basis and update some packages towards ocaml-core-kernel? Help is also required in reviewing the patches. The series has become quite large and hard to review (42 patches). If you could try them out that would be great. -pukkamustard Erik writes: > Hi, I have a project that requires a more recent core-kernel and > some of the > ppx'es (such as ppx_fields_conv). > > Being very new to guix I've managed to add/update packages for > python and ruby > stuff, but this ocaml.scm file is quite different. There's a lot > going on which > I'm guessing is related to complexities arising from the whole > ppx transition > that happened in the ocaml ecosystem a few years ago, or perhaps > just to the > somewhat unsynchronized way libraries move to new versions of > the compiler and > libs (just speculating here). > > Anyway afaict (with my limited guix-fu) I would either need to > duplicate a whole > lot of packages or somehow reorganize things to share > definitions where it makes > sense. Both those options would require some coordination with > the people who > made the ocaml.scm infrastructure first, because clearly there > are projects out > there that need the current set of packages to work like they do > now and I don't > want to just post a huge patch that surprises these people. > > Can we get a thread going somewhere on adding a recent version > of > ocaml-core-kernel (for the 4.11.1 ocaml package, possibly > bumping that > to 4.11.2 in the process)? > > Best regards, > Erik Lovlie From debbugs-submit-bounces@debbugs.gnu.org Tue May 18 16:58:49 2021 Received: (at 47768) by debbugs.gnu.org; 18 May 2021 20:58:49 +0000 Received: from localhost ([127.0.0.1]:57455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lj6ng-0003Hz-NU for submit@debbugs.gnu.org; Tue, 18 May 2021 16:58:49 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lj6ne-0003Hm-OQ for 47768@debbugs.gnu.org; Tue, 18 May 2021 16:58:48 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 5A777240027 for <47768@debbugs.gnu.org>; Tue, 18 May 2021 22:58:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1621371520; bh=oZNCX0daVcUejjX0nOAM5pnAXMf4eEkRvCbukbqx1yA=; h=From:Subject:Date:Cc:To:From; b=bW97tIC1/q3ChLu8SgKP2n4bCQBBTY3ltWdEWdGNRSLpidG26rRGrxjTdJxFKHyj7 wwc9xmbHjKd1+iw91D7guGNtNq/gN18wwgYHx9N3b3PmZVLLSQzGD1hq/Bv/wpiet+ HdOoizyzqQ8FYpen3iyDBEUIS03oS50tb+Wrl0D9vEsKX1l/W3iODZlJE/SCDX7YLa LbP8gB8WHas7dePKTfm+pFXqKjm+SI0j6Qv2hJqNq/T1aLfbuasdexSQ64GzEeqrvj D45zIb+mDw1TxKunkFz02jbFBZJ6hy8H9ZdHkLifQg3HJ6TbwuelK7LLeD4xNSBdMP vciBeleBUL8eg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fl7dV3z5Sz9rxM; Tue, 18 May 2021 22:58:38 +0200 (CEST) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: "erikl@posteo.net" Mime-Version: 1.0 (1.0) Subject: Re: ocaml - how can we get more recent version of core-kernel and common ppx'es Date: Tue, 18 May 2021 20:58:37 +0000 Message-Id: References: <86h7iz7p6f.fsf@posteo.net> In-Reply-To: <86h7iz7p6f.fsf@posteo.net> To: pukkamustard X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47768 Cc: guix-devel@gnu.org, 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Great, this is exactly what I was hoping to find! I had of course forgotten t= o search the debbugs and in the devel mailing list there were only really ol= d threads about the 4.07 stuff.=20 Thanks for your work here, I will test your patches and let you know :) Sent from my iPhone > On 18 May 2021, at 22:38, pukkamustard wrote: >=20 > =EF=BB=BFHi Erik, >=20 > There has been some work towards updating the OCaml packages in Guix (see h= ttps://issues.guix.gnu.org/47768). >=20 > A lot of packages have been updated so that there is a now an updated ocam= l-X package for a previously existing ocaml4.07-X package. This includes a l= ot of ppx'es. However not everything has been updated yet and there are stil= l a few packages missing to be able to update ocaml-core-kernel. But maybe y= ou could use the #47768 as a basis and update some packages towards ocaml-co= re-kernel? >=20 > Help is also required in reviewing the patches. The series has become quit= e large and hard to review (42 patches). If you could try them out that woul= d be great. >=20 > -pukkamustard >=20 >=20 > Erik writes: >=20 >> Hi, I have a project that requires a more recent core-kernel and some of t= he >> ppx'es (such as ppx_fields_conv). >>=20 >> Being very new to guix I've managed to add/update packages for python and= ruby >> stuff, but this ocaml.scm file is quite different. There's a lot going on= which >> I'm guessing is related to complexities arising from the whole ppx transi= tion >> that happened in the ocaml ecosystem a few years ago, or perhaps just to t= he >> somewhat unsynchronized way libraries move to new versions of the compile= r and >> libs (just speculating here). >>=20 >> Anyway afaict (with my limited guix-fu) I would either need to duplicate a= whole >> lot of packages or somehow reorganize things to share definitions where i= t makes >> sense. Both those options would require some coordination with the people= who >> made the ocaml.scm infrastructure first, because clearly there are projec= ts out >> there that need the current set of packages to work like they do now and I= don't >> want to just post a huge patch that surprises these people. >>=20 >> Can we get a thread going somewhere on adding a recent version of >> ocaml-core-kernel (for the 4.11.1 ocaml package, possibly bumping that to= 4.11.2 in the process)? >>=20 >> Best regards, >> Erik Lovlie >=20 From debbugs-submit-bounces@debbugs.gnu.org Tue May 25 15:18:19 2021 Received: (at 47768) by debbugs.gnu.org; 25 May 2021 19:18:20 +0000 Received: from localhost ([127.0.0.1]:46844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llcZH-0003RO-P7 for submit@debbugs.gnu.org; Tue, 25 May 2021 15:18:19 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:59084 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llcZG-0003R6-HT for 47768@debbugs.gnu.org; Tue, 25 May 2021 15:18:19 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1621970290; bh=tHPcL9QWASFXMTlBjMsng5SIiieLpubrEtVbqofO200=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=tCemHEUme6cKGGGfG2Sd2ZzKlC89k6fgckQSZ+vXB+ugR7Y+dz8MO4dD262fxyBEL Zdfdi2I90BLi6EsrWkGoZ09VBVkpZG0nTygoJutfy1809jRqBIx++ErSnodsi9aNsy OY5Rv+iTsYR3+IYOyw3GoWBgqQJs+IZt2jXvzElU= To: pukkamustard , 47768@debbugs.gnu.org Subject: Re: [bug#47768] [PATCH v2 11/43] gnu: ocaml-migrate-parsetree: Update to 2.1.0. In-Reply-To: <20210510051628.15359-12-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> <20210510051628.15359-12-pukkamustard@posteo.net> Date: Tue, 25 May 2021 21:18:03 +0200 Message-ID: <87wnrmhbbo.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Mon, May 10 2021, pukkamustard wrote: > * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 2.1.0. > (ocaml-migrate-parsetree-1): New variable. What’s the reason for keeping the old version of ‘ocaml-migrate-parsetree’? Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , Maxime Devos , divoplade X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Mon, May 10 2021, pukkamustard wrote: > * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 2.1.0. > (ocaml-migrate-parsetree-1): New variable. What’s the reason for keeping the old version of ‘ocaml-migrate-parsetree’? Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Mon, May 10 2021, pukkamustard wrote: > * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 2.1.0. > (ocaml-migrate-parsetree-1): New variable. What=E2=80=99s the reason for keeping the old version of =E2=80=98ocaml-migrate-parsetree=E2=80=99? Also, this commit could probably be squashed with 10/43. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmCtTWsVHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x5ZwEP/jJnGwQKA3jI35ytqX+kR9soqME8 evLI0dkwkTCdKQ5SOc9NFVsBY515rBn15WyPbBfXGs4yCH1tVcR5hEzUQUDusqzm 6y/1RdKu7jZvFeKxQc8i41vZQqBZ5nt1/VmtqjbEvqvk5eHCP86dOuQ+WmFa6ToE c2OB0Ss91iu4trDx//441Mj7QngQsiRlsF7ivZlZOTyMGebMFzV2DkoCydqLQpXH TwqUuLzS4VI6uU+vDL5rulVbit8wa+59qZsgwLWKNcPF/PNsSl+invLN8UsH/ri5 QtrZQ5+4XJRnpuIhwRwivrf5j/ZhA19Mad1blqmFigd/d0Hfr4XIwdJMbwomIkmx C5BbiJ08nS8Y8KXLPgaMaWIx3B3NM5vrwSmMl0nXSLrXIMfD7W2o78wdnCwYw+GI ApxoYYhrlmqyh7w2QJD2jkicCcEO6Dlb58hLTj0b8f/bdIrCN8kVqNqcH+XmnhLK 9R3080cAQJkL6j6XNzracZEjogd6gv0xEe0UpSDaojFGF/q4v3LuejU+KM3STKd/ DsLtCnltd2HRNBwhXMmtGn82hy8lGYpS6AmDNfweNKx2xYz1cG5X6jNq/mLe4xjW KZq0tm5Nqa+W2mtPRU0liM6YTQNQq+ykvI9ilq1MMT2S4ewciusmmU6Boa32reo4 BOs0yBJ6DN6oinWx =6VVi -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue May 25 15:21:53 2021 Received: (at 47768) by debbugs.gnu.org; 25 May 2021 19:21:53 +0000 Received: from localhost ([127.0.0.1]:46854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llccj-0003XP-Gj for submit@debbugs.gnu.org; Tue, 25 May 2021 15:21:53 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:59168 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llcch-0003X9-Gz for 47768@debbugs.gnu.org; Tue, 25 May 2021 15:21:52 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1621970505; bh=6/VNm7ehsxkOp5fLL5m1KUxJCtvY+PZg3zhoA4VRyb4=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=VvfcwTiCe+mfogmS750pkucPaeiN5lM3YoC9a7/Cx1sEZrijAX7AwfCrf4fGmTd1c u9jQMvbpbCS+qxr5YnWR/mxyOZJOZkhNzbLOz79MMJoXHrwQYdz2KiiziHdUM/uHhP 5j7ixpdNodHSM0mPbX2DLdH88LP0G6Cd2mw4b8LI= To: pukkamustard , 47768@debbugs.gnu.org Subject: Re: [bug#47768] [PATCH v2 14/43] gnu: Add ocaml-uunf. In-Reply-To: <20210510051628.15359-15-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> <20210510051628.15359-15-pukkamustard@posteo.net> Date: Tue, 25 May 2021 21:21:44 +0200 Message-ID: <87pmxehb5j.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Mon, May 10 2021, pukkamustard wrote: > +(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. [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , Maxime Devos , divoplade X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Mon, May 10 2021, pukkamustard wrote: > +(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. [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Mon, May 10 2021, pukkamustard wrote: > +(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 What=E2=80=99s the reason for disabling test? Does the package lack tests? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmCtTkkVHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x50tgP/2mYFEPn2tZo39RmhaCSSJEJmyRb iiAegOn9ynJ/J3frtZuuAaeV2t7l0gu+l3VZxdiwHrcT+w8n4pCZcXzwkmEgdGvi OQpnEycWeTsu3k501Zb6XH/IHon76d0knUHio/aTM4B8GvlFdw8oq7WTITLG59PC 1e3/u7m2tl8L8utbr/ZNrjX+ARUCay5LJhRJp1TqwTH5nNkAnH+Li29Wg5bJNW4S NdXtrSvoCKBwcatyjCMdCjPh4/nrt1AYLaVo6Xae/HmstFCBymMMaB0Sf1NBLS9Q WfAxD70Y7hrbD3Xf8P30FCvrRF5ss56TMFD8RN5EXAY2m3v4IhRceeab+79Wiksh t6+hy0BQTzKlJ4Tjr8hP+9r4n5XtgjmS0BpQx3CjVcNCMwHJA06F0cMylc967Whd WfrW5c6j2v4ntu/Z3sJJVrntrCpdaEL8VnUrRgju/bxwTOhW3cloRiZ6UtcoTQ1x /FyZkbOKZp7XRBrKjWAL10cRaYrYxh5/um3VfrorSwj/uAvVVSEHLQlOVLNDGiag v8dpUyg7Rk9723vxaKJM6yrab2syTK3l7XM/dAqI8MF04YHB9/oohGzjgW4JlDQQ H+ZFzZcxmaZa1SLT0vPfCIXg46l51E34GRdF7MQj97P7bbctuXlYjqwqRE/hWDHQ 1efxPcavVpEfOtFO =gT8T -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue May 25 15:29:29 2021 Received: (at 47768) by debbugs.gnu.org; 25 May 2021 19:29:29 +0000 Received: from localhost ([127.0.0.1]:46886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llck4-0003kR-SC for submit@debbugs.gnu.org; Tue, 25 May 2021 15:29:29 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:59376 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llck2-0003kB-8e for 47768@debbugs.gnu.org; Tue, 25 May 2021 15:29:27 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1621970958; bh=UJyPqKJLrx1JBY0+/2/MO18/xqC6N2tWXnU716XIUJU=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=Ij74TUn48AFj3JMWdOuemei1R8/xnKLm70EgfMKNYJ7dKTqIsmv0zv0qUaxhQ26px hH0dD1M1blPJopeopxcLMdAr1+cIogSNC+N0ulH2G5hHbL+p4cw60MuPpVpC+WQtru 7SrtTz+AV7GRgVxDxfyyIEVujfJaO4WilswdrwdU= To: pukkamustard , 47768@debbugs.gnu.org Subject: Re: [bug#47768] [PATCH v2 00/43] Assorted OCaml patches (V2) In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> Date: Tue, 25 May 2021 21:29:18 +0200 Message-ID: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Mon, May 10 2021, pukkamustard wrote: > Hello Guix, > > This is V2 of the patch series which includes the fixes suggested by > Maxime for ocaml-gen and merges issue #45558 (Add js_of_ocaml by > divoplade; https://issues.guix.gnu.org/45558 [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , Maxime Devos , divoplade X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Mon, May 10 2021, pukkamustard wrote: > Hello Guix, > > This is V2 of the patch series which includes the fixes suggested by > Maxime for ocaml-gen and merges issue #45558 (Add js_of_ocaml by > divoplade; https://issues.guix.gnu.org/45558 [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Mon, May 10 2021, pukkamustard wrote: > Hello Guix, > > This is V2 of the patch series which includes the fixes suggested by > Maxime for ocaml-gen and merges issue #45558 (Add js_of_ocaml by > divoplade; https://issues.guix.gnu.org/45558). > > This is becoming an even larger series. Please let me know if there is > anything I can do to make this easier to review. All the packages build fine, but I haven=E2=80=99t tested anything. LGTM! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmCtUA4VHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x5KsEP+gPM02Gk1x5pp9EVNp1JwIXhE0Fg +LNEajZKtiAvXmTxs5BmJJETen+Gko+VfysGcjuc44Vjrth2jMIcR+F97DA1mv1g Rqlw/bwZXekyAWiQBjNO1aT1/fiecDd0XdUoa5BT7c289dZ8Zf0Fl1PkPEZWUJNq /jx3IVbxV+EBkHHTalPijZj7Rz4/IonkbJqn2oZUeJ4FRQ2iEW7HUHX3IZsu2GQP WZERQpz2VL3b4lyKcvQykQmci//tdDy0Vjzn2nEQ3+VhKhqyHLx2GqP1qVFsPxPa 1ct8JWlhb5oQTNxEGxh0ewQeywXStEQkZioFgKj9Pbar2dm0GTaYhicM8qqOIXSc QRQHLeRw2FKmvGCNuDOdyIUI1czJhvXeW8u6d4JLsAwIYfSFSOpzUGR7QLBFQJZO 9Pl63HsswY2rhDQ2nhkJNmhwh0dVIwDa1hMzMM5VmnXbYIAjHv2c+Ams0Z3AblP3 Tw7wNih3Gm29a+uwxJHBqlzdxQB5RGF2XCuVSYHsiAUtm7n3Pj6t3VgIAWkX5Ph2 k+sWthoAfUmaVv4pQf8QNg+j9PYG4gjmVbgnVmbmoXPDIru42B8kCr+7hxGALpKJ /ajNF0k6lD1AHL3pG2IcAMpWn/1340pOY9pGfaOfRvBNrGC1tdfURfchEA4aO4yB iLhbtxXcB2nwAgJb =mOIb -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 29 18:01:31 2021 Received: (at 47768) by debbugs.gnu.org; 29 May 2021 22:01:31 +0000 Received: from localhost ([127.0.0.1]:57865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ln71P-0004jc-2N for submit@debbugs.gnu.org; Sat, 29 May 2021 18:01:31 -0400 Received: from mout02.posteo.de ([185.67.36.66]:50883) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ln71K-0004jM-W1 for 47768@debbugs.gnu.org; Sat, 29 May 2021 18:01:29 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A9953240101 for <47768@debbugs.gnu.org>; Sun, 30 May 2021 00:01:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622325680; bh=Ej6o17MTeX6NTC89dTq3RbVOaIKGhYoBk3tRcnkh0Vg=; h=Date:From:To:Cc:Subject:From; b=IpoMll9jzQ0hz5UoW6jxardBj6W09OfjaVhhXVGmFFPSbXUStSXHAnGONwEsA/kl7 ya89bAV1n212Dj5Fyz0O4kbueQxYhoAI7KVYJ/8msSrEXBfQXymP0pilGkhwDIKQVo qQD9iM1+35hEQ4xc/sD0H6QBInn3trfIvO6pc50Bk8hsy0BL0BgCY0yiDech67iKAK 16/45vvgSIEH1/Z65AXQRjsOKxoFIBYhp4WtjY5fi/weyoM+c/bMlSo3wh6tgxExjK /sWF4errItl1pHlwnaC+6ZmAGVGI937RDssaUvqbpBXlqCQpH2RhTZfUnb7bGxeiVw 1Nn64/vPOzkDg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FswVl3dkMz6tmN; Sun, 30 May 2021 00:01:19 +0200 (CEST) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Date: Sat, 29 May 2021 22:01:19 +0000 From: Erik To: pukkamustard Subject: Re: ocaml - how can we get more recent version of core-kernel and common ppx'es In-Reply-To: <86h7iz7p6f.fsf@posteo.net> References: <86h7iz7p6f.fsf@posteo.net> Message-ID: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: guix-devel@gnu.org, 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) I have now applied the patches locally and tested a handful of the=20 updated packages, and things appear to be working fine for me. Thanks a=20 lot for doing this! What is the process for getting these patches commited to master? Do we=20 need someone to test that the patches didn't break any existing package? /Erik=C2=A0 On 18.05.2021 22:29, pukkamustard wrote: > Hi Erik, >=20 > There has been some work towards updating the OCaml packages in Guix > (see https://issues.guix.gnu.org/47768). >=20 > A lot of packages have been updated so that there is a now an updated > ocaml-X package for a previously existing ocaml4.07-X package. This > includes a lot of ppx'es. However not everything has been updated yet > and there are still a few packages missing to be able to update > ocaml-core-kernel. But maybe you could use the #47768 as a basis and > update some packages towards ocaml-core-kernel? >=20 > Help is also required in reviewing the patches. The series has become > quite large and hard to review (42 patches). If you could try them out > that would be great. >=20 > -pukkamustard >=20 >=20 > Erik writes: >=20 >> Hi, I have a project that requires a more recent core-kernel and some=20 >> of the >> ppx'es (such as ppx_fields_conv). >>=20 >> Being very new to guix I've managed to add/update packages for python=20 >> and ruby >> stuff, but this ocaml.scm file is quite different. There's a lot going= =20 >> on which >> I'm guessing is related to complexities arising from the whole ppx=20 >> transition >> that happened in the ocaml ecosystem a few years ago, or perhaps just=20 >> to the >> somewhat unsynchronized way libraries move to new versions of the=20 >> compiler and >> libs (just speculating here). >>=20 >> Anyway afaict (with my limited guix-fu) I would either need to=20 >> duplicate a whole >> lot of packages or somehow reorganize things to share definitions=20 >> where it makes >> sense. Both those options would require some coordination with the=20 >> people who >> made the ocaml.scm infrastructure first, because clearly there are=20 >> projects out >> there that need the current set of packages to work like they do now=20 >> and I don't >> want to just post a huge patch that surprises these people. >>=20 >> Can we get a thread going somewhere on adding a recent version of >> ocaml-core-kernel (for the 4.11.1 ocaml package, possibly bumping that= =20 >> to 4.11.2 in the process)? >>=20 >> Best regards, >> Erik Lovlie From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:03:49 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:03:49 +0000 Received: from localhost ([127.0.0.1]:37749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAc5-0006CO-Ld for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:03:49 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34779) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAc3-0006C7-NR for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:03:44 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 6B753240027 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:03:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622577817; bh=MEEbs7m6uRR8l8mnRpUoe5RfNyQ2v1PWs2B4eu1pEPY=; h=From:To:Cc:Subject:Date:From; b=AVPllpe5nhWprh0CHyv8zPkRYU2nddbOGohWZz2aZMCiV6+OeIL+wLiIRI0mwpIWl R9cgkcKU/C+kFCBmaQU4kUMxYO1qTaggXulu9HOsVoE+1gFoFudGRd9lh6o4lNRhjs YWl1QcM3ypRMKFS+wUViF004HvGJ6XNMFOIzyn6xBuW1BZZwtTIYuRo/YNFh4FPAUY 52O0MBvJmJ4vNX3eP3h+M2xMgolW4Vjk+FiLHYrLzuwipc8R9iS4s8RzOOK/jpjebb ZJOs5OjoCC2wITYO+r9HOvLg24PR2/I8ySjCZjuVdzH8Ngva/LSS8Her4c8hNejaNL Y8oLHEL28LuGA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvjlP0sXYz9rxP; Tue, 1 Jun 2021 22:03:27 +0200 (CEST) References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> <20210510051628.15359-15-pukkamustard@posteo.net> <87pmxehb5j.fsf@yoctocell.xyz> From: pukkamustard To: Xinglu Chen Subject: Re: [bug#47768] [PATCH v2 14/43] gnu: Add ocaml-uunf. Date: Tue, 01 Jun 2021 19:54:22 +0000 In-reply-to: <87pmxehb5j.fsf@yoctocell.xyz> Message-ID: <867djdpd31.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: Maxime Devos , 47768@debbugs.gnu.org, divoplade X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) > What=E2=80=99s the reason for disabling test? Does the package lack=20 > tests? Good catch! I was sloppy and ignored the tests. ocaml-uunf has=20 tests, but required an external file that is not distributed with=20 the package. I have added the tests (inspired by the utf8proc package in=20 gnu/textutils.scm). From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:12:43 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:12:43 +0000 Received: from localhost ([127.0.0.1]:37753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAkl-0006RA-6a for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:12:43 -0400 Received: from mout02.posteo.de ([185.67.36.66]:55527) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAkj-0006Qr-1O for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:12:41 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id A98362400FF for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:12:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622578354; bh=RcOE/j4cZHjTtgVXQExiXUMfJJ2jpfrf+sMvqXkDq1A=; h=From:To:Cc:Subject:Date:From; b=LMt6V6Hl1wFgdD06Bg8XHSX3H6e/Cv2Y8GO4N4IWKFiYd+K5DtIsXn3m7HP1wd3td +OjqSHv3L6c/x3cWx6GTPDLpg712km3GbADzuxPk5UyLaWj4Jn6CS3uA/sa4SuUUq+ YrQQimEtACPm5BIyuI8MVTxE2UtKeQU5tt1JADzjtOlFcivvuWOuTLBsq/Hw3nYR+p OkV8bziU3B+LDBxFybsbmYb5VbqYQcvY7CdJBoVXliLQipDrtoQfoOA3dy26XxOQ82 pNhSfa6xulUsK2Dsn8JTXuoaS0GQ/jL4XWr+pjWEDL+DGJL+DnkrkeKQIE4lvJmvII S+aqWZqyId8NQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fvjxk272Yz9rxR; Tue, 1 Jun 2021 22:12:25 +0200 (CEST) References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> <20210510051628.15359-12-pukkamustard@posteo.net> <87wnrmhbbo.fsf@yoctocell.xyz> From: pukkamustard To: Xinglu Chen Subject: Re: [bug#47768] [PATCH v2 11/43] gnu: ocaml-migrate-parsetree: Update to 2.1.0. Date: Tue, 01 Jun 2021 20:04:12 +0000 In-reply-to: <87wnrmhbbo.fsf@yoctocell.xyz> Message-ID: <865yyxpco1.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, Xinglu Chen writes: > On Mon, May 10 2021, pukkamustard wrote: > >> * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to >> 2.1.0. >> (ocaml-migrate-parsetree-1): New variable. > > What’s the reason for keepin [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [185.67.36.66 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [185.67.36.66 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 47768 Cc: Maxime Devos , 47768@debbugs.gnu.org, divoplade X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Hi, Xinglu Chen writes: > On Mon, May 10 2021, pukkamustard wrote: > >> * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to=20 >> 2.1.0. >> (ocaml-migrate-parsetree-1): New variable. > > What=E2=80=99s the reason for keeping the old version of > =E2=80=98ocaml-migrate-parsetree=E2=80=99? There are two reasons: 1. ocaml4.07-* packages seem to require ocaml-migrate-parsetree=20 version 1.*. 2. There are some ocaml-* packages that require the old version of=20 ocaml-migrate-parsetree (e.g. ocaml-bisect-ppx or ocaml-mdx). There are a couple of other ocaml packages with two versions. The=20 older version is just named ocaml4.07-NAME (e.g. ocaml-sexplib is=20 version 0.14.0 and ocaml4.07-sexplib is version 0.11.0). For=20 ocaml-migrate-parsetree this does not work as some ocaml-*=20 packages require the old version - thus ocaml-migrate-parsetree-1. > Also, this commit could probably be squashed with 10/43. Done. From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:20:22 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:20:22 +0000 Received: from localhost ([127.0.0.1]:37767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAsA-0006fW-9v for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:20:22 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:54858 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAs8-0006fE-PM for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:20:21 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1622578812; bh=nfG0HCqYvLGjPrx1ve2bnKObu+Ot+BJYTXjN6fliwTk=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=RBnLdK5odlNVqZAIICdp/OcsTBEWB5Aoy5mLMH4TuIKeUeGKV3Kj2y7k97N7J8IpT ZmuoWtC0ZQrGDAGNcxZCdPhK7PXzIFwq0TxeiZN0VMPNoI7RQFmG94BJ8lu1vmq7r4 TxGLTIcZmmGbANSCAs9lOWS7RkyTN91Dwulrbkg0= To: pukkamustard Subject: Re: [bug#47768] [PATCH v2 11/43] gnu: ocaml-migrate-parsetree: Update to 2.1.0. In-Reply-To: <865yyxpco1.fsf@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> <20210510051628.15359-12-pukkamustard@posteo.net> <87wnrmhbbo.fsf@yoctocell.xyz> <865yyxpco1.fsf@posteo.net> Date: Tue, 01 Jun 2021 22:19:52 +0200 Message-ID: <87bl8pe3rr.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Tue, Jun 01 2021, pukkamustard wrote: > Hi, > > Xinglu Chen writes: > >> On Mon, May 10 2021, pukkamustard wrote: >> >>> * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to >>> 2.1.0. >>> (ocaml-migrate-pa [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: 47768 Cc: Maxime Devos , 47768@debbugs.gnu.org, divoplade X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Tue, Jun 01 2021, pukkamustard wrote: > Hi, > > Xinglu Chen writes: > >> On Mon, May 10 2021, pukkamustard wrote: >> >>> * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to >>> 2.1.0. >>> (ocaml-migrate-pa [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Tue, Jun 01 2021, pukkamustard wrote: > Hi, > > Xinglu Chen writes: > >> On Mon, May 10 2021, pukkamustard wrote: >> >>> * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to=20 >>> 2.1.0. >>> (ocaml-migrate-parsetree-1): New variable. >> >> What=E2=80=99s the reason for keeping the old version of >> =E2=80=98ocaml-migrate-parsetree=E2=80=99? > > There are two reasons: > > 1. ocaml4.07-* packages seem to require ocaml-migrate-parsetree=20 > version 1.*. > 2. There are some ocaml-* packages that require the old version of=20 > ocaml-migrate-parsetree (e.g. ocaml-bisect-ppx or ocaml-mdx). > > There are a couple of other ocaml packages with two versions. The=20 > older version is just named ocaml4.07-NAME (e.g. ocaml-sexplib is=20 > version 0.14.0 and ocaml4.07-sexplib is version 0.11.0). For=20 > ocaml-migrate-parsetree this does not work as some ocaml-*=20 > packages require the old version - thus ocaml-migrate-parsetree-1. OK, thanks for the explanation. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmC2lmgVHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x5vq8P/jpplzCWC+tqCG4NS9ZzSEHsOrzO IZseSqA/cn/rIqMBiqVPaN63xgv5vY8DfNk2oYDbIinag3tRN8PW63G7Kk8gwnGN fzP4r6XT9GhK4zTcIiaxEBrm5ISj6D0YKZqFeoDqVuc3gG5KOxW3+9ODz7eYRlAC cH4+8T2bJuA0lAPkBWT2v396lcAQGTUNIPF0UpUY3ytsAmiavkI37pADr+9pd8DW lN7IC0KQEezgRgIEtub9E/wYuiazH5L/FXxswZu05AbyUidUp+xa1r2QJ2nxWtNS Ezffku9AFd9w0HHQSwrG/GLoPyiSO7WxulUJAWFzgUm+pnf6wymSPI0trl2ATtB7 JVYNzHz5F/IE05AxipHpuxkA8iWFjel8PWnkz0wgHDT/zqlFQIA2VbETA3AvZW0C 3yz5UAbgyRlTYlVFSBQLXHG16Pfjp7mT/qBLJwPG//AR89xiRB7goeq03aEqTGI3 NvcivcUxrQFkVRwtd0v/dNSGIOG8XDYbNMBuCFVrJiuuD52SEcd0ESQrX/yZkkgI rmMGPxQ4oc4AbikTuL0eDhVydzdhtfQI95HnClW5AVKP35YUhK4VcSTM48mHVGpS 1lu9psR/W5wn6wn9XoM2x2FwglxWUbD4jKdJwlJvTJnsaAxZqkeXpTrdfjhw3v9S bvq/Ymo3/qBFdQTj =braQ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:22:53 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:22:53 +0000 Received: from localhost ([127.0.0.1]:37772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAua-0006kD-Mb for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:22:52 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAuY-0006ju-TA for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:22:51 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 98CFF240101 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:22:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622578964; bh=OPWM59PT3/RS5AtRQNXuNwkB+3kQoI4GjAVUitNzjqY=; h=From:To:Cc:Subject:Date:From; b=JR6onC7ocMx3OxOjvmb/QIlMTRiVj8XzAg+rI/MEMQjkDW/OrAD2NwTw/5gs9cp9V KmxP1IdWcbd0j5UPbD7hT3wij8M6rBKAUwG8+7n80RFdZZ0ivAOy/SE0l2HGOP8hkh dHuXGg6FhGlPC+u8mkqGTgKl1k5R0gF0Gl2D8b93GPEIPq3XZ2BPkpr4B97WlXiLwe E0qaRXT5yQQxV8VY2nQ3ReXbfMTFc6G188zI7R/OpVsKkDuPNpD5QsV+IPxZGE2TWV pcpaw8XFTXUrvV2wbmBSve9v7fxUuMFu1GhbpEzn5EM19y2r0i/sPjuEgyh1/dYqKG KRVgEYxgZOnRg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fvk9W4sqnz6tmF; Tue, 1 Jun 2021 22:22:39 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 00/42] Assorted OCaml patches Date: Tue, 1 Jun 2021 20:21:21 +0000 Message-Id: <20210601202203.8587-1-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, Xinglu Chen writes: > All the packages build fine, but I haven’t tested anything. Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [185.67.36.66 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [185.67.36.66 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , Maxime Devos , 47768@debbugs.gnu.org, divoplade , Erik X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Hi, Xinglu Chen writes: > All the packages build fine, but I haven’t tested anything. Thanks for the review! It follows a V3 with the two changes you suggested (add tests for ocaml-uunf and merge patches 10 and 11 of V2). Erik has tested some of the packages and reports that everything seems to be fine. > LGTM! Maybe we are good to merge now? -pukkamustard divoplade (2): gnu: Add ocaml-graphics. gnu: Add ocaml-js-of-ocaml. pukkamustard (40): gnu: ocaml-integers: Update to 0.4.0. gnu: ocaml-ctypes: Update to 0.18.0. gnu: ocaml-ctypes: Make ocaml-integers a propagated input. gnu: ocaml-lwt: Make libev a propagated input. gnu: ocaml-lwt: Update to 5.4.0. gnu: ocaml4.07-gen: Update to 0.5.3. gnu: Add ocaml-gen. gnu: Add ocaml-stdio. gnu: Add ocaml-compiler-libs. gnu: ocaml-migrate-parsetree: Update to 2.1.0. gnu: Add ocaml-ppxlib. gnu: Add ocaml-sedlex. gnu: Add ocaml-uunf. gnu: Add ocaml-ppx-sexp-conv. gnu: Add ocaml-bigstringaf. gnu: Add ocaml-ppx-let. gnu: Add ocaml-syntax-shims. gnu: Add ocaml-ppx-compare. gnu: Add ocaml-ppx-here. gnu: Add ocaml-ppx-cold. gnu: Add ocaml-ppx-assert. gnu: Add ocaml-ppx-custom-printf. gnu: Add ocaml-ppx-hash. gnu: Add ocaml-ppx-enumerate. gnu: Add ocaml-ppx-js-style. gnu: Add ocaml-ppx-base. gnu: Add ocaml-fieldslib. gnu: Add ocaml-ppx-fields-conv. gnu: Add ocaml-ppx-optcomp gnu: Add ocaml-ppx-optional. gnu: Add ocaml-jst-config. gnu: Add ocaml-jane-street-headers. gnu: Add ocaml-time-now. gnu: Add ocaml-ppx-inline-test. gnu: Add ocaml-angstrom. gnu: Add ocaml-uri. gnu: Add ocaml-variantslib. gnu: Add ocaml-ppx-variants-conv. gnu: Add ocaml-ppx-expect. gnu: ocaml-num: Update to 1.4. gnu/packages/ocaml.scm | 1751 ++++++++++++++++++++++++++-------------- 1 file changed, 1133 insertions(+), 618 deletions(-) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:06 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:06 +0000 Received: from localhost ([127.0.0.1]:37777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAvm-0006n5-2u for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:37673) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAvk-0006mY-Sf for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:05 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 3B5A52400E5 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:23:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579039; bh=8xu5bfUs+hd/kQ/bo4snJLhBuUYCoU9MCaHS6iyT9Mo=; h=From:To:Cc:Subject:Date:From; b=mHPZ5QYGGBL/LLkrZqmkXMQ6lItyIwj6tEhsycPlmACPiFe3eKXbWpxAtlj39yh3o HC4okZTSbpHFi53XBTebRiU3AmU6gxYyAjR535hV0JUMIBYNE70AR3YU9qUvm4rIMr KLwrm8uK0j9z8ou5vrW1TnIOLmKNiA3oWhHzvW7NDJEbCma5kaL8kusepJrIDjgbuJ or5+ONE/U+oPBgAe4Ogr/0a1j4j6bJrBADB1fJE6svGkJrC6CP2gkYjyQ0Xibd3jB6 TSL7buJ/8Jqig0K4qds5FJaqYZHBWe0JCAgH15X676oAUpef2VcNFQySJy0w18Pi06 mdJfFE//v+oMg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkC0530Qz9rxG; Tue, 1 Jun 2021 22:23:56 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 01/42] gnu: ocaml-integers: Update to 0.4.0. Date: Tue, 1 Jun 2021 20:22:44 +0000 Message-Id: <20210601202325.8777-2-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-integers): Update to 0.4.0. --- gnu/packages/ocaml.scm | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 427ea38ccc..8069ad31d8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Simon Tournier ;;; Copyright © 2020 divoplade -;;; Copyright © 2020 pukkamustard +;;; Copyright © 2020, 2021 pukkamustard ;;; Copyright © 2021 aecepoglu ;;; Copyright © 2021 Sharlatan Hellseher ;;; @@ -3810,29 +3810,20 @@ sensitive completion, colors, and more.") (define-public ocaml-integers (package (name "ocaml-integers") - (version "0.3.0") + (version "0.4.0") (home-page "https://github.com/ocamllabs/ocaml-integers") (source (origin - (method url-fetch) - (uri (string-append home-page - "/releases/download/v0.2.2/integers-" - version ".tbz")) - (file-name (string-append name "-" version ".tbz")) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk")))) - (build-system ocaml-build-system) + "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd")))) + (build-system dune-build-system) (arguments - `(#:tests? #f; no tests - #:build-flags (list "build") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs - `(("ocamlbuild" ,ocamlbuild))) - (inputs - `(("topkg" ,ocaml-topkg) - ("opam" ,opam))) + `(#:tests? #f)) ; no tests (synopsis "Various signed and unsigned integer types for OCaml") (description "The ocaml-integers library provides a number of 8-, 16-, 32- and 64-bit signed and unsigned integer types, together with aliases such as -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:20 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:20 +0000 Received: from localhost ([127.0.0.1]:37781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAw0-0006nf-Dz for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:20 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAvy-0006nM-3r for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:18 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 797EC2400FC for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579052; bh=jb+cPvo0uXQfspOteUZVjCu6mJlrRv3eqqcSX0jHB3Q=; h=From:To:Cc:Subject:Date:From; b=hCsGc+ACr+2MyUk5iAjnsCUnP8B5UolJu45XGTdz2ZPUKp1AGKCEUPVW0QDsr1eR7 A5n5AorJEHEsF/Q1/kNOr5W9APNKYVK5qvhoZ8WlH7K1tKaHGQJB29RbPvi4J5ypxx 8JnpCrt1XpC6seH56oO3n38K0nA+s2TtT76DhYdqrP0GS3ArsUfOHcWnXd/SygZxKM eONj7rjHo40dQZvnt7QUJszp9ABONFLl3Lh0c7vTKinMRFFEGJvkFRhsHbOSvs+UGA yD4CiHb3KzQPPgtp0cyzQbPBrMWWyVQWvnA7oY8Qk4Jq7N985LyTboIguuin5WfdBT S7Xg6VhKsAhsw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCG1Pqlz9rxQ; Tue, 1 Jun 2021 22:24:09 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 02/42] gnu: ocaml-ctypes: Update to 0.18.0. Date: Tue, 1 Jun 2021 20:22:45 +0000 Message-Id: <20210601202325.8777-3-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-ctypes): Update to 0.18.0. --- gnu/packages/ocaml.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8069ad31d8..46b5542864 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3833,7 +3833,7 @@ long and size_t whose sizes depend on the host platform.") (define-public ocaml-ctypes (package (name "ocaml-ctypes") - (version "0.14.0") + (version "0.18.0") (home-page "https://github.com/ocamllabs/ocaml-ctypes") (source (origin (method git-fetch) @@ -3843,7 +3843,7 @@ long and size_t whose sizes depend on the host platform.") (file-name (git-file-name name version)) (sha256 (base32 - "1b2q3h63ngf4x9qp65qwapf2dg9q0mcdah6qjm2q0c7v2p5vysv9")))) + "03zrbnl16m67ls0yfhq7a4k4238x6x6b3m456g4dw2yqwc153vks")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require an old lwt @@ -3862,6 +3862,8 @@ long and size_t whose sizes depend on the host platform.") (delete 'configure)))) (native-inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("bigarray-compat" ,ocaml-bigarray-compat))) (inputs `(("libffi" ,libffi) ("ounit" ,ocaml-ounit) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:23 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:23 +0000 Received: from localhost ([127.0.0.1]:37785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAw2-0006nv-Na for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:22 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35005) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAw0-0006nO-Kl for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:21 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id BAD4B240027 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579054; bh=u/WcTbJSm1QXJD6mHgZPsPoJiB/XQmzoiSYou/jNRfE=; h=From:To:Cc:Subject:Date:From; b=m+FynO8Z7JTkxvUWztxhMJXzJGPbWDUARJwLxJ1uQDGUUp/Yg07GQ9hDU0RJgge7u Mvm9y+970NDLoP57SSBSRhVXBLu/l30cdPQdnApt+K8A6DGqpLNhUX8fA8f2WNIDDL /6F/dSSbauFHTfXxVjAj5QCpdoPS90xvOXtvhyS4VmWaE7TkdtwrUTaWkAA+J56Vew XPymZ4ULKybMfS1gnypNAB6A7DVXfzG5f4szISpbEKzSRKx0WprtTdAze80azGSCfL RBFroLIxtEXKZ4i5nEhxR/M3WCRrUbvXlQ8FqEfOQABazLsbKpq+tvZV/X/xLWFytR jJGGo4Qn6ClIQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCJ5ZvNz9rxS; Tue, 1 Jun 2021 22:24:12 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 03/42] gnu: ocaml-ctypes: Make ocaml-integers a propagated input. Date: Tue, 1 Jun 2021 20:22:46 +0000 Message-Id: <20210601202325.8777-4-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-ctypes)[propagated-inputs]: Add ocaml-integers. [inputs]: Remove ocaml-integers. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 46b5542864..7d467b3b70 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3863,11 +3863,11 @@ long and size_t whose sizes depend on the host platform.") (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs - `(("bigarray-compat" ,ocaml-bigarray-compat))) + `(("bigarray-compat" ,ocaml-bigarray-compat) + ("integers" ,ocaml-integers))) (inputs `(("libffi" ,libffi) ("ounit" ,ocaml-ounit) - ("integers" ,ocaml-integers) ("lwt" ,ocaml-lwt) ("topkg" ,ocaml-topkg) ("opam" ,opam))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:24 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:24 +0000 Received: from localhost ([127.0.0.1]:37789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAw4-0006oB-0E for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:24 -0400 Received: from mout01.posteo.de ([185.67.36.65]:50233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAw2-0006nU-Kc for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:23 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 1D21C240029 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579057; bh=ATStMxElfUsc4K0EoTTTyGG+eR4uE4kn6l6VufETU4M=; h=From:To:Cc:Subject:Date:From; b=sME8fGyulKigmyo9cQtRBwO2U9XoDzgCAX3wY3zls1dqe7aX/56dSpgCfNeeUFifF 5USirmOzJzBY4V4gukO9kFYoBj5FLo8PYjtFcFW6YLSGKGWw8pgiHu18YdITYCaqzb 43t2t3RdXVB1Ed31L0La7BBggAnJTF42JOM8ho/u7nxuFcq8K4KxCd4/tWwU/ylioZ HwREYVEgFA5465fjZU7ENf9beLohSRtBkOVomC9pkDFhwC2K5kfqcAiFXA8Ax9DQZ2 WY+1H23eZMjaMg1dIpVnKfR93VgIxeHnxBTa7hX310yQz0pIx24slU59wc7JfalPy4 zPC+8xVC78jBA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCL6W9xz9rxQ; Tue, 1 Jun 2021 22:24:14 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 04/42] gnu: ocaml-lwt: Make libev a propagated input. Date: Tue, 1 Jun 2021 20:22:47 +0000 Message-Id: <20210601202325.8777-5-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-lwt) [propagated-inputs]: Add libev. [inputs]: Remove libev. (ocaml-ouint2, ocaml4.07-lambda-term, ocaml-markup) [inputs]: Remove libev. --- gnu/packages/ocaml.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7d467b3b70..5509ff495c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1342,9 +1342,6 @@ compilers that can directly deal with packages.") (base32 "0gxjw1bhmjcjzri6x6psqrkbbyq678b69bqfl9i1zswp7cj2lryg")))) (build-system dune-build-system) - (inputs - ;; XXX Should libev be a propagated-input of ocaml-lwt? - `(("libev" ,libev))) (propagated-inputs `(("lwt" ,ocaml-lwt) ("ocaml-stdlib-shims" ,ocaml-stdlib-shims))) @@ -2318,13 +2315,13 @@ for mapping files in memory. This function is the same as the ("ocaml-cppo" ,ocaml-cppo) ("pkg-config" ,pkg-config))) (inputs - `(("libev" ,libev) - ("glib" ,glib))) + `(("glib" ,glib))) (propagated-inputs `(("ocaml-mmap" ,ocaml-mmap) ("ocaml-ocplib-endian" ,ocaml-ocplib-endian) ("ocaml-result" ,ocaml-result) - ("ocaml-seq" ,ocaml-seq))) + ("ocaml-seq" ,ocaml-seq) + ("libev" ,libev))) (home-page "https://github.com/ocsigen/lwt") (synopsis "Cooperative threads and I/O in monadic style") (description "Lwt provides typed, composable cooperative threads. These @@ -3761,8 +3758,6 @@ connect an engine to your inputs and rendering functions to get an editor.") ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log)) ("ocaml-lwt-react" ,(package-with-ocaml4.07 ocaml-lwt-react)) ("ocaml-zed" ,ocaml4.07-zed))) - (inputs - `(("libev" ,libev))) (home-page "https://github.com/diml/lambda-term") (synopsis "Terminal manipulation library for OCaml") (description "Lambda-Term is a cross-platform library for manipulating the @@ -6011,8 +6006,6 @@ the full Core is not available, such as in Javascript.") (build-system dune-build-system) (arguments `(#:package "markup")) - (inputs - `(("libev" ,libev))) (propagated-inputs `(("ocaml-bisect-ppx" ,ocaml-bisect-ppx) ("ocaml-uchar" ,ocaml-uchar) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:26 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:26 +0000 Received: from localhost ([127.0.0.1]:37793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAw6-0006oR-CM for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:26 -0400 Received: from mout01.posteo.de ([185.67.36.65]:55367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAw5-0006nd-9p for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:25 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id C10E9240027 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579059; bh=jtmYSfcX/FNKT+IL/zNaHAb96y2lQ39dC7WDW9kNBTU=; h=From:To:Cc:Subject:Date:From; b=gIqj9lDSLwU9lrg/MejmlNMbMMBbzO40Xco5an2hcGSZPUymKM3ZCVH98nhZE3b4C nqCJoVatX2cS3K802YYvg46Osv4MA0O1aZGrq4wUNCnjiajxeQpcF14HbBtWGFDMvb dGCS6CC6wIgJbzy/+3BMFxM67Tqbs2bTjzkZaB4R4Cb+LpWVh7pbm+9Spg5YxawJoj CjF8G8GV5eWwMNHIY1kZbI9uThd2XNf6CnZfhpd+R/l65Y+nCWp7y0MBo/e/OZx0eE 4n09x8eEv97RepmSSSfrpKBnzC2VJMafll2Yd8jz58J/PPZI9/Tq3gx38328hCIs6w oE2dZrx7MIyRg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCP4Dywz9rxG; Tue, 1 Jun 2021 22:24:17 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 05/42] gnu: ocaml-lwt: Update to 5.4.0. Date: Tue, 1 Jun 2021 20:22:48 +0000 Message-Id: <20210601202325.8777-6-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-lwt): Update to 5.4.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5509ff495c..85f73b6d69 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2297,7 +2297,7 @@ for mapping files in memory. This function is the same as the (define-public ocaml-lwt (package (name "ocaml-lwt") - (version "5.1.1") + (version "5.4.0") (source (origin (method git-fetch) @@ -2306,7 +2306,7 @@ for mapping files in memory. This function is the same as the (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1nl7rdnwfdhwcsm5zpay1nr9y5cbapd9x1qzily7zk9ab4v52m8g")))) + "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d")))) (build-system dune-build-system) (arguments `(#:package "lwt")) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:28 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:28 +0000 Received: from localhost ([127.0.0.1]:37797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAw8-0006og-KW for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:28 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAw7-0006nu-AH for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:27 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id BF17D240027 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579061; bh=sXNRZ4oC/MJ7eCA21G3U3NaAMR1d/UcXHAymyaRlOxg=; h=From:To:Cc:Subject:Date:From; b=CT4uT9CaraINA15MTAe0DoEe1O/4ITmjs7X5zzHdu9DMJHVBD9PLKkJ84l/SJARVo rvlu/HaBc0IejJwTdNYDnzOh60O3/UzizcUxrmXqT+oEQn7tXQwgGLJDJov+ZqbuXT bf8JlK2G/rCV07ya0uh0Ra0avZ9f0lA26WJvXVyzOiQ77BTX9YkZ5+pCDVlelsE1Ya 98xEKYrMvSf+a6XvuAhJEXsNbuPI48MeV5LBHCyaE7bwBjca0onIOvtbmncm7/9Jvn nWUwTvbKSjuCymWuQXzlT8FYwEkECzG6R5GjynbjahmMkp8CdvvByv0w/WHXvQzhNG 2dyjNO2yPBmfA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCS0PBNz9rxF; Tue, 1 Jun 2021 22:24:19 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 06/42] gnu: ocaml4.07-gen: Update to 0.5.3. Date: Tue, 1 Jun 2021 20:22:49 +0000 Message-Id: <20210601202325.8777-7-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml4.07-gen): Update to 4.07. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 85f73b6d69..34e1b954d2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2511,7 +2511,7 @@ representation of the data.") (define-public ocaml4.07-gen (package (name "ocaml4.07-gen") - (version "0.5.2") + (version "0.5.3") (source (origin (method git-fetch) (uri (git-reference @@ -2520,7 +2520,7 @@ representation of the data.") (file-name (git-file-name name version)) (sha256 (base32 - "1h9g508rnj2j8va5nvhamzscp954vrkh0hdf4pn3d10pcfyslfg2")))) + "1jzrs0nsdk55annkd2zrk5svi61i3b1nk6qyqdc2y26vnzqvzfg8")))) (build-system dune-build-system) (arguments `(#:tests? #f; no tests -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:32 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:32 +0000 Received: from localhost ([127.0.0.1]:37801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwB-0006oy-QN for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:32 -0400 Received: from mout01.posteo.de ([185.67.36.65]:49087) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAw9-0006oI-Py for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:30 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 468A5240027 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579064; bh=0Uva56yGIO+qAi1+GBDnBMeyZhDwZkcQupmzXLq1vZY=; h=From:To:Cc:Subject:Date:From; b=en7LJJEN/v7ZSKhd/BkM/Ya/zkv66PWrfpnN1I7uWdBNK32tXWfEp1UoTXkNqognY TlSLvnfZ91BH4hJr6LdelC4kfiu4U+k1/2B/n2v63/oDXcuIpDfwKzXaKsq7lq6Wud Ap2Yv8mG1x8umWcoc8yigmz4+m/d5C7nGS+7OgD2Y8vQjx8cmUdMVSe7S9g14fSm/y Ai67GaDpUEWcoAR8LBiNyKLC4jvQlpFyAjrZgmTUhCyxypLL2Bdh9/vU8q7KdgGYBz Q3VWLrdMvkpZJO5jqdJ7T/9Zq6CHwLf2GkyA7NODeFHH+Ai4BX/kQf4G4Hbj07R7Lp paciBFUuIatjg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCV0hPSz9rxF; Tue, 1 Jun 2021 22:24:21 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 07/42] gnu: Add ocaml-gen. Date: Tue, 1 Jun 2021 20:22:50 +0000 Message-Id: <20210601202325.8777-8-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-gen): New variable. (ocaml4.07-gen): Remove variable. (ocaml4.07-sedlex): Replace ocaml4.07-gen with ocaml-gen. --- gnu/packages/ocaml.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 34e1b954d2..877b9284d1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2508,9 +2508,9 @@ format. It can process XML documents without a complete in-memory representation of the data.") (license license:isc))) -(define-public ocaml4.07-gen +(define-public ocaml-gen (package - (name "ocaml4.07-gen") + (name "ocaml-gen") (version "0.5.3") (source (origin (method git-fetch) @@ -2523,16 +2523,13 @@ representation of the data.") "1jzrs0nsdk55annkd2zrk5svi61i3b1nk6qyqdc2y26vnzqvzfg8")))) (build-system dune-build-system) (arguments - `(#:tests? #f; no tests - #:package "gen" - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:package "gen" + #:test-target ".")) (propagated-inputs - `(("ocaml-odoc" ,(package-with-ocaml4.07 ocaml4.07-odoc)))) + `(("ocaml-odoc" ,ocaml-odoc))) (native-inputs - `(("ocaml-qtest" ,(package-with-ocaml4.07 ocaml-qtest)) - ("ocaml-qcheck" ,(package-with-ocaml4.07 ocaml-qcheck)))) + `(("ocaml-qtest" ,ocaml-qtest) + ("ocaml-qcheck" ,ocaml-qcheck))) (home-page "https://github.com/c-cube/gen/") (synopsis "Iterators for OCaml, both restartable and consumable") (description "Gen implements iterators of OCaml, that are both restartable @@ -2577,7 +2574,7 @@ and consumable.") (native-inputs `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) (propagated-inputs - `(("ocaml-gen" ,ocaml4.07-gen) + `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen)) ("ocaml-ppx-tools-versioned" ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned)) ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar)))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:34 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:34 +0000 Received: from localhost ([127.0.0.1]:37805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwE-0006pD-52 for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:34 -0400 Received: from mout02.posteo.de ([185.67.36.66]:39889) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwC-0006oe-Qc for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:33 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 40DF62400FE for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579067; bh=8R/u/YaOX+y1seIiq0rhClsy7jBS3Zs2lbkpdvEQebs=; h=From:To:Cc:Subject:Date:From; b=P1Mvuohy59UtbCtY8/SZpnH6rNucsyqLsM98sTc/qOrBQXFjmmOej4xU3sA5/VGPu GAmgaAD+O9n0FFKkvtiSFQtGhPr+xVA+HwP0CE395bEnutFyL2loijmE5+/3wTaU5o gvTDgqhyG0U8iPcLorg98qlI8NOcblrdHONP8MpE0yZmQAPNjePGXlqoKxL48crlM5 rBYPA1HpHnVG8OhjHPsFfWuRhQv0LnERbP52Xn8OjAK9Fv0/xHvxT+KxOCXsmu947C truy9RqrX7CV7sGvKAVWkYLcwARPJytyse1RlkPQiih5PLRFaTyIkIt1S5rcEjohmM VQ2QLuBoO3R8A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCX4PFFz9rxH; Tue, 1 Jun 2021 22:24:24 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 08/42] gnu: Add ocaml-stdio. Date: Tue, 1 Jun 2021 20:22:51 +0000 Message-Id: <20210601202325.8777-9-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (ocaml-stdio): New variable. (ocaml4.07-stdio): Inherit from ocaml-stdio. --- gnu/packages/ocaml.scm | 58 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 877b9284d1..95407de74d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1978,7 +1978,7 @@ library.") #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("pkg-config" ,pkg-config))) (inputs `(("sqlite" ,sqlite))) @@ -4086,7 +4086,7 @@ syntax checking on dedukti files.") ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_inline_test"))) (synopsis "Syntax extension for writing in-line tests in ocaml code") @@ -4429,7 +4429,7 @@ Atom.") `(("gsl" ,gsl))) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio))) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://mmottl.github.io/gsl-ocaml") (synopsis "Bindings to the GNU Scientific Library") (description @@ -4714,30 +4714,20 @@ so they don't expose everything at toplevel. For instance, @code{Ast_helper} is now @code{Ocaml_common.Ast_helper}.") (license license:expat))) -(define-public ocaml4.07-stdio +(define-public ocaml-stdio (package - (name "ocaml4.07-stdio") - (version "0.11.0") + (name "ocaml-stdio") + (version "0.14.0") (home-page "https://github.com/janestreet/stdio") (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append home-page ".git")) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1facajqhvq34g2wrg368y0ajxd6lrj5b3lyzyj0jhdmraxajjcwn")))) + (janestreet-origin "stdio" version + "1hj5hraprqy2i90a690l11yjszvb99j818q3d684ryx6p2lddk0l")) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) - (arguments - `(#:tests? #f ;no tests - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(("ocaml-base" ,ocaml-base) + ("ocaml-sexplib0" ,ocaml-sexplib0))) + (arguments `(#:tests? #f)) ;no tests + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-stdio)))) (synopsis "Standard IO library for OCaml") (description "Stdio implements simple input/output functionalities for OCaml. It @@ -4745,6 +4735,16 @@ re-exports the input/output functions of the OCaml standard libraries using a more consistent API.") (license license:expat))) +(define-public ocaml4.07-stdio + (package-with-ocaml4.07 + (package + (inherit ocaml-stdio) + (version "0.11.0") + (source + (janestreet-origin "stdio" version + "0pqbp2wy5fgmc38irwvmj9nlcvclb1ix1mp4y7l39bgvvlz303h9")) + (properties '())))) + (define-public ocaml-ppx-derivers (package (name "ocaml-ppx-derivers") @@ -4794,7 +4794,7 @@ as part of the same ocaml-migrate-parsetree driver.") ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (arguments @@ -5422,7 +5422,7 @@ else expression.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_optcomp"))) (home-page "https://github.com/janestreet/ppx_optcomp") @@ -5551,7 +5551,7 @@ useful errors on failure.") ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib) @@ -5827,7 +5827,7 @@ various Jane Street packages.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio))) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://github.com/janestreet/configurator") (synopsis "Helper library for gathering system configuration") (description "Configurator is a small library that helps writing OCaml @@ -5920,7 +5920,7 @@ thousands of times faster than fork. ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-spawn" ,ocaml4.07-spawn) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -5967,7 +5967,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-splittable-random" ,ocaml4.07-splittable-random) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-typerep" ,ocaml4.07-typerep) ("ocaml-variantslib" ,ocaml4.07-variantslib) ("ocaml-migrate-parsetree" @@ -6251,7 +6251,7 @@ library FFTW.") `(("openblas" ,openblas) ("lapack" ,lapack) ("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio))) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://mmottl.github.io/lacaml/") (synopsis "OCaml-bindings to BLAS and LAPACK") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:37 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:38 +0000 Received: from localhost ([127.0.0.1]:37809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwH-0006pV-Kl for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:37 -0400 Received: from mout02.posteo.de ([185.67.36.66]:49907) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwF-0006ov-Hx for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id EDD922400FD for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579070; bh=mLbSJlGWP8R5rhy02/K7Axi7kXW+e2NVAxHaxTDSc4E=; h=From:To:Cc:Subject:Date:From; b=GT2PODNu3JgUKUsB560SSWvIbSPbaFKDpj9sDNhmEaMjqopkQsviq/D43D+jnvS1L phNhelGG82HhsvzxmARGNeXp1mednPBJ7DW8thweutciSYOADlc+ypP6P8sRLHtV/B YE9uUngDwqhh2CByfHcGeWYQyCnQcqM5SoyiVWo2Vlb6dBekrPhGU7cNVj0tGsNIFY xP3/1Sg/2JO3gtKFYQJ42l3rWzKAmpJYuDmBegXbvQJkAf1DIjkOzDtuMmzlMZ9cW4 ee69NHnW0shnEBG8QU06FImei9dbwNl4k3dXMr/Q/fNQiKwrZpUec9gfcaVg0NeVX3 kI5/QUHkH4ayg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCb3qrKz9rxD; Tue, 1 Jun 2021 22:24:27 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 09/42] gnu: Add ocaml-compiler-libs. Date: Tue, 1 Jun 2021 20:22:52 +0000 Message-Id: <20210601202325.8777-10-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-compiler-libs): New variable. (ocaml4.07-compiler-libs): Inherit from ocaml-compiler-libs. --- gnu/packages/ocaml.scm | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 95407de74d..93cfa8f54b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4084,7 +4084,7 @@ syntax checking on dedukti files.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) + ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4686,34 +4686,50 @@ provided by companion libraries such as #:dune ,ocaml4.07-dune)) (properties '())))) -(define-public ocaml4.07-compiler-libs +(define-public ocaml-compiler-libs (package - (name "ocaml4.07-compiler-libs") - (version "0.11.0") + (name "ocaml-compiler-libs") + (version "0.12.3") (home-page "https://github.com/janestreet/ocaml-compiler-libs") (source (origin (method git-fetch) (uri (git-reference - (url (string-append home-page ".git")) + (url home-page) (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) + "00nrar7h2pyflbdiq6wwwrb4k5jh9iff0jllihzm6ms8d5pspsg5")))) (build-system dune-build-system) - (arguments - `(#:tests? #f ;no tests - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ocaml-compiler-libs"))) + (arguments `(#:tests? #f)) ;no tests + (properties `((upstream-name . "ocaml-compiler-libs") + (ocaml4.07-variant . ,(delay ocaml4.07-compiler-libs)))) (synopsis "Compiler libraries repackaged") (description "This package simply repackages the OCaml compiler libraries so they don't expose everything at toplevel. For instance, @code{Ast_helper} is now @code{Ocaml_common.Ast_helper}.") (license license:expat))) +(define-public ocaml4.07-compiler-libs + (package-with-ocaml4.07 + (package + (inherit ocaml-compiler-libs) + (name "ocaml-compiler-libs") + (version "0.11.0") + (home-page "https://github.com/janestreet/ocaml-compiler-libs") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) + (properties `((upstream-name . "ocaml-compiler-libs")))))) + (define-public ocaml-stdio (package (name "ocaml-stdio") @@ -4790,7 +4806,7 @@ as part of the same ocaml-migrate-parsetree driver.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) + ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:40 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:40 +0000 Received: from localhost ([127.0.0.1]:37813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwJ-0006pk-Ut for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:40 -0400 Received: from mout01.posteo.de ([185.67.36.65]:54393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwI-0006p6-Cl for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id D729A24002A for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579072; bh=fFsrHPVO5dc0JdsdDEgEkNZ/UILhxynaFNKOImv8p5U=; h=From:To:Cc:Subject:Date:From; b=LxDHpTaRii60h7CGpIFtZm5Lui1rUaxHzsCSG3Ak+I0Qukg+TRT0xsPUVfW4Kos7E uSdk+SsJnfjPo8OFNZf0DvrM3+zxC712Ls07QcNmXdzti3QKHtah5msy/9Zhm6C5th 1a0qfGU9ImS0rCVz87vZLMWnw2BLZOhS/+ghtCVWAcepw2AMHp8USEYhztfz/aAy8u Zz5mPb+XvTyUlwTl5HDQ1aV2J73qWWRtXxnv8siDeQdQJ86fye5wFSBzRkg+Cewehu c2PlSW24s0v5TlkzRajsPcqQZeaNxQleMg67SR+leLa8GkHxaqo4OokCs06oYnVHMr CSEEwU/ZgaU/g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCf2PlHz9rxF; Tue, 1 Jun 2021 22:24:30 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 10/42] gnu: ocaml-migrate-parsetree: Update to 2.1.0. Date: Tue, 1 Jun 2021 20:22:53 +0000 Message-Id: <20210601202325.8777-11-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 93cfa8f54b..0b606e296c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1771,32 +1771,51 @@ module of this library is parameterised by the type of S-expressions.") (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree") - (version "1.7.3") + (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 - "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx")))) + "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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:47 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:47 +0000 Received: from localhost ([127.0.0.1]:37817 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwQ-0006q6-9t for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:47 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwN-0006pd-Tj for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:45 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 625E2240029 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579078; bh=26ka1nto6VEbym7wior1XOeHkNryD5/LdrQxGWS6Qac=; h=From:To:Cc:Subject:Date:From; b=V7BjZ4ErYf8KzEjmReHRpFc1NElLfAvhmt/NCcJNCMKTKbFT0b/0FCsKh4E2lwIEP pQKVgj8Y+aLaGnzvsLMsPz71YMEt0ExaTBo7vEyV1qdxQYdZSJh35c2sV7UgJOE+3a IUC0Mj0cgF0HaTGTd4OH54SICvn35t8ajL1cmTDYqEdPWddY2e05fppChb0tsfa0B4 jXZBwgaQ9BVndw+gBe4OMOpbNUaqwUj9+EXKua1mxgDM2SgGu7lDuxh8pj7l14svaz QvuAhN2uKNdB3E2aJHt2un+15xVLroG+swRZ83zhEuvKL94KRBozXt5wExi86Ge0c8 opbNWpqvOjIog== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCj1yhDz9rxF; Tue, 1 Jun 2021 22:24:32 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 11/42] gnu: Add ocaml-ppxlib. Date: Tue, 1 Jun 2021 20:22:54 +0000 Message-Id: <20210601202325.8777-12-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-ppxlib): New variable. (ocaml4.07-ppxlib): Inherit from ocaml-ppxlib. --- gnu/packages/ocaml.scm | 144 +++++++++++++++++++++++------------------ 1 file changed, 81 insertions(+), 63 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0b606e296c..7fe59c0b95 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4106,7 +4106,7 @@ syntax checking on dedukti files.") ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_inline_test"))) (synopsis "Syntax extension for writing in-line tests in ocaml code") (description "This package contains a syntax extension for writing @@ -4807,54 +4807,32 @@ ppx_deriving and ppx_type_conv to inter-operate gracefully when linked as part of the same ocaml-migrate-parsetree driver.") (license license:bsd-3))) -(define-public ocaml4.07-ppxlib +(define-public ocaml-ppxlib (package - (name "ocaml4.07-ppxlib") - (version "0.6.0") + (name "ocaml-ppxlib") + (version "0.22.0") (home-page "https://github.com/ocaml-ppx/ppxlib") (source (origin (method git-fetch) (uri (git-reference - (url (string-append home-page ".git")) + (url home-page) (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv")))) + "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'set-topfind - (lambda* (#:key inputs #:allow-other-keys) - ;; add the line #directory ".." at the top of each file - ;; using #use "topfind";; to be able to find topfind - (let* ((findlib-path (assoc-ref inputs "findlib")) - (findlib-libdir - (string-append findlib-path "/lib/ocaml/site-lib"))) - (substitute* '("test/base/test.ml" - "test/code_path/test.ml" - "test/deriving/test.ml" - "test/driver/attributes/test.ml" - "test/driver/non-compressible-suffix/test.ml" - "test/driver/transformations/test.ml") - (("#use \"topfind\";;" all) - (string-append "#directory \"" findlib-libdir "\"\n" - all)))) - #t))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(("ocaml-base" ,ocaml-base) + ("ocaml-compiler-libs" ,ocaml-compiler-libs) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-stdlib-shims" ,ocaml-stdlib-shims) + ("ocaml-ppx-derivers" ,ocaml-ppx-derivers) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-result" ,ocaml-result) + ("ocaml-sexplib0" ,ocaml-sexplib0))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-ppxlib)))) (synopsis "Base library and tools for ppx rewriters") (description @@ -4872,6 +4850,46 @@ OCaml AST in the OCaml syntax; @end itemize") (license license:expat))) +(define-public ocaml4.07-ppxlib + (package-with-ocaml4.07 + (package + (inherit ocaml-ppxlib) + (name "ocaml-ppxlib") + (version "0.6.0") + (home-page "https://github.com/ocaml-ppx/ppxlib") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv")))) + (build-system dune-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-topfind + (lambda* (#:key inputs #:allow-other-keys) + ;; add the line #directory ".." at the top of each file + ;; using #use "topfind";; to be able to find topfind + (let* ((findlib-path (assoc-ref inputs "findlib")) + (findlib-libdir + (string-append findlib-path "/lib/ocaml/site-lib"))) + (substitute* '("test/base/test.ml" + "test/code_path/test.ml" + "test/deriving/test.ml" + "test/driver/attributes/test.ml" + "test/driver/non-compressible-suffix/test.ml" + "test/driver/transformations/test.ml") + (("#use \"topfind\";;" all) + (string-append "#directory \"" findlib-libdir "\"\n" + all)))) + #t))))) + (properties '())))) + (define-public ocaml4.07-ppx-compare (package (name "ocaml4.07-ppx-compare") @@ -4890,7 +4908,7 @@ OCaml AST in the OCaml syntax; `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -4929,7 +4947,7 @@ by making sure that you only compare comparable values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "fieldslib"))) (home-page "https://github.com/janestreet/fieldslib") (synopsis "Syntax extension to record fields") @@ -4961,7 +4979,7 @@ of a record and create new record values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "variantslib"))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values") @@ -4987,7 +5005,7 @@ standard library.") ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5019,7 +5037,7 @@ new record values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5050,7 +5068,7 @@ definitions.") ("ocaml-variantslib" ,ocaml4.07-variantslib) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5083,7 +5101,7 @@ variant types.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5183,7 +5201,7 @@ storage of large amounts of data.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -5218,7 +5236,7 @@ hash functions from type exrpessions and definitions.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_enumerate"))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") @@ -5250,7 +5268,7 @@ many values).") `(("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_bench"))) (home-page "https://github.com/janestreet/ppx_bench") (synopsis "Syntax extension for writing in-line benchmarks in ocaml code") @@ -5280,7 +5298,7 @@ many values).") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_here"))) (home-page "https://github.com/janestreet/ppx_here") (synopsis "Expands [%here] into its location") @@ -5335,7 +5353,7 @@ many values).") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_sexp_value"))) (home-page "https://github.com/janestreet/ppx_sexp_value") (synopsis "Simplify building s-expressions from ocaml values") @@ -5366,7 +5384,7 @@ ocaml values.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_sexp_message"))) (home-page "https://github.com/janestreet/ppx_sexp_message") (synopsis "A ppx rewriter for easy construction of s-expressions") @@ -5398,7 +5416,7 @@ context such as function arguments.") (propagated-inputs `(("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_pipebang"))) (home-page "https://github.com/janestreet/ppx_pipebang") (synopsis "Inline reverse application operators `|>` and `|!`") @@ -5429,7 +5447,7 @@ context such as function arguments.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_optional"))) (home-page "https://github.com/janestreet/ppx_optional") (synopsis "Pattern matching on flat options") @@ -5458,7 +5476,7 @@ else expression.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_optcomp"))) (home-page "https://github.com/janestreet/ppx_optcomp") (synopsis "Optional compilation for OCaml") @@ -5488,7 +5506,7 @@ size, the version of the compiler, ...") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_let"))) (home-page "https://github.com/janestreet/ppx_let") (synopsis "Monadic let-bindings") @@ -5518,7 +5536,7 @@ match expressions, and if expressions.") ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_fail"))) (home-page "https://github.com/janestreet/ppx_fail") (synopsis "Add location to calls to failwiths") @@ -5550,7 +5568,7 @@ position.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_assert"))) (home-page "https://github.com/janestreet/ppx_assert") (synopsis "Assert-like extension nodes that raise useful errors on failure") @@ -5589,7 +5607,7 @@ useful errors on failure.") ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)) ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)))) (properties `((upstream-name . "ppx_expect"))) (home-page "https://github.com/janestreet/ppx_expect") @@ -5625,7 +5643,7 @@ to denote the expected output.") ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-octavius" ,(package-with-ocaml4.07 ocaml-octavius)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_js_style"))) (home-page "https://github.com/janestreet/ppx_js_style") (synopsis "Code style checker for Jane Street Packages") @@ -5658,7 +5676,7 @@ packages.") ("ocaml-typerep" ,ocaml4.07-typerep) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_typerep_conv"))) (home-page "https://github.com/janestreet/ppx_typerep_conv") (synopsis "Generation of runtime types from type declarations") @@ -5692,7 +5710,7 @@ from type definitions.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_base"))) (home-page "https://github.com/janestreet/ppx_base") (synopsis "Base set of ppx rewriters") @@ -5728,7 +5746,7 @@ verification tool.") ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_bin_prot"))) (home-page "https://github.com/janestreet/ppx_bin_prot") (synopsis "Generation of bin_prot readers and writers from types") @@ -5775,7 +5793,7 @@ functions from type definitions.") ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_jane"))) (home-page "https://github.com/janestreet/ppx_jane") (synopsis "Standard Jane Street ppx rewriters") @@ -5958,7 +5976,7 @@ thousands of times faster than fork. ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) + ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (home-page "https://github.com/janestreet/core") (synopsis "Alternative to OCaml's standard library") (description "The Core suite of libraries is an alternative to OCaml's -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:49 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:49 +0000 Received: from localhost ([127.0.0.1]:37823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwT-0006qM-5z for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:49 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53625) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwQ-0006ps-Jq for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:47 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 168AF24002A for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579081; bh=DjReW/kuSKYqk7gSlG9wRrPiMbZcxyA4cffeDB/P4nI=; h=From:To:Cc:Subject:Date:From; b=EEMZNWyxCu7e+Nf54kBZ638PkTTkwPy4dfwqijpHdX/XoO70t022VNKYpOzI5b+uw Mebp+k1ZO/3E/HYKCsT0M2NHSDfCbUNO8Oocx3qSKscy8Goz9FASgLB/eket+5gvVb mrcKM5zPVp8A/jsyR26F/uMcb/6OCOkZiz3u+TohDf9ww2E8wh2tkhCK6vSe6mv5n6 sgJsetsUDZ/YLzG2vVZgW44uhwssw1JjzGk18m8TrQqVXS7QlF8S8bIt8y1egmjEmd JwJtBMgRihQ81KY9i/slCYTvoicAwIngTjCIcyvlpbSu9OWAzmZjCldh+VSa0biB05 ZyRKSJ5ckfwbg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCp5qPFz9rxD; Tue, 1 Jun 2021 22:24:38 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 12/42] gnu: Add ocaml-sedlex. Date: Tue, 1 Jun 2021 20:22:55 +0000 Message-Id: <20210601202325.8777-13-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-sedlex): New variable. (ocaml4.07-sedlex): Inherit from ocaml-sedlex. --- gnu/packages/ocaml.scm | 57 ++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7fe59c0b95..605567b996 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2555,10 +2555,10 @@ representation of the data.") and consumable.") (license license:bsd-2))) -(define-public ocaml4.07-sedlex +(define-public ocaml-sedlex (package - (name "ocaml4.07-sedlex") - (version "2.1") + (name "ocaml-sedlex") + (version "2.3") (source (origin (method git-fetch) (uri (git-reference @@ -2567,36 +2567,37 @@ and consumable.") (file-name (git-file-name name version)) (sha256 (base32 - "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26")))) + "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar")))) (build-system dune-build-system) (arguments - `(#:tests? #f; no tests + `(#:tests? #f ; no tests #:package "sedlex" #:phases (modify-phases %standard-phases (add-before 'build 'copy-resources (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "src/generator/data" + ;; Newer versions of dune emit an error if files it wants to + ;; build already exist. Delete the dune file so dune doesn't + ;; complain. + (delete-file "dune") (for-each - (lambda (file) - (copy-file (assoc-ref inputs file) file)) - '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt" - "PropList.txt"))) + (lambda (file) + (copy-file (assoc-ref inputs file) file)) + '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt" + "PropList.txt"))) #t)) (add-before 'build 'chmod (lambda _ (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) - #t))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + #t))))) (native-inputs - `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) + `(("ocamlbuild" ,ocamlbuild))) (propagated-inputs - `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen)) - ("ocaml-ppx-tools-versioned" - ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned)) - ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar)))) + `(("ocaml-gen" ,ocaml-gen) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) + ("ocaml-uchar" ,ocaml-uchar))) ;; These three files are needed by src/generator/data/dune, but would be ;; downloaded using curl at build time. (inputs @@ -2621,11 +2622,29 @@ and consumable.") (sha256 (base32 "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk")))))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sedlex)))) (home-page "https://www.cduce.org/download.html#side") (synopsis "Lexer generator for Unicode and OCaml") (description "Lexer generator for Unicode and OCaml.") (license license:expat))) +(define-public ocaml4.07-sedlex + (package-with-ocaml4.07 + (package + (inherit ocaml-sedlex) + (name "ocaml-sedlex") + (version "2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-community/sedlex") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26")))) + (properties '())))) + (define-public ocaml-uchar (package (name "ocaml-uchar") @@ -3473,7 +3492,7 @@ Format module of the OCaml standard library.") `(("which" ,which))) (propagated-inputs `(("ocaml-xmlm" ,(package-with-ocaml4.07 ocaml-xmlm)) - ("ocaml-sedlex" ,ocaml4.07-sedlex) + ("ocaml-sedlex" ,(package-with-ocaml4.07 ocaml-sedlex)) ("ocaml-easy-format" ,(package-with-ocaml4.07 ocaml-easy-format)) ("ocaml-base64" ,(package-with-ocaml4.07 ocaml-base64)))) (home-page "http://piqi.org") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:50 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:51 +0000 Received: from localhost ([127.0.0.1]:37825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwU-0006qa-IY for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:50 -0400 Received: from mout01.posteo.de ([185.67.36.65]:59007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwS-0006pv-R7 for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:49 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 4E814240026 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579083; bh=ri2hZA5/ghI/2Yee7ac3XACxjmaJcKfdyemNLyWH1vo=; h=From:To:Cc:Subject:Date:From; b=heCBoC1UUFV10ODn3jLE6CiXcl6h78TnmQFHvTUWzkQAQIE+2FSaEK2UZFs3hnPUN islxH1U/sRo7nLOMOa77RcmirYkzwdxbFFPpBK+YSvPbuXC/S998ABrF1c277DUO9T MI8wx6YgoPvN+yIpuqyM1bzwnjFgIeipVUsTlmWRFd17ptcD8n9tKDiyxri/aSwf3F +AhYKfNGwCx4Eh8Vx/hl2VdA9TBUApZQgdKUJtbiC6PFt5IRaXuOTySaZtcToTL7+i xyz7R8OjXIxO6WF+Q2c4OsMTTyBFaMyPNPJa07LAEDvgHO947snm+twG/wugzsNl3Y nUNaAOTZa/vmw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCs1h6zz9rxF; Tue, 1 Jun 2021 22:24:41 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 13/42] gnu: Add ocaml-uunf. Date: Tue, 1 Jun 2021 20:22:56 +0000 Message-Id: <20210601202325.8777-14-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-uunf): New variable. --- gnu/packages/ocaml.scm | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 605567b996..0e9e9b8084 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2708,6 +2708,51 @@ 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 + `(#:build-flags (list "build" "--tests" "true") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'check 'check-data + (lambda* (#:key inputs #:allow-other-keys) + (copy-file (assoc-ref inputs "NormalizationTest.txt") + "test/NormalizationTest.txt") + #t))))) + (native-inputs + `(("ocamlbuild" ,ocamlbuild) + ("opam" ,opam) + ("topkg" ,ocaml-topkg) + ;; Test data is otherwise downloaded wit curl + ("NormalizationTest.txt" + ,(origin + (method url-fetch) + (uri (string-append "https://www.unicode.org/Public/" + version + "/ucd/NormalizationTest.txt")) + (sha256 + (base32 "07g0ya4f6zfzvpp24ccxkb2yq568kh83gls85rjl950nv5fya3nn")))))) + (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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:54 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:54 +0000 Received: from localhost ([127.0.0.1]:37829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwX-0006qt-VK for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:54 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54209) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwV-0006q7-VS for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:52 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 58E3E2400E5 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579086; bh=VW7COgijQW1i2idJd8LPnl53/nyI4czVJjL7AxBIdx4=; h=From:To:Cc:Subject:Date:From; b=Ye5ID3TDkIjr4kgz5f/KCkzVtTYaqPIpRlOl8K7slv+fzmI/TnM+/XQVtcdSfjrvQ 0h2zh/JWhYOlLbPPa2gDhP8Yugi60N9nVycqDrZN59AQRvAGIYCxqY9CC5ojpLhVrq aGczA6LajnDBOcDK6+HND1717db4xoQ3X9ESzePF/FMXTSULdjRYHefUv+kq4ep7dI Pxs2Nz7On2Apr72vef6TnuaWQSSwUKs5NBnnnEtbNPldfn/Xe3WWooGD8QCJYbqmfL tIlKw+fEWLHCdshxw+yX4qQD9bsuo1FRrskkjRqhqEznF4G9uBBDmcZpYEexHbDDfw NdfmhNlThsI7g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCv4y5Nz9rxF; Tue, 1 Jun 2021 22:24:43 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 14/42] gnu: Add ocaml-ppx-sexp-conv. Date: Tue, 1 Jun 2021 20:22:57 +0000 Message-Id: <20210601202325.8777-15-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 0e9e9b8084..9847990d18 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3443,7 +3443,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)) @@ -5083,36 +5083,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") @@ -5120,30 +5134,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))) @@ -5162,7 +5176,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)))) @@ -5195,7 +5209,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)))) @@ -5262,7 +5276,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)))) @@ -5414,7 +5428,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)))) @@ -5445,7 +5459,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)))) @@ -5629,7 +5643,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)))) @@ -5666,7 +5680,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" @@ -5771,7 +5785,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)))) @@ -6080,7 +6094,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:54 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:54 +0000 Received: from localhost ([127.0.0.1]:37833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwY-0006r2-JL for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:54 -0400 Received: from mout01.posteo.de ([185.67.36.65]:50957) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwX-0006qL-U9 for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:54 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 64223240026 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579088; bh=jVgGvrEG+EclxIvTON2zUqlboE1HtzC8UgQl9BrXyJs=; h=From:To:Cc:Subject:Date:From; b=h8daZvuD6MwIOXaj/vEtcCWgEppHEWFbnuxG7u/hnK4yidwqVSWGUTl32/1Vs1Cpd JIxrQ4W1oaxs8F1LT7GBUUnNBQ1KLBIr3FeB9qS91jet0u4WaZeIAxptMb0X4gLUXd xnWgxByBv0TNGCdXUeN0H7R+IaOq1bBdGnMISWK8NZQJERq/fbMwEnU8wsLJXs383f VmJplHDMW2JacX6dHD4OCd90+vC0RhEKbpegK9ZawlqHSIlpmMSeHMtKMms6blm3tn vXa4xRhXLIXSOjHv+nab/hb0NKkrrSDvRkamdEhYvCMPVHuBuaDNCM1teUTdL3Eu7T 1hGL0V2ZMtAOw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCy4s3Hz9rxF; Tue, 1 Jun 2021 22:24:46 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 15/42] gnu: Add ocaml-bigstringaf. Date: Tue, 1 Jun 2021 20:22:58 +0000 Message-Id: <20210601202325.8777-16-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 9847990d18..a2a3a78ea7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6592,3 +6592,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))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:24:58 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:58 +0000 Received: from localhost ([127.0.0.1]:37837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwb-0006rP-Qu for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:58 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45859) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwa-0006qk-Cm for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:56 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id D616A24002A for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579090; bh=Of5mqDSoCf0L16oGhx1K5zKfK2tpt+lBrqisAYHJizU=; h=From:To:Cc:Subject:Date:From; b=iQKnvoGioZ0VIooqY3Ghhm5WX37lt+2nqxRHD2Apk18DnBs3GZK/q1RGFWvuT7eui Y14E7g/utc13qxLSE80r0xCYIxjcgCMmhZZoF8wO3y7Gf0nduTOo6B32SMMYkp+Ssx 5o0YvkVbbqcGOfhUxwTbRQUOGzZmHPUsxofqiYJyC3fuOKD1C+SNi1xF50ZSgco9Yq nO7sjAUS6U4Zof9J4BbYOPOxZxWKLxAc2xH04G5NH2xdwdykWbjFsbqr2KCnFXfaRM VbBR3syvqLN17MhbXG2voJQwG8tkQtDrfpa9Wg7uUWQ95U6Iotpf0sLsuFWLPxh/3v 6TAaH3vjqoqLg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkD05yWMz9rxF; Tue, 1 Jun 2021 22:24:48 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 16/42] gnu: Add ocaml-ppx-let. Date: Tue, 1 Jun 2021 20:22:59 +0000 Message-Id: <20210601202325.8777-17-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 a2a3a78ea7..e6877e4e87 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5563,35 +5563,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") @@ -5861,7 +5863,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:00 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:00 +0000 Received: from localhost ([127.0.0.1]:37842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwe-0006ri-4I for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:00 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwc-0006qs-QN for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:59 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 49990240026 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579093; bh=v5Uj+B+XWD5NAWLmF5vUlHIM0oLIkQJYkMf0utuUoiY=; h=From:To:Cc:Subject:Date:From; b=SfdjWLjYSCExS+jyyq9YHJZ5haBeSzY9r3D8w1SQ7Ylng+Ei1oIoqr0mztjck070q 71vyHDQ4Ul6q3W0/p9PLubZWPYRI2T851A/tyhtmq2Oz9azTExLyaHz0YqZsioPfR8 TpdzdJMJp7YZ8PUQXoLf88qq48vuuglCQBQ9+S2IiOLEobTr18EcPGrdrXBrLOb8IL wu2YVG7DdBvtrt9YX5hfhXb/xYh2S4X65Q1e0DEuFxl0k/uyy/vvaUBjY+SnOUEfkI a2DazzGRvOD60vZsk1rbdC6SxUtnlx2LvXUhYDNy5X0PA2jTEjky+hju7vmOkMQ5WM grRd5GRCLWd5Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkD30qcNz9rxF; Tue, 1 Jun 2021 22:24:50 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 17/42] gnu: Add ocaml-syntax-shims. Date: Tue, 1 Jun 2021 20:23:00 +0000 Message-Id: <20210601202325.8777-18-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 e6877e4e87..7d5655e643 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6628,3 +6628,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))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:01 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:01 +0000 Received: from localhost ([127.0.0.1]:37844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwf-0006rq-B3 for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:01 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwd-0006qs-F7 for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:00 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 1EA87240027 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579099; bh=Os2viVFu+jOESP7p8nSCCc7xdGf9B/+O45fmSUa1+o8=; h=From:To:Cc:Subject:Date:From; b=EhPEGWllMIl2majja5JVtoKVzLyDhLQ3mxSJ08WQ/6ATmtwqdMuT0NW9Gk2GI7Nga crsCgSgnl1qpOEjFyrzZTQEIKSxGrfoxPW0+5e3IS3S/CWRiLFwBuaqWDV3Rqh6HZR VfsQnPK9mQODpFjxPDFBwgZmpjT0m7bO1kOwbGQPiZGhA9X6r/hGvRW6pCp7FDtbeH hVwaq6/g8dbjms3L68dA7QCZOBMWnV8mvdhSJbO0QgTdNifGzsgncvtd/JtHu1wqG4 kiRXorZTLvx/Qk3mijB9EOwaeKkz43lddIdBxDtI0LBfrWKH5ShwGSpRVzAyy9lbuK 7TsZDuTVxX3eQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkD82yBdz9rxH; Tue, 1 Jun 2021 22:24:56 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 19/42] gnu: Add ocaml-ppx-here. Date: Tue, 1 Jun 2021 20:23:02 +0000 Message-Id: <20210601202325.8777-20-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 5b88f87f8a..a10d092a92 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5365,37 +5365,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") @@ -5439,7 +5441,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)) @@ -5470,7 +5472,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)) @@ -5625,7 +5627,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)))) @@ -5656,7 +5658,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)) @@ -5692,7 +5694,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) @@ -5835,7 +5837,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)))) @@ -5873,7 +5875,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:04 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:04 +0000 Received: from localhost ([127.0.0.1]:37853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwh-0006sh-P2 for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:04 -0400 Received: from mout01.posteo.de ([185.67.36.65]:46129) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwf-0006rG-I4 for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:02 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 0929C240027 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579096; bh=rSUlPkyjBUtO2qcG7oqnz6CYvcTggh9CNc7LjjQenO0=; h=From:To:Cc:Subject:Date:From; b=HBKmBk44aTbMV2JP+IDc5LiTPLrh5YnAfbhxZLL0K8VIuZULjFVD3r+JK28h9fcIo YAc/Yd0eWlEbV/Rl232tqx5cv119sZGPNQ6D/qw0Ijsh3lawhbQunvJkwTDLwyhewu 2xK+gifVGS+l5b1QKmf+PiUGqMls7Heqk3SuK7CvDAvpwjg6GX/ZsmCgsYZxtcbp/a eHaSeIAKGDhFR2fFTx59sVUeeR0A2FbQSXjno3w5KLuPs9JayGQlx2H6ti9EkiROJq dvxUDnKcRwd4q49yUvNwFzxSKmTF9MWIRijbFAEp2tkXKwlDsw/gfJ7zgs0SDGUwib x5uZmVRRtdIbw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkD54gVwz9rxG; Tue, 1 Jun 2021 22:24:53 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 18/42] gnu: Add ocaml-ppx-compare. Date: Tue, 1 Jun 2021 20:23:01 +0000 Message-Id: <20210601202325.8777-19-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 7d5655e643..5b88f87f8a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4954,30 +4954,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 @@ -4988,6 +4982,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") @@ -5206,7 +5218,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)) @@ -5275,7 +5287,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)) @@ -5643,7 +5655,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" @@ -5677,7 +5689,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) @@ -5783,7 +5795,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:04 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:04 +0000 Received: from localhost ([127.0.0.1]:37856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwi-0006sq-6V for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:04 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwf-0006qs-W4 for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:02 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id A3227240029 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579101; bh=U/oR/C2PS1HQcrfWKB72j1FdpyDZpiPWWRsT7SfTh5U=; h=From:To:Cc:Subject:Date:From; b=MgE3baP5O9NRH8u6vJxdSUb39CqqH6/bUHkQMjIxSZH1cuc2y4p5UI6GZyAxetPVq WMVOMOLMH4fX+zw+h2wmiD24XAkjht5G43IegtXwrKPmGNlTlv2wFce6YWLOsWUc7R KVcQ21iJmJx38Q6beq/wL3R5DzDk3fNJ96QMW8Bp1suOExI+JqEAVSLBOKhPW2zcM6 gABr9tOPgYh1ZdErhbSdAxH03N3mDtQoguB7FSlnH7aicAIPv8uc9bvwQB23P7iV6l cul5hQWec/4K7ft5zrR3FS3vMCUcCfMnnsyX5jVl0PbEhI6bgi5kRrB6T8riuM4h1Y FmXH89WcKg3HQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDC3xvRz9rxH; Tue, 1 Jun 2021 22:24:59 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 20/42] gnu: Add ocaml-ppx-cold. Date: Tue, 1 Jun 2021 20:23:03 +0000 Message-Id: <20210601202325.8777-21-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 a10d092a92..f9a3c72234 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5638,6 +5638,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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:12 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:13 +0000 Received: from localhost ([127.0.0.1]:37876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwq-0006vR-Hu for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:12 -0400 Received: from mout02.posteo.de ([185.67.36.66]:33453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwo-0006tH-4R for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:10 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 7DF712400FD for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579104; bh=fidn8gcnoHdJwkTAYcRpW6aOVONunRaALX7R/+DDgSM=; h=From:To:Cc:Subject:Date:From; b=ly5iWCu55RpbArnJw0XDJyOU0EZ4Wn4LvSlf5SgW6we16QSuLej6L0/ox+vmiwPLw 7fN2LfZ6B0OaJoicfoSqj2jNgWfDmc1xBqGhVzO9dNNnrwLE/rUAKm1Oa4PbEbWfxl CmnwOLOXZe2lLQQ4Eb/2h4wgRK4u4lzvFoQJnMolrD2HGnVCeMOxlmCT6yOUh9jiZu GVCbg3sP+nAbzw7mgO/aLO9QZVpBXoqDU2XzlLtaatFifkhw+wRo1c+5z6z3u5nS71 7xSI1Ax18N4ZREUkzQVyOmiIxBd/2TfgMQi4a942kTfOZvNdr45d56QWrFoP+7vieR ZfoQ4JFLTirIw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDF6n20z9rxH; Tue, 1 Jun 2021 22:25:01 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 21/42] gnu: Add ocaml-ppx-assert. Date: Tue, 1 Jun 2021 20:23:04 +0000 Message-Id: <20210601202325.8777-22-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 f9a3c72234..61db4d1747 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5660,38 +5660,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") @@ -5712,7 +5721,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) @@ -5889,7 +5898,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) @@ -6085,7 +6094,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) @@ -6127,7 +6136,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:15 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:15 +0000 Received: from localhost ([127.0.0.1]:37880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAws-0006vh-Uq for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:15 -0400 Received: from mout01.posteo.de ([185.67.36.65]:51583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwq-0006u2-Ho for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:13 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 07EC924002B for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579107; bh=lu8HeivCkOQhvPGGhcevF3LVNXwCSYApp8IBioNQcLQ=; h=From:To:Cc:Subject:Date:From; b=OpbpveIyv/ZG5DUO0q0FU5vbVL/3dI9rONo81lfz5MstzFtzJYhYFXs6JmBh9V96k F4kcl0ovcF4IttIM1iWKqCrigmhcwfRyKvLK0PYp4btryZrRC1iT4ZxwGguztJmFfg HcbhYtyeIqejOAcDpnCVIHAlbvmwbyuNqZhcTLa74x0Gyxv7ILi2TeExEqFOLr1xDo 9SJC/fObODj/BcDJPs2D+Fn6UTwmJrqvgCKVGVRxzOHVR5sAlX+GC3Li4+Pzu1S812 UMLaT6mcREXB5WRArzKONkmUehG7FMoR5uI0O0/eMuBzvTvDo2hsHsxpHYn/6iUoRb KCPAMZl0ZFiMw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDJ553cz9rxD; Tue, 1 Jun 2021 22:25:04 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 22/42] gnu: Add ocaml-ppx-custom-printf. Date: Tue, 1 Jun 2021 20:23:05 +0000 Message-Id: <20210601202325.8777-23-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 61db4d1747..d8af57fdcc 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5173,36 +5173,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") @@ -5219,7 +5228,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) @@ -5723,7 +5732,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) @@ -5902,7 +5911,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:17 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:17 +0000 Received: from localhost ([127.0.0.1]:37884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwv-0006vy-Af for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:17 -0400 Received: from mout02.posteo.de ([185.67.36.66]:39207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwu-0006vH-9M for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:16 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 3DBB72400E5 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579110; bh=ZVXd3FpRrP5UCHwICc1PJy2nv2FYUbTLvjKU4J41i/A=; h=From:To:Cc:Subject:Date:From; b=dHyfjpdMtqGPjcAAzMbLTYt8AteBfpL/puyJ8+7MpMjyx4xcFlCHNTtheF6c5awJV UmZRqvq/grMPJBf6/Q6gDVb1ObMI7RVjaPdvJ6T+AhaSMe6fHmmIXObhLujQl3bDHd PZ9dkSb+ljh/8oux+jwXRvpbw2Dx7k0ClzVJDWSEyxlZsNtxMIuiidJiqNC5NFtp3r fb6V5OWbbjXZE5r/C90uci0h9HMoa8JuM0w23I6ZNy5I4cJ6DP6DBqEbGGmrALh9vQ 0LVQTzQtcWoB+ie7sAb0zb9jO3tbfpvyPQgzy5qus7IClupgKf9wObv3WjRT/KT1hh 2uNiDEcCzHM9Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDM2WSzz9rxD; Tue, 1 Jun 2021 22:25:07 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 23/42] gnu: Add ocaml-ppx-hash. Date: Tue, 1 Jun 2021 20:23:06 +0000 Message-Id: <20210601202325.8777-24-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 d8af57fdcc..9696180af3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5280,38 +5280,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") @@ -5319,23 +5327,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") @@ -5839,7 +5847,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" @@ -6147,7 +6155,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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:21 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:21 +0000 Received: from localhost ([127.0.0.1]:37888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwy-0006wM-PB for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:21 -0400 Received: from mout01.posteo.de ([185.67.36.65]:50185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwx-0006vf-95 for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:19 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id BA353240029 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579113; bh=uoVAtLY1p1hwG0VR4mvPiQJiEU2cFHjVOU/EpWUMKvI=; h=From:To:Cc:Subject:Date:From; b=Ribc7G1K+GvQhxRoRvASRbaAfLYqtOHyvyHUrU2E+Vl+CPUC/EXQ7x6Gfs/3KUjgZ f+/btMX7kdutGZyavAntvbvJG1d/WsBB59fbKKZS932Pin3j74vK63ow+fUYbXHjJB kU8GBcdw5Y2SwJM4G8UP7z9+Qbiwq9EY9mljpDW5OxpgWOOEX0h7f0/cgZWsOl/adI ORCLUGEs5ysGLDyDGHvMJUMKqG4eC5nVq4IdyrGXwxFoJ2knfW9SKgn9ckCNzIueDZ aMiULTS9JCkaR3TbC7PGpHZE9U25S/DXfkM8sflGnN8NfvfRCxoOVwZrGkj5LHzcyL 5k459fuwt/NRQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDQ603Tz9rxK; Tue, 1 Jun 2021 22:25:10 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 24/42] gnu: Add ocaml-ppx-enumerate. Date: Tue, 1 Jun 2021 20:23:07 +0000 Message-Id: <20210601202325.8777-25-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 9696180af3..44ae65c345 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5320,31 +5320,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 @@ -5352,6 +5344,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") @@ -5846,7 +5856,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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:24 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:24 +0000 Received: from localhost ([127.0.0.1]:37892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAx2-0006wc-3Y for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:24 -0400 Received: from mout01.posteo.de ([185.67.36.65]:55101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwz-0006vs-TU for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:22 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 54EF424002B for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579116; bh=rsXWz1zrrt0oaUaM+ENW+SX5kjMizcPOTB8IeKT3Wv0=; h=From:To:Cc:Subject:Date:From; b=I3P++UcK2+ScBR1tgOIExC90YifzkDIsfLI/I+6+m3tnoFpOcmUZS7tcV/zK36yQ1 Tenya18GfXbZGFbVHtmgSnaD778xQIGrCdBYNhD2tOxpKijzNwtbMMYs+oI40BO8jq uDMTyU6RizvMAKAMpQHSXLrVBxGKmGjPpbT4Qnx7rG4B2lnboDo4cZTTVHdsrgYi2+ 5f/UNBZoczUDWgvBTf4ZkvE6lyBVpcnXPwdzlLT3kKfnw4ZX+8qWLgOK96ADfgkf1p OvfUQcahHj+x3/qLYN47b2kjD0fvPLqq1EpuXq6W8WmgQNA3z01RPqK6zK4dvPLktk Wzb1MxNSlWhNQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDV1YWRz9rxH; Tue, 1 Jun 2021 22:25:13 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 25/42] gnu: Add ocaml-ppx-js-style. Date: Tue, 1 Jun 2021 20:23:08 +0000 Message-Id: <20210601202325.8777-26-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 44ae65c345..61ff1ea15f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5771,32 +5771,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 @@ -5804,6 +5794,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") @@ -5858,7 +5858,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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:26 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:26 +0000 Received: from localhost ([127.0.0.1]:37896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAx4-0006wv-Eb for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:26 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41117) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAx2-0006wD-Iv for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:25 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 0592B2400FE for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579119; bh=gUmKLm6ryZ46gLznQr9Udh6DWuwnFaDPyvu4+naWvzM=; h=From:To:Cc:Subject:Date:From; b=o2pOpYXvEKpKLnTjZm8bROfxpBpkD6Aud5o+02v4QqhqKwW7zSrE5rlBcJME4/d0C jqsNi/SPxPZTHDT2+4Wj8iBvXu4sxrbDOtQC3H+kNJMBY/XeS31u6K/FUIUrWED/ed 5VARsk1cWxiuvFkqMrLwp7R6HVFwG5g3oC5BDm5c0fwiMU+TrGVzk4XfOcvRF2XHf2 ViURPgrSUZaj3EO6sLeUrjITPVw77laSsia/aTugIAodcW9cUtwH5HW63FY1DB6u3G wZttBUOnGif5VonYod3zx/ocXvZh30Hr5Ig6/Y3w8IVK8ayR9XsU7MU7glqfBgGpK2 URn5U9Uxi87mg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDX4zTYz9rxH; Tue, 1 Jun 2021 22:25:16 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 26/42] gnu: Add ocaml-ppx-base. Date: Tue, 1 Jun 2021 20:23:09 +0000 Message-Id: <20210601202325.8777-27-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 61ff1ea15f..7ff1ef9e49 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5836,34 +5836,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. @@ -5872,6 +5866,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") @@ -5926,7 +5939,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)) @@ -6164,7 +6177,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:29 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:29 +0000 Received: from localhost ([127.0.0.1]:37900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAx6-0006xA-QU for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:29 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAx4-0006wU-Td for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:27 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 5FC8C240026 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579121; bh=lG1bMreB9q1j3qMO7gEhbFqYlCEk+P3TKmN3qYFr58o=; h=From:To:Cc:Subject:Date:From; b=MQuAYIeIriyGKVpgfIbSE1tCMJz6PK/Kqf0AwW+jomq91p75O9f7+XTe3C29qsyrP WlfqJkOTlSw4dm5S/hjyu/oRAjtVc/sQTcGUwI2jUElcfutUhFXwZiqO0DSVerMZZg +qS5BR4gXPam1Lbk48C6oaOa1EGYvDc6y2XgLGDEDdB3SA5JwAWmVoxty+60DW28hd 5JDoa2Dhp+GFJPno20yom6ztWWFptRyaQ/tjxbguOA1/qDKXOCq6WVbQ+CDm/Pcksj +cmiYKyeocHM89zxEk/y9C6ymq0j+9I0p2COFUXa7o4QKE9m8ytq/z/nlDrddLG6Bm 0zEvQGXaNzRCg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDb36PKz9rxG; Tue, 1 Jun 2021 22:25:19 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 27/42] gnu: Add ocaml-fieldslib. Date: Tue, 1 Jun 2021 20:23:10 +0000 Message-Id: <20210601202325.8777-28-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 7ff1ef9e49..129f9322ee 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5000,31 +5000,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 @@ -5032,6 +5022,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") @@ -5078,7 +5078,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)))) @@ -6174,7 +6174,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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:32 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:32 +0000 Received: from localhost ([127.0.0.1]:37904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxA-0006xV-6B for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:32 -0400 Received: from mout02.posteo.de ([185.67.36.66]:47795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAx8-0006wk-0G for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:30 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 5D2DF2400E5 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579124; bh=kjIJpyE6HozXKrIGALNadeigFsGaPiu0gvqGcFpyJrs=; h=From:To:Cc:Subject:Date:From; b=CN06NK37xICT1I6xeaDqyWKl21KMMbsZ+G+BklNx0kb4yfdLWVAd7tERSmVcWQlFG 57jT+FvDUH22rtJroH1l3meyLE6OjXh2ijPBSonYTDjYO6z/2I4bisRgH0uogXxvXo YWOBYwIgjwn2Pcx9TcRkUxJoNitmA3RSsPNC/Lq9YDesppkBKopTUT22PDLx1WmgDF eW0h4wtvlEdXpOMMbaN+AodPtRKedkXvZeN2b/MTaU/J2Yewzn3HqxTggAk9xl1AT4 fz+wt/dN1D39ej584FQJt+SYFMAKPm1i9g6XpmkW6e7OAkycSzscrtxkkQkKFkRFLU e9CkMNSg8G3Hg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDd5kNDz9rxG; Tue, 1 Jun 2021 22:25:21 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 28/42] gnu: Add ocaml-ppx-fields-conv. Date: Tue, 1 Jun 2021 20:23:11 +0000 Message-Id: <20210601202325.8777-29-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 129f9322ee..1cdc536b2e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5063,31 +5063,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 @@ -5095,6 +5093,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") @@ -5229,7 +5237,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" @@ -5751,7 +5759,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)) @@ -5945,7 +5953,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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:33 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:34 +0000 Received: from localhost ([127.0.0.1]:37908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxB-0006xi-Jf for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:33 -0400 Received: from mout02.posteo.de ([185.67.36.66]:38909) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxA-0006x2-Ii for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:33 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id E22C32400FF for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579126; bh=vpmWqL0PPOLhHNAsXHsPqw150pJkHqLeHuURpjtEyIY=; h=From:To:Cc:Subject:Date:From; b=F+dcp3FHSoX3jOsjLnE1AK+Kllz4W6zB2lEv7O6v8kdWd8W8/CZ/krljGjRNR8sXA T9ehE+3DPKHjYLKVyWfxnnrWEk0OmaQ3+DOTMjRszjXf9x+/TvAKJ/eYUyxAKZjmRr eDX+g9gKo6Cy54HjdFBZYJsD9TgEVmtzRTOwakGZUm6H8xWjFjq0W0ZneWSQyHVPXh 5NGJhdAyn/hcFi3NXywOLjVfK5pRGAoHGvEpjPF4WRUHns1dKq03Y/oDvP8SEj1Waq WS9fByotrOShBCi2WgY6KFqTni8z8fkq0Dr7Vo70jpejTUNW11ZwsMHf+N97B/YHqq VAmcWdc/FqHIw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDh5gHqz9rxG; Tue, 1 Jun 2021 22:25:24 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 29/42] gnu: Add ocaml-ppx-optcomp Date: Tue, 1 Jun 2021 20:23:12 +0000 Message-Id: <20210601202325.8777-30-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 1cdc536b2e..a40ea8c124 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5583,35 +5583,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") @@ -5957,7 +5967,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:37 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:37 +0000 Received: from localhost ([127.0.0.1]:37912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxE-0006xz-VL for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:37 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40361) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxD-0006xI-1e for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:35 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 748552400E5 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579129; bh=FDPk/jsTgdiHwwD3AOrKPIlLMY0D8DT6LBB2IxteRbY=; h=From:To:Cc:Subject:Date:From; b=anoSVHwWH8UsxX/4zohlQQxF0Cc2psw9rTFi6b51mCsEcy++Cmv2Ta2lXMfHOX717 xUZSCJVeWSRSfiu0T2B5MwkSWIbfohWrFc8B67lvGIVvLcYF7vhrU27684o/pYz7q7 0IFZvA2VTU/+up8bJ3iuG0Fw6r4tk1CDBFNBaRCoS8JNaX9YO8buDHOt4cn0Ug5TBP ROLSMahOykmLz0qBDyES96ipBBFE7Z3lbKp7Oz6o3BcL+IpYyCay9CGy2mnXAm3M2y LWP2cav+dmxXDMQDiF0kxS05rvhUc14R6vGLcFpEZEepviZr9D95xcUPJDzDKbxDFV cEH7iY5atRFnQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDl1Zm8z9rxG; Tue, 1 Jun 2021 22:25:27 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 30/42] gnu: Add ocaml-ppx-optional. Date: Tue, 1 Jun 2021 20:23:13 +0000 Message-Id: <20210601202325.8777-31-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 a40ea8c124..d8cea8e73f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5551,31 +5551,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 @@ -5583,6 +5574,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") @@ -5968,7 +5970,7 @@ functions from type definitions.") ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) - ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional) + ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional)) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:39 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:39 +0000 Received: from localhost ([127.0.0.1]:37916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxH-0006yG-8g for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:39 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51103) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxF-0006xU-Be for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:37 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AF5C52400E5 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579131; bh=e22SqwTaKRjhzLU7SuLhNCxfBDIGI/LmK0FCAMoet2U=; h=From:To:Cc:Subject:Date:From; b=msc0kYny7M40RxbkskntirG+E5iSbCrq8BHNVDCF1jc65hmH9jW5fPJL6Dmy7oRY7 dKcHbHjCuzCPNytXj0MyZ9ECCTb97jvsPMaIzFbRmeeaCEjcYG1EE+KAjaMz2U4vMg Fj0IsysDufMruMiEF4zDtzWi4USBEfLhU6G2XXrmgfHwcvd1zGgpttNuVILDEQfSfX qr8kEUJIpZYSuucj8+geMXMUrlb8vg7rpBpSvaFW41iKB0BtQl0ktnS8MAF4cUa2H1 Z3IXDkZ7UV3Srwy5BUOiEkVUqW6uRN97tRrm/fgOmLKFuAXhWv/yhbALTHoYNWlRJW Hsp84c11ZJdQA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDn5f51z9rxG; Tue, 1 Jun 2021 22:25:29 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 31/42] gnu: Add ocaml-jst-config. Date: Tue, 1 Jun 2021 20:23:14 +0000 Message-Id: <20210601202325.8777-32-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 d8cea8e73f..704a86dbfe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4141,6 +4141,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") @@ -4158,7 +4182,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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:41 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:41 +0000 Received: from localhost ([127.0.0.1]:37920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxJ-0006yV-GR for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:41 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34369) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxH-0006xq-Nk for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:40 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 34CC0240029 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579134; bh=x7nP1H0t1rg7bMBB0Srky9TsLKHUHI7UulB3K7nuAcs=; h=From:To:Cc:Subject:Date:From; b=bHFPi9/9riFy/soTXqUgwn4ezcJN/+b94nMPWe9Ndpq2xnTy57sY5L0EtFz7d/hf0 lRj5WaW/yDUwE1Myvc3MGkmWStHEMUw4O45Yc+qu8vcObYmE0goF7+lHlUoBKoSZqy spsSnFcB1tyXwnBHRQBo3QXZiQDsRsszNC1CrjQvD8xHXRl7ETQ1chSntJaprtUT6L CZcJSNhxU9over6edKz04y56TVJp+lZaCIANSAP9Ea8OBWiPvYVBTSCy18ExiJfrfx 5X1NdWxxrv8ijgQqAUroIqad5F8oo6hC22l1HhzGgU++eVDUWvxgIhdsTvcQoUjeR0 MWplm7f9y+93w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDr0GD3z9rxG; Tue, 1 Jun 2021 22:25:31 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 32/42] gnu: Add ocaml-jane-street-headers. Date: Tue, 1 Jun 2021 20:23:15 +0000 Message-Id: <20210601202325.8777-33-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 704a86dbfe..7788d5ee46 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4165,6 +4165,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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:43 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:43 +0000 Received: from localhost ([127.0.0.1]:37924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxK-0006yl-QL for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:42 -0400 Received: from mout02.posteo.de ([185.67.36.66]:39101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxK-0006xy-1W for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:42 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 6DC602400E5 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579136; bh=pprWpIzXM8cLJLxbQ8WGTFP92ocHvfa70IF+m1duaWg=; h=From:To:Cc:Subject:Date:From; b=I8F3qJ8qOcxVBhBO9MNYt0lUuUVAVnP5AiKl/HG8FnrE6cQu0JyzNX3R/iQ8viM/J nNep3Pdq3SDn1pihRufHAS18XqI29LBGlPdRIrbeZiLJ/AkNzuctyaUCTLXUSsgh81 /dScV6wTCjNbUreSae1CfZlSYEh+7WVrMZE4XzR1hijSo7xeYjHauhPsa+g8tBy702 JZ0pvHSA4t6MaOnBfgKjHB/sxowYt5LG1mEb6qWwRQC5xNOEBw2rwgtOJ1iajXvxcy zf9MxGU8S+EECjn0nSOf073KZoLzWSjrWfp08et+FlAzQmiJ1By5160ukNEXP8W/3O qvc4iO9zSVAxg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDt3rRmz9rxD; Tue, 1 Jun 2021 22:25:34 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 33/42] gnu: Add ocaml-time-now. Date: Tue, 1 Jun 2021 20:23:16 +0000 Message-Id: <20210601202325.8777-34-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 7788d5ee46..9bf6408ff4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4181,6 +4181,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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:46 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:46 +0000 Received: from localhost ([127.0.0.1]:37928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxO-0006z5-0u for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:46 -0400 Received: from mout01.posteo.de ([185.67.36.65]:51035) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxM-0006yH-GZ for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:45 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id F2B5824002A for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579139; bh=Zonk3wWKyT17sIqD0hX2fzj3tcrfIx2vBM+kOW9SEGU=; h=From:To:Cc:Subject:Date:From; b=Fw+A5x2m7bD6BmjB0jCmbcyxRI6FQt6HsCRCt1KfzkFsuNs7W43B4HJ5xXGmmO7gD UfFpcFSQV2jky0ysxH+V7okKo6hayjpYU6TS7gGm7Ws1ZkJdOvx8vek20ARv5ZHCC2 mXU8J1SbwvmsvbwoCceAaMSr9Q2r8TIyvyP95u0E8Ycf3wj0L+P4PVrvTzZpHdWC1l MrR8nTnOR1yRsWIhDkZ2CFn5BovG8r+keuMeL6N5ZH4UepOkYJy7zx8QB3K29WIpSz 5a013iepC9r9GzG1lwUtTkX+gb1zxUjZiXQM3kcgTxyShnwgobWH/C5rfLeseV0ZiO IoOK65vsPPkPg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDw5yfYz9rxD; Tue, 1 Jun 2021 22:25:36 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 34/42] gnu: Add ocaml-ppx-inline-test. Date: Tue, 1 Jun 2021 20:23:17 +0000 Message-Id: <20210601202325.8777-35-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 9bf6408ff4..e186a6663e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4206,10 +4206,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 @@ -4220,29 +4220,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") @@ -4259,7 +4282,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 @@ -5455,7 +5478,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)))) @@ -5838,7 +5861,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)) @@ -6032,7 +6055,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)) @@ -6264,7 +6287,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:48 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:48 +0000 Received: from localhost ([127.0.0.1]:37932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxQ-0006zL-EW for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:48 -0400 Received: from mout02.posteo.de ([185.67.36.66]:44551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxP-0006ye-4s for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:47 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 7002F2400FE for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579141; bh=jIiI4KncQNfD6AqOEpplK+mLzuQp61N/YPiiFbx40EI=; h=From:To:Cc:Subject:Date:From; b=NZg5PkIVjGUmuNGQTjsLMx+WfnhXZOME/ZDrDgOZJJuioREx9fadiOKFCcIWTKPPe iyfUM25W6XjiKF5wmDA7fi3B74CkedNzWzj4f9MM0uq5LXk+isCYFZsL9ik7/QQrkv WmjnOPI6fBMRmuZeXYRM2vd6aVWUjTUGrGO6vzhU4vk53JzyNQYDCko/tQqwXW36lx 69xMiwm4EFIOHIt29BnawpEdXY4nJrd/NumOTTvunv36NC6eKjcSiPQ109w0tWaZkp eS+4Rvk7+sbTCfDDkw6PKg2awxknaWewyPxBO9mce1N793wIsWG1GFKN6OSSQeWiJh xmIqd8yHUg9gA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkDz2FJVz9rxD; Tue, 1 Jun 2021 22:25:38 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 35/42] gnu: Add ocaml-angstrom. Date: Tue, 1 Jun 2021 20:23:18 +0000 Message-Id: <20210601202325.8777-36-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 e186a6663e..6e16f93ab4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6846,3 +6846,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))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:53 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:54 +0000 Received: from localhost ([127.0.0.1]:37938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxV-0006zi-Mf for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:53 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45279) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxT-0006z9-KG for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:52 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 13F1C24002A for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579146; bh=T5iuTi302dyE/+eyyxOl2ymCVops9g7b26VU4FSzfVo=; h=From:To:Cc:Subject:Date:From; b=mQc2KYOBNzhUzQWHbuxuCI8LZjz80Kx9cdGnEfEbUejhzpwPNpCk/RKUru6439YcI jb8I4LA8oPtZ5LabxkM8oxrhNLImKamR3rvMaT4C/g/rnveLhVBgDj54oxRgqW8J6J FmjqAXK7wJi0BZtjhewWCbpCRgvgWylT6A6GwwLmbe8G7Vm1mJm7mRC2rJxmCyAsFL BAdrfK8CDBuxqLimWtNTGMPPYQgs9WlNEYeImRX2sQXRvBPgJFri/P1wskXHNcmvD3 e9Sz0UD7//jFhvK86Sex6OM0v7GffZOmnng6VFcKF+Fqpk/AlYybnltm41N7E0di+N O8MNr8EhvjVsw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkF36X7pz9rxK; Tue, 1 Jun 2021 22:25:43 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 37/42] gnu: Add ocaml-graphics. Date: Tue, 1 Jun 2021 20:23:20 +0000 Message-Id: <20210601202325.8777-38-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org, divoplade X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: divoplade * gnu/packages/ocaml.scm (ocaml-graphics): New variable. Co-Authored-By: pukkamustard --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e1055cb43c..d2db62ebfe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6913,3 +6913,29 @@ Both interfaces give the user total control over the blocking behavior of their application, with the unbuffered interface enabling zero-copy IO. Parsers are backtracking by default and support unbounded lookahead.") (license license:bsd-3))) + +(define-public ocaml-graphics + (package + (name "ocaml-graphics") + (version "5.1.1") + (home-page "https://github.com/ocaml/graphics") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14w07ydji2nbdk366nfp2pzs9484xp9vqv63n345id13v48z8bfi")))) + (build-system dune-build-system) + (propagated-inputs + `(("libx11" ,libx11))) + (synopsis "The OCaml graphics library") + (description + "The graphics library provides a set of portable drawing primitives. +Drawing takes place in a separate window that is created when +Graphics.open_graph is called. This library used to be distributed with OCaml +up to OCaml 4.08.") + (license license:lgpl2.1+))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:55 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:55 +0000 Received: from localhost ([127.0.0.1]:37942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxW-0006zw-Uf for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:55 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58031) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxV-0006zN-RE for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:54 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 4CEAF240029 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579148; bh=7ZdnwIIYxGDMcruNj2IakJsJUsfrOfUKBi2ZqSpXMtY=; h=From:To:Cc:Subject:Date:From; b=CK2HHtnxOPiLVhSs6KlEwutOLT6aQo3v7KnXGSf9lLdcO8tdUyTwe42kKXGNvMgcE qSA+YDra8K5PmcR+TVBNdTbq9ihCetgOnEHHZYm/CNLNZ83wsjehVFFFZLcwNNm14y CoASEDcI5NwD9ibkqho5DWwL1tJWhu13OKKfJXZwvfpoOie+Akp/GG6XK4xAWlttxt qpg18CHbLdZ5lFwOkedjAAaCmpV+MWbOsd0TdYjAzCHWWQYtjzLi3Tg4uao1fBWKVp ako1fks3z4KAZozC9SxA+ko3e2Z+0elLf+bjcu/fsIvDc6pgd5zTChnfDNdRGYNNoV ELj2Z2LAae63A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkF62WnCz9rxM; Tue, 1 Jun 2021 22:25:46 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 38/42] gnu: Add ocaml-variantslib. Date: Tue, 1 Jun 2021 20:23:21 +0000 Message-Id: <20210601202325.8777-39-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-variantslib): New variable. (ocaml4.07-variantslib): Inherit from ocaml-variantslib. --- gnu/packages/ocaml.scm | 52 ++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d2db62ebfe..882348e136 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5150,37 +5150,45 @@ of a record and create new record values.") "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")) (properties `((upstream-name . "fieldslib")))))) -(define-public ocaml4.07-variantslib +(define-public ocaml-variantslib (package - (name "ocaml4.07-variantslib") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/variantslib-v" version ".tar.gz")) - (sha256 - (base32 - "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3")))) + (name "ocaml-variantslib") + (version "0.14.0") + (source + (janestreet-origin "variantslib" version + "11zp27gh282dx9ifbhcp6i7fkc97fvk8amaj58mf1g1hwklc0lm3")) (build-system dune-build-system) (arguments ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "variantslib"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "variantslib") + (ocaml4.07-variant . ,(delay ocaml4.07-variantslib)))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values") (description "The Core suite of libraries is an alternative to OCaml's standard library.") (license license:asl2.0))) +(define-public ocaml4.07-variantslib + (package-with-ocaml4.07 + (package + (inherit ocaml-variantslib) + (name "ocaml-variantslib") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/variantslib-v" version ".tar.gz")) + (sha256 + (base32 + "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3")))) + (properties `((upstream-name . "variantslib")))))) + (define-public ocaml-ppx-fields-conv (package (name "ocaml-ppx-fields-conv") @@ -5281,7 +5289,7 @@ definitions.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-variantslib" ,ocaml4.07-variantslib) + ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -6325,7 +6333,7 @@ standard library that was developed by Jane Street.") ("ocaml-splittable-random" ,ocaml4.07-splittable-random) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-typerep" ,ocaml4.07-typerep) - ("ocaml-variantslib" ,ocaml4.07-variantslib) + ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (properties `((upstream-name . "core_kernel"))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:25:58 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:25:58 +0000 Received: from localhost ([127.0.0.1]:37946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxa-00070C-9x for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:58 -0400 Received: from mout01.posteo.de ([185.67.36.65]:55301) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxY-0006zY-FK for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:56 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id E793C24002D for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579150; bh=KFhqeQnFnOcN5IJwgd+RBtPcOxOJv3s7RxyAcW37Qnk=; h=From:To:Cc:Subject:Date:From; b=ABCRENOPxXQmni6qUCo+LbSClLlRPt2Sn/nizmb+HNb6RGSWk0VeRXwIZJnbFqtfG +SjGWyAY9M8VrrAv3vk6Z59pmvoWVVbOK6LcKGrkWuN9yLZngY5hsEbLoC6Y6QS2Gm dP0S0sBiWQCYLCAtuyMQFlfdNpmNc5+DysES8hGmj6lKDU1+dPfrzSDXQ0VGSMz+hl r42Sf4atXCfcYx8M+tedZZC4v4tE/svV6rfLB5qguDpxKqq1GPiBy+ZbLJzLh1kGjH imrlLrBH8MUstZU84NrndGNozYe0qgd9wKJn4GpId2y5p6qMfwWALamgW/PcEdLPBV FTpLTDv/R7p9w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkF84WLmz9rxS; Tue, 1 Jun 2021 22:25:48 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 39/42] gnu: Add ocaml-ppx-variants-conv. Date: Tue, 1 Jun 2021 20:23:22 +0000 Message-Id: <20210601202325.8777-40-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-ppx-variants-conv): New variable. (ocaml4.07-ppx-variants-conv): Inherit from ocaml-ppx-variants-conv. --- gnu/packages/ocaml.scm | 65 ++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 882348e136..5710629d9d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5273,32 +5273,29 @@ definitions.") "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) (properties `((upstream-name . "ppx_sexp_conv")))))) -(define-public ocaml4.07-ppx-variants-conv +(define-public ocaml-ppx-variants-conv (package - (name "ocaml4.07-ppx-variants-conv") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_variants_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) + (name "ocaml-ppx-variants-conv") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_variants_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q6a43zrwqzdz7aja0k44a2llyjjj5xzi2kigwhsnww3g0r5ig84")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(("ocaml-base" ,ocaml-base) + ("ocaml-variantslib" ,ocaml-variantslib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties - `((upstream-name . "ppx_variants_conv"))) + `((upstream-name . "ppx_variants_conv") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-variants-conv)))) (home-page "https://github.com/janestreet/ppx_variants_conv") (synopsis "Generation of accessor and iteration functions for OCaml variant types") @@ -5307,6 +5304,24 @@ definitions.") variant types.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-variants-conv + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-variants-conv) + (name "ocaml-ppx-variants-conv") + (version "0.11.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_variants_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) + (properties `((upstream-name . "ppx_variants_conv")))))) + (define-public ocaml-ppx-custom-printf (package (name "ocaml-ppx-custom-printf") @@ -5365,7 +5380,7 @@ string conversion.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (arguments @@ -5901,7 +5916,7 @@ useful errors on failure.") ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -6101,7 +6116,7 @@ functions from type definitions.") ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value) ("ocaml-ppx-typerep-conv" ,ocaml4.07-ppx-typerep-conv) - ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) + ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:26:02 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:26:02 +0000 Received: from localhost ([127.0.0.1]:37950 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxd-00070Y-Lh for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:26:02 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34709) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxb-0006zp-B8 for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:25:59 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id C934E24002D for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579153; bh=g4WZaqHjjmq5m/asmJpDlkRzE8bkreA9HUMe5A4fFjE=; h=From:To:Cc:Subject:Date:From; b=aomo/4tcFKG+ffzUGS/AOcUvGnicLalfu1sBP43ITRi0Btev1jaBSZyLnfONV+lvS T2ELhFy/i2J8UpEQjz0d6+VjUnaHnEhkRnit/acj1IqrqvfZhIxVEfRDX7w6riTNXl iQFEdiCxP1rjm0BLnmvOYQ7t4rM8sV/MAFUrwzL5Mp8sAlgxHGQH2kskg0ywo2Vzpf b6/jTILPCV6S1gvO3sR9RO11W8/81lZmxfLKB/6Dsaj6HhvOR0rl+MBO2WIwHBnCip RCYfpVklTB5P/DR5gnTrq/lpbgEdM1w8LDYh5R0qvVL3PvZ69P5vX4PHBgQBrTtKLa YLExixJeSqDMQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkFC26K8z9rxR; Tue, 1 Jun 2021 22:25:50 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 40/42] gnu: Add ocaml-ppx-expect. Date: Tue, 1 Jun 2021 20:23:23 +0000 Message-Id: <20210601202325.8777-41-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ocaml.scm (ocaml-ppx-expect): New variable. (ocaml4.07-ppx-expect): Inherit from ocaml-ppx-expect. --- gnu/packages/ocaml.scm | 83 +++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5710629d9d..c3246c07d2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3804,7 +3804,7 @@ library is currently designed for Unicode Standard 3.2.") `(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)))) (native-inputs - `(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect))) + `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) (properties `((upstream-name . "charInfo_width"))) (home-page "https://bitbucket.org/zandoye/charinfo_width/") @@ -5889,40 +5889,31 @@ useful errors on failure.") ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties `((upstream-name . "ppx_assert")))))) -(define-public ocaml4.07-ppx-expect +(define-public ocaml-ppx-expect (package - (name "ocaml4.07-ppx-expect") - (version "0.12.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_expect") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1wawsbjfkri4sw52n8xqrzihxc3xfpdicv3ahz83a1rsn4lb8j5q")))) + (name "ocaml-ppx-expect") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_expect") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vbbnjrzpyk5p0js21lafr6fcp2wqka89p1876rdf472cmg0l7fv")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) - ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)) - ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)))) - (properties `((upstream-name . "ppx_expect"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-re" ,ocaml-re))) + (properties `((upstream-name . "ppx_expect") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect)))) (home-page "https://github.com/janestreet/ppx_expect") (synopsis "Cram like framework for OCaml") (description "Expect-test is a framework for writing tests in OCaml, similar @@ -5932,6 +5923,30 @@ output-generating code, interleaved with @code{%expect} extension expressions to denote the expected output.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-expect + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-expect) + (version "0.12.0") + (source + (janestreet-origin "ppx_expect" version + "1zpci8c49yn2ixchmwjx1kf9pwybv3dnn4l2dgnd6m36qnkralfk")) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-assert" ,ocaml-ppx-assert) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-custom-printf" ,ocaml-ppx-custom-printf) + ("ocaml-ppx-fields-conv" ,ocaml-ppx-fields-conv) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-ppx-variants-conv" ,ocaml-ppx-variants-conv) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-re" ,ocaml-re))) + (properties `((upstream-name . "ppx_expect")))))) + (define-public ocaml-ppx-js-style (package (name "ocaml-ppx-js-style") @@ -6104,7 +6119,7 @@ functions from type definitions.") ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-expect" ,ocaml4.07-ppx-expect) + ("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)) ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) @@ -6249,7 +6264,7 @@ Configurator allows one to: #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (native-inputs - `(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect))) + `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) (home-page "https://github.com/janestreet/spawn") (synopsis "Spawning sub-processes") (description -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:26:03 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:26:03 +0000 Received: from localhost ([127.0.0.1]:37957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxf-000719-3f for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:26:03 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40237) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxe-000705-0a for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:26:02 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 535822400FE for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579156; bh=XJDAb5odN96DhRRGzlPxptuURp4z5BSTsWIj/pl4Ld0=; h=From:To:Cc:Subject:Date:From; b=jTE4eKcXABr6vMGXNv5Y1/ZScHmM7R7/G1nRjfqhqjjJfXhIjPbzs+VKXPuJXp6z0 yW/TOG9ugkzvuexooZ305jomgcicJ7FYtlHwsWACw3U4zHR0RbJMPx9uASKdzWQdCg y4TiJxqTKb8QO83Yf2mX/zCHHROQ6oq0Ui8Jvozh/K93OpuDOk164PScLA9P2/pusU xTeC7kgRlc2ZmSGGM9OfuQ9PBBv7rL+a06b8B8ivBKu6Kix6YFY8fmTAytM29qVhuZ uHLq51vcs3y+RZftknlxzUhiZtywdi+UZNyKs5lMEnoeVJnL3ac7zL/ksWhT5RoApF DnZQIfYOtSFNw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkFG1P9nz9rxH; Tue, 1 Jun 2021 22:25:53 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 41/42] gnu: ocaml-num: Update to 1.4. Date: Tue, 1 Jun 2021 20:23:24 +0000 Message-Id: <20210601202325.8777-42-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/ocaml.scm (ocaml-num): Update to 1.4. --- gnu/packages/ocaml.scm | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c3246c07d2..76acfdb4bc 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -958,7 +958,7 @@ written in Objective Caml.") (define-public ocaml-num (package (name "ocaml-num") - (version "1.1") + (version "1.4") (source (origin (method git-fetch) @@ -967,33 +967,8 @@ written in Objective Caml.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0")))) - (build-system ocaml-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'fix-makefile - (lambda* (#:key outputs #:allow-other-keys) - ;; This package supposes we install to the same directory as - ;; the ocaml package. - (substitute* "src/META" - (("\"\\^\"") (string-append "\"" (assoc-ref outputs "out") - "/lib/ocaml/site-lib\""))) - (substitute* "src/Makefile" - (("\\) \\$\\(STDLIBDIR\\)") - (string-append ") " (assoc-ref outputs "out") - "/lib/ocaml/site-lib"))) - #t)) - (add-after 'install 'fix-stubslib - (lambda* (#:key outputs #:allow-other-keys) - (format #t "~a~%" (find-files "." ".*.so")) - (let ((stubdir (string-append (assoc-ref outputs "out") - "/lib/ocaml/site-lib/stublibs"))) - (delete-file stubdir) - (mkdir-p stubdir) - (install-file "src/dllnums.so" stubdir)) - #t))))) + (base32 "1vzdnvpj5dbj3ifx03v25pj2jj1ccav072v4d29pk1czdba2lzfc")))) + (build-system dune-build-system) (home-page "https://github.com/ocaml/num") (synopsis "Arbitrary-precision integer and rational arithmetic") (description "OCaml-Num contains the legacy Num library for -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:26:05 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:26:05 +0000 Received: from localhost ([127.0.0.1]:37966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxh-000724-By for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:26:05 -0400 Received: from mout01.posteo.de ([185.67.36.65]:54951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxR-0006yv-6f for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:26:04 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id A8E37240029 for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579143; bh=dIe0RX5cXIfrYN4bw0kgGYUC+c/UzK52so2DfNBiZgs=; h=From:To:Cc:Subject:Date:From; b=FuCV5F456z/Qh7AW7GtXxunpHpZ652i8PpazA6+dH31n3AaToNV7+e8cL1yR62o54 OriVVpjtosJ83AkmPxGlaudU/8zxxzR8wxOv1uw6M/AKyQbA3uHL6gM7TyqOqrN04P qGBa7G9a+VsklUpqQsNuHrLnymynaHwii1O06ZtZKmPEONpabD60ma1h8ND8RgEAxs 62m8x9tr//finFGDf6Al01oHT0bivcf8N3all7vXAL1wU5lGEwGIEJa1Gmh+ReFeUZ JkN/r+6PMXnQXljMmV6w+1qbeD9iSL0RFXdteJNo3QDslluzFRRALDLnfI8jCo9spg SbQXQKX1BP8Rw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkF14hHwz9rxH; Tue, 1 Jun 2021 22:25:41 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 36/42] gnu: Add ocaml-uri. Date: Tue, 1 Jun 2021 20:23:19 +0000 Message-Id: <20210601202325.8777-37-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 6e16f93ab4..e1055cb43c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3416,6 +3416,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") @@ -3448,6 +3477,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.") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 16:26:07 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:26:07 +0000 Received: from localhost ([127.0.0.1]:37971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxi-00072b-ML for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:26:06 -0400 Received: from mout01.posteo.de ([185.67.36.65]:37313) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAxg-00070M-Hh for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:26:05 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 07F1D24002C for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:25:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579159; bh=mVj5z4tv/7GzOeP1KakwFZMryPHO1eu7Kl1pr1cqZ6Q=; h=From:To:Cc:Subject:Date:From; b=JZKzC/WT5Qgb0RIa9mveiN4JvbGMyCPRmVM14oyvZW7YLHvn0fqLi2+d+3Eq42Miv 5lyU13SBqRzDitYb2Ajdqw0BIWKAqIr10/bJKLJr1WOwV9jNz2GoiNl706gtqr+XCn UmPECTGfUYxBv3cq18HWkmtt7WI/N3p1GRPkl6pSrSNk8tQW6HsK8zWpNEc82VlcJT 1BoxNogljAHls9B6/LQ2/9gFlqHsyrfJWFTABY0yi3OjeHOaWwOUhuMbZ95v/GeS2/ 9hu5ZHbN7Js/FELTK+fYmo+ZIVrKd+xX/uDSlYjSV/8pam9zLVVKkyMqzCgW8ouvEh F2OJYIsiFsLHA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkFJ56btz9rxH; Tue, 1 Jun 2021 22:25:56 +0200 (CEST) From: pukkamustard To: Xinglu Chen Subject: [PATCH v3 42/42] gnu: Add ocaml-js-of-ocaml. Date: Tue, 1 Jun 2021 20:23:25 +0000 Message-Id: <20210601202325.8777-43-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , 47768@debbugs.gnu.org, divoplade X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: divoplade * gnu/packages/ocaml.scm (ocaml-js-of-ocaml): New variable. Co-Authored-By: pukkamustard --- gnu/packages/ocaml.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 76acfdb4bc..5761c5c0c1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) + #:use-module (gnu packages node) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -6952,3 +6953,43 @@ Drawing takes place in a separate window that is created when Graphics.open_graph is called. This library used to be distributed with OCaml up to OCaml 4.08.") (license license:lgpl2.1+))) + +(define-public ocaml-js-of-ocaml + (package + (name "ocaml-js-of-ocaml") + (version "3.9.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocsigen/js_of_ocaml") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00hdjaj94j3nc6f6wbbpx59h4yc79siphs34i1hry11r56paaqyk")))) + (build-system dune-build-system) + (arguments `(#:test-target ".")) + (propagated-inputs + `(("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-uchar" ,ocaml-uchar) + ("ocaml-menhir" ,ocaml-menhir) + ("ocaml-reactivedata" ,ocaml-reactivedata) + ("ocaml-cmdliner" ,ocaml-cmdliner) + ("ocaml-lwt" ,ocaml-lwt) + ("ocaml-tyxml" ,ocaml-tyxml) + ("ocaml-re" ,ocaml-re) + ("ocaml-uutf" ,ocaml-uutf) + ("ocaml-graphics" ,ocaml-graphics) + ("ocaml-yojson" ,ocaml-yojson))) + (native-inputs + ;; for tests + `(("node" ,node) + ("ocaml-ppx-expect" ,ocaml-ppx-expect) + ("ocaml-num" ,ocaml-num))) + (properties `((upstream-name . "js_of_ocaml"))) + (home-page "https://ocsigen.org/js_of_ocaml/") + (synopsis "Compiler from OCaml bytecode to Javascript") + (description "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. +It makes it possible to run pure OCaml programs in JavaScript environment like +browsers and Node.js.") + (license license:lgpl2.1+))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 17:46:47 2021 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 21:46:47 +0000 Received: from localhost ([127.0.0.1]:38093 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loCDn-0002uL-00 for submit@debbugs.gnu.org; Tue, 01 Jun 2021 17:46:47 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:56790 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loCDl-0002u6-9z for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 17:46:46 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1622583997; bh=Rsqlm4NIHhR2ycSsVhXfoxC62RRBNUqYwUXRfLZGxV4=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=a9wwkLQvOt14URFpu+w4py6zbrnIEiCTnt1xr42IjyIGQ3wvA66iBMKajddcyCBV6 FMlmQC5MNLCRPrlbbBmipJjXR4oaSqBsEd8m0Y4efllqmt3bbvCRb7GRg2xiw4OjTa kka4wAV9eM5K/5u7kQCJ1dCvF72rPdJ+6sT3F+OQ= To: pukkamustard Subject: Re: [bug#47768] [PATCH v3 00/42] Assorted OCaml patches In-Reply-To: <20210601202203.8587-1-pukkamustard@posteo.net> References: <87lf82hasx.fsf@yoctocell.xyz> <20210601202203.8587-1-pukkamustard@posteo.net> Date: Tue, 01 Jun 2021 23:46:36 +0200 Message-ID: <87czt5xnpf.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Tue, Jun 01 2021, pukkamustard wrote: > Hi, > > Xinglu Chen writes: > >> All the packages build fine, but I haven’t tested anything. > > Thanks for the review! You are welcome! Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: 47768 Cc: pukkamustard , divoplade , 47768@debbugs.gnu.org, Maxime Devos , Erik X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Tue, Jun 01 2021, pukkamustard wrote: > Hi, > > Xinglu Chen writes: > >> All the packages build fine, but I haven’t tested anything. > > Thanks for the review! You are welcome! Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Tue, Jun 01 2021, pukkamustard wrote: > Hi, > > Xinglu Chen writes: > >> All the packages build fine, but I haven=E2=80=99t tested anything. > > Thanks for the review! You are welcome! > It follows a V3 with the two changes you suggested (add tests for > ocaml-uunf and merge patches 10 and 11 of V2). The changes look good to me, and =E2=80=98ocaml-uunf=E2=80=99 builds fine. > Erik has tested some of the packages and reports that everything seems > to be fine. > >> LGTM! > > Maybe we are good to merge now? No objections from me, but I don=E2=80=99t have commit access. :( Thank you and divoplade for the work! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmC2qrwVHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x5PewP/027YlqTDbkc0KPPn55iYOehvlxT gZ2sNq2iqbJF0mmm2HeEcSCL5lJtYLOgQfvL5CwYjP+bSaCUHlGZYsE+DGK+WYM1 iDl56pPJKe210Lnl4fAANXGXCXo1m6FeH1pIfTW5oKGN+Ztbi82dBAOh8dKU97se pkIbNsd+dmXZkh/0VltvOKClLam62rvtBM5zqXU9Y52m9L/zUDgg9ZRcwgVyuH76 7/f1gCSDXaNKra6P/ll3OU0VYBikMxvz72MJ4qUxeNQikWdcmMInm6oyj08b06XW /BskNmPVo3t3ZhHecIZniiU7LSsGMLI6dSBJopD9doF7PMo6SH/7HriW5USBtaZK pH9OmnwSmNIdlVp6FSfzVH1M7zUkhsBqbFxd6ELzoV2GKn52KhcVdD6jl+DsZ8eP yIgiqxz0e9DaeTG5SALarc3aYRjFbmvZfXFaO11pt5+umxsrv5NwHqia2zvGbmKL 7vrkUUvae/SmwUVoTQg/YnAYw5YxRhGILT/RpKhcgO7bWi+rfwtqCpG6cqE6nAB2 quX0v6Mdq2+S1GHTU3otgR6QFfuuzStSz4yhtLucK4PHc5BPNQ99zvty3mpfAo+k alg2bdhuHKd+gRjT/Sc5bf43JHCCBY9lapdt218/XjxsJXnSUYKxcYHiy0vFUbQ2 yCMIbFgqNezIHRni =Np9A -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 01 21:20:18 2021 Received: (at submit) by debbugs.gnu.org; 2 Jun 2021 01:20:18 +0000 Received: from localhost ([127.0.0.1]:38230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loFYQ-0007zX-7R for submit@debbugs.gnu.org; Tue, 01 Jun 2021 21:20:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:36248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loFYO-0007zM-SO for submit@debbugs.gnu.org; Tue, 01 Jun 2021 21:20:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loFYO-00087J-Mw for guix-patches@gnu.org; Tue, 01 Jun 2021 21:20:16 -0400 Received: from lepiller.eu ([89.234.186.109]:37034) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loFYK-0005Th-Rl for guix-patches@gnu.org; Tue, 01 Jun 2021 21:20:15 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 3e7b869e; Wed, 2 Jun 2021 01:20:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date :in-reply-to:references:mime-version:content-type :content-transfer-encoding:subject:to:cc:from:message-id; s= dkim; bh=cTAdfsGiN3WEi1UWKN85tUSMC4hJ24limbp82Xf+Gdc=; b=OrjXMfI zlQICqW+dvOOZsTM7mFG500QtJnI6Kk49j1Tgn8QKp/c2Rgvg+rzCWdLyytHxQlH u9oiit94OYk35ZG3d9fi5oX7s58uWaoaAfUvOfZUtrdEM3i5VDPC2LeRcVzBJLmo O6ARgpd34UV2Dgk7GN8N7AD4izCj/Km5AS/HtzkTGQkICx9m9f+Ab7cJXNfUsocZ iFeseSOHdkoIi2R+yLYgBH3TSnfeILv4R8ek5MQD15yvMeRKmoWBNVZfwx8K9ApU 5LHStzV0kjMYn5oplX59uQ/2YErbt4+6DgFiWmJNVUHj1izYc52KXUFW1J5hUtf8 VsIXG/QhGBg5zpw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 67141109 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Wed, 2 Jun 2021 01:20:04 +0000 (UTC) Date: Tue, 01 Jun 2021 21:19:42 -0400 User-Agent: K-9 Mail for Android In-Reply-To: <87czt5xnpf.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> <20210601202203.8587-1-pukkamustard@posteo.net> <87czt5xnpf.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----BQ60W1U7OD4YHBHQ9CUMLBP19IIV6A" Content-Transfer-Encoding: 7bit Subject: Re: [bug#47768] [PATCH v3 00/42] Assorted OCaml patches To: guix-patches@gnu.org, Xinglu Chen , pukkamustard From: Julien Lepiller Message-ID: <7662B41F-646C-44A3-807C-D4678139619A@lepiller.eu> Received-SPF: pass client-ip=89.234.186.109; envelope-from=julien@lepiller.eu; helo=lepiller.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: submit Cc: Erik , Maxime Devos , 47768@debbugs.gnu.org, divoplade X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) ------BQ60W1U7OD4YHBHQ9CUMLBP19IIV6A Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable I keep telling myself I should review and merge the changes but I keep havi= ng better things to do :p=2E I'll have a look during the week-end if noone = beats me at it :) Le 1 juin 2021 17:46:36 GMT-04:00, Xinglu Chen a = =C3=A9crit : >On Tue, Jun 01 2021, pukkamustard wrote: > >> Hi, >> >> Xinglu Chen writes: >> >>> All the packages build fine, but I haven=E2=80=99t tested anything=2E >> >> Thanks for the review! > >You are welcome! > >> It follows a V3 with the two changes you suggested (add tests for >> ocaml-uunf and merge patches 10 and 11 of V2)=2E > >The changes look good to me, and =E2=80=98ocaml-uunf=E2=80=99 builds fine= =2E > >> Erik has tested some of the packages and reports that everything >seems >> to be fine=2E >> >>> LGTM! >> >> Maybe we are good to merge now? > >No objections from me, but I don=E2=80=99t have commit access=2E :( > >Thank you and divoplade for the work! ------BQ60W1U7OD4YHBHQ9CUMLBP19IIV6A Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable I keep telling myself I should review and merge th= e changes but I keep having better things to do :p=2E I'll have a look duri= ng the week-end if noone beats me at it :)

Le 1 juin 2021 17:46:36 GMT-04:00, Xinglu Chen <public@yoctocell=2Exyz= > a =C3=A9crit :
On Tue, Jun 01 2021, pukkamustard wrote:

 Hi,

 Xinglu Chen <p=
ublic@yoctocell=2Exyz> writes:

All the packages build fine, but I haven=E2=80=99t tested an=
ything=2E

 Thanks for the review!

Y= ou are welcome!

It = follows a V3 with the two changes you suggested (add tests for
ocaml-uun= f and merge patches 10 and 11 of V2)=2E

The changes loo= k good to me, and =E2=80=98ocaml-uunf=E2=80=99 builds fine=2E

Erik has tested some of the pac= kages and reports that everything seems
to be fine=2E

LGTM!

Maybe we = are good to merge now?

No objections from me, but I don= =E2=80=99t have commit access=2E :(

Thank you and divoplade for the = work!
------BQ60W1U7OD4YHBHQ9CUMLBP19IIV6A-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 06 08:54:03 2021 Received: (at 47768) by debbugs.gnu.org; 6 Jun 2021 12:54:03 +0000 Received: from localhost ([127.0.0.1]:50958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpsHy-0005Ku-Sy for submit@debbugs.gnu.org; Sun, 06 Jun 2021 08:54:03 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:55212 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpsHy-0005KR-0R for 47768@debbugs.gnu.org; Sun, 06 Jun 2021 08:54:02 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1622984036; bh=geeXDByvgH7cqRJuVaCgOsjT+fGFLu2R55VIg4rjd5I=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=StJAfGCYwmzXS9NAXd9hxHk6vHREZCjrLO57zYWDEJr1TQbMmfZWSvelC5X0uRywr K0YAt3+dZ7JhCIicLbE1eFCA6ZYn1cxFYmnCFRpebCxvXwEIhXQW+4r/LaZ+h3M+/Y H1Cu5TKzKx+fqg/KkraCvjyUWBswmC/egvAgubCA= To: Julien Lepiller , 47768@debbugs.gnu.org, pukkamustard@posteo.net Subject: Re: [bug#47768] [PATCH v3 00/42] Assorted OCaml patches In-Reply-To: <7662B41F-646C-44A3-807C-D4678139619A@lepiller.eu> References: <87lf82hasx.fsf@yoctocell.xyz> <20210601202203.8587-1-pukkamustard@posteo.net> <87czt5xnpf.fsf@yoctocell.xyz> <7662B41F-646C-44A3-807C-D4678139619A@lepiller.eu> Date: Sun, 06 Jun 2021 14:53:53 +0200 Message-ID: <87tumb5f32.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Tue, Jun 01 2021, Julien Lepiller wrote: > I keep telling myself I should review and merge the changes but I keep > having better things to do :p. I'll have a look during the week-end if > noone beats me at it :) Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS X-Debbugs-Envelope-To: 47768 Cc: erikl@posteo.net, d@divoplade.fr, maximedevos@telenet.be X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Tue, Jun 01 2021, Julien Lepiller wrote: > I keep telling myself I should review and merge the changes but I keep > having better things to do :p. I'll have a look during the week-end if > noone beats me at it :) Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=-=-= Content-Type: text/plain On Tue, Jun 01 2021, Julien Lepiller wrote: > I keep telling myself I should review and merge the changes but I keep > having better things to do :p. I'll have a look during the week-end if > noone beats me at it :) Friendly ping! :) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEAVhh4yyK5+SEykIzrPUJmaL7XHkFAmC8xWEVHHB1YmxpY0B5 b2N0b2NlbGwueHl6AAoJEKz1CZmi+1x5ijcP/iwzq7OzKH21RwX/H1s+pcuc8PwB fbaQmjAcSQwGgMUfPKSfu+7jhLErV9TZO7S3snTfbVPfX2ra1Llw89AfjkxYnAxW QtP93BLysHSz6m5OqUDRRzGRwoYvnRVR3N6anzPDtni0JFBcQuQxa03zKvPxluW1 IucK7DiJ+MutJbC7MF1H8ch1STcFq5Sv+RxhFRiWtoXj2EMJUzm5nNK96Sfe4he+ pjd50laBxq32RJa/u+XlIO8gEbl2J9pOHEw/fNTGBzsHkPSMIphFZHnEpz+y4KZE zmafIVWXium5+jU/SpsBXKRMC+E1lMClPMio9SctXxwlwrj29YFkOpu5ozHowpgW w1LTGu+DpwEmjmvi68QBxA5WV/lUcPFwg99mnDMLcYN9NrkrfRnFcD3ebs2z/ghh eMnEw7OlJVjdoUgPZncCdUwrfT/paYrpB46sllSbg2jwKV7pQwRXzDtc6/gaWIPH uhatI8mhyLI6aX9SernliQsPX+yAhjp7yqc5fPr7vd7NyPtKGwyvtsxS3GtqrU+p Fm8lQ0mWgCCrZcWJwi7EECN9kvJKvkco9E6Azze4rYxe2xzMFsW2USZqQht6zB63 6QhJar/ErKh0/ZDJXJwSGJMltB+Cu1NrSjYMHOwoIbhl9uZTJU3hmDPKE0gSwfCm 8MmujqlcHZwaQRVO =3o9N -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 06 11:19:41 2021 Received: (at 47768) by debbugs.gnu.org; 6 Jun 2021 15:19:41 +0000 Received: from localhost ([127.0.0.1]:53711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpuYv-0003ZU-LS for submit@debbugs.gnu.org; Sun, 06 Jun 2021 11:19:41 -0400 Received: from lepiller.eu ([89.234.186.109]:43832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpuYs-0003ZK-PW for 47768@debbugs.gnu.org; Sun, 06 Jun 2021 11:19:39 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id cb64743f; Sun, 6 Jun 2021 15:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=sZYtVngzxQVc NvSrwOwnZZ6/bSprAHh/4ai03lophPM=; b=ltLoqI4Axo9v5wMGOR7+DTyQ20U6 X4gRWA+ubVDMGn01NpW5+rzRZq5Fqs89HLyyyFHIlvXL160vtam5C37vv1OZ1WUT 4MT0lgTIT/jtveKd3Nms4mfMIG5JUl5ywv40TnSyC6okm7kJLoFDBC2W5CjVfjSg qDA/NKitD0Gu70ItYL6bOfEQ+cL0bAL/EpS2+0i58kSZzaqgYo4FPXuDS0ggpiBw 1WZTd8FBn3urNaUO3e9runsCJJFXVmfQ4qgLkPGTbQVQTP+rM9E6O9JeYeK/gWGR e+gAuWGQVm8MzfhTM8z6fTwbyvu9wDc5+5yWFTDlwPF60c+t5ZG3L0q1zQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ac18799f (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 6 Jun 2021 15:19:35 +0000 (UTC) Date: Sun, 6 Jun 2021 17:19:23 +0200 From: Julien Lepiller To: Xinglu Chen Subject: Re: [bug#47768] [PATCH v3 00/42] Assorted OCaml patches Message-ID: <20210606171923.655b1186@tachikoma.lepiller.eu> In-Reply-To: <87tumb5f32.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> <20210601202203.8587-1-pukkamustard@posteo.net> <87czt5xnpf.fsf@yoctocell.xyz> <7662B41F-646C-44A3-807C-D4678139619A@lepiller.eu> <87tumb5f32.fsf@yoctocell.xyz> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Le Sun, 06 Jun 2021 14:53:53 +0200, Xinglu Chen a écrit : > On Tue, Jun 01 2021, Julien Lepiller wrote: > > > I keep telling myself I should review and merge the changes but I > > keep having better things to do :p. I'll have a look during the > > week-end i [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 47768 Cc: pukkamustard@posteo.net, erikl@posteo.net, d@divoplade.fr, 47768@debbugs.gnu.org, maximedevos@telenet.be X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Le Sun, 06 Jun 2021 14:53:53 +0200, Xinglu Chen a =C3=A9crit : > On Tue, Jun 01 2021, Julien Lepiller wrote: >=20 > > I keep telling myself I should review and merge the changes but I > > keep having better things to do :p. I'll have a look during the > > week-end if noone beats me at it :) =20 >=20 > Friendly ping! :) >=20 Alright, I managed to review and push the first 20 patches, as b477a9f42e52cf07e05add0632bc01e9d268dd55 to 52dc188e12fe80dfe13ba04f995081beedde6358. I'll try to take some more time later to push the rest. Not sure I can do that today though. From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 13 11:43:45 2021 Received: (at 47768-done) by debbugs.gnu.org; 13 Jun 2021 15:43:45 +0000 Received: from localhost ([127.0.0.1]:44252 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsSH3-0007Bi-2I for submit@debbugs.gnu.org; Sun, 13 Jun 2021 11:43:45 -0400 Received: from lepiller.eu ([89.234.186.109]:44518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsSGz-0007BX-Qt for 47768-done@debbugs.gnu.org; Sun, 13 Jun 2021 11:43:44 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 052b7910; Sun, 13 Jun 2021 15:43:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=UNyDkiURKytT GGFW5Yjc/u39N1EhaPzllaF9eZKzeDc=; b=MO9Vof0DYGhzUVpn7BAEhxoQ4IBy pDidlYtguHIIFmsOmHIGzp85U2/dZ9rCVmNSyJubC28ILX23XQZ9PcOiECdDJ2Sb tJ7yECe9srOvgk5JhH4gBfBI4F1N3FWAlH4VkVpdCQ8Ac4a7bHAPFxE22qrtdjZ0 iC0pZD8tXYoCQuC6LInbNTc1VVF4lTVI5rCwsZCK8toy27fBOzUFjDxOXRjDl7Vk JsJE5NfHDv3PGaZ4RnTkvb1zAjCt6lBYNjtbiBJZTvGbi9I7Geu6v6Fd3vWdzRre q6KkDuoRuFER42pZMMdBOoaiqCGW3p3zxjtL8Wr+p6jZ370VYhLhO/wWpw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b6dd7f09 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 13 Jun 2021 15:43:38 +0000 (UTC) Date: Sun, 13 Jun 2021 17:43:34 +0200 From: Julien Lepiller To: Xinglu Chen Subject: Re: [bug#47768] [PATCH v3 00/42] Assorted OCaml patches Message-ID: <20210613174334.29c476a8@tachikoma.lepiller.eu> In-Reply-To: <20210606171923.655b1186@tachikoma.lepiller.eu> References: <87lf82hasx.fsf@yoctocell.xyz> <20210601202203.8587-1-pukkamustard@posteo.net> <87czt5xnpf.fsf@yoctocell.xyz> <7662B41F-646C-44A3-807C-D4678139619A@lepiller.eu> <87tumb5f32.fsf@yoctocell.xyz> <20210606171923.655b1186@tachikoma.lepiller.eu> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Le Sun, 6 Jun 2021 17:19:23 +0200, Julien Lepiller a écrit : > Le Sun, 06 Jun 2021 14:53:53 +0200, > Xinglu Chen a écrit : > > > On Tue, Jun 01 2021, Julien Lepiller wrote: > > > > > I keep telling myself I should review and merge the ch [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 47768-done Cc: pukkamustard@posteo.net, erikl@posteo.net, d@divoplade.fr, 47768-done@debbugs.gnu.org, maximedevos@telenet.be X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Le Sun, 6 Jun 2021 17:19:23 +0200, Julien Lepiller a =C3=A9crit : > Le Sun, 06 Jun 2021 14:53:53 +0200, > Xinglu Chen a =C3=A9crit : >=20 > > On Tue, Jun 01 2021, Julien Lepiller wrote: > > =20 > > > I keep telling myself I should review and merge the changes but I > > > keep having better things to do :p. I'll have a look during the > > > week-end if noone beats me at it :) =20 > >=20 > > Friendly ping! :) > > =20 >=20 > Alright, I managed to review and push the first 20 patches, as > b477a9f42e52cf07e05add0632bc01e9d268dd55 to > 52dc188e12fe80dfe13ba04f995081beedde6358. I'll try to take some more > time later to push the rest. Not sure I can do that today though. >=20 >=20 >=20 And I just pushed the rest of this series from 77b3588debb63062d3112010908c5e8c501301c3 to d9e14697fd967770ce30fb54ce127ec521fc43f7. I took the liberty to rename ocaml-js-of-ocaml to simply js-of-ocaml, since it's the name of the tool. Thank you all who participated! From unknown Sat Jun 21 03:23:36 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 12 Jul 2021 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator