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 cEQTBqfl6V/xDwAA0tVLHw (envelope-from ) for ; Mon, 28 Dec 2020 14:03:19 +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 eJnsAafl6V8dbgAAB5/wlQ (envelope-from ) for ; Mon, 28 Dec 2020 14:03:19 +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 658A69403A9 for ; Mon, 28 Dec 2020 14:03:18 +0000 (UTC) Received: from localhost ([::1]:52064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktt7F-0003Tj-CB for larch@yhetil.org; Mon, 28 Dec 2020 09:03:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktt70-0003RL-O4 for guix-patches@gnu.org; Mon, 28 Dec 2020 09:03:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51337) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktt70-0004Pj-F4 for guix-patches@gnu.org; Mon, 28 Dec 2020 09:03:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktt70-0005nH-Ab for guix-patches@gnu.org; Mon, 28 Dec 2020 09:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 09/12] gnu: Add ocaml-odoc. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 14:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: pukkamustard Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.160916413622216 (code B ref 45498); Mon, 28 Dec 2020 14:03:02 +0000 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 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-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: , Cc: 45498@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.22 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=lepiller.eu header.s=dkim header.b=FNZPfaVr; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (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: 658A69403A9 X-Spam-Score: -1.22 X-Migadu-Scanner: scn1.migadu.com X-TUID: ON4bX4F4/DkV 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")