From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id AE8lCZCdVWGCCAAAgWs5BA (envelope-from ) for ; Thu, 30 Sep 2021 13:20:48 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id uOjSBJCdVWFwBAAAB5/wlQ (envelope-from ) for ; Thu, 30 Sep 2021 11:20:48 +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 57DDF29322 for ; Thu, 30 Sep 2021 13:20:47 +0200 (CEST) Received: from localhost ([::1]:44102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVu7K-0000ek-CF for larch@yhetil.org; Thu, 30 Sep 2021 07:20:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVu6d-0000cr-01 for guix-patches@gnu.org; Thu, 30 Sep 2021 07:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40037) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVu6c-0006qr-Cm for guix-patches@gnu.org; Thu, 30 Sep 2021 07:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVu6c-0002IU-5q for guix-patches@gnu.org; Thu, 30 Sep 2021 07:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50490] [PATCH 0/5] Some julia packages Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Sep 2021 11:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50490 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: zimoun Cc: 50490@debbugs.gnu.org Received: via spool by 50490-submit@debbugs.gnu.org id=B50490.16330007798786 (code B ref 50490); Thu, 30 Sep 2021 11:20:02 +0000 Received: (at 50490) by debbugs.gnu.org; 30 Sep 2021 11:19:39 +0000 Received: from localhost ([127.0.0.1]:51582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVu6E-0002He-N0 for submit@debbugs.gnu.org; Thu, 30 Sep 2021 07:19:39 -0400 Received: from flashner.co.il ([178.62.234.194]:43148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVu6C-0002HP-GE for 50490@debbugs.gnu.org; Thu, 30 Sep 2021 07:19:37 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id CA272403F4; Thu, 30 Sep 2021 11:19:29 +0000 (UTC) Date: Thu, 30 Sep 2021 14:18:57 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , zimoun , 50490@debbugs.gnu.org References: <86tui6ymdl.fsf_-_@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="DMqMgMN//5ZyT0sT" Content-Disposition: inline In-Reply-To: <86tui6ymdl.fsf_-_@gmail.com> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633000847; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=CNVNSE6ItGY8a+5ofi+XN4Gx+hODd9bo3eT/bL77ygQ=; b=LfrkPDvpNG9B0XenPdF798Z7jhq6WTU+OVH/LfHQvh2pvOm0zZmHr4bPRXnOy/b3A+HONK erpe10NNsXaO8KBpuBalkT4cYqM8NlAgxXahFSzCkyW1zwv6Vb0r9nC7nZFxTnvTku8Rm1 SJFsUIWAYFw1aIaHDl9GMwzpk85d8t6/a4/sq8ZAnkBLLvuCqiFQVDYjlEnvuVV4wkb5Pj E8CiiOBzBRuSNsLhHd9wZOYr5rdl9dm9/d8c6B/fkq7tAYHUDnHGRdoS/thiufRzdxtKdS cEHciXG9h28rzlKi2yPSLcZCds6HJwjc1ZMEqoP394hm3CJr5UpLPn0ejrqcfg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633000847; a=rsa-sha256; cv=none; b=LhU66CaV/ejS/66RfEIlcJpkA4Ss1lpVH1OxpU1SwwfxUqLPLX59hFQ5PeQakAR2/em80o Imgvigdio8f8tdlC4/KP426O2ZZT2BYKRN86xpvIBwMBv5h2sJCD3m2TJqeZI3Z6pfX5oO D9XUXL7+75ak/tix3wkASRnm7EM503x2P20Z+ZzKVt2bmcFrOP2/7ynli+EbVIot5dDo7a dHJnUagw/6daKsaF0BxCAu5/M4ZQG9rwO7hWkXeH85hrbIt5kcGoh0csIg8P3n3/WoBnOS q1vVnebTBmXLohQlZ6JeEZAmp4mVZJBhbMNljYJuQ/Lqo/Co5eaje84N2qmoUw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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-Spam-Score: -4.40 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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: 57DDF29322 X-Spam-Score: -4.40 X-Migadu-Scanner: scn1.migadu.com X-TUID: z3umtEA7CvDs --DMqMgMN//5ZyT0sT Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Sep 27, 2021 at 07:11:18PM +0200, zimoun wrote: > Hi Efraim, >=20 > On mar., 14 sept. 2021 at 21:19, Efraim Flashner = wrote: >=20 > I would add here an explanation, along these lines: =C2=ABThese four > variables are added by the same commit to avoid a cyclic dependency.=C2=BB >=20 > > * gnu/packages/julia-xyz.scm (julia-documenter, > > julia-documentermarkdown, julia-documentertools): New variables. > > (julia-documenter-0.22): New hidden variable. > > --- > > gnu/packages/julia-xyz.scm | 146 ++++++++++++++++++++++++++++++++++++- > > 1 file changed, 145 insertions(+), 1 deletion(-) >=20 > The patch does not apply=E2=80=A6 Probably due to the module imports. python-xyz was added in a different patch. >=20 > > diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm > > index 309687019d..e7e7680cca 100644 > > --- a/gnu/packages/julia-xyz.scm > > +++ b/gnu/packages/julia-xyz.scm > > @@ -26,7 +26,9 @@ (define-module (gnu packages julia-xyz) > > #:use-module (guix git-download) > > #:use-module (guix build-system julia) > > #:use-module (gnu packages gcc) > > - #:use-module (gnu packages julia-jll)) > > + #:use-module (gnu packages julia-jll) > > + #:use-module (gnu packages python) > > + #:use-module (gnu packages version-control)) > > > > (define-public julia-abstractffts > > (package > > @@ -990,6 +992,148 @@ (define-public julia-docstringextensions > > valuable enough at this time.") > > (license license:expat))) > > > > +;; By removing all the javascript and css downloads any HTML documenta= tion > > +;; produced by this package will not be very useful. > > +(define-public julia-documenter > > + (package > > + (name "julia-documenter") > > + (version "0.27.6") > > + (source > > + (origin > > + (method git-fetch) > > + (uri (git-reference > > + (url "https://github.com/JuliaDocs/Documenter.jl") > > + (commit (string-append "v" version)))) > > + (file-name (git-file-name name version)) > > + (sha256 > > + (base32 "1y6rql7cxc7hfhc8rfq1mdmffp70sqzyh4vnnq93fziwrc8c8sbj= ")))) > > + (build-system julia-build-system) > > + (arguments > > + `(#:phases > > + (modify-phases %standard-phases > > + (add-after 'unpack 'patch-source > > + (lambda* (#:key inputs #:allow-other-keys) > > + (substitute* "src/Deps.jl" > > + (("pip install") > > + (string-append (assoc-ref inputs "python") > > + "/bin/pip install"))) > > + #t)) > > + (add-after 'unpack 'remove-javascript-downloads > > + (lambda _ > > + (substitute* "src/Writers/HTMLWriter.jl" > > + (("cdnjs.cloudflare.com") "example.com")) > > + ;; Removing the javascript downloads causes these tests f= ail. > > + (substitute* "test/examples/tests.jl" > > + ((".*Main\\.examples_html_doc.*") "") > > + ((".*Main\\.examples_html_mathjax3_doc.*") "")) > > + #t))))) > > + (propagated-inputs > > + `(("julia-ansicoloredprinters" ,julia-ansicoloredprinters) > > + ("julia-docstringextensions" ,julia-docstringextensions) > > + ("julia-iocapture" ,julia-iocapture) > > + ("julia-json" ,julia-json))) > > + (inputs > > + `(("python" ,python-wrapper))) > > + (native-inputs > > + `(("git" ,git-minimal) > > + ("julia-documentermarkdown" ,julia-documentermarkdown) > > + ("julia-documentertools" ,julia-documentertools))) > > + (home-page "https://juliadocs.github.io/Documenter.jl") > > + (synopsis "Documentation generator for Julia") > > + (description "This package provides a documentation generator for = Julia.") > > + (license license:expat))) > > + > > +(define-public julia-documenter-0.22 >=20 > Do we need to make it public? Is it not enough to keep it hidden? It should be enough to not make it hidden and not public. Also, I took another look at it and adjusted the package slightly so it can use the current julia-documenter version and not an older version for the bootstrap. >=20 > > + (package > > + (inherit julia-documenter) > > + (name "julia-documenter") > > + (version "0.22.6") > > + (source > > + (origin > > + (method git-fetch) > > + (uri (git-reference > > + (url "https://github.com/JuliaDocs/Documenter.jl") > > + (commit (string-append "v" version)))) > > + (file-name (git-file-name name version)) > > + (sha256 > > + (base32 > > + "1z8b7267y7yn5nx8sjwkmc0ph97vmv42q52jg7s89ghqb9xx3wv5")))) > > + (arguments > > + `(#:tests? #f ; Some tests require network. > > + #:phases > > + (modify-phases %standard-phases > > + (add-after 'unpack 'remove-javascript-downloads > > + (lambda _ > > + ;; This isn't problematic because we only use > > + ;; this package for bootstrapping. > > + (substitute* '("assets/html/documenter.js" > > + "assets/html/search.js" > > + "src/Writers/HTMLWriter.jl") > > + (("cdnjs.cloudflare.com") "example.com")) > > + #t))))) > > + (propagated-inputs > > + `(("julia-docstringextensions" ,julia-docstringextensions) > > + ("julia-json" ,julia-json))) > > + (inputs `()) > > + (native-inputs `()) > > + (properties '((hidden? . #t))))) > > + > > +(define-public julia-documentermarkdown > > + (package > > + (name "julia-documentermarkdown") > > + (version "0.2.2") > > + (source > > + (origin > > + (method git-fetch) > > + (uri (git-reference > > + (url "https://github.com/JuliaDocs/DocumenterMarkdown.j= l") > > + (commit (string-append "v" version)))) > > + (file-name (git-file-name name version)) > > + (sha256 > > + (base32 "0sx89hi5p2f8zi2rp5qrv06m270d90pxj5d2y5cxls1spax7wqx8= ")))) > > + (build-system julia-build-system) > > + (inputs > > + ;; We don't want to propagate the bootstrap version. > > + ;; Cycle with Documenter.jl in later versions. > > + `(("julia-documenter" ,julia-documenter-0.22))) > > + (home-page "https://github.com/JuliaDocs/DocumenterMarkdown.jl") > > + (synopsis "Documenter's Markdown") > > + (description "This package enables the Markdown / MkDocs backend of > > +@code{Documenter.jl}.") > > + (license license:expat))) > > + > > +(define-public julia-documentertools > > + (package > > + (name "julia-documentertools") > > + (version "0.1.13") > > + (source > > + (origin > > + (method git-fetch) > > + (uri (git-reference > > + (url "https://github.com/JuliaDocs/DocumenterTools.jl") > > + (commit (string-append "v" version)))) > > + (file-name (git-file-name name version)) > > + (sha256 > > + (base32 "05p57p8xlkn42m1lv9gq4hl96vp7hpj19d51p828ai1rbpcpi3a6= ")))) > > + (build-system julia-build-system) > > + (arguments > > + `(#:tests? #f)) ; Tests require network. > > + (inputs > > + ;; We don't want to propagate the bootstrap version. > > + ;; Cycle with Documenter.jl in later versions. > > + `(("julia-documenter" ,julia-documenter-0.22))) > > + (propagated-inputs > > + `(("julia-docstringextensions" ,julia-docstringextensions) > > + ("julia-gumbo" ,julia-gumbo) > > + ("julia-sass" ,julia-sass))) > > + (native-inputs > > + `(("julia-example" ,julia-example))) > > + (home-page "https://github.com/JuliaDocs/DocumenterTools.jl") > > + (synopsis "Extra tools for setting up Documenter") >=20 > I would write =C2=ABsetting up Documenter.jl=C2=BB >=20 > > + (description "This package contains utilities for setting up docum= entation > > +generation with @code{Documenter.jl}.") > > + (license license:expat))) > > + > > (define-public julia-diffresults > > (package > > (name "julia-diffresults") >=20 > =E2=80=A6so I have not tried it. It LGTM though. >=20 > Cheers, > simon --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --DMqMgMN//5ZyT0sT Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmFVnSEACgkQQarn3Mo9 g1EyIBAAj8PKaTzliMx8wIkMI37JU+N/KFP9cOgp4AHh1J+bqF9azEF8a1Kz8H4N 9ptY2cQ+qHgAmRKdvfek6e3n5Xb56LVvloYCRQGMxkQ7A7v6yTNokR8I5QxN/Ukz aSPj2NaW8YuwIDuyM1m2rYn+GEZ9IDD5Pz5ew3J2Wk+N6fuYbQN50WHRD0QChtGA iLMOzx31hb4WhXyT+3z6+pS2pJZCplrME9n+D2YoNl6x+piFA3SPCKZMoOyq87NT LX3p/Mf1MQQlzsW5RCt/py0+zQo4Qd2zQKoidCgYF2UZbpS8PO5Uv22X5Nay1QFr yrWZvXmzncTTzODbAXNbsq1GJ+6QQmlcSjmb4qmVQMjLTNrVE8Gm4FPVZy2APYAe mZXPIdSsthNqhOG0dqgSa0fT5yqid24bVaPpoT1tkXAf2FR2rZYtSCurNdQWEn/J +10fi/aLHU3MbXtSN/crDVm11XPs0/6AVU5FJTLmsxOASOTN7qCJzxPMtHhvVS6j MhBdv1F62yk9BhgP06caKIkV5qhQQ2whATJzjclDuwXsz513X0Qr4MFAUnwQluUZ F9ssMoT0Ff3OwvOjthvYY5gKaaqeEuMbM7d8pZkZ2BrqrvvGI8qyNiKVPbPFwI2+ FchocDNbHAxAFCG70VeeoAev4Hxvo+VeYbCETt7Nzz43n9nW4o8= =IOR2 -----END PGP SIGNATURE----- --DMqMgMN//5ZyT0sT--