From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id n6zwKxZK6l/aWQAA0tVLHw (envelope-from ) for ; Mon, 28 Dec 2020 21:11:50 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id kACJJxZK6l+qHAAAB5/wlQ (envelope-from ) for ; Mon, 28 Dec 2020 21:11:50 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6EEEB9403CD for ; Mon, 28 Dec 2020 21:11:50 +0000 (UTC) Received: from localhost ([::1]:57904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktznx-0008Ql-9W for larch@yhetil.org; Mon, 28 Dec 2020 16:11:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktznH-0007fo-7w for guix-patches@gnu.org; Mon, 28 Dec 2020 16:11:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktznG-0006ZB-Rg for guix-patches@gnu.org; Mon, 28 Dec 2020 16:11:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktznG-0006lG-NE for guix-patches@gnu.org; Mon, 28 Dec 2020 16:11:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v3 09/14] gnu: Add ocaml-odoc. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 21:11:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.160918984625855 (code B ref 45498); Mon, 28 Dec 2020 21:11:06 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 3.78 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=posteo.net header.s=2017 header.b=bgyNXqED; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 6EEEB9403CD X-Spam-Score: 3.78 X-Migadu-Scanner: scn0.migadu.com X-TUID: 6x1dmIxLc236 * 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