From patchwork Mon Dec 28 12:47:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26031 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 3BFAD27BC04; Mon, 28 Dec 2020 12:48: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 4700327BC05 for ; Mon, 28 Dec 2020 12:48:15 +0000 (GMT) Received: from localhost ([::1]:40812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrwc-0007Fz-Dx for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 07:48:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwQ-0007Fc-SX for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51238) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwQ-00041f-Le for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwQ-0003w5-Hx for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 01/12] gnu: Remove ocaml-js-build-tools. References: <20201228124017.24295-1-pukkamustard@posteo.net> In-Reply-To: <20201228124017.24295-1-pukkamustard@posteo.net> Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 12:48: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.160915965514952 (code B ref 45498); Mon, 28 Dec 2020 12:48:02 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:35 +0000 Received: from localhost ([127.0.0.1]:34518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrvv-0003sw-SS for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:35 -0500 Received: from mout02.posteo.de ([185.67.36.66]:50971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrvu-0003sj-4z for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:31 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 014B92400FD for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159644; bh=RehPZ00GRntKaLmUQuAm0uQLZoxW7MoXK5vdTeWMDo8=; h=From:To:Cc:Subject:Date:From; b=deHbP/hq0zsIggEqcMOG5q3W63gFnJs1/ExeTxQr4RV5Ji9lIRJGTz7xEx3csFaNi ga96TVlEm7CdERnaffj4FgTMueMcgZILzVC4IH83Z+4DZWVH0EeRLFBUqbbTamOkXf a7m8SemrK8oehKFt55LWV86WcQrJ0RxyDpIfaqu+YUmo3pO2mIiHed8A87HrZhZEzx mbJvGBH5rHIRLq2k1dvZqd3IseM/mthJCjapnROeETTwu8ob9oDAJbDNXKM222Sk7l O3HHgJuuq4+QnPyXP2gQ4SPfT/dHUXvWZL7cSoayVXA0Mi323K0KfoVCB2gsht593J lN+9xt7QQUjZQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HPl24wxz6tnh; Mon, 28 Dec 2020 13:47:23 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:07 +0100 Message-Id: <20201228124718.24736-1-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 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 12:47:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26030 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 8BB4827BC09; Mon, 28 Dec 2020 12:48: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 2C77827BC04 for ; Mon, 28 Dec 2020 12:48:15 +0000 (GMT) Received: from localhost ([::1]:40810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrwc-0007Fw-65 for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 07:48:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwR-0007Fi-8L for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwR-000420-1m for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwQ-0003wC-W7 for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 02/12] gnu: Add ocaml-sexplib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 12:48: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.160915966215005 (code B ref 45498); Mon, 28 Dec 2020 12:48:02 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:42 +0000 Received: from localhost ([127.0.0.1]:34526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw5-0003tc-A2 for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:42 -0500 Received: from mout02.posteo.de ([185.67.36.66]:36857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw3-0003sz-Cx for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:39 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 69A242400FF for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159653; bh=idFXokDPq6zgaxFfrlh9vb8aocjQsWULvrjGJWl7wX8=; h=From:To:Cc:Subject:Date:From; b=hygCsgQyJUxMklwDFoJNqRNq7/O1tNkcM5DCfYEfmGZSkE+oSo57v1mLBk6kP9UZC 7ZoRq9ujTTSEEH20FIAhZAI8nK/4/s1wo0mtt/GKtswQ0VmDUASg7EQ6HJvAN5f9Q0 Rv+A+9whBOgN4jgQvyRgyUbfURT0tpts8CxWjL6DMHPq5bELKjiGOUk2G83AOF5GQx /ronwK3CKjNPtd57ktnVOFyIm6VDrCPcJn6PFwZLik/2DKYXApZfk2vavwIRvyogyg 48oOkyfBixvr38kRRuHNS3BH7KPUt6+Zl76yYtGD53t4753RGLuGKQNupS5ZDqyXrc 1MLElLmaULUDA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HPq6kHYz6tmH; Mon, 28 Dec 2020 13:47:27 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:08 +0100 Message-Id: <20201228124718.24736-2-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-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 | 46 +++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index aa9dfb3dae..917a82c514 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") @@ -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 (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 (inherit ocaml-sexplib0) + (name "ocaml4.07-sexplib0") + (version "0.11.0") + (source + (janestreet-origin "sexplib0" version + "1p06p2s7p9xsjn0z9qicniv1ai54d8sj11k8j633di2mm7jzxpin")) + (arguments + `(#:tests? #f ;no tests + #:ocaml ,ocaml-4.07 + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)))) (define-public ocaml4.07-parsexp (package From patchwork Mon Dec 28 12:47:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26032 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 E90A027BC04; Mon, 28 Dec 2020 12:48: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 5421B27BC05 for ; Mon, 28 Dec 2020 12:48:16 +0000 (GMT) Received: from localhost ([::1]:40844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrwd-0007Gy-Eg for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 07:48:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwR-0007Fo-KO for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwR-000425-E0 for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwR-0003wK-CR for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 03/12] gnu: Add ocaml-base. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 12:48: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.160915966315018 (code B ref 45498); Mon, 28 Dec 2020 12:48:03 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:43 +0000 Received: from localhost ([127.0.0.1]:34529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw6-0003ty-Em for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:43 -0500 Received: from mout02.posteo.de ([185.67.36.66]:36233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw3-0003t0-Nq for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:40 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AA7B5240101 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159653; bh=z0U9QbQrhhz9dl9UYL8OUbG/yxHNqhA7jlnGmmHrHy0=; h=From:To:Cc:Subject:Date:From; b=bj3MYSngRmUCOQOfcOveexKuid55FADNGu6lPighrHLqhQJjTvTsodMJ0433qRDAh AJe/B2AsMfDz6vqNLxoBV6Vmlzjz4oMRuxyRmTU4d8x3M3PlVp5uhOYHwT6+8pB27z bgpNRpcrQ9AnMDtl44+F18GfMR5enJk4/+Z2Z403bVWrdspx/pqkr2gK2GmnzyJ4PV zC/tMb5IW57OpoKDakIYbAL73KjDTfqgnS2lDjqxe1VHcyHTNTEEmD94NlsOyWk12i r+xfFI0j+G0F96BKsBGi38jvBmAtJMjMbycGBRVxXDA78u9glAxE2ww6UBMqFgB99D 54r03G40/waiQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HPs3XZRz6tmb; Mon, 28 Dec 2020 13:47:29 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:09 +0100 Message-Id: <20201228124718.24736-3-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-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 | 48 ++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 917a82c514..36137e9d78 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4146,22 +4146,47 @@ parsexp_io.") functionality for parsing and pretty-printing s-expressions.") (license license:expat))) -(define-public ocaml4.07-base +(define-public ocaml-base (package + (name "ocaml-base") + (version "0.14.0") + (home-page "https://github.com/janestreet/base") + (source + (janestreet-origin "base" version + "1rkdhsgbcv0a8p29mwvpd2ldz8cjk97pixl43izm54wyin4lp778")) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-sexplib0" ,ocaml-sexplib0))) + (arguments '()) + (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. + +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))) + +(define-public ocaml4.07-base + (package (inherit ocaml-base) (name "ocaml4.07-base") (version "0.11.1") - (home-page "https://github.com/janestreet/base") (source (origin + ;; version 0.11.1 is not released on ocaml.janestreet.org. (method git-fetch) (uri (git-reference - (url (string-append home-page ".git")) + (url "https://github.com/janestreet/base.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir")))) - (build-system dune-build-system) (propagated-inputs `(("ocaml-sexplib0" ,ocaml4.07-sexplib0))) (arguments @@ -4173,20 +4198,7 @@ functionality for parsing and pretty-printing s-expressions.") (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 -library. It provides all standard functionalities one would expect -from a language standard library. It uses consistent conventions -across all of its module. - -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))) + #:dune ,ocaml4.07-dune)))) (define-public ocaml4.07-compiler-libs (package From patchwork Mon Dec 28 12:47:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26034 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 A3F4027BC05; Mon, 28 Dec 2020 12:48:25 +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 5AD1327BC04 for ; Mon, 28 Dec 2020 12:48:25 +0000 (GMT) Received: from localhost ([::1]:41488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrwm-0007aO-Gm for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 07:48:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwS-0007GT-HT for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51242) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwS-00042D-9b for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwS-0003wZ-7I for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 04/12] gnu: Add ocaml-parsexp. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 12:48: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.160915967315064 (code B ref 45498); Mon, 28 Dec 2020 12:48:04 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:53 +0000 Received: from localhost ([127.0.0.1]:34537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrwG-0003us-RZ for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:53 -0500 Received: from mout01.posteo.de ([185.67.36.65]:37525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw4-0003t3-Es for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:41 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 0A464160060 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159654; bh=pDfWuy7b7WweQeXyuFExctlem/87I2Wd4caT7qKtbgY=; h=From:To:Cc:Subject:Date:From; b=C0mXLNSwYGE6ADObEfrz8meo6LjhtA5ohFPRHCCcSYI5qBZYHyiZZprssHD11jbxm S0OSfJOkD2UaFvXL3nOO9DutJp7dLvW3fuPSW0gmymMuqKIoIJRFy/8Ci5AyQozFzC leXzcIqX2ZG3Ym+js5n9tot6RyVXjAYhcMuUE0MnPPpjxkUzHNlh8ZpVtM8qwbYVsm Z1HbcVi9vH3X1EOXTzKP+J2dfFpZePb5KQpofjislNENHn/DN47m35UZpkJnIs4o50 y3PW1kQoP3lMjSaxTjnUp6QoMe7+Sl1X7OUdzkRo4HBQuOOyW8U79u8EqsP5kKJKDy Z/OPQ2oZ9B6gQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HPt3zWpz6tmT; Mon, 28 Dec 2020 13:47:30 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:10 +0100 Message-Id: <20201228124718.24736-4-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-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, 21 insertions(+), 17 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 36137e9d78..f6488a0e23 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4065,28 +4065,18 @@ that was developed by Jane Street, the largest industrial user of OCaml.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)))) -(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" ,ocaml4.07-sexplib0))) + `(("ocaml-sexplib0" ,ocaml-sexplib0) + ("ocaml-base" ,ocaml-base))) (synopsis "S-expression parsing library") (description "This library provides generic parsers for parsing S-expressions from @@ -4115,6 +4105,20 @@ s-expressions from files or other external sources, you should use parsexp_io.") (license license:expat))) +(define-public ocaml4.07-parsexp + (package (inherit ocaml-parsexp) + (name "ocaml4.07-parsexp") + (version "0.11.0") + (source + (janestreet-origin "parsexp" version + "11a30zkfgbi6pb4whq22k1zc8ghdp9bwxl5s5cdlmx1z8s4yxsf0")) + (arguments + `(#:ocaml ,ocaml-4.07 + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) + (inputs + `(("ocaml-sexplib0" ,ocaml4.07-sexplib0))))) + (define-public ocaml4.07-sexplib (package (name "ocaml4.07-sexplib") From patchwork Mon Dec 28 12:47:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26035 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 11A8927BC05; Mon, 28 Dec 2020 12:48: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 A6BBA27BC04 for ; Mon, 28 Dec 2020 12:48:25 +0000 (GMT) Received: from localhost ([::1]:41506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrwm-0007av-Qh for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 07:48:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwS-0007Fu-1n for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51241) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwR-000429-RE for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwR-0003wR-QS for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 05/12] gnu: Add ocaml-sexplib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 12:48: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.160915966315024 (code B ref 45498); Mon, 28 Dec 2020 12:48:03 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:43 +0000 Received: from localhost ([127.0.0.1]:34531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw7-0003uB-DM for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:43 -0500 Received: from mout02.posteo.de ([185.67.36.66]:39571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw4-0003t4-25 for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:40 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 1B20C240103 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159654; bh=CtJO+WmcesKUP8s0soPPJWYuGwky/rUiivopE3dQ7Es=; h=From:To:Cc:Subject:Date:From; b=Pbd/GImgCR94KYXHsfp1WDNbNqbMx75/Ypjo8kx3dYEZc6pcXWp2CNfMMnqE5MiYp 5ogFbE3FZIdBTGFf/8UCATvF2JrBFzzNp/81nHF7uJ4VYUOnpT5JXUqyivrvuzWhvJ kn3xTWx3M8TNYkyxajvUsP89JjJYEJYjFaSuWziRp5zWJJPl75URdu5Gb3ikd7ug02 V12hKspewvS3y2ZrYwQoQQ1WwH9waZlN4CgMGTGMAdnbkkLi/1DQQSNTPM2ToijD5s SLnQEPCvBXBZYR3wBcO3ezshUjaNhzFJo3HMs1OcdSmQ3c9JKOyGCJNvYtE2TXkREf 05IiekO+VZowg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HPw2HFTz6tmG; Mon, 28 Dec 2020 13:47:32 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:11 +0100 Message-Id: <20201228124718.24736-5-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-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 | 44 ++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f6488a0e23..09bbc71803 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4119,22 +4119,34 @@ parsexp_io.") (inputs `(("ocaml-sexplib0" ,ocaml4.07-sexplib0))))) -(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) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-num" ,ocaml-num) + ("ocaml-parsexp" ,ocaml-parsexp) + ("ocaml-sexplib0" ,ocaml-sexplib0))) + (synopsis + "Library for serializing OCaml values to and from S-expressions") + (description + "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 (inherit ocaml-sexplib) + (name "ocaml4.07-sexplib") + (version "0.11.0") + (source + (janestreet-origin "sexplib" version + "0ksx62zsxhz8xmdrsn41n2hbc2qbyh3bxxc6946xisvgwh42h3q3")) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib @@ -4142,13 +4154,7 @@ parsexp_io.") (propagated-inputs `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) ("ocaml-parsexp" ,ocaml4.07-parsexp) - ("ocaml-sexplib0" ,ocaml4.07-sexplib0))) - (synopsis - "Library for serializing OCaml values to and from S-expressions") - (description - "This package is part of Jane Street's Core library. Sexplib contains -functionality for parsing and pretty-printing s-expressions.") - (license license:expat))) + ("ocaml-sexplib0" ,ocaml4.07-sexplib0))))) (define-public ocaml-base (package From patchwork Mon Dec 28 12:47:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26040 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 9612027BC05; Mon, 28 Dec 2020 12:48:47 +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 4818427BC04 for ; Mon, 28 Dec 2020 12:48:47 +0000 (GMT) Received: from localhost ([::1]:42858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrx8-0008AB-GK for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 07:48:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwT-0007IT-EC for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwT-00042U-51 for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwT-0003wn-3K for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 06/12] gnu: Add ocaml-ounit2. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 12:48: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.160915967415078 (code B ref 45498); Mon, 28 Dec 2020 12:48:05 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:54 +0000 Received: from localhost ([127.0.0.1]:34541 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrwH-0003v2-FX for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:53 -0500 Received: from mout01.posteo.de ([185.67.36.65]:60212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw4-0003t5-EP for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:42 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 49EB6160063 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159654; bh=jLqJNiG3znGkJtdLGXvbVl9L0/zgFFLHdQUCs0A8tE4=; h=From:To:Cc:Subject:Date:From; b=FpDceAUbgkZm5GS1dBgWratAvoR9SHC2ckvS+y4c3nUJ3S6kq4P3oJGbzPvwza5v2 +w+7Py9JSxQpgNJuP6IXrjryJDVoJcshMwme6RHisNqJca4TI9SYp+XU42KICKV5FG BC2C24yDDeGcTjLoCODf3u82sAX2KegH+hExsDFQIz+7DrQRieq8seaDlfPZ/xfx92 vNIqbaM7h3LszCtYHphPLYmUlQKENNJGtbPdzggT06UiusE7SBO0ohazniqSqPuK9A 9JR+13hCotbarHkcKBY8R4pa/lrmun2XoMS3m5366CFoD3knWeKCzzrvLD422Ilffw f8CEIysqY0gTQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HPx36BLz6tmG; Mon, 28 Dec 2020 13:47:33 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:12 +0100 Message-Id: <20201228124718.24736-6-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-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 09bbc71803..6b18479382 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 12:47:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26037 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 0966D27BC09; Mon, 28 Dec 2020 12:48:37 +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 A312B27BC04 for ; Mon, 28 Dec 2020 12:48:36 +0000 (GMT) Received: from localhost ([::1]:42252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrwx-0007tj-RN for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 07:48:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwS-0007HR-W3 for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwS-00042K-Nv for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwS-0003wg-Ln for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 07/12] 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 12:48: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.160915967315071 (code B ref 45498); Mon, 28 Dec 2020 12:48:04 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:53 +0000 Received: from localhost ([127.0.0.1]:34539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrwH-0003uv-6Z for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:53 -0500 Received: from mout01.posteo.de ([185.67.36.65]:45326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw4-0003tD-UV for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:42 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 30A4D160061 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159655; bh=62/ChJNXrcF3Z7PaoZdtNqlm6z7WCLVcxRCKLrVWV5w=; h=From:To:Cc:Subject:Date:From; b=lZd1jNGJZb/Fn/neQFxOXciang9plgeGzV6F4SNqZZS9f5rP2lS+o0i4bPjKsA08X YZUqk4p/KDYal8F/rWfW5DG59eK3nljQHdn4HnJWdSWgOL9wRS08dP8DPIGz9WKy2C ZPMKaVpfvrpsTo0S3IPktRXRO+rtaKjxAK/fP+Ez7Srybusfqkhzm7H3I02kHMmkkv k8IeQZpYwoRRi1cjo14thJ1Sl8N/QPIi80OT7FOn4FbTZz2apH4GIGvWAp3C2/WUdH HpiXotdLHvb4LX/VrRnCBaeSAIJKLnRDI+6cfUf6rHYXYs4OAdC+7q9TEuXB9t1PYu FhRbCbMGgm04g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HPy5DtGz6tmG; Mon, 28 Dec 2020 13:47:34 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:13 +0100 Message-Id: <20201228124718.24736-7-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-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 6b18479382..bbdf65892e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5587,7 +5587,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) @@ -5597,7 +5597,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 12:47:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26041 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 9AE4E27BC05; Mon, 28 Dec 2020 12:48:53 +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 0478527BC04 for ; Mon, 28 Dec 2020 12:48:53 +0000 (GMT) Received: from localhost ([::1]:43126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrxE-0008Go-7f for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 07:48:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwT-0007Jm-SV for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51245) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwT-00042q-JJ for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwT-0003wv-HS for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 08/12] 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 12:48: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.160915967415086 (code B ref 45498); Mon, 28 Dec 2020 12:48:05 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:54 +0000 Received: from localhost ([127.0.0.1]:34543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrwH-0003v9-VW for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:54 -0500 Received: from mout01.posteo.de ([185.67.36.65]:59266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw6-0003tG-7c for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:42 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 5205116005C for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159656; bh=zwbo1WuvcAKtFv3vKqy7XAhNJlVwUJJmY3frfRLnmPg=; h=From:To:Cc:Subject:Date:From; b=rMkqTCiXx3XitMms3Pp+lEFn82mcmKnczUUl30O8TLRbwESyFiUzFK0JWUI9sMod2 WtfB4xKqitPq+tZUEqCV1qyVrgOPUcQnz54mUeHUEdq2BfIIiMl79R9zVsO/2caaUQ eDSIu2Ct1zMXJuooHpCRpbGuRGFvSZregBJPGrdy/mA+7PCMe3tFT2x85nxTqXdkQn /cRte016J8oCpqmft29005S7JmvH3dSKpEJgB1L4JrB7J68TmPbLf0GSNy+KzWsckR jHle/qASz7tXc/u1kgpXdDENjuT323x0Uwl3ShjisZr5dVKUtGtyvEW2FH5KTcAP9S 38gJyY02vkv1Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HPz6MZcz6tm6; Mon, 28 Dec 2020 13:47:35 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:14 +0100 Message-Id: <20201228124718.24736-8-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-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. (ocaml4.07-tyxml): New variable. (ocaml4.07-odoc)[inputs]: Replace ocaml-tyxml with ocaml4.07-tyxml and ocaml-markup with ocaml-markup0.8.0. --- gnu/packages/ocaml.scm | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bbdf65892e..6714c266d1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5538,7 +5538,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 @@ -5549,7 +5549,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")) @@ -5561,7 +5561,7 @@ 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))) (synopsis "Error-recovering functional HTML5 and XML parsers and writers") (description "Markup.ml provides an HTML parser and an XML parser. The @@ -5584,6 +5584,25 @@ 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")))))) + (define-public ocaml-tyxml (package (name "ocaml-tyxml") @@ -5619,6 +5638,17 @@ also create your own representation and use it to instantiate a new set of combinators.") (license license:lgpl2.1))) +(define-public ocaml4.07-tyxml + (package-with-ocaml4.07 + (package + (inherit ocaml-tyxml) + (inputs + `(("ocaml-re" ,ocaml-re) + ("ocaml-seq" ,ocaml-seq) + ("ocaml-uutf" ,ocaml-uutf) + ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) + ("ocaml-markup" ,ocaml-markup0.8.0)))))) + (define-public ocaml-bisect-ppx (package (name "ocaml-bisect-ppx") @@ -5681,7 +5711,7 @@ then run the Bisect_ppx report tool on the generated visitation files.") #:dune ,ocaml4.07-dune)) (inputs `(("ocaml-alcotest" ,(package-with-ocaml4.07 ocaml-alcotest)) - ("ocaml-markup" ,(package-with-ocaml4.07 ocaml-markup)) + ("ocaml-markup" ,(package-with-ocaml4.07 ocaml-markup0.8.0)) ("ocaml-sexplib" ,ocaml4.07-sexplib) ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) ("ocaml-uutf" ,(package-with-ocaml4.07 ocaml-uutf)))) @@ -5691,7 +5721,7 @@ then run the Bisect_ppx report tool on the generated visitation files.") ("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-tyxml" ,ocaml4.07-tyxml) ("ocaml-bisect-ppx" ,(package-with-ocaml4.07 ocaml-bisect-ppx)))) (home-page "https://github.com/ocaml/odoc") (synopsis "OCaml documentation generator") From patchwork Mon Dec 28 12:47:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26033 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 9D39527BC05; Mon, 28 Dec 2020 12:48: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 194EB27BC04 for ; Mon, 28 Dec 2020 12:48:20 +0000 (GMT) Received: from localhost ([::1]:41100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrwh-0007Ph-6w for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 07:48:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwU-0007Kr-A0 for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51246) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwT-00043b-WC for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwT-0003x2-UO for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 09/12] gnu: Add ocaml-odoc. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 12:48: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.160915967415093 (code B ref 45498); Mon, 28 Dec 2020 12:48:05 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:54 +0000 Received: from localhost ([127.0.0.1]:34545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrwI-0003vH-EM for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:54 -0500 Received: from mout01.posteo.de ([185.67.36.65]:59133) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw7-0003tI-Bb for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:44 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id A2B16160060 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159657; bh=ATmqA9SNFPTyChPJHFgtwFHAVY9cL5fBCKODAyvXzMI=; h=From:To:Cc:Subject:Date:From; b=kKGjDp3kSfGKK5yNTM9VNr0kxTmI6fuBlIbOCExizX+IXxlOgQ9EH3MmpH9Rs6tXI 4ihIPZB0Pg4LXqyYOT793Ctbu3v6jM25hB4hCPdYPUzFJcPGM4q34+/MOiS4kIp7vG +q6/LvDR41v/PIG2dLRMMT+m49H6F7Wz+6D88+8G88pBz//nQfRYHccInKrlk64V4E GGth1uyaZlx02zIbxuuN4kph8GXiL3s7vN13kAMTmAFU1aFy9debSuN/QDr30gXdUk yZ9Em5tc5VuOr0DBqx43xBH/K7wYBeA9xZVoI+wP96fL2dirycy80oeoFYUkYOtq3T T1/WepaJ93LSQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HQ12SP8z6tmG; Mon, 28 Dec 2020 13:47:37 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:15 +0100 Message-Id: <20201228124718.24736-9-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-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 | 70 ++++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 20 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6714c266d1..3d94f7c221 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) @@ -5691,10 +5692,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) @@ -5703,26 +5704,23 @@ 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-markup0.8.0)) - ("ocaml-sexplib" ,ocaml4.07-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" ,ocaml4.07-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))) (home-page "https://github.com/ocaml/odoc") (synopsis "OCaml documentation generator") (description "Odoc is a documentation generator for OCaml. It reads @@ -5734,6 +5732,38 @@ advantage over ocamldoc is an accurate cross-referencer, which handles the complexity of the OCaml module system.") (license license:isc))) +(define-public ocaml4.07-odoc + (package-with-ocaml4.07 + (package + (inherit ocaml-odoc) + (name "ocaml-odoc") + ;; 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 + (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")))) + (inputs + `(("ocaml-alcotest" ,ocaml-alcotest) + ("ocaml-markup" ,ocaml-markup0.8.0) + ("ocaml-sexplib" ,ocaml4.07-sexplib) + ("ocaml-re" ,ocaml-re) + ("ocaml-uutf" ,ocaml-uutf))) + (native-inputs + `(("ocaml-astring" ,ocaml-astring) + ("ocaml-cmdliner" ,ocaml-cmdliner) + ("ocaml-cppo" ,ocaml-cppo) + ("ocaml-fpath" ,ocaml-fpath) + ("ocaml-result" ,ocaml-result) + ("ocaml-tyxml" ,ocaml4.07-tyxml) + ("ocaml-bisect-ppx" ,ocaml-bisect-ppx)))))) + (define-public ocaml4.07-fftw3 (package (name "ocaml4.07-fftw3") From patchwork Mon Dec 28 12:47:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26036 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 B816C27BC05; Mon, 28 Dec 2020 12:48: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 320C727BC04 for ; Mon, 28 Dec 2020 12:48:26 +0000 (GMT) Received: from localhost ([::1]:41578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrwn-0007cj-C1 for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 07:48:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwU-0007LV-KY for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51247) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwU-00043p-DC for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwU-0003x9-Ap for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 10/12] gnu: Add ocaml-version. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 12:48: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.160915967515100 (code B ref 45498); Mon, 28 Dec 2020 12:48:06 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:55 +0000 Received: from localhost ([127.0.0.1]:34547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrwI-0003vO-Q3 for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:55 -0500 Received: from mout02.posteo.de ([185.67.36.66]:33205) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw8-0003tL-W9 for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:45 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id DDD3B2400FC for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159658; bh=UF3tDYrPUcz9o2vmuneultdjEZhNeCw8JgVrdHR6ujw=; h=From:To:Cc:Subject:Date:From; b=BtyXxm20f4Ryr+iUEwwAt/grAAotqThd2um1DLqLcbwxXiZU2rQYFrH8SmNTVEsSj P5CldGFWVqJv8H10BdZw5jn6CP8yNHKS2CfC7IWT6OTT7yck0fVcIk8APsZsN7h1tJ 33jDzxCAcbKftHncl78DVw4O0kuh0watrpZw2uds1r0l+3M3pdAKW0CsqKsOGHolPd J+O2/KCQ1TKyLV7JlN10GJ4KdRcFRnQdgf8DoGwKy4wkKn4aLR6vqrXSlZCLSGYia9 j+x1BV6xDO54R3X8GjTZauQI6YJsyZA30TzmkOy3Ah378gRFDVJ+9QeNntE5eKk+Ry IZBnZzg82ySGw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HQ23fvNz6tmJ; Mon, 28 Dec 2020 13:47:38 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:16 +0100 Message-Id: <20201228124718.24736-10-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-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 3d94f7c221..c449b5a739 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5870,6 +5870,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 12:47:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26039 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 3F39327BC05; Mon, 28 Dec 2020 12:48:38 +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 87B5527BC04 for ; Mon, 28 Dec 2020 12:48:37 +0000 (GMT) Received: from localhost ([::1]:42294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrwy-0007ul-Mf for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 07:48:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47342) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwY-0007MD-Ig for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51248) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwU-000443-PC for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwU-0003xH-Nh for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 11/12] gnu: Add ocaml-mdx. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 12:48: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.160915967515110 (code B ref 45498); Mon, 28 Dec 2020 12:48:06 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:55 +0000 Received: from localhost ([127.0.0.1]:34549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrwJ-0003vV-3y for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:55 -0500 Received: from mout01.posteo.de ([185.67.36.65]:41466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrwB-0003tk-3K for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:47 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id E152F160061 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159659; bh=asme4Pamv7iZAYa3PZQTVIzFhnDSYdtZvxeLQpn/ob8=; h=From:To:Cc:Subject:Date:From; b=mbibDVX/YNoGuS9+O2ieRtnNQRKskL8XE7muTxSMBigb5/9nPzaYEmQUXAchpO63/ /bEzmMumMzxzj6z16dsKgsyPHpriMGDfbp2F7bv9pgn0TwNEy1TR0Uu9WDHGeW/NGb 0I3G6SQ/AFvA5CTldJkCmtyQmwoMtcZaUFohQ6sKbonKaRVvuvE/oCJ/EbEs7exLyO Wz+bwh18Nj7ImooghNcR+pv8+y/px8CTIlFL2CwI/BcgWUDM/giVmLA+n5SwH+rES9 FDRmfX9cTzXvqpGh1VIiL+BWn5QjCtjlXt2fCqopV2iEJgVCyaILHajIMHK7pp/uOr WytKtSxrUO2Yw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HQ3460jz6tmG; Mon, 28 Dec 2020 13:47:39 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:17 +0100 Message-Id: <20201228124718.24736-11-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-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 c449b5a739..8d3a2e01f3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5896,6 +5896,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 12:47:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 26038 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 B924727BC09; Mon, 28 Dec 2020 12:48:37 +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 074C727BC05 for ; Mon, 28 Dec 2020 12:48:37 +0000 (GMT) Received: from localhost ([::1]:42234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrwy-0007tN-6w for patchwork@mira.cbaines.net; Mon, 28 Dec 2020 07:48:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwY-0007MF-HO for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51249) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwV-000446-7I for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwV-0003xO-5D for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 12/12] gnu: Add ocaml-merlin. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 12:48: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.160915967615116 (code B ref 45498); Mon, 28 Dec 2020 12:48:07 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:56 +0000 Received: from localhost ([127.0.0.1]:34551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrwJ-0003vf-Er for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:55 -0500 Received: from mout02.posteo.de ([185.67.36.66]:54993) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrwB-0003ts-Dk for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:48 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 457302400FE for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159661; bh=c8xlQD+LPYQxbXVi30/D5FTYFKGeveXT/KDY8JTspYk=; h=From:To:Cc:Subject:Date:From; b=KFI6CcXhEwMNA2Oh21oLo9hjY6h7pEfx68Wa4e44/C2s61Hwy7v1W2GPIlPtFicHh RxHp0qW0OODHl+7jUh3y0eRDQVahSKYpRTJEv2uaxVTKf1H0i4zY4gABa2v/Z6MFFB QT4aok8eQYBBBQlJ3MnIF4+bxf7J1AE+7YCg8QqVa6vUwgkBEM52qHUzMvsDhTKZpM iGabtL6ar9qaOXUlr+tmV4zO9SEQwb/hy8ZIFDTbxV3jDGFQAsWcoucTpjVfONDcjc /zJSyEfIoiwK0yFMkjRyN4IqbMQAYU1fO87tiQ/wHKgtzm2ElYjrsMKsEnY2pUgexh JSW+GvNj83kcg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HQ45hWNz6tm6; Mon, 28 Dec 2020 13:47:40 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:18 +0100 Message-Id: <20201228124718.24736-12-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-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 8d3a2e01f3..5b74116305 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")