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 wIlzOFX+UWGlSwAAgWs5BA (envelope-from ) for ; Mon, 27 Sep 2021 19:24:37 +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 WFkLNFX+UWFLIgAAB5/wlQ (envelope-from ) for ; Mon, 27 Sep 2021 17:24:37 +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 3FAB429940 for ; Mon, 27 Sep 2021 19:24:37 +0200 (CEST) Received: from localhost ([::1]:42766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUuMm-0002SZ-Cu for larch@yhetil.org; Mon, 27 Sep 2021 13:24:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUuAg-0000J9-M9 for guix-patches@gnu.org; Mon, 27 Sep 2021 13:12:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59395) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUuAg-0001yO-Dn for guix-patches@gnu.org; Mon, 27 Sep 2021 13:12:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUuAg-0006nL-90 for guix-patches@gnu.org; Mon, 27 Sep 2021 13:12:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50490] [PATCH 0/5] Some julia packages Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Sep 2021 17:12:06 +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: Efraim Flashner Cc: 50490@debbugs.gnu.org Received: via spool by 50490-submit@debbugs.gnu.org id=B50490.163276272426083 (code B ref 50490); Mon, 27 Sep 2021 17:12:06 +0000 Received: (at 50490) by debbugs.gnu.org; 27 Sep 2021 17:12:04 +0000 Received: from localhost ([127.0.0.1]:42702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUuAd-0006mQ-8V for submit@debbugs.gnu.org; Mon, 27 Sep 2021 13:12:04 -0400 Received: from mail-wr1-f42.google.com ([209.85.221.42]:34350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUuAV-0006kI-It for 50490@debbugs.gnu.org; Mon, 27 Sep 2021 13:11:56 -0400 Received: by mail-wr1-f42.google.com with SMTP id t8so53305461wri.1 for <50490@debbugs.gnu.org>; Mon, 27 Sep 2021 10:11:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=Y8HcIdzLZKCnv3uAHkQBLihMxUyVaa6fkcMITg3WAzE=; b=GPL3Nej/exQp1eW+/wQ1LW9w2DhxcB4JaPx3AFnezqeWLTxpBwB6SZKlmqPRw7w0NA rN0i7gYOSoUD9Cxygsco2kdCTmwXgAkfOJAtp5EXByJd12BmuASjPjN8oJJ5H4LIvmmK AsOOE5SiBI8YQyij310afuTGeI/MPbWSscb/XZd9DBao9c53zWEP4+HO35dkJoDmVKK0 GjBWciwHbNjJbvSjwfQ+DhySuxSwwqhO37ZJxhZmyGQKVa/9+vxGkssbDZS4s1j73U2f TEyFNisyOGz/0w/35wyj3z12vloVNiiy0Lafo+XhdNyttvEU1GwtHWJUmjeqXGyZoxDp xPkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=Y8HcIdzLZKCnv3uAHkQBLihMxUyVaa6fkcMITg3WAzE=; b=eVVw11qtkgrCBNBT8UTJsb3afm1gwfGVlLf9hcyZbV4j5ey+MBsu+VVrr3kIoxgM9C 7J9KzyZAyoS4XmKa+HSO2joKci7SZlHCxzKEFKBVnkayT2MYDuah1ci2k1slaN0LonEQ A/L4ki80mkzZN5qgJSU2omcDKxtXKw4bQDQIM1gEkKfxeVmdQWTCjOTZbQ2yFTXtFcVT T+5HZzoQjyxGdjEdiUB9jYa2Y0BjztZnssC8hpQvuuZ1aiy2R53uKAtRzia8Y7NZ6aj+ jUimO+LKiigbdnmTXcHevmFsbwHwuTuIaf0Zz6/I/XbxuvqYn21UsYiBLIIATSblLGGO DoXw== X-Gm-Message-State: AOAM532UILyR2/VOF+7rTS/kVcwbx4tgdyP10M2crOV8Eo/3QkidvBmC ywrxCZgafgwJpAjKYjeb0bZTc6DApjU= X-Google-Smtp-Source: ABdhPJzoITZL0C7EV3VfoSDPS+EsnLctUXY0DfaruP9lLDvd31HGqNhSxmh0Zojo+W04bJgvYXgMtA== X-Received: by 2002:adf:fcca:: with SMTP id f10mr1131788wrs.304.1632762710102; Mon, 27 Sep 2021 10:11:50 -0700 (PDT) Received: from jack-Precision-7820-Tower ([193.48.40.117]) by smtp.gmail.com with ESMTPSA id u5sm18594932wrg.57.2021.09.27.10.11.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 10:11:49 -0700 (PDT) From: zimoun References: Date: Mon, 27 Sep 2021 19:11:18 +0200 In-Reply-To: (Efraim Flashner's message of "Tue, 14 Sep 2021 21:19:27 +0300") Message-ID: <86tui6ymdl.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) 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: , 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=1632763477; 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: content-transfer-encoding:content-transfer-encoding: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:dkim-signature; bh=Y8HcIdzLZKCnv3uAHkQBLihMxUyVaa6fkcMITg3WAzE=; b=gCu3TW8ZOGFbbSlDCek4gD2cE3qI+aEkCFCSWnipd9JQSKK6LMqP4VZJ/BRMLJPvjHx79h 4YihFWBMcuGfJBcPcQ9Ej+oRnjj4ew30iKUzxPuRC7hP0p47G1YZK+5N/OsEe70MHMrkjy WOTWzX+8G2/ajm0uJZ6D4dEuNbbEPazSKHPY+oZTIuxMPEH5z73WXcvRl1D0aVqvXTYUjn tFjD6VfzDUtRICds77OHWxQAvMCa5pFvt6tG4bg62ZgQQmsH99BhiG2Jj+3mVok8CfwvQo 05KH1YqNTMwkKPBBmhvgn91HUK0Pp5VE96OWsAlQHPgju+8qKz3ECQ+w5vSERw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632763477; a=rsa-sha256; cv=none; b=bjyhMtMiJl6ffY3v+tDbmOZ7DiVVEyGhlg9iQs+2UhzhumhGK9fsLETr7AolJwWJ3ICNnH qBlc/0BpjjmJHe5Hkk9QG4BNzLxDYku3jVl5awP2+OzS4QRRtUL61Hgke6CVWjJe0XyhhQ d9KsMS0K3ZPTn4MWXuzvxIObMaQqJ1etsP5EFROS692M6yPZoVgTO0aWLSV4hCOb/6/oqN uNnLdzz/j/4Zsp1+81K5nvQSqFegdvxJBL211Ze/0KlM/3GTq+tVWCX6Lg/vcPRdS3QjZy 3jEKkmm5Nt6PJU/HxgedvWeLy3knwYxYXgjG14p8pqBC7BOWSx87gzOlnqmdAA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="GPL3Nej/"; 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: 0.21 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="GPL3Nej/"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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: 3FAB429940 X-Spam-Score: 0.21 X-Migadu-Scanner: scn0.migadu.com X-TUID: dNa82E7hVeCa Hi Efraim, On mar., 14 sept. 2021 at 21:19, Efraim Flashner wr= ote: 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 > * 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(-) The patch does not apply=E2=80=A6 > 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 documentati= on > +;; 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 fai= l. > + (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 Ju= lia.") > + (license license:expat))) > + > +(define-public julia-documenter-0.22 Do we need to make it public? Is it not enough to keep it hidden? > + (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.jl") > + (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") I would write =C2=ABsetting up Documenter.jl=C2=BB > + (description "This package contains utilities for setting up documen= tation > +generation with @code{Documenter.jl}.") > + (license license:expat))) > + > (define-public julia-diffresults > (package > (name "julia-diffresults") =E2=80=A6so I have not tried it. It LGTM though. Cheers, simon