From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 07:41:11 2020 Received: (at submit) by debbugs.gnu.org; 28 Dec 2020 12:41:11 +0000 Received: from localhost ([127.0.0.1]:34507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrpm-0003if-Ox for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:41:11 -0500 Received: from lists.gnu.org ([209.51.188.17]:33064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrpi-0003iP-Vu for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:41:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrpi-0006AA-OJ for guix-patches@gnu.org; Mon, 28 Dec 2020 07:41:06 -0500 Received: from mout02.posteo.de ([185.67.36.66]:47525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrpZ-0001gh-LL for guix-patches@gnu.org; Mon, 28 Dec 2020 07:41:06 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 7B1382400FE for ; Mon, 28 Dec 2020 13:40:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159254; bh=VGVJl4osEmrF5RvQJsv51FvVNkB2zrkbYovX4d3df/4=; h=From:To:Cc:Subject:Date:From; b=fzcrLOx5aVbQaLw1Tz1Ef7wj4g0cnqwnU3UqLOSUJWDdg0Q9Gg+BVPO37KGRQK1nG ViQT0S59pkNPFk19YuBzqCzDcv/T/ntaUdVHlqmpKAEECzR8po+wE+k4gjWGlC1B+1 vCCTpjp9H6ddc564BxZ56gwXKLYIqxuRROabBP+C3YKdXHATeF3dRUAYfSxPK24lMi nm9Qx+Z8jbbfuqoT9YhLvR9Etn33muwOrthyTUNEKKfWL4ZgBtBHymeYAT7o7yUFT1 pWbm16hA+WbOjexrzZITValoeht5wjnSkFszp0GQqReOnr2tUFKMOpH0RHyqlI4Mnw 8kiUowjr8RbHw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HGF3ffbz6tmF; Mon, 28 Dec 2020 13:40:53 +0100 (CET) From: pukkamustard To: guix-patches@gnu.org Subject: [PATCH 00/12] Add ocaml-merlin. Date: Mon, 28 Dec 2020 13:40:17 +0100 Message-Id: <20201228124017.24295-1-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.66; envelope-from=pukkamustard@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: pukkamustard , 34412@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi Guix, This adds ocaml-merlin, a development tool for OCaml (and dependencies). Some notes and questions: - ocaml4.07-merlin is already available (version 3.2.2). This version has not been updated (but changed to inherit from ocaml-merlin). - There are many ocaml4.07-* packages in Guix. The reason for this is that some packages need to be built with OCaml 4.07 but some newer versions of libraries do no longer support OCaml 4.07 (or the old version of dune), requiring older versions of the same packages. See also commit message 9ada1555. This is quite cumbersome as two trees of OCaml packages need to be maintained. A nice solution would be to upgrade packages requiring OCaml 4.07 to also build with the default OCaml (4.11). Packages that are not dependencies of other packages that require OCaml 4.07 seem to be: `bap`, `ocaml-earley` and `pplacer`. Maybe this should be opened as an issue? - Some OCaml libraries have dependencies in `inputs` that seem to be required from packages using the libraries. E.g. `ocaml-yojson` depends on `ocaml-biniou`. Packages depending on `ocaml-yojson` need to manually add `ocaml-biniou` to their inputs. Would it work/make sense to add `ocaml-biniou` to `propagated-inputs` of `ocaml-yojson`? - Test for ocaml-merlin (version 3.4.2) work. This resolves issue #34412 (alltough ocaml4.07-merlin still can not run tests). Thanks! -pukkamustard pukkamustard (12): gnu: Remove ocaml-js-build-tools. gnu: Add ocaml-sexplib. gnu: Add ocaml-base. gnu: Add ocaml-parsexp. gnu: Add ocaml-sexplib. gnu: Add ocaml-ounit2. gnu: ocaml-tyxml: Update to 4.4.0. gnu: ocaml-markup: Update to 1.0.0. gnu: Add ocaml-odoc. gnu: Add ocaml-version. gnu: Add ocaml-mdx. gnu: Add ocaml-merlin. gnu/packages/ocaml.scm | 527 ++++++++++++++++++++++++++++------------- 1 file changed, 359 insertions(+), 168 deletions(-) -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 07:47:35 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH 01/12] gnu: Remove ocaml-js-build-tools. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 07:47:42 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH 02/12] gnu: Add ocaml-sexplib. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 07:47:43 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH 03/12] gnu: Add ocaml-base. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 07:47:43 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH 05/12] gnu: Add ocaml-sexplib. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 07:47:53 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH 04/12] gnu: Add ocaml-parsexp. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 07:47:53 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH 07/12] gnu: ocaml-tyxml: Update to 4.4.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 07:47:53 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH 06/12] gnu: Add ocaml-ounit2. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) * 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 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 07:47:54 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH 08/12] gnu: ocaml-markup: Update to 1.0.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 07:47:54 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH 09/12] gnu: Add ocaml-odoc. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 07:47:55 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH 10/12] gnu: Add ocaml-version. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 07:47:55 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH 11/12] gnu: Add ocaml-mdx. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 07:47:55 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH 12/12] gnu: Add ocaml-merlin. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 08:58:33 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 13:58:33 +0000 Received: from localhost ([127.0.0.1]:34646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktt2e-0005es-OF for submit@debbugs.gnu.org; Mon, 28 Dec 2020 08:58:32 -0500 Received: from lepiller.eu ([89.234.186.109]:58592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktt2a-0005eh-BX for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 08:58:31 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id cd4f7401; Mon, 28 Dec 2020 13:58:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=liTuNtOdgmzC 9GHOBoGr7y4Zk51n4AgDsk5ut77b8uk=; b=XwdKLDpVSqo4FzD1erNCRC/lRoF/ BsxEBfd6I+ORoG5wSn3bCBynI/wbgBged+nCxWE0H1adT7/3NHUVTqbhRF3lio3O 1MdlwepsQlNdN0ng7wIIsOr+38ZnmJCZyCo2EKXWPt/3gOASyL9mC8stWQ2jl9Re pRsDKNqFKJ8fXsV/cBCL013jzTIpRwafN5lKLyqNKu/IZ4cgFIOFOm4ehYN6dqBU BiqQol6CF8423uzkic9O+7t6Z7H5BlP1FzzM/1Ag7PslXuxShuVMt6Ko6J0uzHsh LmhNmrcdcWP985cC7cf7FhqN+vd00DxinrN9oaq4/YeGmMY/KxeFvYAgUQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id f77bb1c5 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 28 Dec 2020 13:58:25 +0000 (UTC) Date: Mon, 28 Dec 2020 14:58:17 +0100 From: Julien Lepiller To: pukkamustard Subject: Re: [bug#45498] [PATCH 08/12] gnu: ocaml-markup: Update to 1.0.0. Message-ID: <20201228145817.65060ada@tachikoma.lepiller.eu> In-Reply-To: <20201228124718.24736-8-pukkamustard@posteo.net> References: <20201228124718.24736-1-pukkamustard@posteo.net> <20201228124718.24736-8-pukkamustard@posteo.net> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45498 Cc: 45498@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le Mon, 28 Dec 2020 13:47:14 +0100, pukkamustard a =C3=A9crit : > [...] > (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))) > =20 > +(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)))))) > + Here, I would also add an ocaml4.07-variant property to ocaml-tyxml, so (package-with-ocaml4.07 ocaml-tyxml) returns that variant (also remove the properties from the variant, or there will be a loop). > (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) Then this would not be needed > ("ocaml-bisect-ppx" ,(package-with-ocaml4.07 > ocaml-bisect-ppx)))) (home-page "https://github.com/ocaml/odoc") > (synopsis "OCaml documentation generator") From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 09:02:16 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 14:02:16 +0000 Received: from localhost ([127.0.0.1]:34650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktt6G-0005mG-9V for submit@debbugs.gnu.org; Mon, 28 Dec 2020 09:02:16 -0500 Received: from lepiller.eu ([89.234.186.109]:58604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktt6E-0005m8-BF for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 09:02:14 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 9ad7fa5e; Mon, 28 Dec 2020 14:02:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=Ncudn72OniAT KoyaTqwtgCd4JmMympuZWnIdMG33qR8=; b=FNZPfaVr5dUxl8QV+XsZyEC4+CAj DFnRnpG1FmMeO7ZwQDEto3Uahf8IfAt+Hc4lrjsXHfce+2TpW7gPI1rwlqWPAmyV WN4UNdFqkSAX4TRm82mEwebFVA7n1N3wEXrOUz/2l7uR4PRE3igi+w+7iMz7f89H X+GNoGaMhZbi3N49uA96awnpUyMfC9SLd0h8lW2UVqik3Z64YEtVWXjzZ9X2g0zU DT5IeVYlUtXznNbmOxCxOXgElvLPVKzd78fgEkKdgHt4lmWhZJ1v16Bmxh91FHeR NkvLa4bOrYjYRELV8uVeiFqHSRVZZRP4Moj2nvAZ+goD6kwl8Cu2SZP3pw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 2953d8e6 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 28 Dec 2020 14:02:12 +0000 (UTC) Date: Mon, 28 Dec 2020 15:02:05 +0100 From: Julien Lepiller To: pukkamustard Subject: Re: [bug#45498] [PATCH 09/12] gnu: Add ocaml-odoc. Message-ID: <20201228150205.27644e52@tachikoma.lepiller.eu> In-Reply-To: <20201228124718.24736-9-pukkamustard@posteo.net> References: <20201228124718.24736-1-pukkamustard@posteo.net> <20201228124718.24736-9-pukkamustard@posteo.net> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45498 Cc: 45498@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le Mon, 28 Dec 2020 13:47:15 +0100, pukkamustard a =C3=A9crit : > * 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(-) >=20 > 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))) > =20 > -(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))) Similarly, I would add a property to the previous package, so package-with-ocaml4.07 works properly. =20 > +(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 debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 09:07:08 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 14:07:09 +0000 Received: from localhost ([127.0.0.1]:34666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kttAy-0005uY-KD for submit@debbugs.gnu.org; Mon, 28 Dec 2020 09:07:08 -0500 Received: from lepiller.eu ([89.234.186.109]:58612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kttAw-0005uM-DK; Mon, 28 Dec 2020 09:07:07 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id eff938db; Mon, 28 Dec 2020 14:07:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=cxORErbEDRx6 OzQGOBkt/a4Ut25ot8cLY1g2cWa7jRA=; b=daxNnhDaJOK87s437tpKL3CfeNDx m9Adbktk+LlvDht81/QSz6UcuodW4fISsCONZago+sgg4IDvtqhBwwzLphjh5wjc dcHST0pRJ8ANqzkHuLNksxL8cCxfmyQmCKiaCUkaWcfADpXMhRXLWQ+9aHksoI2Q GsUMFy9259WXXPjjy72j9o0y1hSWU52OCyWeSZYlUeAI/BNv992RO3ndtgbvNUt5 c/QvrS3FxIf7vn6QxYAcGK7lR8L06XDe2jgnOW5utjo6gV5I5h8nIafiMBL0L47r pPFI2IsaTlOvzK/+6EwZi/P5ejQS8Jh3l4OpDcZKpMqdGR6H1hU0bT8D9Q== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 131c7be1 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 28 Dec 2020 14:07:04 +0000 (UTC) Date: Mon, 28 Dec 2020 15:06:55 +0100 From: Julien Lepiller To: pukkamustard Subject: Re: [bug#45498] [PATCH 00/12] Add ocaml-merlin. Message-ID: <20201228150655.101e4704@tachikoma.lepiller.eu> In-Reply-To: <20201228124017.24295-1-pukkamustard@posteo.net> References: <20201228124017.24295-1-pukkamustard@posteo.net> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45498 Cc: 45498@debbugs.gnu.org, 34412@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le Mon, 28 Dec 2020 13:40:17 +0100, pukkamustard a =C3=A9crit : > Hi Guix, >=20 > This adds ocaml-merlin, a development tool for OCaml (and > dependencies). Thanks for the patches! >=20 > Some notes and questions: >=20 > - ocaml4.07-merlin is already available (version 3.2.2). This version > has not been updated (but changed to inherit from ocaml-merlin). >=20 > - There are many ocaml4.07-* packages in Guix. The reason for this is > that some packages need to be built with OCaml 4.07 but some newer > versions of libraries do no longer support OCaml 4.07 (or the old > version of dune), requiring older versions of the same packages. See > also commit message 9ada1555. Have you tried updating dune to the latest version that builds with ocaml 4.07? >=20 > This is quite cumbersome as two trees of OCaml packages need to be > maintained. Actually 3, there are ocaml 4.07, 4.09 and 4.11 currently. I'm working on a bootstrap for ocaml 4.07 (ocaml builds from a binary version of itself), so I don't think it'll disappear soon, but at least we can try and make ocaml4.07-* packages disappear :) >=20 > A nice solution would be to upgrade packages requiring OCaml 4.07 > to also build with the default OCaml (4.11). Packages that are not > dependencies of other packages that require OCaml 4.07 seem to be: > `bap`, `ocaml-earley` and `pplacer`. Maybe this should be opened as > an issue? pretty sure they build with at least ocaml-4.09 now, I'll see what I can do :) >=20 > - Some OCaml libraries have dependencies in `inputs` that seem to be > required from packages using the libraries. E.g. `ocaml-yojson` > depends on `ocaml-biniou`. Packages depending on `ocaml-yojson` need > to manually add `ocaml-biniou` to their inputs. Would it work/make > sense to add `ocaml-biniou` to `propagated-inputs` of `ocaml-yojson`? Yeah, could you provide an additional patch for that? >=20 > - Test for ocaml-merlin (version 3.4.2) work. This resolves issue > #34412 (alltough ocaml4.07-merlin still can not run tests). >=20 > Thanks! > -pukkamustard Thank you! I've sent some remarks to your patches, but generally LGTM :) >=20 > pukkamustard (12): > gnu: Remove ocaml-js-build-tools. > gnu: Add ocaml-sexplib. > gnu: Add ocaml-base. > gnu: Add ocaml-parsexp. > gnu: Add ocaml-sexplib. > gnu: Add ocaml-ounit2. > gnu: ocaml-tyxml: Update to 4.4.0. > gnu: ocaml-markup: Update to 1.0.0. > gnu: Add ocaml-odoc. > gnu: Add ocaml-version. > gnu: Add ocaml-mdx. > gnu: Add ocaml-merlin. >=20 > gnu/packages/ocaml.scm | 527 > ++++++++++++++++++++++++++++------------- 1 file changed, 359 > insertions(+), 168 deletions(-) >=20 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:11:09 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:11:10 +0000 Received: from localhost ([127.0.0.1]:36801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktwz4-00006B-2E for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:11:09 -0500 Received: from mout01.posteo.de ([185.67.36.65]:41900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktwyy-00005d-UK for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:11:04 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 41A74160061 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:10:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179054; bh=qNqqH7sP9GOVRkGFhi/HFpvdypkO3ojoCpIRPtCG5do=; h=From:To:Cc:Subject:Date:From; b=DHSp+d4qSeSUVzbIMZoBhI/8qsJN8XGHaCrTw+0ftcq1+TT9ENLliLG+J+LahPMhu jJ6jHxV/2jmKhUMmLYZ0EkRETxlNkECJhwsEvIYtsnt+z5+Pc6znl7omFnc2br1t0m Eqke830/V7dAaHjCh7jkt2D1+T0sPxThKWqdDLDIvit9JgeZm2L6Xg0M8djCAz+YwJ TKZ7KMPkYme9p7HUnTr11SXzY2hY5KH37yqqXwjsmFul9D+ERpO0ynhjX484jyCZfz puW3/4Ex7Qg14mrcQtHpxK7b0h44j/nKx1pY4L6cFa25fGaUWK6yhfK/5MIJKm9z1v BJwPQiRKqCf2A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4Qb14tjZz6tmK; Mon, 28 Dec 2020 19:10:53 +0100 (CET) References: <20201228124017.24295-1-pukkamustard@posteo.net> <20201228150655.101e4704@tachikoma.lepiller.eu> User-agent: mu4e 1.4.13; emacs 27.1 From: pukkamustard To: Julien Lepiller Subject: Re: [bug#45498] [PATCH 00/12] Add ocaml-merlin. In-reply-to: <20201228150655.101e4704@tachikoma.lepiller.eu> Date: Mon, 28 Dec 2020 19:10:48 +0100 Message-ID: <86pn2tn6mv.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: 45498@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Thank you for the feedback! v2 of patch series coming shortly... I was not aware of the `ocaml4.07-variant` property. It makes things a lot nicer! I've added it for `ocaml-markup` and `ocaml-odoc` and also `ocaml-sexplib0`, `ocaml-parsexp`, `ocaml-base` and `ocaml-sexplib`. This makes `ocaml4.07-*` vanish from lot of places in favor of `(package-with-ocaml4.07 *)`. > Have you tried updating dune to the latest version that builds > with > ocaml 4.07? Not yet. For ocaml-markup 1.0.0 the problem is that the dune file version is set to 2.7. Any dune below 2.7.x will probably not work. For other packages it might work... > >> >> This is quite cumbersome as two trees of OCaml packages need >> to be >> maintained. > > Actually 3, there are ocaml 4.07, 4.09 and 4.11 currently. I'm > working > on a bootstrap for ocaml 4.07 (ocaml builds from a binary > version of > itself), so I don't think it'll disappear soon, but at least we > can try > and make ocaml4.07-* packages disappear :) > \o/ Looking forward to the bootstrap! With the `ocaml4.*-variant` property managing the 3 trees does not seem so bad after all. Currently there are a lot of packages only for 4.07. It would be nicer to have packages for default compiler and when needed variants for older compilers. I plan to do some OCaml hacking in the next months and will send in patches toward this, if that is ok. >> - Some OCaml libraries have dependencies in `inputs` that seem >> to be >> required from packages using the libraries. E.g. >> `ocaml-yojson` >> depends on `ocaml-biniou`. Packages depending on `ocaml-yojson` >> need >> to manually add `ocaml-biniou` to their inputs. Would it >> work/make >> sense to add `ocaml-biniou` to `propagated-inputs` of >> `ocaml-yojson`? > > Yeah, could you provide an additional patch for that? Done. Patch 13 in v2. -pukkamustard From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:14:38 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH v2 01/13] gnu: Remove ocaml-js-build-tools. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:14:39 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH v2 02/13] gnu: Add ocaml-sexplib0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:14:40 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH v2 03/13] gnu: Add ocaml-base. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:14:41 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH v2 04/13] gnu: Add ocaml-parsexp. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:14:50 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH v2 05/13] gnu: Add ocaml-sexplib. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:14:50 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH v2 06/13] gnu: Add ocaml-ounit2. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) * 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 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:14:51 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH v2 07/13] gnu: ocaml-tyxml: Update to 4.4.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:14:51 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH v2 08/13] gnu: ocaml-markup: Update to 1.0.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:14:51 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH v2 09/13] gnu: Add ocaml-odoc. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:15:05 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH v2 11/13] gnu: Add ocaml-mdx. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:15:05 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH v2 10/13] gnu: Add ocaml-version. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:15:06 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH v2 12/13] gnu: Add ocaml-merlin. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 13:15:07 2020 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 To: 45498@debbugs.gnu.org Subject: [PATCH v2 13/13] gnu: ocaml-yojson: Make dependencies propagated-inputs. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 15:00:50 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 20:00:50 +0000 Received: from localhost ([127.0.0.1]:36960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktyhF-0002u0-Uz for submit@debbugs.gnu.org; Mon, 28 Dec 2020 15:00:50 -0500 Received: from lepiller.eu ([89.234.186.109]:58636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktyhD-0002tl-0p for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 15:00:48 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id b65b518b; Mon, 28 Dec 2020 20:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=CxCQ0RBxZuPr UhyIw0Yg1pBCrXfqsyAsvTZNWdVucvo=; b=j5HOHJfwnvi1ll0i7WKGr5TUykvU 5vJ0jYg5p3eyvjZBxQE0DqnD9xQDMBsJGUAA+hxIITP+Fdc4DNRwB78z0cMA6m6d F5bn1NfQ+VhVBnfXc/JxC+CzYBIiJ0D7jHnL6nEpgtUDuZgs5Sdrs1+meaZ4dNBw 7HYUR5SfvneuXJOGnsBj+ZTQvrueE37qRpWK6C2dK5jJ7iNCf1q+MQV/ShBESirf ukA1NY3B1ZOuQjxeepI7xSL5Ak3E9YJy3v6Uc4u+Kb6KwotN4YRxvi6DivC9/0PO Rr+vfGErSA7cGfu7GKXJylGuTH3RDqBaSFDsvz6XY8d79GM8oZiGqNvnCA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id e749e1ca (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 28 Dec 2020 20:00:44 +0000 (UTC) Date: Mon, 28 Dec 2020 21:00:37 +0100 From: Julien Lepiller To: pukkamustard Subject: Re: [bug#45498] [PATCH 00/12] Add ocaml-merlin. Message-ID: <20201228210037.0af6cf8a@tachikoma.lepiller.eu> In-Reply-To: <86pn2tn6mv.fsf@posteo.net> References: <20201228124017.24295-1-pukkamustard@posteo.net> <20201228150655.101e4704@tachikoma.lepiller.eu> <86pn2tn6mv.fsf@posteo.net> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 45498 Cc: 45498@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le Mon, 28 Dec 2020 19:10:48 +0100, pukkamustard a =C3=A9crit : > Thank you for the feedback! v2 of patch series coming shortly... >=20 > I was not aware of the `ocaml4.07-variant` property. It makes=20 > things a > lot nicer! >=20 > I've added it for `ocaml-markup` and `ocaml-odoc` and also > `ocaml-sexplib0`, `ocaml-parsexp`, `ocaml-base` and=20 > `ocaml-sexplib`. Thank you, it will make things easier to maintain I think :) >=20 > This makes `ocaml4.07-*` vanish from lot of places in favor of > `(package-with-ocaml4.07 *)`. >=20 > > Have you tried updating dune to the latest version that builds=20 > > with > > ocaml 4.07? =20 >=20 > Not yet. For ocaml-markup 1.0.0 the problem is that the dune file > version is set to 2.7. Any dune below 2.7.x will probably not=20 > work. Is this a hard requirement? I think we used to be able to use older dune versions despite this. >=20 > For other packages it might work... >=20 > > =20 > >> > >> This is quite cumbersome as two trees of OCaml packages need=20 > >> to be > >> maintained. =20 > > > > Actually 3, there are ocaml 4.07, 4.09 and 4.11 currently. I'm=20 > > working > > on a bootstrap for ocaml 4.07 (ocaml builds from a binary=20 > > version of > > itself), so I don't think it'll disappear soon, but at least we=20 > > can try > > and make ocaml4.07-* packages disappear :) > > =20 >=20 > \o/ Looking forward to the bootstrap! Yay, it should become reality in the next few months. Currently we target ocaml 4.07 because it's the last version that doesn't require merlin; after that we should be able to use ocaml4.07-merlin to build the parser for more recent versions. > With the `ocaml4.*-variant` property managing the 3 trees does not=20 > seem > so bad after all. >=20 > Currently there are a lot of packages only for 4.07. It would be=20 > nicer > to have packages for default compiler and when needed variants for=20 > older > compilers. This is for historical reasons: we had these packages with ocaml 4.07, and only for those packages that still require ocaml 4.07. More recent versions of these packages have a different dependency tree, which makes it hard to maintain both trees at the same time, especially as there is no version that supports any two of our ocaml compilers at the same time. > I plan to do some OCaml hacking in the next months and will send=20 > in > patches toward this, if that is ok. That would be very appreciated! > >> - Some OCaml libraries have dependencies in `inputs` that seem=20 > >> to be > >> required from packages using the libraries. E.g.=20 > >> `ocaml-yojson` > >> depends on `ocaml-biniou`. Packages depending on `ocaml-yojson`=20 > >> need > >> to manually add `ocaml-biniou` to their inputs. Would it=20 > >> work/make > >> sense to add `ocaml-biniou` to `propagated-inputs` of=20 > >> `ocaml-yojson`? =20 > > > > Yeah, could you provide an additional patch for that? =20 >=20 > Done. Patch 13 in v2. Could you instead put this as patch 12, and add merlin as patch 13? That way you don't have to add the dependencies in merlin and remove them in the following patch. Also, patch 12 adds ocaml-dot-merlin-reader and ocaml-merlin. could you separate it in two separate patches? I'm also wondering if we should call this package "merlin" instead of ocaml-merlin, since it provides a binary of that name? >=20 > -pukkamustard >=20 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:09:42 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:09:42 +0000 Received: from localhost ([127.0.0.1]:36998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzlu-0006f6-4W for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:09:42 -0500 Received: from mout01.posteo.de ([185.67.36.65]:36636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzlo-0006ep-Uz for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:09:40 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 7ABA216005C for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:09:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189770; bh=OX5vbqliwKb8Aq1dk2gHF45jhrllBB8AapA6eO38iDk=; h=From:To:Cc:Subject:Date:From; b=Q2L4c7uujEocqg+xsoIdN1DQVHoSzlsPIpUFEDqhN++VJeQ1GMik6T5IGaUU5Vycr lCWf4YJY/22boNfPnMMEH6fylIiKEZSPnPLLeNWiHMd6yxVLckwaSv9WR31WZcDgf8 bWvWDiVMkaAdIeNMdTscP6T8BZP/OMI3ned2Xea3QlNtp8wdZPCr5D2wJNskeNyHys 45DHjM/zzVX0ErEjEh4MB5X9cdacVB28rcb4RqzMpLeyGGor0XvLN7EEQO0mgZd/cB NbWNNd18iosKuN+tQ7DLjHe+BIdktyrdQg4FdbfxgnaE+s1T6ZAyvnIGCe5PsXFG47 LjLR5/MuhlgiQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VY555Fcz9rxK; Mon, 28 Dec 2020 22:09:29 +0100 (CET) References: <20201228124017.24295-1-pukkamustard@posteo.net> <20201228150655.101e4704@tachikoma.lepiller.eu> <86pn2tn6mv.fsf@posteo.net> <20201228210037.0af6cf8a@tachikoma.lepiller.eu> User-agent: mu4e 1.4.13; emacs 27.1 From: pukkamustard To: Julien Lepiller Subject: Re: [bug#45498] [PATCH 00/12] Add ocaml-merlin. In-reply-to: <20201228210037.0af6cf8a@tachikoma.lepiller.eu> Date: Mon, 28 Dec 2020 22:09:24 +0100 Message-ID: <86a6txfxiz.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: 45498@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) >> > Have you tried updating dune to the latest version that >> > builds >> > with >> > ocaml 4.07? >> >> Not yet. For ocaml-markup 1.0.0 the problem is that the dune >> file >> version is set to 2.7. Any dune below 2.7.x will probably not >> work. > > Is this a hard requirement? I think we used to be able to use > older > dune versions despite this. Not sure. Will keep this for future investigation. >> >> - Some OCaml libraries have dependencies in `inputs` that >> >> seem >> >> to be >> >> required from packages using the libraries. E.g. >> >> `ocaml-yojson` >> >> depends on `ocaml-biniou`. Packages depending on >> >> `ocaml-yojson` >> >> need >> >> to manually add `ocaml-biniou` to their inputs. Would it >> >> work/make >> >> sense to add `ocaml-biniou` to `propagated-inputs` of >> >> `ocaml-yojson`? >> > >> > Yeah, could you provide an additional patch for that? >> >> Done. Patch 13 in v2. > > Could you instead put this as patch 12, and add merlin as patch > 13? > That way you don't have to add the dependencies in merlin and > remove > them in the following patch. > > Also, patch 12 adds ocaml-dot-merlin-reader and ocaml-merlin. > could you > separate it in two separate patches? Done. v3 coming shortly... > I'm also wondering if we should > call this package "merlin" instead of ocaml-merlin, since it > provides a > binary of that name? Hm, both seems fine to me. I've stuck to "ocaml-merlin" for now. Feel free to change if you think "merlin" is more suitable. -pukkamustard From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:10:34 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:10:34 +0000 Received: from localhost ([127.0.0.1]:37004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmg-0006gp-Ef for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:34 -0500 Received: from mout02.posteo.de ([185.67.36.66]:41243) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzme-0006gV-4O for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:29 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id E6B4D2400FD for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189821; bh=RehPZ00GRntKaLmUQuAm0uQLZoxW7MoXK5vdTeWMDo8=; h=From:To:Cc:Subject:Date:From; b=jU6C52Ph+Xr6StuqAyjXEpbfocrXRvKaavWmJJ504O8dIvMdwDe9ZMCvEMzoPJw9U uxfMW9cUoySPH7Gyral4e1ta4hf5Z56V1XmtpPFIune+JyMRwAXBeXaPziPcTMxCs4 dEa6204z4GaJutdEDOrZjSM4XOuEEPBMlkg6+kdFu0D0gwQQgyf3G8st2RjVM1SFPq //7AcskLieCxGC4YNoMVSL4fWRlO6ScbllWqSZGiyEMpiCGc2guf0F/a5E6lrZZaYW DeGXC5V020kd4wFN7RkMtfnhy301PjL2sY1tm+Q+rnjLtY4OrHdCsuEXMc4y5GYWvs A51za5KXwI4PQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZ539Wnz9rxK; Mon, 28 Dec 2020 22:10:21 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 01/14] gnu: Remove ocaml-js-build-tools. Date: Mon, 28 Dec 2020 22:10:03 +0100 Message-Id: <20201228211016.8448-1-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <86a6txfxiz.fsf@posteo.net> References: <86a6txfxiz.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:10:35 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:10:36 +0000 Received: from localhost ([127.0.0.1]:37010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzml-0006hO-61 for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:35 -0500 Received: from mout01.posteo.de ([185.67.36.65]:44030) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmg-0006gY-8M for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:30 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 96F8816005C for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189824; bh=1ScI70MPP5NOcIV8Lu+M+ZmjJuKeaXerfnIinBSVYzk=; h=From:To:Cc:Subject:Date:From; b=NzMOZsNL05nEnZ9rJYssyhiNkuLH3gvOpEjjp+gEM0FjE9PE7cZg/TasxZ4Ei/mAZ W2xwh87iiMbhD8BFhnD7fZyy30BY7kFkSKxp0KCMzur1b8PGZD424DitbGFv3EpGBM jD7icF43C1huK7iCCPlTymrX1Wdf9Qf7zaxlPBki0QxiqhX1H3vx6qLmXlrfNZtsPt t5/oc1QnfwiVyCmvnOcYm3oFqrVD0yw0gGPq3ORbhUw+QJZ/UhwoOBDuO4NGskH7ql vPbhE/fbftLxq8VJTv818KKaz/IRbXvjujYOtcz4PQJBX755TAY8NZqR9s4i4RmAQ/ 2cgzGc4N1+XXg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZ80bRfz9rxH; Mon, 28 Dec 2020 22:10:24 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 02/14] gnu: Add ocaml-sexplib0. Date: Mon, 28 Dec 2020 22:10:04 +0100 Message-Id: <20201228211016.8448-2-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:10:36 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:10:36 +0000 Received: from localhost ([127.0.0.1]:37013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzml-0006hW-QH for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:36 -0500 Received: from mout01.posteo.de ([185.67.36.65]:58513) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmi-0006gb-20 for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:33 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 4632216005C for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189826; bh=lUOFEWmUPnMB0tQnFsimHj3SuXP9ftTM+Nzs87z+UzU=; h=From:To:Cc:Subject:Date:From; b=fT/9FPr4jm7K9aBpefF7fDLh1c24OC4YJkMDk+hI2r46u+9RxD1yyY5oxFem4D8+m ZIPHRhgINplN22AIGMqD65mWjS6bQTRyd/yRz8F3CftMCpk6jcEelKgp8X5/U0INrk a2Uhkq5JYxNAT+k9oqAzLX9UFtM32jE23a/ngyNBIiDRyn4bLO9/oWKjkc7DzNIMAF rs0mLN1EG+e4sZd1sPnane5m50Xytnld7CadWPWOrAcQ3qhMQDxhyJX+kLqL2/2pvb cAUqFGuHqEQto5hDQ/vn6wtAWNUO3mTnSGjtkZ8jpt6zVhJfoEXGcH8QQpbACozj70 yh4Ef4n8TbgjQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZ9690Hz9rxH; Mon, 28 Dec 2020 22:10:25 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 03/14] gnu: Add ocaml-base. Date: Mon, 28 Dec 2020 22:10:05 +0100 Message-Id: <20201228211016.8448-3-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:10:37 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:10:37 +0000 Received: from localhost ([127.0.0.1]:37015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmm-0006hd-Lk for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:37 -0500 Received: from mout01.posteo.de ([185.67.36.65]:42716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmj-0006gc-13 for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:33 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 5F12616005C for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189827; bh=lje/MO0hATw9uBELU735PWtRN8lS97KodPJ7Ut1jU4Q=; h=From:To:Cc:Subject:Date:From; b=KuBXSl+ycPjSHoqG+QhZXHbUlrBiP8EyNIgocJHmiT1eUtuiLG6qP4wXzZVI5Z/dw D/RQPfuFXS4TKlnf7+pq25pzbcaJ6471ntl/Edpt8eo9TeHFcNAVBbt5WZupiyTl+D c2K8vAVU2t2dJnmK4jjpRCzg2/HrQ+OK3gUWEd9srvYW8NQYKC4rGfRh9R062REG/J WtGWpboAl6af5olvOtFdbj/r/0hTi5AIN9+gzL6zIHjzb2u3Amj84JF6Vc4JnLDeJX HlgA0tTIbA0P0LSqWT8+kFwpbmAQmRirIpGI2KctkrsvqMrTaRvVss4vmmLQStP3fq jFOGIOm0y0N0g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZC0G7Gz9rxH; Mon, 28 Dec 2020 22:10:27 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 04/14] gnu: Add ocaml-parsexp. Date: Mon, 28 Dec 2020 22:10:06 +0100 Message-Id: <20201228211016.8448-4-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:10:44 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:10:44 +0000 Received: from localhost ([127.0.0.1]:37021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmu-0006iM-2v for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:44 -0500 Received: from mout02.posteo.de ([185.67.36.66]:39479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmk-0006ge-4d for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:34 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 70D8E2400FD for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189828; bh=d2kT8deGl8M+t/SmR61zwCxkAQC2wtb42P6soXvLLiQ=; h=From:To:Cc:Subject:Date:From; b=X9iGshCymujc4dCZRyzLMj3PyuuchVZMFceON8OwVI54gShr6JYMdQ5eBFC2gAbOf nyTrdx4boKjpKQfQQ2F6xLX7GE7wdnBJQBnd0Fft9VsqbJzRjzMD2hZCLvYd0jAk/k Vri+kubmsfFydLiwXXq0tERjwbKr2Sc1OJOWqJsZuUOoi/gEuCy7P/ro/J2LhT+OTe SGQBIhUm+1gnfpVhclVAThXOtt8PFpZCatG6j6m6zzv19meznFUj+RC258iJ9mohrL Nt7TckSERJDBeXTdunPIP1yAek/M9vV1uBRQ432pjzaei+IhZIUkUxFL8IpxYu0M9M uVGl+bStYBDfg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZD0mpvz9rxH; Mon, 28 Dec 2020 22:10:28 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 05/14] gnu: Add ocaml-sexplib. Date: Mon, 28 Dec 2020 22:10:07 +0100 Message-Id: <20201228211016.8448-5-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:10:44 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:10:44 +0000 Received: from localhost ([127.0.0.1]:37023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmu-0006iO-Dh for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:44 -0500 Received: from mout01.posteo.de ([185.67.36.65]:46339) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzml-0006gn-6E for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:35 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 7683216005C for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189829; bh=rO6DbaMGstkO1z/r8Bg98PQAvLQVIcH7fhv9fLV+75Q=; h=From:To:Cc:Subject:Date:From; b=dt7LwIYqezMJG0x+Y9B51fXIY/lndpC3n07FBXAeKXChh1P9krpiG1UFJjRM5Ug9g LvSER2sW15F4Mx2q7fdWnEybbVhs8oIVmQpmG9S0ZjwkMaNqXVoYy+wE8MUXR2Po9C 4IAZIdMYWpUQ7rglI+/oANR0ORHbnZTLHslJUURlX4X+M2aw8+8M8cG0tzMYJaRcYz h+m9PoQeZa2cxkwHXMvPTHiRoF8VAEoAKwqsjoLqXwTOIk5m0ATbvMe/FbzwjCfADI /LFuKcumxaW7AKsL4j5VfK7KepSW/bt7M9AYoAAr6FZ3fh2IKdLyVInZ1+X77nm8NZ G2CJanGx2BNKg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZF0sPkz9rxH; Mon, 28 Dec 2020 22:10:29 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 06/14] gnu: Add ocaml-ounit2. Date: Mon, 28 Dec 2020 22:10:08 +0100 Message-Id: <20201228211016.8448-6-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) * 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 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:10:45 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:10:45 +0000 Received: from localhost ([127.0.0.1]:37025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmu-0006iW-Mi for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:44 -0500 Received: from mout01.posteo.de ([185.67.36.65]:40304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmm-0006gw-M1 for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:37 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id E6CFE16005C for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189830; bh=v4Pv0ahzQubunJJYZg+Ak85FL8xvU66Tb5lCAK/jmZ4=; h=From:To:Cc:Subject:Date:From; b=iSuWF3MoGyZLNcdCH7OMeacV6ApNWFq3+zJgiyThdYLhggWTD1PlS63pC0CkfETJ5 4B156ZjANrqwQ7fwMw7F9Y9Lz7UFw8WxChInRz79gSHjJ/050AKUJYOCp9z/9kWBnL mFo47mJb7Jo/mnMVOpVIv/ln/MtgGBS3dwYQroNrB7GD5CiZLn9GDx0HjHuqNTlZgq 5n7dMp5EtGs8MY7vbs2A5nR55AUWQDvmKt8uoXq9CM9NJjYHkQSor4UzUgvPTUxg3M OJrDWLQrNEKQHIxWJkbqs3xviPYfVGnu1hnJnmOEgYd+kobI9HCVwEwbE/PdMNwV3F TI5RrbkCht5lg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZG3r6tz9rxK; Mon, 28 Dec 2020 22:10:30 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 07/14] gnu: ocaml-tyxml: Update to 4.4.0. Date: Mon, 28 Dec 2020 22:10:09 +0100 Message-Id: <20201228211016.8448-7-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:10:45 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:10:45 +0000 Received: from localhost ([127.0.0.1]:37028 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmv-0006id-1D for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:45 -0500 Received: from mout01.posteo.de ([185.67.36.65]:38517) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmn-0006gy-L4 for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:38 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id F1553160061 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189832; bh=LEd/FiE5tnkarsMHJl5Si/upsVREXI7oEebpHnrhA0M=; h=From:To:Cc:Subject:Date:From; b=D2oRfHUe/6ueLp8ejWLXLTIjo6Bv1KCUOWVQ9ZDaB5PPl2MimrgDtCSbQuuYDTl/+ Gl2o0Ex8ZFDwtvzzO207iUqUa+A935tGz0m7062ZQiWofhQNxllYVeFFfuarO6XaHB 6NLPlPgVljXpYXbWjSkjxvMj+Bt3fUSn0JnOXt9yglzFBhPHfugg1sZOZUuS/TAVof HtfPwRv4mFByxMoea0w0ao6oIbbtT4NpwHSQVz6QohIfJKinDJsLtcPYbwG88D2PEU D7iafGFERCnW1rD3Wl5GRBMirmjhZKA5q9O7jkpSSqyyBWhFFw7+B0MIwfx6DUVAqD DcBFYPUiWdBgg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZH4W2pz9rxH; Mon, 28 Dec 2020 22:10:31 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 08/14] gnu: ocaml-markup: Update to 1.0.0. Date: Mon, 28 Dec 2020 22:10:10 +0100 Message-Id: <20201228211016.8448-8-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:10:45 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:10:46 +0000 Received: from localhost ([127.0.0.1]:37030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmv-0006iq-GW for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:45 -0500 Received: from mout01.posteo.de ([185.67.36.65]:38099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmo-0006hA-Pc for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:39 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 0EDEE160061 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189833; bh=w4WAx4sThVTZ5kHcXpA3ri2FA/m6u84I9QI4carPwMs=; h=From:To:Cc:Subject:Date:From; b=bgyNXqEDMH4q8WJi65w9piFYPiEceTCtCFxNU3bE9wrNrcPcXjSUqRJdR+hySgBV0 SxeKXzKhWT48Bh6l+J72xDEJokc1IalfNcM2TuGsTTGsmMZgREZw08d05RxHKxfftp v4fFu6zTqBdr2bw50nOUQL57SMi2L/EGenZ/DL2LLvyOu6+Ucd4+goSyWO8W3JiLrr 4OHXRYXs/ZVzNm2fqe6/p3Olin+mNwbatr3gM0t3e+QtHrnthDRinKacZqJ85D5Qbr ElQLFl4VdCLbuDXrpTnmSfViWopRodlLbco7qoOfhUh/TruUy+050MYnN2U+Ubyk4Y fFn74p0AyNpXQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZJ4z28z9rxH; Mon, 28 Dec 2020 22:10:32 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 09/14] gnu: Add ocaml-odoc. Date: Mon, 28 Dec 2020 22:10:11 +0100 Message-Id: <20201228211016.8448-9-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:10:46 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:10:46 +0000 Received: from localhost ([127.0.0.1]:37032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmv-0006iy-Tg for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:46 -0500 Received: from mout02.posteo.de ([185.67.36.66]:36225) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzms-0006hv-UI for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:43 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 4A6632400FB for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189837; bh=NLlBBpEMzCuq8dNliYI3onyJexpyjaTybMPBPe07SRo=; h=From:To:Cc:Subject:Date:From; b=WVbdMtZKo7Kkq2p6wb25EqC7ME+4CyfTtWhQld2nYKSfYBq5APwRQr2xZtkKdq+Mo rifGqKYyDKZptMqSe2Moe3TZmSUauRjpdi5/2p3jhXnsEzMqjcH0z4UOPAONKND4Nt Q0+P/P72lW1YBgr4oADdaT7yZi/KomMJa6BToqXTaYgcy8t1DyZEs16UdoimSm3XhG ZqxR+ruKoXbNWrBU/AcjZi08dW8iUl4nAxPK+GPnCllkEvafKMsvhH1ecCSh2U5JNr bru7xPZz62n9Gvq24GtJyVGO/XEp5LpRiaHDdKzrYUbsg0aOM+w4bw4gsQrA/DntlK /m3pV5pLxaqAw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZN6yWNz9rxH; Mon, 28 Dec 2020 22:10:36 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 10/14] gnu: Add ocaml-version. Date: Mon, 28 Dec 2020 22:10:12 +0100 Message-Id: <20201228211016.8448-10-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:11:03 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:11:03 +0000 Received: from localhost ([127.0.0.1]:37039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktznD-0006k4-Ao for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:11:03 -0500 Received: from mout02.posteo.de ([185.67.36.66]:35207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmu-0006i9-MV for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:45 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 20A762400FD for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189839; bh=c7SrvkzGOuMWE9+xrYuRsaEbUolJ8cWRUiIQESgIZng=; h=From:To:Cc:Subject:Date:From; b=MW9xhFhK4lWarE+LsIl7I5JVcOWr6wv3PWQMwg60y8OIZ2RRfzd7ohioPfJzvecBt bTb1RxnodbIbf+7T2twFACbUJO+AR2VuziyYrAe/2iuHf7bomECbvz5ho60QyXwu3j m/5M7iJto0L0+c0w/rrZKPDJO8U1hrDabJQ5JeVMKkC1QKeWhgqG61CUjO+u8oQZxW AI22zdaMITKvg1g6iNZdZuV3HfMgd9fi53NiXhaskEKZqor409htcZ5/GWKTPZkerZ xsazo5XE+mqdWMipqz2C8Dl1mijRGagk9Ed5HgOTr4RoJWX27b+6HmglMt4RvnqAaE pafrl+Oo45AwQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZQ5cvDz9rxL; Mon, 28 Dec 2020 22:10:38 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 11/14] gnu: Add ocaml-mdx. Date: Mon, 28 Dec 2020 22:10:13 +0100 Message-Id: <20201228211016.8448-11-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:11:04 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:11:04 +0000 Received: from localhost ([127.0.0.1]:37042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktznD-0006kE-OG for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:11:04 -0500 Received: from mout02.posteo.de ([185.67.36.66]:46343) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmw-0006iB-1v for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:46 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 626872400FC for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189840; bh=b44KDortcSGRtuxZxuoeF8G34mxNoenp4Gu84NSg8qw=; h=From:To:Cc:Subject:Date:From; b=iwDqmr2JboiDPlqNc8VtO+vZUKadGqHGZF7w7A01F4ryqKBAxOTaKFjBGwqdGJhlO 8TZQ69/E5bwLJeGY6XtjSIRvGlnXst/mX3BYxVj+e7FW4p9eEI5SOhU7QzOuiE+N9i gwdAu4XARDhB++b0R0GgJnEiKWT+m0bgiymaHz5HGbj4vu/kINEnbgUtLIvyVg24N4 LRbTmadwZ5IiSNB4am8Gy9PzfA9BD06B6b4SFQELMbzTKLMVkJJqR0wlwsrbyGfXks xU5l4/2JTabM1CGizI1da3L6hJeSPjkGE4t5O2l2Fenv5tj6IIKg5zlyGTkeCZuuq1 J9I3Mb5iqDtpw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZS0W3Zz9rxH; Mon, 28 Dec 2020 22:10:40 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 12/14] gnu: ocaml-yojson: Make dependencies propagated-inputs. Date: Mon, 28 Dec 2020 22:10:14 +0100 Message-Id: <20201228211016.8448-12-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-yojson): Make dependencies propagated-inputs. (ocaml4.07-merlin)[inputs]: Remove ocaml-biniou and ocaml-easy-format. --- gnu/packages/ocaml.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 385d96977e..a4c0bdb1ac 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 @@ -3925,9 +3925,7 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb")))) (build-system dune-build-system) (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" ,(package-with-ocaml4.07 ocaml-yojson)))) (native-inputs `(("ocaml-findlib" ,ocaml-findlib))) (arguments -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:11:04 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:11:04 +0000 Received: from localhost ([127.0.0.1]:37044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktznE-0006kM-4D for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:11:04 -0500 Received: from mout02.posteo.de ([185.67.36.66]:58031) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmx-0006iD-9R for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:48 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 949DC2400FC for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189841; bh=j55rrcso6HFu4u2riCB+Wi2M27Ae6AKQUx7OiOaXEQ8=; h=From:To:Cc:Subject:Date:From; b=J3RwzlibuVzFs9a3umPa6GnEhOJO/aqnxlV0TExkdXq/W4T0mxIZE5YBFS9n34UVj HAKVoEH9vF624VMRDWCcoTO3YITafIe0T6gLgjqL0uIgy495ZGKj888Q1dIvsLb+pp skW3wASAwFW3cOXf5gZ4tzI5LkBGVqM9Q0pdLme3wN82xlXHq8Oi7ZkpcmkI6JaYH7 U0TH+uTlimfksWl9u/RJ0L4io9dJnh/v2QyLJhKWbNNBsRq7a2Cp96yuIuNO45caX0 xJb+AirT+v5gIxGMolfMrudUo1cf1pNFzHHyzHJHY450dbgtUMRah+Jjx08Ey+AZFu QVvduvdT4CVsw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZT042Nz9rxH; Mon, 28 Dec 2020 22:10:40 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 13/14] gnu: Add ocaml-dot-merlin-reader. Date: Mon, 28 Dec 2020 22:10:15 +0100 Message-Id: <20201228211016.8448-13-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-dot-merlin-reader): New variable. --- gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a4c0bdb1ac..8efc7caba4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3908,6 +3908,33 @@ 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 ocaml-dot-merlin-reader + (package + (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))) + (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 ocaml4.07-merlin (package (name "ocaml4.07-merlin") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 28 16:11:05 2020 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:11:05 +0000 Received: from localhost ([127.0.0.1]:37047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktznE-0006kZ-Hd for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:11:05 -0500 Received: from mout01.posteo.de ([185.67.36.65]:47472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmy-0006iF-Au for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:48 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 85B3116005C for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189842; bh=SVFDT16Q1q1ekl4JMbt3f3Edio7OZQW6MJ3alKabIWY=; h=From:To:Cc:Subject:Date:From; b=PLJ/WE5poMjB92gUVEU6FYP8sDRHsyNWiXoJ/hJde4yjngwj6e9BVHPo9McfJbm7A pmM/5NtiX6mdFEx9hjwQ2Dk9QAsvQNFB+ALGDsr4MJM0mk/6LlN91a+GTqO9R54LSZ LcEPiQujZNYVQJY5VsZyiJZNmLct7ZS1eVan4fKZfRS3u6r0X2MmsZ4OKmJCzrUzKp LPAXEWEfxGS5pSiW/3fOvWx4xe6MaMgEXn5jlEP+xNp08c6Fpxteb0JQckc4Ciy5k+ skgpwg+OqKLMU+lJ6vlo8c4bvpUl+rHjloI/oMic4of+Ht3cksy7q5QWYnCJ/lFxzc yXVeWTLUeSX4w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZV16l5z9rxL; Mon, 28 Dec 2020 22:10:42 +0100 (CET) From: pukkamustard To: 45498@debbugs.gnu.org Subject: [PATCH v3 14/14] gnu: Add ocaml-merlin. Date: Mon, 28 Dec 2020 22:10:16 +0100 Message-Id: <20201228211016.8448-14-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 45498 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ocaml.scm (ocaml-merlin): New variable. (ocaml4.07-merlin): Inherit from ocaml-merlin. --- gnu/packages/ocaml.scm | 54 ++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8efc7caba4..f3f275046f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3935,11 +3935,10 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") @code{ocaml-merlin} configurations.") (license license:expat))) -(define-public ocaml4.07-merlin +(define-public ocaml-merlin (package - (name "ocaml4.07-merlin") - (version "3.2.2") - (home-page "https://ocaml.github.io/merlin/") + (name "ocaml-merlin") + (version "3.4.2") (source (origin (method git-fetch) @@ -3949,18 +3948,19 @@ 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-yojson" ,(package-with-ocaml4.07 ocaml-yojson)))) + `(("ocaml-yojson" ,ocaml-yojson) + ("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. @@ -3968,6 +3968,34 @@ 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-yojson" ,ocaml-yojson))) + (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") -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 30 08:29:35 2020 Received: (at 45498-done) by debbugs.gnu.org; 30 Dec 2020 13:29:35 +0000 Received: from localhost ([127.0.0.1]:42151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kubXj-0004lu-Nh for submit@debbugs.gnu.org; Wed, 30 Dec 2020 08:29:35 -0500 Received: from lepiller.eu ([89.234.186.109]:58786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kubXi-0004lj-Hv for 45498-done@debbugs.gnu.org; Wed, 30 Dec 2020 08:29:35 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 3c9e80b5; Wed, 30 Dec 2020 13:29:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=bAkZ7sZEXpnT 4ndw4drj+p+7ajJkjHCk8+ku4Eu6vps=; b=OjxJohH1Ks16IB5n8q2MpmMZxQhm jdcgRVQ4NRHOWxxk6jw2C6hE+CXP8nhalBL3sZLnXPsi/fO+xLiFycnqy8o0OhkT EHjSPFagrK+Ys6OzubFRPuHK1nmsQIyos047bTy7I8LONGdEuWajgv8rVOGASmoM DRobac2Ik2xFCcWD3vNRHdQxhBS3L0etgcFwGzdspcwg+hkr2BUFK1isKyzoiX46 yb2VcXO1Fz0iFLBDoX5aG2IJqoK0gGwrF6/4EmBBGZ78mqm4UkxYzVTJMqIV+f+f SL8L18I7JVLQMmWVA6iCdnadZH986rrujYrY7WtGe1EljIUtY2gyqKwLFA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 3b1923a1 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Wed, 30 Dec 2020 13:29:31 +0000 (UTC) Date: Wed, 30 Dec 2020 14:29:25 +0100 From: Julien Lepiller To: pukkamustard Subject: Re: [bug#45498] [PATCH 00/12] Add ocaml-merlin. Message-ID: <20201230142925.07153226@tachikoma.lepiller.eu> In-Reply-To: <20201228124017.24295-1-pukkamustard@posteo.net> References: <20201228124017.24295-1-pukkamustard@posteo.net> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Pushed as 77ca156ab2b3a89b2e15d9de4912ad8e022c2c78 to 8b036927a45fb2c1428badabdc3dc0d9d51f7f25 to master, thank you! Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 PDS_TONAME_EQ_TOLOCAL_VSHORT Very short body and From looks like 2 different emails 2.0 PDS_TONAME_EQ_TOLOCAL_SHORT Short body with To: name matches everything in local email X-Debbugs-Envelope-To: 45498-done Cc: 45498-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Pushed as 77ca156ab2b3a89b2e15d9de4912ad8e022c2c78 to 8b036927a45fb2c1428badabdc3dc0d9d51f7f25 to master, thank you! Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 PDS_TONAME_EQ_TOLOCAL_VSHORT Very short body and From looks like 2 different emails -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 2.0 PDS_TONAME_EQ_TOLOCAL_SHORT Short body with To: name matches everything in local email Pushed as 77ca156ab2b3a89b2e15d9de4912ad8e022c2c78 to 8b036927a45fb2c1428badabdc3dc0d9d51f7f25 to master, thank you! From unknown Thu Aug 14 21:49:06 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 28 Jan 2021 12:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator