From patchwork Mon Dec 28 18:14:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26052 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9596E27BC04; Mon, 28 Dec 2020 18:15:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F1D971794D for ; Mon, 28 Dec 2020 18:15:14 +0000 (GMT) Received: from localhost ([::1]:40048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx33-0003bB-Vr for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:15:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2t-0003aG-2v for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2s-0006dG-Qn for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2s-0000EL-Kl for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 01/13] gnu: Remove ocaml-js-build-tools. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179279735 (code B ref 45498); Mon, 28 Dec 2020 18:15:02 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:14:39 +0000 Received: from localhost ([127.0.0.1]:36805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2R-0000BN-5k for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:38 -0500 Received: from mout02.posteo.de ([185.67.36.66]:46637) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2P-0000B2-4n for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:34 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2E557240100 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179266; bh=RehPZ00GRntKaLmUQuAm0uQLZoxW7MoXK5vdTeWMDo8=; h=From:To:Cc:Subject:Date:From; b=EP9aFXHe3qLJG/j8hNZu4n+s5qDN14KLSnExKj7sqC9qpbog4K9NuISEp7Fwcvhd7 d8U68ARUa2G8d4bxbhpUvOnXIcB6Dg5N0yhkDi5r5ssVQoepjSqUjIVcIczvOLb4tL JQsVWeAGUw/egdoF3ANcojsjqPHNd4gXetwpu+LcLLEGk1xn97OwCw7bEdIlcUMaV3 r/6nEFi2ob7Z2HtGgBAS/PlZ8bOm/H07q8GTXTV2XAN4FPQ7GjUpKbmez3hpRuu+KR RQb5Ry57x49aqo3Jfhb+7BHWlAd2g+jhMTFF9B1JY5RLGxrFNyBeJzEICqaWafE0uh jYaldlHpVkeRA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4Qg54JwLz6tmH; Mon, 28 Dec 2020 19:14:25 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:02 +0100 Message-Id: <20201228181414.14196-1-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <86pn2tn6mv.fsf@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches The package is deprecated and no longer maintained. It is recommended to use dune instead. * gnu/packages/ocaml.xyz (ocaml-js-build-tools, janestreet-origin, janestreet-arguments): Remove variable. --- gnu/packages/ocaml.scm | 65 +----------------------------------------- 1 file changed, 1 insertion(+), 64 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2bfda7307e..aa9dfb3dae 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2020 pukkamustard ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,47 +93,6 @@ (number->string file-number) "/" name "-" version ".tar.gz")) -;; Janestreet packages are found in a similar way and all need the same patch. -(define (janestreet-origin name version hash) - (origin (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/" - (version-major+minor version) "/files/" - name "-" version ".tar.gz")) - (sha256 (base32 hash)) - (modules '((guix build utils))) - (snippet - (let ((pattern (string-append "lib/" name))) - `(begin - ;; install.ml contains an invalid reference to the ppx file and - ;; propagates this error to the generated META file. It - ;; looks for it in the "lib" directory, but it is installed in - ;; "lib/ocaml/site-lib/package". This substitute does not change - ;; this file for non ppx packages. - (substitute* "install.ml" - ((,pattern) (string-append "lib/ocaml/site-lib/" ,name))) - ;; The standard Makefile would try to install janestreet modules - ;; in OCaml's directory in the store, which is read-only. - (substitute* "Makefile" - (("--prefix") - "--libdir $(LIBDIR) --prefix")) - #t))))) - -;; They also require almost the same set of arguments -(define janestreet-arguments - `(#:use-make? #t - #:make-flags - (list (string-append "CONFIGUREFLAGS=--prefix " - (assoc-ref %outputs "out") - " --enable-tests") - (string-append "LIBDIR=" - (assoc-ref %outputs "out") - "/lib/ocaml/site-lib") - ;; for ocaml-bin-prot, otherwise ignored - (string-append "OCAML_TOPLEVEL_PATH=" - (assoc-ref %build-inputs "findlib") - "/lib/ocaml/site-lib")) - #:phases (modify-phases %standard-phases (delete 'configure)))) - (define-public ocaml-4.11 (package (name "ocaml") @@ -2715,29 +2675,6 @@ system in your OCaml projects. It helps to create standard entry points in your build system and allows external tools to analyse your project easily.") (license license:lgpl2.1+))) ; with ocaml static compilation exception -(define-public ocaml-js-build-tools - (package - (name "ocaml-js-build-tools") - (version "113.33.06") - (source (janestreet-origin "js-build-tools" version - "0r8z4fz8iy5y6hkdlkpwf6rk4qigcr3dzyv35585xgg2ahf12zy6")) - (native-inputs - `(("oasis" ,ocaml-oasis) - ("ocamlbuild" ,ocamlbuild) - ("opam" ,opam))) - (build-system ocaml-build-system) - (arguments janestreet-arguments) - (home-page "https://github.com/janestreet/js-build-tools") - (synopsis "Collection of tools to help building Jane Street Packages") - (description "This package contains tools to help building Jane Street -packages, but can be used for other purposes. It contains: -@enumerate -@item an @command{oasis2opam-install} tool to produce a @file{.install} file -from the oasis build log -@item a @code{js_build_tools} ocamlbuild plugin with various goodies. -@end enumerate") - (license license:asl2.0))) - (define-public ocaml-cppo (package (name "ocaml-cppo") From patchwork Mon Dec 28 18:14:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26055 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2186427BC04; Mon, 28 Dec 2020 18:15:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7ECDA1794D for ; Mon, 28 Dec 2020 18:15:28 +0000 (GMT) Received: from localhost ([::1]:40104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx3H-0003cq-JJ for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:15:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2t-0003aQ-Ey for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53522) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2t-0006dW-7F for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2t-0000EV-2S for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 02/13] gnu: Add ocaml-sexplib0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179279747 (code B ref 45498); Mon, 28 Dec 2020 18:15:03 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:14:39 +0000 Received: from localhost ([127.0.0.1]:36811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2U-0000Bq-Un for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:39 -0500 Received: from mout02.posteo.de ([185.67.36.66]:48135) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2R-0000B7-1h for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:35 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 5B4FC2400FF for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179269; bh=1ScI70MPP5NOcIV8Lu+M+ZmjJuKeaXerfnIinBSVYzk=; h=From:To:Cc:Subject:Date:From; b=Yu2lzd5t2ViTiGSeCke17W2K7C8ihCwZuy2OF3DI9zLbGdCc8O9K+c+c1KoRJfhlM mGkrgSStej7Un97AfwWGRq1sbuAPekcm+0ZC0WmMWsa9L/6mvPXE0JsjM90XN9Bp4B SBRBTnbBpZyujt4duL+A2y4JoyisvOWkwmWqZ8kDzXmj6xx2ujUsAWIIEB0MGjCXrb jbGVZfyTeT3XD6vsl0WmPoLxOJRfQUQlJlta8lvmovhKB24RjjkgYLKoWG8or7BJ3l xVpWq+OE78LGMVdensrRIYdg7/DhgHmhdnE4mUPcnOaACB+RFCuktCKCVrKBxrZp1Y U/U1XbXRjKsOw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4Qg90QzXz6tmL; Mon, 28 Dec 2020 19:14:29 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:03 +0100 Message-Id: <20201228181414.14196-2-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-sexplib0): New variable. (ocaml4.07-sexplib0): Inherit from ocaml-sexplib0. (janestreet-origin): New variable. --- gnu/packages/ocaml.scm | 60 ++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index aa9dfb3dae..7dced949d3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -93,6 +93,14 @@ (number->string file-number) "/" name "-" version ".tar.gz")) +(define (janestreet-origin name version hash) + (origin (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) "/files/" + name "-v" (version-major+minor+point version) + ".tar.gz")) + (sha256 (base32 hash)))) + (define-public ocaml-4.11 (package (name "ocaml") @@ -2917,7 +2925,7 @@ JSON.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv))) (propagated-inputs `(("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) - ("ocaml-sexplib0" ,ocaml4.07-sexplib0) + ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stringext" ,(package-with-ocaml4.07 ocaml-stringext)))) (home-page "https://github.com/mirage/ocaml-uri") (synopsis "RFC3986 URI/URL parsing library") @@ -3648,7 +3656,7 @@ syntax checking on dedukti files.") ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) - ("ocaml-sexplib0" ,ocaml4.07-sexplib0) + ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stdio" ,ocaml4.07-stdio) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_inline_test"))) @@ -4027,33 +4035,35 @@ an arbitrary number of processes. Cache coherence protocols and mutual exclusion algorithms are typical examples of such systems.") (license license:asl2.0))) -(define-public ocaml4.07-sexplib0 +(define-public ocaml-sexplib0 (package - (name "ocaml4.07-sexplib0") - (version "0.11.0") + (name "ocaml-sexplib0") + (version "0.14.0") (home-page "https://github.com/janestreet/sexplib0") (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 - "07v3ggyss7xhfv14bjk1n87sr42iqwj4cgjiv2lcdfkqk49i2bmi")))) + (janestreet-origin "sexplib0" version + "0adrc0r1vvvr41dcpj8jwkzh1dfgqf0mks9xlnnskqfm3a51iavg")) (build-system dune-build-system) - (arguments - `(#:tests? #f ;no tests - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + (arguments `(#:tests? #f)) ;no tests + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sexplib0)))) (synopsis "Library containing the definition of S-expressions and some base converters") (description "Part of Jane Street's Core library The Core suite of libraries is an industrial strength alternative to OCaml's standard library that was developed by Jane Street, the largest industrial user of OCaml.") -(license license:expat))) + (license license:expat))) + +(define-public ocaml4.07-sexplib0 + (package-with-ocaml4.07 + (package + (inherit ocaml-sexplib0) + (name "ocaml-sexplib0") + (version "0.11.0") + (source + (janestreet-origin "sexplib0" version + "1p06p2s7p9xsjn0z9qicniv1ai54d8sj11k8j633di2mm7jzxpin")) + (arguments `(#:tests? #f)) ; no tests + (properties '())))) (define-public ocaml4.07-parsexp (package @@ -4076,7 +4086,7 @@ that was developed by Jane Street, the largest industrial user of OCaml.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (inputs - `(("ocaml-sexplib0" ,ocaml4.07-sexplib0))) + `(("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (synopsis "S-expression parsing library") (description "This library provides generic parsers for parsing S-expressions from @@ -4128,7 +4138,7 @@ parsexp_io.") (propagated-inputs `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) ("ocaml-parsexp" ,ocaml4.07-parsexp) - ("ocaml-sexplib0" ,ocaml4.07-sexplib0))) + ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (synopsis "Library for serializing OCaml values to and from S-expressions") (description @@ -4153,7 +4163,7 @@ functionality for parsing and pretty-printing s-expressions.") "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-sexplib0" ,ocaml4.07-sexplib0))) + `(("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (arguments `(#:phases (modify-phases %standard-phases @@ -4224,7 +4234,7 @@ is now @code{Ocaml_common.Ast_helper}.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,ocaml4.07-base) - ("ocaml-sexplib0" ,ocaml4.07-sexplib0))) + ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (arguments `(#:tests? #f ;no tests #:ocaml ,ocaml-4.07 @@ -4288,7 +4298,7 @@ as part of the same ocaml-migrate-parsetree driver.") ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) ("ocaml-stdio" ,ocaml4.07-stdio) ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) - ("ocaml-sexplib0" ,ocaml4.07-sexplib0))) + ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (arguments `(#:phases (modify-phases %standard-phases From patchwork Mon Dec 28 18:14:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26057 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BC6B327BC05; Mon, 28 Dec 2020 18:15:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8C26F27BC04 for ; Mon, 28 Dec 2020 18:15:44 +0000 (GMT) Received: from localhost ([::1]:40796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx3X-00042k-Kk for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:15:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2t-0003aY-Ra for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2t-0006de-Jv for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2t-0000Ec-FW for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 03/13] gnu: Add ocaml-base. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179280758 (code B ref 45498); Mon, 28 Dec 2020 18:15:03 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:14:40 +0000 Received: from localhost ([127.0.0.1]:36813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2V-0000C0-GU for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:40 -0500 Received: from mout02.posteo.de ([185.67.36.66]:48717) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2S-0000B9-8a for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:37 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 7E4352400FF for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179270; bh=lUOFEWmUPnMB0tQnFsimHj3SuXP9ftTM+Nzs87z+UzU=; h=From:To:Cc:Subject:Date:From; b=ditdkkhWYG1uNJU0a81+PWmcyS/OO/eLyMwT307CCNMCIeFiPmsqwxsy/tUmGBw9s Z9PHFZCUkCv0XZQumAGi1x1Hoyv2JhzUf2+0UQIILNVky8kOgQ4Ntcr7mkBaouN3rL FXzmcKbKkZ7j7VvKRUXQfqjFWXbuacLedC1Bm0QI46GwJyyAw/8TvnEtUH8XDp539l u+CuPawYVHp00nSHP7xQYUcAzk1gF+Auc1lUjWV1EU39nBakLOBYtDXenKqjJSUjq/ B08FoWxOFMWgZjpI5ONmQZCwMpVf3f9BUnb+ZR4mGEft64ZZ6lqWoSWwG9Gyvf5/Rr oz+Q9hhVfny8Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4QgB0015z6tm6; Mon, 28 Dec 2020 19:14:29 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:04 +0100 Message-Id: <20201228181414.14196-3-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-base): New variable. (ocaml4.07-base): Inherit from ocaml-base. --- gnu/packages/ocaml.scm | 137 ++++++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 62 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7dced949d3..6a232be8a7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1607,7 +1607,7 @@ library.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (native-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-stdio" ,ocaml4.07-stdio) ("pkg-config" ,pkg-config))) (inputs @@ -2560,7 +2560,7 @@ hierarchy of modules.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (native-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("pcre:bin" ,pcre "bin"))) (propagated-inputs `(("pcre" ,pcre))) (home-page "https://mmottl.github.io/pcre-ocaml") @@ -3652,7 +3652,7 @@ syntax checking on dedukti files.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("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) @@ -3946,7 +3946,7 @@ Atom.") (inputs `(("gsl" ,gsl))) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-stdio" ,ocaml4.07-stdio))) (home-page "https://mmottl.github.io/gsl-ocaml") (synopsis "Bindings to the GNU Scientific Library") @@ -4146,38 +4146,22 @@ parsexp_io.") functionality for parsing and pretty-printing s-expressions.") (license license:expat))) -(define-public ocaml4.07-base +(define-public ocaml-base (package - (name "ocaml4.07-base") - (version "0.11.1") + (name "ocaml-base") + (version "0.14.0") (home-page "https://github.com/janestreet/base") (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 - "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir")))) + (janestreet-origin "base" version + "1rkdhsgbcv0a8p29mwvpd2ldz8cjk97pixl43izm54wyin4lp778")) (build-system dune-build-system) (propagated-inputs - `(("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'build - ;; make warnings non fatal (jbuilder behaviour) - (lambda _ - (invoke "dune" "build" "@install" "--profile=release")))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (synopsis - "Full standard library replacement for OCaml") - (description - "Base is a complete and portable alternative to the OCaml standard + `(("ocaml-sexplib0" ,ocaml-sexplib0))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base)))) + (synopsis + "Full standard library replacement for OCaml") + (description + "Base is a complete and portable alternative to the OCaml standard library. It provides all standard functionalities one would expect from a language standard library. It uses consistent conventions across all of its module. @@ -4186,7 +4170,36 @@ Base aims to be usable in any context. As a result system dependent features such as I/O are not offered by Base. They are instead provided by companion libraries such as @url{https://github.com/janestreet/stdio, ocaml-stdio}.") - (license license:expat))) + (license license:expat))) + +(define-public ocaml4.07-base + (package-with-ocaml4.07 + (package + (inherit ocaml-base) + (name "ocaml-base") + (version "0.11.1") + (source + (origin + ;; version 0.11.1 is not released on ocaml.janestreet.org. + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/base.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'build + ;; make warnings non fatal (jbuilder behaviour) + (lambda _ + (invoke "dune" "build" "@install" "--profile=release")))) + #:ocaml ,ocaml-4.07 + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) + (properties '())))) (define-public ocaml4.07-compiler-libs (package @@ -4233,7 +4246,7 @@ is now @code{Ocaml_common.Ast_helper}.") "1facajqhvq34g2wrg368y0ajxd6lrj5b3lyzyj0jhdmraxajjcwn")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (arguments `(#:tests? #f ;no tests @@ -4291,7 +4304,7 @@ as part of the same ocaml-migrate-parsetree driver.") "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -4354,7 +4367,7 @@ OCaml AST in the OCaml syntax; "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4393,7 +4406,7 @@ by making sure that you only compare comparable values.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4425,7 +4438,7 @@ of a record and create new record values.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4450,7 +4463,7 @@ standard library.") "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -4483,7 +4496,7 @@ new record values.") "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4513,7 +4526,7 @@ definitions.") "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-variantslib" ,ocaml4.07-variantslib) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -4546,7 +4559,7 @@ variant types.") "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -4576,7 +4589,7 @@ string conversion.") "1rsd91gx36prj4whi76nsiz1bzpgal9nzyw3pxdz1alv4ilk2il6")))) (build-system dune-build-system) (inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("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) @@ -4645,7 +4658,7 @@ storage of large amounts of data.") "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("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-migrate-parsetree" @@ -4682,7 +4695,7 @@ hash functions from type exrpessions and definitions.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4744,7 +4757,7 @@ many values).") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4773,7 +4786,7 @@ many values).") #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) - (propagated-inputs `(("ocaml-base" ,ocaml4.07-base))) + (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)))) (home-page "https://github.com/janestreet/typerep") (synopsis "Typerep is a library for runtime types") (description "Typerep is a library for runtime types.") @@ -4797,7 +4810,7 @@ many values).") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("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-migrate-parsetree" @@ -4828,7 +4841,7 @@ ocaml values.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("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-migrate-parsetree" @@ -4893,7 +4906,7 @@ context such as function arguments.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4923,7 +4936,7 @@ else expression.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-stdio" ,ocaml4.07-stdio) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_optcomp"))) @@ -4952,7 +4965,7 @@ size, the version of the compiler, ...") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4981,7 +4994,7 @@ match expressions, and if expressions.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -5011,7 +5024,7 @@ position.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("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) @@ -5044,7 +5057,7 @@ useful errors on failure.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) @@ -5088,7 +5101,7 @@ to denote the expected output.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("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)) @@ -5121,7 +5134,7 @@ packages.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-typerep" ,ocaml4.07-typerep) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) @@ -5190,7 +5203,7 @@ verification tool.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-migrate-parsetree" @@ -5268,7 +5281,7 @@ driver including all standard Jane Street ppx rewriters.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) @@ -5328,7 +5341,7 @@ various Jane Street packages.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-stdio" ,ocaml4.07-stdio))) (home-page "https://github.com/janestreet/configurator") (synopsis "Helper library for gathering system configuration") @@ -5415,7 +5428,7 @@ thousands of times faster than fork. #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("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) @@ -5455,7 +5468,7 @@ standard library that was developed by Jane Street.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,ocaml4.07-base) + `(("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) @@ -5715,7 +5728,7 @@ library FFTW.") (native-inputs `(("openblas" ,openblas) ("lapack" ,lapack) - ("ocaml-base" ,ocaml4.07-base) + ("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-stdio" ,ocaml4.07-stdio))) (home-page "https://mmottl.github.io/lacaml/") (synopsis From patchwork Mon Dec 28 18:14:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26053 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 71E4127BC04; Mon, 28 Dec 2020 18:15:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 26CA41794D for ; Mon, 28 Dec 2020 18:15:16 +0000 (GMT) Received: from localhost ([::1]:40056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx34-0003ba-MO for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:15:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2u-0003ae-Bn for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2u-0006dj-3w for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2t-0000Ek-UM for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 04/13] gnu: Add ocaml-parsexp. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179281774 (code B ref 45498); Mon, 28 Dec 2020 18:15:03 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:14:41 +0000 Received: from localhost ([127.0.0.1]:36816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2W-0000CA-Fy for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:41 -0500 Received: from mout02.posteo.de ([185.67.36.66]:33143) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2T-0000BC-4K for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:37 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 87CD62400FE for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179271; bh=lje/MO0hATw9uBELU735PWtRN8lS97KodPJ7Ut1jU4Q=; h=From:To:Cc:Subject:Date:From; b=EgER6E9QLHJKhMIRKMLrS2fjr6A89sRTsp7q37sUqVSEUH9kUnLXYZEtSYXtKHqMt +hVpOuSq7RjuaH6bZj6scMIeK4PFf4mjnWqQ4qNdxnfdxeyfl6CCCBqCI39FzUNe2I xx7RZ2oMWqzoBAvLouyARXBbikpn2/qcKebeec1K/kfX6UQSF53L1Cc7rlHgQmPfQC fQSVllwNuKkCt/U4XggnfCN+ksoT2G5X7Pb1y2GpFhEpnKxzlI0Vul0M/hi7nXbnGC +QHGkb2qagRPmJnOawxEMGZigdA6y0wU11rf1b/Ye71a4yqIuUPNJuvO8DyhFXJbG4 smWNQYDKB0dOA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4QgB63Csz6tm5; Mon, 28 Dec 2020 19:14:30 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:05 +0100 Message-Id: <20201228181414.14196-4-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-parsexp): New variable. (ocaml4.07-parsexp): Inherit from ocaml-parsexp. --- gnu/packages/ocaml.scm | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6a232be8a7..31f524331f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4065,28 +4065,19 @@ that was developed by Jane Street, the largest industrial user of OCaml.") (arguments `(#:tests? #f)) ; no tests (properties '())))) -(define-public ocaml4.07-parsexp +(define-public ocaml-parsexp (package - (name "ocaml4.07-parsexp") - (version "0.11.0") + (name "ocaml-parsexp") + (version "0.14.0") (home-page "https://github.com/janestreet/parsexp") (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 - "1nyq23s5igd8cf3n4qxprjvhbmb6ighb3fy5mw7hxl0mdgsw5fvz")))) + (janestreet-origin "parsexp" version + "158znj19dvfdcwsgzs3rdhxpj1g4aw0d4nkfr8c05bahf0lnshlb")) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (inputs - `(("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) + `(("ocaml-sexplib0" ,ocaml-sexplib0) + ("ocaml-base" ,ocaml-base))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-parsexp)))) (synopsis "S-expression parsing library") (description "This library provides generic parsers for parsing S-expressions from @@ -4115,6 +4106,17 @@ s-expressions from files or other external sources, you should use parsexp_io.") (license license:expat))) +(define-public ocaml4.07-parsexp + (package-with-ocaml4.07 + (package + (inherit ocaml-parsexp) + (name "ocaml-parsexp") + (version "0.11.0") + (source + (janestreet-origin "parsexp" version + "11a30zkfgbi6pb4whq22k1zc8ghdp9bwxl5s5cdlmx1z8s4yxsf0")) + (properties '())))) + (define-public ocaml4.07-sexplib (package (name "ocaml4.07-sexplib") @@ -4137,7 +4139,7 @@ parsexp_io.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) - ("ocaml-parsexp" ,ocaml4.07-parsexp) + ("ocaml-parsexp" ,(package-with-ocaml4.07 ocaml-parsexp)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (synopsis "Library for serializing OCaml values to and from S-expressions") From patchwork Mon Dec 28 18:14:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26060 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AFA8127BC05; Mon, 28 Dec 2020 18:15:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EB25A27BC04 for ; Mon, 28 Dec 2020 18:15:55 +0000 (GMT) Received: from localhost ([::1]:41612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx3i-0004PS-WD for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:15:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2u-0003b3-Qs for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2u-0006dr-Ic for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2u-0000Et-Dl for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 05/13] gnu: Add ocaml-sexplib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179290823 (code B ref 45498); Mon, 28 Dec 2020 18:15:04 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:14:50 +0000 Received: from localhost ([127.0.0.1]:36826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2g-0000DC-2K for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:50 -0500 Received: from mout01.posteo.de ([185.67.36.65]:54034) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2U-0000BE-Lc for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:39 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id D9049160061 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179272; bh=d2kT8deGl8M+t/SmR61zwCxkAQC2wtb42P6soXvLLiQ=; h=From:To:Cc:Subject:Date:From; b=oDzIAxVCPGgYhhm3utxiE0k84wS6oK0kAg+UW0eDGdWeh1EaiWR2pNdekGU7fBXoa nP1+7T/nZ6INF0smTbSKClg8eqN5RfJhwcfndLMBofwGlveTdeRj7M9uedFiB0adBH ecszsbZ3zc65nKif5HW6vWvLIgRMXoJW551IB++3Qg9lHLUQn8XVj5znrg1/src3sT 7xu2SGEeFgmA4EI+gasgQuqWFxtrJHQDonjoITwcBClWnk41iCntWPlhmpqDP+mU4y OBB4fe8Zm2cONQ5r+DGqNDX15k9LFZaPs7Rm0dLaj37R+u5zaEgdAH99msRbBV0TRP 62+nbRpvH8n7A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4QgD1hcTz6tm5; Mon, 28 Dec 2020 19:14:32 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:06 +0100 Message-Id: <20201228181414.14196-5-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-sexplib): New variable. (ocaml4.07-sexplib): Inherit from ocaml-sexplib. --- gnu/packages/ocaml.scm | 49 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 31f524331f..246141c618 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2886,7 +2886,7 @@ writing to these structures, and they are accessed via the Bigarray module.") (propagated-inputs `(("ocaml-hex" ,(package-with-ocaml4.07 ocaml-hex)) ("ocaml-jsonm" ,(package-with-ocaml4.07 ocaml-jsonm)) - ("ocaml-sexplib" ,ocaml4.07-sexplib))) + ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)))) (home-page "https://github.com/mirage/ezjsonm/") (synopsis "Read and write JSON data") (description "Ezjsonm provides more convenient (but far less flexible) input @@ -4117,37 +4117,38 @@ parsexp_io.") "11a30zkfgbi6pb4whq22k1zc8ghdp9bwxl5s5cdlmx1z8s4yxsf0")) (properties '())))) -(define-public ocaml4.07-sexplib +(define-public ocaml-sexplib (package - (name "ocaml4.07-sexplib") - (version "0.11.0") + (name "ocaml-sexplib") + (version "0.14.0") (home-page "https://github.com/janestreet/sexplib") (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 - "1qfl0m04rpcjvc4yw1hzh6r16jpwmap0sa9ax6zjji67dz4szpyb")))) + (janestreet-origin "sexplib" version + "12rlnc6fcrjfdn3gs2agi418sj54ighhs6dfll37zcv7mgywblm2")) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) - ("ocaml-parsexp" ,(package-with-ocaml4.07 ocaml-parsexp)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-num" ,ocaml-num) + ("ocaml-parsexp" ,ocaml-parsexp) + ("ocaml-sexplib0" ,ocaml-sexplib0))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sexplib)))) (synopsis "Library for serializing OCaml values to and from S-expressions") (description - "This package is part of Jane Street's Core library. Sexplib contains + "This package is part of Jane Street's Core library. Sexplib contains functionality for parsing and pretty-printing s-expressions.") (license license:expat))) +(define-public ocaml4.07-sexplib + (package-with-ocaml4.07 + (package + (inherit ocaml-sexplib) + (version "0.11.0") + (source + (janestreet-origin "sexplib" version + "0ksx62zsxhz8xmdrsn41n2hbc2qbyh3bxxc6946xisvgwh42h3q3")) + (properties '())))) + (define-public ocaml-base (package (name "ocaml-base") @@ -5435,7 +5436,7 @@ thousands of times faster than fork. ("ocaml-core-kernel" ,ocaml4.07-core-kernel) ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-sexplib" ,ocaml4.07-sexplib) + ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-spawn" ,ocaml4.07-spawn) ("ocaml-stdio" ,ocaml4.07-stdio) ("ocaml-migrate-parsetree" @@ -5482,7 +5483,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) - ("ocaml-sexplib" ,ocaml4.07-sexplib) + ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-splittable-random" ,ocaml4.07-splittable-random) ("ocaml-stdio" ,ocaml4.07-stdio) ("ocaml-typerep" ,ocaml4.07-typerep) @@ -5649,7 +5650,7 @@ then run the Bisect_ppx report tool on the generated visitation files.") (inputs `(("ocaml-alcotest" ,(package-with-ocaml4.07 ocaml-alcotest)) ("ocaml-markup" ,(package-with-ocaml4.07 ocaml-markup)) - ("ocaml-sexplib" ,ocaml4.07-sexplib) + ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) ("ocaml-uutf" ,(package-with-ocaml4.07 ocaml-uutf)))) (native-inputs From patchwork Mon Dec 28 18:14:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26054 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D2B0327BC04; Mon, 28 Dec 2020 18:15:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6B2051794D for ; Mon, 28 Dec 2020 18:15:26 +0000 (GMT) Received: from localhost ([::1]:40116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx3F-0003dG-J4 for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:15:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2v-0003bC-6V for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53526) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2u-0006e2-Uy for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2u-0000F0-QV for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 06/13] gnu: Add ocaml-ounit2. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179291830 (code B ref 45498); Mon, 28 Dec 2020 18:15:04 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:14:51 +0000 Received: from localhost ([127.0.0.1]:36828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2g-0000DE-DK for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:50 -0500 Received: from mout02.posteo.de ([185.67.36.66]:47265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2V-0000BK-Fw for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:40 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id C21282400FC for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179273; bh=rO6DbaMGstkO1z/r8Bg98PQAvLQVIcH7fhv9fLV+75Q=; h=From:To:Cc:Subject:Date:From; b=Jd3Vue8qtI6pxRJVW2jz3Itx+E8gdSuwLTfucpwHU0eMH5pF0ba3iEXXxpPwLtptJ Ff4Bn0/K+gwHaXwC6W24XFCnzf/8ofcx6PuXjqrmd//GuatMfbtkxbi3IQ52Aa69ZT VweAQn6LSBzO6j7wTtEBxDGVrTwQ4QrgUnTe8LFpuWGYOVatbfk/fgTBu2UX/JI8ij thzk8At3opBM38bQVckswY/YYlo7ECywBwPkOj0LAfX6Z3MCp/pVKR0PZBMul8aJ3V H+MHSXN0hYmEOKPxYZ97pkHxgOBPF14S75mgf2LjuMgWm4xPMz4oWrZefq0z84ZItP Ykcjdl2SydOjQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4QgF1sY2z6tm9; Mon, 28 Dec 2020 19:14:33 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:07 +0100 Message-Id: <20201228181414.14196-6-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.xyz (ocaml-ounit2): New variable. --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 246141c618..f132edbbca 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -981,6 +981,32 @@ compilers that can directly deal with packages.") `(("m4" ,m4) ("ocaml" ,ocaml-4.09))))) +(define-public ocaml-ounit2 + (package + (name "ocaml-ounit2") + (version "2.2.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gildor478/ounit.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (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))) + (home-page "https://github.com/gildor478/ounit") + (synopsis "Unit testing framework for OCaml") + (description "Unit testing framework for OCaml. It is similar to JUnit and +other XUnit testing frameworks.") + (license license:expat))) + ;; note that some tests may hang for no obvious reason. (define-public ocaml-ounit (package From patchwork Mon Dec 28 18:14:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26062 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 01AD427BC04; Mon, 28 Dec 2020 18:16:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C4B5F1794D for ; Mon, 28 Dec 2020 18:16:09 +0000 (GMT) Received: from localhost ([::1]:42302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx3w-0004gz-Te for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:16:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2v-0003bp-N3 for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53531) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2v-0006e6-Dk for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2v-0000F9-7y for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 07/13] gnu: ocaml-tyxml: Update to 4.4.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179291837 (code B ref 45498); Mon, 28 Dec 2020 18:15:05 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:14:51 +0000 Received: from localhost ([127.0.0.1]:36830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2g-0000DL-RI for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:51 -0500 Received: from mout01.posteo.de ([185.67.36.65]:36186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2W-0000BO-GZ for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:40 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id DCF0316005F for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179274; bh=v4Pv0ahzQubunJJYZg+Ak85FL8xvU66Tb5lCAK/jmZ4=; h=From:To:Cc:Subject:Date:From; b=PpHa5PafX+eCylgRQp6JQdWsuTGPdiKxOFXquocnMidX1jQyERCoWiFeShykseUIq ek34OKp8F9b1Mxe/X9HTN3P4V2M1clFeuAtyLa2J1JaHVmNlenuREYjFczNobr/OWf AI83SjaKqcLG3C1yKXNv7Ux/lcnCcEZexi/mhUgPiDeENQKF9NdC5mbfiZm28kXq3K v9tbSq5LWGjC07k9Rx9kuIAY1b393EJpMrZ9SEYSzlrXJ9Sm7RNIqdI1WHQxLO7yc3 IZ0blgR9S1O4Oa9wZH63uwtzPpLpY0RlHbjtybKKiaTqxCRVldB6fcfcMwxPdxLOoF 5bCFjEXrI0ZcA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4QgG1j20z6tm5; Mon, 28 Dec 2020 19:14:34 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:08 +0100 Message-Id: <20201228181414.14196-7-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-tyxml): Update to 4.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 f132edbbca..c042ebd58b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5581,7 +5581,7 @@ stream, and convert everything to UTF-8.") (define-public ocaml-tyxml (package (name "ocaml-tyxml") - (version "4.3.0") + (version "4.4.0") (source (origin (method git-fetch) @@ -5591,7 +5591,7 @@ stream, and convert everything to UTF-8.") (file-name (git-file-name name version)) (sha256 (base32 - "0wv19xipkj8l2sks1h53105ywbjwk7q93fb7b8al4a2g9wr109c0")))) + "1hw4phyadcfgywgh5sj87i76gp56qwxzwlcpfdwjbf6ggag9clmd")))) (build-system dune-build-system) (inputs `(("ocaml-re" ,ocaml-re) From patchwork Mon Dec 28 18:14:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26056 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A953A27BC05; Mon, 28 Dec 2020 18:15:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6128B1794D for ; Mon, 28 Dec 2020 18:15:44 +0000 (GMT) Received: from localhost ([::1]:40828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx3X-00043h-GS for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:15:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2w-0003ct-Fo for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2w-0006eJ-5E for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2w-0000FT-0K for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 08/13] gnu: ocaml-markup: Update to 1.0.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179291844 (code B ref 45498); Mon, 28 Dec 2020 18:15:05 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:14:51 +0000 Received: from localhost ([127.0.0.1]:36832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2h-0000DS-4D for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:51 -0500 Received: from mout01.posteo.de ([185.67.36.65]:52985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2X-0000BU-6A for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:41 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 9F3F7160060 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179275; bh=LEd/FiE5tnkarsMHJl5Si/upsVREXI7oEebpHnrhA0M=; h=From:To:Cc:Subject:Date:From; b=X/P1XDOjnkdma/Ck3sFZqACvXJlbFlH0RZHiI0y9U5qAeetussv0OJ+rAc8oSE6QD zeyU1ZODrE34SGjp1SQkjGtAeNitOSDqrefvY/4ht21Dy2U3tosXBOcJxA7hRXSIFM Wom6VdjBRxx+sqZNz4zxUjpOQi7jUulYLTV4M19MGUkMh0Kb130RHeGmrHtIQ9kbPc iaQbUdBqbIhfQw6hXFipgtUwoH6FMhU487hhFlN6M90bR2wiudiytCyuxPSSu4Ovqu ZRJVLzagwOAdq7ZYxbLK536hNoQsIvQHVELCSeRZ0KC47VqZqyjpADh4DKU/bphO6q PgjN/IwXw989w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4QgH1yBtz6tm5; Mon, 28 Dec 2020 19:14:35 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:09 +0100 Message-Id: <20201228181414.14196-8-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-markup): Update to 1.0.0. (ocaml-markup0.8.0): New variable. --- gnu/packages/ocaml.scm | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c042ebd58b..6f4c0b980e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5532,7 +5532,7 @@ the full Core is not available, such as in Javascript.") (define-public ocaml-markup (package (name "ocaml-markup") - (version "0.8.2") + (version "1.0.0") (home-page "https://github.com/aantron/markup.ml") (source (origin @@ -5543,7 +5543,7 @@ the full Core is not available, such as in Javascript.") (file-name (git-file-name name version)) (sha256 (base32 - "13zcrwzjmifniv3bvjbkd2ah8wwa3ld75bxh1d8hrzdvfxzh9szn")))) + "09hkrf9pw6hpb9j06p5bddklpnjwdjpqza3bx2179l970yl67an9")))) (build-system dune-build-system) (arguments `(#:package "markup")) @@ -5555,8 +5555,10 @@ the full Core is not available, such as in Javascript.") ("ocaml-uutf" ,ocaml-uutf) ("ocaml-lwt" ,ocaml-lwt))) (native-inputs - `(("ocaml-ounit" ,ocaml-ounit) + `(("ocaml-ounit2" ,ocaml-ounit2) ("pkg-config" ,pkg-config))) + (properties + `((ocaml4.07-variant . ,(delay (package-with-ocaml4.07 ocaml-markup0.8.0))))) (synopsis "Error-recovering functional HTML5 and XML parsers and writers") (description "Markup.ml provides an HTML parser and an XML parser. The parsers are wrapped in a simple interface: they are functions that transform @@ -5578,6 +5580,26 @@ a single pass. They automatically detect the character encoding of the input stream, and convert everything to UTF-8.") (license license:bsd-3))) +;; ocaml-markup 1.0.0 can not be built with old version of dune used in +;; package-with-ocaml4.07 +(define-public ocaml-markup0.8.0 + (package + (inherit ocaml-markup) + (name "ocaml-markup") + (version "0.8.0") + (home-page "https://github.com/aantron/markup.ml") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append home-page ".git")) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0aif4abvfmi9xc1pvw5n5rbm6rzkkpsxyvdn0lanr33rjpvkwdlm")))) + (properties '()))) + (define-public ocaml-tyxml (package (name "ocaml-tyxml") From patchwork Mon Dec 28 18:14:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26061 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A1C4F27BC04; Mon, 28 Dec 2020 18:15:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 261FD1794D for ; Mon, 28 Dec 2020 18:15:58 +0000 (GMT) Received: from localhost ([::1]:41826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx3l-0004Uw-BO for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:15:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2x-0003ep-7f for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53537) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2w-0006eU-Ul for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2w-0000Fk-Ng for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 09/13] gnu: Add ocaml-odoc. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179291851 (code B ref 45498); Mon, 28 Dec 2020 18:15:06 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:14:51 +0000 Received: from localhost ([127.0.0.1]:36834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2h-0000DZ-Ef for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:51 -0500 Received: from mout01.posteo.de ([185.67.36.65]:52430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2Y-0000BW-38 for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:42 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 7A29916005F for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179276; bh=w4WAx4sThVTZ5kHcXpA3ri2FA/m6u84I9QI4carPwMs=; h=From:To:Cc:Subject:Date:From; b=CXc6HkzQJtaGaQbwawP6ouBp4E1jON5f5G2AoShp87WwvHoJsbTjyYyXR5QeCxy5E ks+X5H3KEHYgnTk7D1yR8nNHMTjn7uj9WR+VRDhcZmksxRmNmSsnKfqG1i54RMpG+S XgbF0t+eMdpm7VhF4a1bffmZxWlN4pXtHnGTGLh/EbFKdMAbUWbirDUh1Hv2eIdyfK KSk21KVxAvmfz3Ww3MrUkV6T46ZdhVc9DKCxkGEzgNKNTP/Nh8O22wiLG283IRi153 iL3s52UjxrG070Y64q2LsHWS01qqiaENxIBVOOu9mT56BZqSITgooNm//ZZxJw8Z1l kHk/K9/HmIoWw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4QgJ0qP9z6tm6; Mon, 28 Dec 2020 19:14:36 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:10 +0100 Message-Id: <20201228181414.14196-9-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-odoc): New variable. (ocaml4.07-odoc): Inherit from ocaml-odoc and update to 1.5.1. --- gnu/packages/ocaml.scm | 60 +++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6f4c0b980e..70386c72ce 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -71,6 +71,7 @@ #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages virtualization) + #:use-module (gnu packages web) #:use-module (gnu packages web-browsers) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -2185,7 +2186,7 @@ representation of the data.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-odoc" ,ocaml4.07-odoc))) + `(("ocaml-odoc" ,(package-with-ocaml4.07 ocaml4.07-odoc)))) (native-inputs `(("ocaml-qtest" ,(package-with-ocaml4.07 ocaml-qtest)) ("ocaml-qcheck" ,(package-with-ocaml4.07 ocaml-qcheck)))) @@ -5677,10 +5678,10 @@ Usage is simple - add package bisect_ppx when building tests, run your tests, then run the Bisect_ppx report tool on the generated visitation files.") (license license:mpl2.0))) -(define-public ocaml4.07-odoc +(define-public ocaml-odoc (package - (name "ocaml4.07-odoc") - (version "1.4.2") + (name "ocaml-odoc") + (version "1.5.2") (source (origin (method git-fetch) @@ -5689,26 +5690,24 @@ then run the Bisect_ppx report tool on the generated visitation files.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0rvhx139jx6wmlfz355mja6mk03x4swq1xxvk5ky6jzhalq3cf5i")))) + (base32 "0fqfyz48q7ss5bc4c5phmp4s3ka3vc08b8gfk8fvyryvb4bq27jm")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (inputs - `(("ocaml-alcotest" ,(package-with-ocaml4.07 ocaml-alcotest)) - ("ocaml-markup" ,(package-with-ocaml4.07 ocaml-markup)) - ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) - ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) - ("ocaml-uutf" ,(package-with-ocaml4.07 ocaml-uutf)))) + `(("ocaml-alcotest" ,ocaml-alcotest) + ("ocaml-markup" ,ocaml-markup) + ("ocaml-sexplib" ,ocaml-sexplib) + ("ocaml-re" ,ocaml-re) + ("ocaml-uutf" ,ocaml-uutf))) (native-inputs - `(("ocaml-astring" ,(package-with-ocaml4.07 ocaml-astring)) - ("ocaml-cmdliner" ,(package-with-ocaml4.07 ocaml-cmdliner)) - ("ocaml-cppo" ,(package-with-ocaml4.07 ocaml-cppo)) - ("ocaml-fpath" ,(package-with-ocaml4.07 ocaml-fpath)) - ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) - ("ocaml-tyxml" ,(package-with-ocaml4.07 ocaml-tyxml)) - ("ocaml-bisect-ppx" ,(package-with-ocaml4.07 ocaml-bisect-ppx)))) + `(("ocaml-astring" ,ocaml-astring) + ("ocaml-cmdliner" ,ocaml-cmdliner) + ("ocaml-cppo" ,ocaml-cppo) + ("ocaml-fpath" ,ocaml-fpath) + ("ocaml-result" ,ocaml-result) + ("ocaml-tyxml" ,ocaml-tyxml) + ("ocaml-bisect-ppx" ,ocaml-bisect-ppx) + ("tidy-html" ,tidy-html))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-odoc)))) (home-page "https://github.com/ocaml/odoc") (synopsis "OCaml documentation generator") (description "Odoc is a documentation generator for OCaml. It reads @@ -5720,6 +5719,25 @@ advantage over ocamldoc is an accurate cross-referencer, which handles the complexity of the OCaml module system.") (license license:isc))) +;; version 1.5.2 requires ocaml-markdown 1.0.0 which does not compile +;; with old version of dune used in package-with-ocaml4.07 +(define-public ocaml4.07-odoc + (package-with-ocaml4.07 + (package + (inherit ocaml-odoc) + (name "ocaml-odoc") + (version "1.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/odoc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0z2nisg1vb5xlk41hqw8drvj90v52wli7zvnih6a844cg6xsvvj2")))) + (properties '())))) + (define-public ocaml4.07-fftw3 (package (name "ocaml4.07-fftw3") From patchwork Mon Dec 28 18:14:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26058 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6A9C827BC04; Mon, 28 Dec 2020 18:15:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2F9571794D for ; Mon, 28 Dec 2020 18:15:46 +0000 (GMT) Received: from localhost ([::1]:40952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx3Z-00048L-Ad for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:15:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2y-0003hP-8G for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53539) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2x-0006ex-Uh for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2x-0000G6-OW for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 10/13] gnu: Add ocaml-version. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179306957 (code B ref 45498); Mon, 28 Dec 2020 18:15:07 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:15:06 +0000 Received: from localhost ([127.0.0.1]:36844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2v-0000FC-85 for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:15:05 -0500 Received: from mout02.posteo.de ([185.67.36.66]:60039) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2Z-0000Bm-P4 for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:44 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 3FC732400FB for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179277; bh=NLlBBpEMzCuq8dNliYI3onyJexpyjaTybMPBPe07SRo=; h=From:To:Cc:Subject:Date:From; b=CJRxWFMAHkq0YJUUzuhpNHxN7UY+gYeugxQ7vxR5tO4eDG5fn6SEYN275MB5/p2FE 8Lr+daYE9NSx2gLC3ec/G9h7uxAVQxU97q3VI6aUJBX5b73AFGiOzfINREwSNXdjIA 7HBEqrG7wzINNS91Nk9SpyvJ2vby0i7VyBKBjPjWd1PlNnSVEi1jBR7qFVybQyPu2f 7ayBy6dfqWnWxh1XqqvZFwxDb0S7UTKzx/hxmeOMcc3VNgGrYsf9YFmKCcHCChNPSy f4qOwOy3ba9jhl/U+/FdYc8u3O5qgsYQIxs+DD1agwWbFR9L3AwN162261sLEjOYWt 90+lp8/MY7SYQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4QgJ6KtBz6tm5; Mon, 28 Dec 2020 19:14:36 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:11 +0100 Message-Id: <20201228181414.14196-10-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-version): New variable. --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 70386c72ce..baebe2540f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5844,6 +5844,32 @@ include the X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output.") (license license:lgpl3+))) +(define-public ocaml-version + (package + (name "ocaml-version") + (version "3.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocurrent/ocaml-version") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13770mp6adjjbx63zsbh6506dqxz241chw8c3y403sxpw45hnaw6")))) + (build-system dune-build-system) + (arguments `(#:tests? #f)) ; no tests + (home-page + "https://github.com/ocurrent/ocaml-version") + (synopsis + "Manipulate, parse and generate OCaml compiler version strings") + (description + "This library provides facilities to parse version numbers of the OCaml +compiler, and enumerates the various official OCaml releases and configuration +variants.") + (license license:isc))) + (define-public lablgtk3 (package (name "lablgtk") From patchwork Mon Dec 28 18:14:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26064 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 033F427BC04; Mon, 28 Dec 2020 18:16:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B0ADF1794D for ; Mon, 28 Dec 2020 18:16:49 +0000 (GMT) Received: from localhost ([::1]:43008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx4a-000509-TJ for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:16:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2x-0003gC-QW for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53538) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2x-0006eg-Gg for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2x-0000Fy-Bb for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 11/13] gnu: Add ocaml-mdx. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179305946 (code B ref 45498); Mon, 28 Dec 2020 18:15:07 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:15:05 +0000 Received: from localhost ([127.0.0.1]:36842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2u-0000F6-Sh for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:15:05 -0500 Received: from mout01.posteo.de ([185.67.36.65]:35691) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2Z-0000Bk-L7 for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:44 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 1980616005F for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179278; bh=c7SrvkzGOuMWE9+xrYuRsaEbUolJ8cWRUiIQESgIZng=; h=From:To:Cc:Subject:Date:From; b=PQQe7umlIIiHBoeEcYboqYhOsenarT5NPWXZno1QvXBx7RSUvzG2qQpdWvRLcOqNJ +jHzxuhWOR8eZM7kvQSijTCIjmzV4+tHjAAnRzWptY9l5BJgnFvhKjfwpeb+dyV/ox 5rYNncqt5UEmeaT2UlWizwYbmmfr5Cd4nDRNGFgTuHV3+qjXC3pbonEwvs0AUh9w3m 2Nf0EXwnMRkBDipNh/jr6EQFQXg8GAnaLj2cQyUtHWnhAeVCNCni00+ZFL1gewxtTu EKaxLO27mS1VvBJdiWZiyjOGlvvbogYOKWUOByxHmQ3PUv60aX7o4IKBIfWEZexjLw QH1J2RY2rjBkQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4QgK4j4Lz6tm5; Mon, 28 Dec 2020 19:14:37 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:12 +0100 Message-Id: <20201228181414.14196-11-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-mdx): New variable. --- gnu/packages/ocaml.scm | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index baebe2540f..385d96977e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5870,6 +5870,55 @@ compiler, and enumerates the various official OCaml releases and configuration variants.") (license license:isc))) +(define-public ocaml-mdx + (package + (name "ocaml-mdx") + (version "1.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/realworldocaml/mdx") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10avyv99xkfqdq3gmq8gps770jpibbfslg97sbhgmp0dpwikz49d")))) + (build-system dune-build-system) + (inputs + `(("ocaml-fmt" ,ocaml-fmt) + ("ocaml-astring" ,ocaml-astring) + ("ocaml-logs" ,ocaml-logs) + ("ocaml-cmdliner" ,ocaml-cmdliner) + ("ocaml-re" ,ocaml-re) + ("ocaml-result" ,ocaml-result) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-odoc" ,ocaml-odoc) + ("ocaml-version" ,ocaml-version))) + (native-inputs + `(("ocaml-cppo" ,ocaml-cppo) + ("ocaml-lwt" ,ocaml-lwt) + ("ocaml-alcotest" ,ocaml-alcotest))) + (home-page + "https://github.com/realworldocaml/mdx") + (synopsis + "Executable code blocks inside markdown files") + (description + "@code{ocaml-mdx} allows to execute code blocks inside markdown files. +There are (currently) two sub-commands, corresponding +to two modes of operations: pre-processing (@code{ocaml-mdx pp}) +and tests (@code{ocaml-mdx test}]). + +The pre-processor mode allows to mix documentation and code, +and to practice @dfn{literate programming} using markdown and OCaml. + +The test mode allows to ensure that shell scripts and OCaml fragments +in the documentation always stays up-to-date. + +@code{ocaml-mdx} is released as two binaries called @code{ocaml-mdx} and +@code{mdx} which are the same, mdx being the deprecated name, kept for now for +compatibility.") + (license license:isc))) + (define-public lablgtk3 (package (name "lablgtk") From patchwork Mon Dec 28 18:14:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26059 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 12AAD27BC05; Mon, 28 Dec 2020 18:15:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 72BDF1794D for ; Mon, 28 Dec 2020 18:15:55 +0000 (GMT) Received: from localhost ([::1]:41594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx3i-0004Ov-JO for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:15:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2y-0003iH-KW for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53540) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2y-0006fC-B3 for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2y-0000GD-5h for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 12/13] gnu: Add ocaml-merlin. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179306974 (code B ref 45498); Mon, 28 Dec 2020 18:15:08 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:15:06 +0000 Received: from localhost ([127.0.0.1]:36847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2v-0000FO-P7 for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:15:06 -0500 Received: from mout01.posteo.de ([185.67.36.65]:45798) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2a-0000C5-P9 for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:45 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 16867160061 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179279; bh=1OGELerneXgGTyIMbYgAJ4OVGfZhgodFYGt0hie9VrU=; h=From:To:Cc:Subject:Date:From; b=bnwp7Rc83LFHhSwp86piX/RzwWTerDDyfg6EFcfHLlINxqJOz0Ahf6paJWe9nf+c8 hOPKeMRseCxnm/nYixi1tfkkv8k+sYyNBY3AsyignnkhtOUDNlhALPlFFsQAZ5u+Rn Wgn92ZRbEbA8wMOG5CM/YnbDKcl42RvZ6N+9HzUnPxUx9bXrQIXa5jlwUNqfnHFRRK o+t3WqGdHtgNn0ilFDtXeFfuuykK3ENVAfMwg5Qx7tyzWPt0e3KiVoJhalaQOQ4oZM FJQ0yebV3fDmHGwIpzCfDHiihnVhHKsU8ebceY8JsTNgd4uWMYNErTefmO5bHDK6uz 5LsJVxQJMwUnQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4QgL3hHdz6tmK; Mon, 28 Dec 2020 19:14:38 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:13 +0100 Message-Id: <20201228181414.14196-12-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-merlin): New variable. (ocaml-dot-merlin-reader): New variable. (ocaml4.07-merlin): Inherit from ocaml-merlin. --- gnu/packages/ocaml.scm | 89 +++++++++++++++++++++++++++++++++++------- 1 file changed, 75 insertions(+), 14 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 385d96977e..258f7e8fd6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3908,11 +3908,41 @@ Mercurial's @code{https://www.selenic.com/blog/?p=663, unified test format}. @code{craml} is released as a single binary (called @code{craml}).") (license license:isc))) -(define-public ocaml4.07-merlin +(define-public ocaml-dot-merlin-reader (package - (name "ocaml4.07-merlin") - (version "3.2.2") + (name "ocaml-dot-merlin-reader") + (version "3.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/merlin") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj")))) + (build-system dune-build-system) + (arguments '(#:package "dot-merlin-reader" + #:tests? #f)) ; no tests + (inputs + `(("ocaml-yojson" ,ocaml-yojson) + ("ocaml-csexp" ,ocaml-csexp) + ("ocaml-result" ,ocaml-result) + ;; XXX: following are dependencies of ocaml-yojson. Should they be + ;; propagated-inputs in ocaml-yojson? + ("ocaml-biniou" ,ocaml-biniou) + ("ocaml-easy-format" ,ocaml-easy-format))) (home-page "https://ocaml.github.io/merlin/") + (synopsis "Reads config files for @code{ocaml-merlin}") + (description "@code{ocaml-dot-merlin-reader} is an external reader for +@code{ocaml-merlin} configurations.") + (license license:expat))) + +(define-public ocaml-merlin + (package + (name "ocaml-merlin") + (version "3.4.2") (source (origin (method git-fetch) @@ -3922,20 +3952,21 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (file-name (git-file-name name version)) (sha256 (base32 - "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb")))) + "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj")))) (build-system dune-build-system) + (arguments '(#:package "merlin" + #:test-target "tests")) (inputs - `(("ocaml-biniou" ,(package-with-ocaml4.07 ocaml-biniou)) - ("ocaml-yojson" ,(package-with-ocaml4.07 ocaml-yojson)) - ("ocaml-easy-format" ,(package-with-ocaml4.07 ocaml-easy-format)))) + `(("ocaml-yojson" ,ocaml-yojson) + ("ocaml-biniou" ,ocaml-biniou) + ("ocaml-easy-format" ,ocaml-easy-format) + ("ocaml-csexp" ,ocaml-csexp) + ("ocaml-result" ,ocaml-result))) (native-inputs - `(("ocaml-findlib" ,ocaml-findlib))) - (arguments - `(#:package "merlin" - #:tests? #f ;; Errors in tests in version 3.2.2 - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(("ocaml-dot-merlin-reader" ,ocaml-dot-merlin-reader) ; required for tests + ("ocaml-mdx" ,ocaml-mdx) + ("jq" ,jq))) + (home-page "https://ocaml.github.io/merlin/") (synopsis "Context sensitive completion for OCaml in Vim and Emacs") (description "Merlin is an editor service that provides modern IDE features for OCaml. Emacs and Vim support is provided out-of-the-box. @@ -3943,6 +3974,36 @@ External contributors added support for Visual Studio Code, Sublime Text and Atom.") (license license:expat))) +;; ocaml-merlin 3.4.2 can not be built with old version of dune used in +;; package-with-ocaml4.07 +(define-public ocaml4.07-merlin + (package-with-ocaml4.07 + (package + (inherit ocaml-merlin) + (name "ocaml-merlin") + (version "3.2.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/merlin") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb")))) + (build-system dune-build-system) + (inputs + `(("ocaml-biniou" ,ocaml-biniou) + ("ocaml-yojson" ,ocaml-yojson) + ("ocaml-easy-format" ,ocaml-easy-format))) + (native-inputs + `(("ocaml-findlib" ,ocaml-findlib))) + (arguments + `(#:package "merlin" + ;; Errors in tests in version 3.2.2 + #:tests? #f))))) + (define-public ocaml4.07-gsl (package (name "ocaml4.07-gsl") From patchwork Mon Dec 28 18:14:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26063 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9928227BC04; Mon, 28 Dec 2020 18:16:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 28B741794D for ; Mon, 28 Dec 2020 18:16:20 +0000 (GMT) Received: from localhost ([::1]:42384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx47-0004jG-3W for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 13:16:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2z-0003j8-00 for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2y-0006fL-NU for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2y-0000GL-Ia for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 13/13] gnu: ocaml-yojson: Make dependencies propagated-inputs. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 18:15:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.1609179307988 (code B ref 45498); Mon, 28 Dec 2020 18:15:08 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:15:07 +0000 Received: from localhost ([127.0.0.1]:36850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2w-0000Ff-Iq for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:15:07 -0500 Received: from mout02.posteo.de ([185.67.36.66]:43169) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2b-0000C8-JZ for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:45 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id D26982400FB for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179279; bh=HBbm84hLEsMgCcfkdhIYqcPyprP2Bpi1nnYj9JeKgQM=; h=From:To:Cc:Subject:Date:From; b=DVkkCiMyZcorxIwrFtWJWdags+b0SAgfwVp/p0k77IhdtZcq7slKE2Bw+WCcv31ET BBF6JuohQZ+6YNvznBLioJffQNN3oJD0DnJcbzdQ0a3etxBVhraj8R6uMqGtxeg623 DKuX9ZI39OP+NUccKTHnwJO/qvWJutvbTabULxekCQ5sY8lFWB9nqrZ/tpbUGHq70d 0rE3pLLTVxsLnpnI6tJFCEURLVgG1K73Wsh/6XU21TIVnvkAJUBlca8ryXpxGTM7tn RYXKqPfVnWrPlcSJrlQM+slwkPQHYXHJe5IpgP31IeG0amfFm8DUcfAOM0zkPDyDpv aycxJMQ0WVojg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4QgM3x99z6tm5; Mon, 28 Dec 2020 19:14:39 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:14 +0100 Message-Id: <20201228181414.14196-13-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-1-pukkamustard@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-yojson): Make dependencies propagated-inputs. --- gnu/packages/ocaml.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 258f7e8fd6..f3f275046f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3857,7 +3857,7 @@ than yojson), with 25-35% space savings.") (build-system dune-build-system) (arguments `(#:test-target ".")) - (inputs + (propagated-inputs `(("ocaml-biniou" ,ocaml-biniou) ("ocaml-easy-format" ,ocaml-easy-format))) (native-inputs @@ -3928,11 +3928,7 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (inputs `(("ocaml-yojson" ,ocaml-yojson) ("ocaml-csexp" ,ocaml-csexp) - ("ocaml-result" ,ocaml-result) - ;; XXX: following are dependencies of ocaml-yojson. Should they be - ;; propagated-inputs in ocaml-yojson? - ("ocaml-biniou" ,ocaml-biniou) - ("ocaml-easy-format" ,ocaml-easy-format))) + ("ocaml-result" ,ocaml-result))) (home-page "https://ocaml.github.io/merlin/") (synopsis "Reads config files for @code{ocaml-merlin}") (description "@code{ocaml-dot-merlin-reader} is an external reader for @@ -3958,8 +3954,6 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") #:test-target "tests")) (inputs `(("ocaml-yojson" ,ocaml-yojson) - ("ocaml-biniou" ,ocaml-biniou) - ("ocaml-easy-format" ,ocaml-easy-format) ("ocaml-csexp" ,ocaml-csexp) ("ocaml-result" ,ocaml-result))) (native-inputs @@ -3994,9 +3988,7 @@ Atom.") "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb")))) (build-system dune-build-system) (inputs - `(("ocaml-biniou" ,ocaml-biniou) - ("ocaml-yojson" ,ocaml-yojson) - ("ocaml-easy-format" ,ocaml-easy-format))) + `(("ocaml-yojson" ,ocaml-yojson))) (native-inputs `(("ocaml-findlib" ,ocaml-findlib))) (arguments