From patchwork Sun May 12 22:12:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 13973 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E5E0D16FDA; Sun, 12 May 2019 23:13:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id F3F1116FD2 for ; Sun, 12 May 2019 23:13:25 +0100 (BST) Received: from localhost ([127.0.0.1]:47863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwii-0004w1-IO for patchwork@mira.cbaines.net; Sun, 12 May 2019 18:13:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiS-0004ks-0l for guix-patches@gnu.org; Sun, 12 May 2019 18:13:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPwiM-0006Zk-9C for guix-patches@gnu.org; Sun, 12 May 2019 18:13:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58332) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPwiM-0006Yj-25 for guix-patches@gnu.org; Sun, 12 May 2019 18:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hPwiL-0007xr-Qn for guix-patches@gnu.org; Sun, 12 May 2019 18:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx). References: <20190512220907.17418-1-mbakke@fastmail.com> In-Reply-To: <20190512220907.17418-1-mbakke@fastmail.com> Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2019 22:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35705 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35705@debbugs.gnu.org Received: via spool by 35705-submit@debbugs.gnu.org id=B35705.155769916630538 (code B ref 35705); Sun, 12 May 2019 22:13:01 +0000 Received: (at 35705) by debbugs.gnu.org; 12 May 2019 22:12:46 +0000 Received: from localhost ([127.0.0.1]:43615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwhv-0007vs-62 for submit@debbugs.gnu.org; Sun, 12 May 2019 18:12:46 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:59703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwho-0007vE-Vj for 35705@debbugs.gnu.org; Sun, 12 May 2019 18:12:32 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E57F120D34 for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:23 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 12 May 2019 18:12:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=fm2; bh=ASZh5fT+0czOCYuU/LxiweJcrf KfOhGiEzwv+gdkEwk=; b=Kuc4S/vQCuSrc3s/X93pf6HI8S7xmP1vb7mxqoXgzg bHiyqUSu1s/80/AP88DWYwJ5+bNDAZAb1M0ax39ZdJjf8GuCO5prRzP9CRJ6ZBfX r/eV1h3n0DmxeH1cF55RMgMtY+w891Bg3BhLVIDrogJ6xrJGfYjoYc17/5r3YjCq qB6vFijwsAcd3r//uWEsl9xIaYPvM6WnvsnSyU3Wnl58elvtaGZiZTc5fXMGhKWa GGj3fNaF45esGolSdXoFITfnMZ+KId3tOW9xKFnRXLBDvbNmY3xZN5YzjUvrewI0 kh8iC/Nsm2vS+BKeNmL30ehi1zLrHgPtvyXVGEUC4ooQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=ASZh5f T+0czOCYuU/LxiweJcrfKfOhGiEzwv+gdkEwk=; b=G0K4Yjm75kkfb86Xs2RDad lDCtlHK40eAKF0vNg2vssW/QkwokGu5JtoZ/YlnHXzUpihZD3CjzsrJOiu5/gsba qCqCtdFE/8wbQLBSYKADrgijTcrY4xEmGvDTGYPDx4lBC6hxeACnwiQtoQEjCeIL vsoBRD+XeI0Q7sq4LarlNGKv8Q7mHGp3DreTSLUSaWDQGMuBOpYPNfNcvHxnYJex 2g9S+wKLHI17mzf39CzFkyy1nUSv6aJUYSGSM1t9IzQSTQ5tk8kK0IVuRglUgFsy 3u5eQPRnEdQe4pyiNXMWIFPv8w3saCmlugQ/xr2q+jtYq96IrbsWJACmaPf34cGA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrleefgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecuogfuuhhsphgvtghtffhomhgrihhnucdlgeelmdenuc fjughrpefhvffufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpeforghrihhushcu uegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucffohhmrghinh epshgtihhphidrohhrghdprhgvrgguthhhvgguohgtshdrohhrghdpghhuiiiilhgvphhh phdrohhrghdpshhphhhinhigqdguohgtrdhorhhgpdhgihhthhhusgdrihhopdhgihhthh husgdrtghomhdpsghithgsuhgtkhgvthdrohhrghdpmhgrthhplhhothhlihgsrdhorhhg pdhgnhhurdhorhhgpdhrvggrughthhgvughotghsrdhiohdpphihthhhohhnrdhorhhgne cukfhppeeivddrudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehm sggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id EBDCF8005B for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:22 -0400 (EDT) From: Marius Bakke Date: Mon, 13 May 2019 00:12:13 +0200 Message-Id: <20190512221221.17781-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-sphinxcontrib-websupport, python2-sphinxcontrib-websupport, python-sphinx, python2-sphinx, python-sphinx-gallery, python2-sphinx-gallery, python-sphinx-rtd-theme, python2-sphinx-rtd-theme, python-guzzle-sphinx-theme, python2-guzzle-sphinx-theme, python-sphinxcontrib-newsfeed, python-sphinxcontrib-programoutput, python2-sphinxcontrib-programoutput, python-sphinx-repoze-interface, python2-sphinx-repoze-interface, python-sphinx-cloud-sptheme, python2-sphinx-cloud-sptheme, python-sphinx-alabaster-theme, python2-sphinx-alabaster-theme, python-sphinx-me, python-sphinxcontrib-svg2pdfconverter): Move to ... (gnu): * gnu/packages/sphinx.scm: ... here. New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. * gnu/packages/admin.scm, gnu/packages/bioinformatics.scm, gnu/packages/calendar.scm, gnu/packages/cluster.scm, gnu/packages/databases.scm, gnu/packages/dav.scm, gnu/packages/disk.scm, gnu/packages/django.scm, gnu/packages/elf.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emulators.scm, gnu/packages/finance.scm, gnu/packages/image.scm, gnu/packages/libffi.scm, gnu/packages/mail.scm, gnu/packages/mpd.scm, gnu/packages/openstack.scm, gnu/packages/pdf.scm, gnu/packages/python-web.scm, gnu/packages/search.scm, gnu/packages/statistics.scm, gnu/packages/storage.scm, gnu/packages/sync.scm, gnu/packages/terminals.scm, gnu/packages/tls.scm, gnu/packages/web.scm: Adjust module imports. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 1 + gnu/packages/bioinformatics.scm | 1 + gnu/packages/calendar.scm | 1 + gnu/packages/cluster.scm | 2 +- gnu/packages/databases.scm | 1 + gnu/packages/dav.scm | 3 +- gnu/packages/disk.scm | 1 + gnu/packages/django.scm | 1 + gnu/packages/elf.scm | 2 +- gnu/packages/emacs-xyz.scm | 1 + gnu/packages/emulators.scm | 2 +- gnu/packages/finance.scm | 1 + gnu/packages/image.scm | 1 + gnu/packages/libffi.scm | 1 + gnu/packages/mail.scm | 1 + gnu/packages/mpd.scm | 2 +- gnu/packages/openstack.scm | 1 + gnu/packages/pdf.scm | 1 + gnu/packages/python-web.scm | 1 + gnu/packages/python-xyz.scm | 328 +--------------------------- gnu/packages/search.scm | 1 + gnu/packages/sphinx.scm | 369 ++++++++++++++++++++++++++++++++ gnu/packages/statistics.scm | 1 + gnu/packages/storage.scm | 1 + gnu/packages/sync.scm | 2 +- gnu/packages/terminals.scm | 1 + gnu/packages/tls.scm | 1 + gnu/packages/web.scm | 3 +- 29 files changed, 399 insertions(+), 334 deletions(-) create mode 100644 gnu/packages/sphinx.scm diff --git a/gnu/local.mk b/gnu/local.mk index 133293aad3..0eada4a839 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -434,6 +434,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/smalltalk.scm \ %D%/packages/sml.scm \ %D%/packages/speech.scm \ + %D%/packages/sphinx.scm \ %D%/packages/spice.scm \ %D%/packages/sqlite.scm \ %D%/packages/ssh.scm \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b6aba4c38b..42dff02b08 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -89,6 +89,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) + #:use-module (gnu packages sphinx) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) #:use-module (gnu packages groff) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ce720f46ed..0685ca966b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -109,6 +109,7 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages serialization) #:use-module (gnu packages shells) + #:use-module (gnu packages sphinx) #:use-module (gnu packages statistics) #:use-module (gnu packages swig) #:use-module (gnu packages tbb) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 2969228ee9..af692e59f2 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages time) #:use-module (gnu packages xml) diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm index 8d6669cd22..3608d67bed 100644 --- a/gnu/packages/cluster.scm +++ b/gnu/packages/cluster.scm @@ -24,7 +24,7 @@ #:use-module (guix packages) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls)) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 403c3b1fb5..de9d3921ab 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -94,6 +94,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages ruby) #:use-module (gnu packages serialization) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index 0bb446bc3c..3b040028a1 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -26,7 +26,8 @@ #:use-module (gnu packages check) #:use-module (gnu packages python) #:use-module (gnu packages python-web) - #:use-module (gnu packages python-xyz)) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx)) (define-public radicale (package diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index c8d2af88ca..c470b1faa6 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) #:use-module (gnu packages vim) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index b9554a388e..e9593c85a2 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages time)) (define-public python-django diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 99f49eb7a7..09be3a75a3 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -34,7 +34,7 @@ #:use-module (gnu packages m4) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages xml)) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 069bf3e1f6..dd49e2f828 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -123,6 +123,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages password-utils) #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages sphinx) #:use-module (gnu packages xdisorg) #:use-module (gnu packages shells) #:use-module (gnu packages sqlite) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index a237b0ee1a..23e5a976ce 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -65,9 +65,9 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index ff7fbe0403..d7536a3518 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -63,6 +63,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index d46354b14e..528f1dcdcb 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages qt) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index f47f7623b4..c1d50ec314 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages ruby) + #:use-module (gnu packages sphinx) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system ruby)) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 2f56b7bcba..aeac81d072 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -106,6 +106,7 @@ #:use-module (gnu packages serialization) #:use-module (gnu packages samba) #:use-module (gnu packages screen) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index a6f6819d3e..f631dbd7c6 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -50,8 +50,8 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages video) #:use-module (gnu packages xiph)) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 2906a574cf..289b845ebc 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) #:use-module (gnu packages time) #:use-module (gnu packages tls) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 75bdf87bf3..cb9d4f653c 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages xdisorg) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2db94f0430..46a6e0d75e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -62,6 +62,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages tls) #:use-module (gnu packages time) #:use-module (gnu packages web) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5ed1ebdd3c..22f514daa6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -124,6 +124,7 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages search) #:use-module (gnu packages shells) + #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) #:use-module (gnu packages terminals) #:use-module (gnu packages tex) @@ -2503,174 +2504,6 @@ reStructuredText.") (define-public python2-pygments (package-with-python2 python-pygments)) -(define-public python-sphinxcontrib-websupport - (package - (name "python-sphinxcontrib-websupport") - (version "1.1.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "sphinxcontrib-websupport" version)) - (sha256 - (base32 - "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x")))) - (build-system python-build-system) - (arguments - ;; FIXME: Tests depend on Sphinx, which depends on this. - `(#:tests? #f)) - (home-page "http://sphinx-doc.org/") - (synopsis "Sphinx API for web applications") - (description "This package provides a Python API to easily integrate -Sphinx documentation into your web application. It provides tools to -integrate Sphinx documents in web templates and to handle searches.") - (license license:bsd-3))) - -(define-public python2-sphinxcontrib-websupport - (package-with-python2 python-sphinxcontrib-websupport)) - -(define-public python-sphinx - (package - (name "python-sphinx") - (version "1.7.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Sphinx" version)) - (sha256 - (base32 - "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - ;; Requires Internet access. - (delete-file "tests/test_build_linkcheck.py") - (substitute* "tests/test_build_latex.py" - (("@pytest.mark.sphinx\\('latex', testroot='images'\\)") - "@pytest.mark.skip()")) - (when (which "python") - ;; XXX: These tests are broken when using Python2: - ;; . - (delete-file "tests/test_api_translator.py") - (delete-file "tests/test_setup_command.py")) - (invoke "make" "test")))))) - (propagated-inputs - `(("python-imagesize" ,python-imagesize) - ("python-sphinx-alabaster-theme" - ,python-sphinx-alabaster-theme) - ("python-babel" ,python-babel) - ("python-snowballstemmer" ,python-snowballstemmer) - ("python-docutils" ,python-docutils) - ("python-jinja2" ,python-jinja2) - ("python-packaging" ,python-packaging) - ("python-pygments" ,python-pygments) - ("python-requests" ,python-requests) - ("python-six" ,python-six) - ("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport))) - (native-inputs - `(("graphviz" ,graphviz) - ("imagemagick" ,imagemagick) ;for "convert" - ("python-html5lib" ,python-html5lib) - ("python-mock" ,python-mock) - ("python-nose" ,python-nose) - ("python-pytest" ,python-pytest))) - (home-page "http://sphinx-doc.org/") - (synopsis "Python documentation generator") - (description "Sphinx is a tool that makes it easy to create documentation -for Python projects or other documents consisting of multiple reStructuredText -sources.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-sphinx)))))) - -(define-public python2-sphinx - (let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) - (package - (inherit base) - (native-inputs `(("python2-mock" ,python2-mock) - ("python2-enum34" ,python2-enum34) - ,@(package-native-inputs base))) - (propagated-inputs `(("python2-pytz" ,python2-pytz) - ("python2-typing" ,python2-typing) - ,@(package-propagated-inputs base)))))) - -(define-public python-sphinx-gallery - (package - (name "python-sphinx-gallery") - (version "0.1.13") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/sphinx-gallery/sphinx-gallery" - "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "03fs99mcb1r7qp0xixqv07vcz98sk21yq19ffdysi0infdcpzfkd")))) - (build-system python-build-system) - (arguments - ;; FIXME: Tests attempt to download , - ;; , and - ;; . - `(#:tests? #f)) - (native-inputs - `(("python-pytest-runner" ,python-pytest-runner))) - (home-page "https://sphinx-gallery.github.io/") - (synopsis "Generate an examples gallery automatically") - (description - "@code{sphinx_gallery} is a Sphinx extension that builds an HTML version -from any set of Python scripts and puts it into an examples gallery.") - (license license:bsd-3))) - -(define-public python2-sphinx-gallery - (package-with-python2 python-sphinx-gallery)) - -(define-public python-sphinx-rtd-theme - (package - (name "python-sphinx-rtd-theme") - (version "0.2.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "sphinx_rtd_theme" version)) - (sha256 - (base32 - "05rlhjzdyapr2w74jjs7mrm8hi69qskcr5vya9f9drpsys7lpxrd")))) - (build-system python-build-system) - (arguments '(#:tests? #f)) ; No tests. - (propagated-inputs - `(("python-sphinx" ,python-sphinx))) - (home-page "https://github.com/snide/sphinx_rtd_theme/") - (synopsis "ReadTheDocs.org theme for Sphinx") - (description "A theme for Sphinx used by ReadTheDocs.org.") - (license license:expat))) - -(define-public python2-sphinx-rtd-theme - (package-with-python2 python-sphinx-rtd-theme)) - -(define-public python-guzzle-sphinx-theme - (package - (name "python-guzzle-sphinx-theme") - (version "0.7.11") - (source - (origin - (method url-fetch) - (uri (pypi-uri "guzzle_sphinx_theme" version)) - (sha256 - (base32 - "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v")))) - (build-system python-build-system) - (propagated-inputs - `(("python-sphinx" ,python-sphinx))) - (home-page "https://github.com/guzzle/guzzle_sphinx_theme") - (synopsis "Sphinx theme used by Guzzle") - (description "This package provides guzzle_sphinx_theme, a theme for the -Sphinx documentation system, used by @uref{http://docs.guzzlephp.org, Guzzle} -and several other projects.") - (license license:expat))) - -(define-public python2-guzzle-sphinx-theme - (package-with-python2 python-guzzle-sphinx-theme)) - (define-public python-bumpversion (package (name "python-bumpversion") @@ -8041,26 +7874,6 @@ files for use with Python.") (home-page "https://github.com/collective/icalendar") (license license:bsd-2))) -(define-public python-sphinxcontrib-newsfeed - (package - (name "python-sphinxcontrib-newsfeed") - (version "0.1.4") - (source (origin - (method url-fetch) - (uri (pypi-uri "sphinxcontrib-newsfeed" version)) - (sha256 - (base32 - "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p")))) - (arguments '(#:tests? #f)) ; No tests. - (build-system python-build-system) - (propagated-inputs - `(("python-sphinx" ,python-sphinx))) - (synopsis "News Feed extension for Sphinx") - (description "Sphinxcontrib-newsfeed is an extension for adding a simple -Blog, News or Announcements section to a Sphinx website.") - (home-page "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed") - (license license:bsd-2))) - (define-public python-args (package (name "python-args") @@ -8860,56 +8673,6 @@ programmatically interfacing with your system's $EDITOR.") (define-public python2-editor (package-with-python2 python-editor)) -(define-public python-sphinxcontrib-programoutput - (package - (name "python-sphinxcontrib-programoutput") - (version "0.10") - (source (origin - (method url-fetch) - (uri (pypi-uri "sphinxcontrib-programoutput" version)) - (sha256 - (base32 - "153hhnlbx4688zj9wd64819ps5znc2jlyp5crkgzvn5hxgy99vpx")))) - (build-system python-build-system) - (arguments - ;; FIXME: Many tests are failing and the upstream is gone. - '(#:tests? #f)) - (propagated-inputs - `(("python-sphinx" ,python-sphinx))) - (synopsis "Sphinx extension to include program output") - (description "A Sphinx extension to literally insert the output of arbitrary -commands into documents, helping you to keep your command examples up to date.") - (home-page "https://github.com/lunaryorn/sphinxcontrib-programoutput") - (license license:bsd-2))) - -(define-public python2-sphinxcontrib-programoutput - (package-with-python2 python-sphinxcontrib-programoutput)) - -(define-public python-sphinx-repoze-autointerface - (package - (name "python-sphinx-repoze-autointerface") - (version "0.8") - (source (origin - (method url-fetch) - (uri (pypi-uri "repoze.sphinx.autointerface" version)) - (sha256 - (base32 - "08ycivzf7bh4a1zcyp31hbyqs1b2c9r26raa3vxjwwmbfqr3iw4f")))) - (build-system python-build-system) - (arguments '(#:tests? #f)) ; No tests. - (propagated-inputs - `(("python-sphinx" ,python-sphinx) - ("python-zope-interface" ,python-zope-interface))) - (synopsis "Auto-generate Sphinx API docs from Zope interfaces") - (description "This package defines an extension for the Sphinx documentation -system. The extension allows generation of API documentation by -introspection of @code{zope.interface} instances in code.") - (home-page "https://github.com/repoze/repoze.sphinx.autointerface") - (license license:repoze))) - -(define-public python2-sphinx-repoze-autointerface - (package-with-python2 python-sphinx-repoze-autointerface)) - (define-public python-vobject (package (name "python-vobject") @@ -10895,52 +10658,6 @@ English stemmer.") (define-public python2-snowballstemmer (package-with-python2 python-snowballstemmer)) -(define-public python-sphinx-cloud-sptheme - (package - (name "python-sphinx-cloud-sptheme") - (version "1.8.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "cloud_sptheme" version)) - (sha256 - (base32 - "1dniqb6a39yh786f86c4jn666rwnyi1jvzn4616zhcchb7sfdshd")))) - (build-system python-build-system) - ;; FIXME: The 'pypi' release archive does not contain tests. - (arguments '(#:tests? #f)) - (native-inputs - `(("python-sphinx" ,python-sphinx))) - (home-page "https://bitbucket.org/ecollins/cloud_sptheme") - (synopsis "'Cloud' theme for Sphinx documenter") - (description "This package contains the \"Cloud\" theme for Sphinx and some -related extensions.") - (license license:bsd-3))) - -(define-public python2-sphinx-cloud-sptheme - (package-with-python2 python-sphinx-cloud-sptheme)) - -(define-public python-sphinx-alabaster-theme - (package - (name "python-sphinx-alabaster-theme") - (version "0.7.12") - (source (origin - (method url-fetch) - (uri (pypi-uri "alabaster" version)) - (sha256 - (base32 - "00nwwjj2d2ym4s2kk217x7jkx1hnczc3fvm8yxbqmsp6b0nxfqd6")))) - (build-system python-build-system) - (propagated-inputs - `(("python-pygments" ,python-pygments))) - (home-page "https://alabaster.readthedocs.io/") - (synopsis "Configurable sidebar-enabled Sphinx theme") - (description "Alabaster is a visually (c)lean, responsive, configurable -theme for the Sphinx documentation system. It's the default theme of Sphinx.") - (license license:bsd-3))) - -(define-public python2-sphinx-alabaster-theme - (package-with-python2 python-sphinx-alabaster-theme)) - (define-public python-setproctitle (package (name "python-setproctitle") @@ -12245,30 +11962,6 @@ make common patterns shorter and easier.") (define-public python2-utils (package-with-python2 python-utils)) -(define-public python-sphinx-me - (package - (name "python-sphinx-me") - (version "0.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "sphinx-me" version)) - (sha256 - (base32 - "06jzgp213zihnvpcy2y5jy3ykid3apc2ncp2pg6a2g05lhiziglq")))) - (build-system python-build-system) - (home-page "https://github.com/stephenmcd/sphinx-me") - (synopsis "Create a Sphinx documentation shell") - (description - "Create a Sphinx documentation shell for your project and include the -README file as the documentation index. It handles extracting the required -meta data such as the project name, author and version from your project for -use in your Sphinx docs.") - (license license:bsd-2))) - -(define-public python2-sphinx-me - (package-with-python2 python-sphinx-me)) - (define-public python-diff-match-patch (package (name "python-diff-match-patch") @@ -15646,22 +15339,3 @@ space that are close to a given query point. It also creates large read-only file-based data structures that are @code{mmap}ped into memory so that many processes may share the same data.") (license license:asl2.0))) - -(define-public python-sphinxcontrib-svg2pdfconverter - (package - (name "python-sphinxcontrib-svg2pdfconverter") - (version "0.1.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "sphinxcontrib-svg2pdfconverter" version)) - (sha256 - (base32 - "1abvbgkkii13q8nsb10r0gc5lm0p9iq1iwhfhakn5ifn6asa0183")))) - (build-system python-build-system) - (propagated-inputs - `(("python-sphinx" ,python-sphinx))) - (home-page "https://github.com/missinglinkelectronics/sphinxcontrib-svg2pdfconverter/releases") - (synopsis "Sphinx SVG to PDF converter extension") - (description "A Sphinx extension to convert SVG images to PDF in case the builder does not support -SVG images natively (e.g. LaTeX).") - (license license:bsd-3))) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index fe51900179..9b2876c359 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml)) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm new file mode 100644 index 0000000000..088f0d3b38 --- /dev/null +++ b/gnu/packages/sphinx.scm @@ -0,0 +1,369 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 David Thompson +;;; Copyright © 2015, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017 Leo Famulari +;;; Copyright © 2016 Hartmut Goebel +;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2017 Danny Milosavljevic +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017 Frederick M. Muriithi +;;; Copyright © 2017 Christopher Allan Webber +;;; Copyright © 2017 Julien Lepiller +;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019 Nicolas Goaziou +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages sphinx) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system python) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) + #:use-module (gnu packages check) + #:use-module (gnu packages graphviz) + #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages time)) + +(define-public python-sphinx + (package + (name "python-sphinx") + (version "1.7.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Sphinx" version)) + (sha256 + (base32 + "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; Requires Internet access. + (delete-file "tests/test_build_linkcheck.py") + (substitute* "tests/test_build_latex.py" + (("@pytest.mark.sphinx\\('latex', testroot='images'\\)") + "@pytest.mark.skip()")) + (when (which "python") + ;; XXX: These tests are broken when using Python2: + ;; . + (delete-file "tests/test_api_translator.py") + (delete-file "tests/test_setup_command.py")) + (invoke "make" "test")))))) + (propagated-inputs + `(("python-imagesize" ,python-imagesize) + ("python-sphinx-alabaster-theme" + ,python-sphinx-alabaster-theme) + ("python-babel" ,python-babel) + ("python-snowballstemmer" ,python-snowballstemmer) + ("python-docutils" ,python-docutils) + ("python-jinja2" ,python-jinja2) + ("python-packaging" ,python-packaging) + ("python-pygments" ,python-pygments) + ("python-requests" ,python-requests) + ("python-six" ,python-six) + ("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport))) + (native-inputs + `(("graphviz" ,graphviz) + ("imagemagick" ,imagemagick) ;for "convert" + ("python-html5lib" ,python-html5lib) + ("python-mock" ,python-mock) + ("python-nose" ,python-nose) + ("python-pytest" ,python-pytest))) + (home-page "http://sphinx-doc.org/") + (synopsis "Python documentation generator") + (description "Sphinx is a tool that makes it easy to create documentation +for Python projects or other documents consisting of multiple reStructuredText +sources.") + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-sphinx)))))) + +(define-public python2-sphinx + (let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) + (package + (inherit base) + (native-inputs `(("python2-mock" ,python2-mock) + ("python2-enum34" ,python2-enum34) + ,@(package-native-inputs base))) + (propagated-inputs `(("python2-pytz" ,python2-pytz) + ("python2-typing" ,python2-typing) + ,@(package-propagated-inputs base)))))) + +(define-public python-sphinxcontrib-newsfeed + (package + (name "python-sphinxcontrib-newsfeed") + (version "0.1.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-newsfeed" version)) + (sha256 + (base32 + "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p")))) + (arguments '(#:tests? #f)) ; No tests. + (build-system python-build-system) + (propagated-inputs + `(("python-sphinx" ,python-sphinx))) + (synopsis "News Feed extension for Sphinx") + (description "Sphinxcontrib-newsfeed is an extension for adding a simple +Blog, News or Announcements section to a Sphinx website.") + (home-page "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed") + (license license:bsd-2))) + +(define-public python-sphinxcontrib-programoutput + (package + (name "python-sphinxcontrib-programoutput") + (version "0.10") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-programoutput" version)) + (sha256 + (base32 + "153hhnlbx4688zj9wd64819ps5znc2jlyp5crkgzvn5hxgy99vpx")))) + (build-system python-build-system) + (arguments + ;; FIXME: Many tests are failing and the upstream is gone. + '(#:tests? #f)) + (propagated-inputs + `(("python-sphinx" ,python-sphinx))) + (synopsis "Sphinx extension to include program output") + (description "A Sphinx extension to literally insert the output of arbitrary +commands into documents, helping you to keep your command examples up to date.") + (home-page "https://github.com/lunaryorn/sphinxcontrib-programoutput") + (license license:bsd-2))) + +(define-public python2-sphinxcontrib-programoutput + (package-with-python2 python-sphinxcontrib-programoutput)) + +(define-public python-sphinxcontrib-svg2pdfconverter + (package + (name "python-sphinxcontrib-svg2pdfconverter") + (version "0.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-svg2pdfconverter" version)) + (sha256 + (base32 + "1abvbgkkii13q8nsb10r0gc5lm0p9iq1iwhfhakn5ifn6asa0183")))) + (build-system python-build-system) + (propagated-inputs + `(("python-sphinx" ,python-sphinx))) + (home-page "https://github.com/missinglinkelectronics/sphinxcontrib-svg2pdfconverter/releases") + (synopsis "Sphinx SVG to PDF converter extension") + (description "A Sphinx extension to convert SVG images to PDF in case the builder does not support +SVG images natively (e.g. LaTeX).") + (license license:bsd-3))) + +(define-public python-sphinxcontrib-websupport + (package + (name "python-sphinxcontrib-websupport") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-websupport" version)) + (sha256 + (base32 + "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x")))) + (build-system python-build-system) + (arguments + ;; FIXME: Tests depend on Sphinx, which depends on this. + `(#:tests? #f)) + (home-page "http://sphinx-doc.org/") + (synopsis "Sphinx API for web applications") + (description "This package provides a Python API to easily integrate +Sphinx documentation into your web application. It provides tools to +integrate Sphinx documents in web templates and to handle searches.") + (license license:bsd-3))) + +(define-public python2-sphinxcontrib-websupport + (package-with-python2 python-sphinxcontrib-websupport)) + +(define-public python-sphinx-gallery + (package + (name "python-sphinx-gallery") + (version "0.1.13") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/sphinx-gallery/sphinx-gallery" + "/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03fs99mcb1r7qp0xixqv07vcz98sk21yq19ffdysi0infdcpzfkd")))) + (build-system python-build-system) + (arguments + ;; FIXME: Tests attempt to download , + ;; , and + ;; . + `(#:tests? #f)) + (native-inputs + `(("python-pytest-runner" ,python-pytest-runner))) + (home-page "https://sphinx-gallery.github.io/") + (synopsis "Generate an examples gallery automatically") + (description + "@code{sphinx_gallery} is a Sphinx extension that builds an HTML version +from any set of Python scripts and puts it into an examples gallery.") + (license license:bsd-3))) + +(define-public python2-sphinx-gallery + (package-with-python2 python-sphinx-gallery)) + +(define-public python-sphinx-me + (package + (name "python-sphinx-me") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sphinx-me" version)) + (sha256 + (base32 + "06jzgp213zihnvpcy2y5jy3ykid3apc2ncp2pg6a2g05lhiziglq")))) + (build-system python-build-system) + (home-page "https://github.com/stephenmcd/sphinx-me") + (synopsis "Create a Sphinx documentation shell") + (description + "Create a Sphinx documentation shell for your project and include the +README file as the documentation index. It handles extracting the required +meta data such as the project name, author and version from your project for +use in your Sphinx docs.") + (license license:bsd-2))) + +(define-public python-sphinx-repoze-autointerface + (package + (name "python-sphinx-repoze-autointerface") + (version "0.8") + (source (origin + (method url-fetch) + (uri (pypi-uri "repoze.sphinx.autointerface" version)) + (sha256 + (base32 + "08ycivzf7bh4a1zcyp31hbyqs1b2c9r26raa3vxjwwmbfqr3iw4f")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; No tests. + (propagated-inputs + `(("python-sphinx" ,python-sphinx) + ("python-zope-interface" ,python-zope-interface))) + (synopsis "Auto-generate Sphinx API docs from Zope interfaces") + (description "This package defines an extension for the Sphinx documentation +system. The extension allows generation of API documentation by +introspection of @code{zope.interface} instances in code.") + (home-page "https://github.com/repoze/repoze.sphinx.autointerface") + (license license:repoze))) + +(define-public python2-sphinx-repoze-autointerface + (package-with-python2 python-sphinx-repoze-autointerface)) + +(define-public python-sphinx-alabaster-theme + (package + (name "python-sphinx-alabaster-theme") + (version "0.7.12") + (source (origin + (method url-fetch) + (uri (pypi-uri "alabaster" version)) + (sha256 + (base32 + "00nwwjj2d2ym4s2kk217x7jkx1hnczc3fvm8yxbqmsp6b0nxfqd6")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pygments" ,python-pygments))) + (home-page "https://alabaster.readthedocs.io/") + (synopsis "Configurable sidebar-enabled Sphinx theme") + (description "Alabaster is a visually (c)lean, responsive, configurable +theme for the Sphinx documentation system. It's the default theme of Sphinx.") + (license license:bsd-3))) + +(define-public python2-sphinx-alabaster-theme + (package-with-python2 python-sphinx-alabaster-theme)) + +(define-public python-sphinx-cloud-sptheme + (package + (name "python-sphinx-cloud-sptheme") + (version "1.8.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "cloud_sptheme" version)) + (sha256 + (base32 + "1dniqb6a39yh786f86c4jn666rwnyi1jvzn4616zhcchb7sfdshd")))) + (build-system python-build-system) + ;; FIXME: The 'pypi' release archive does not contain tests. + (arguments '(#:tests? #f)) + (native-inputs + `(("python-sphinx" ,python-sphinx))) + (home-page "https://bitbucket.org/ecollins/cloud_sptheme") + (synopsis "'Cloud' theme for Sphinx documenter") + (description "This package contains the \"Cloud\" theme for Sphinx and some +related extensions.") + (license license:bsd-3))) + +(define-public python2-sphinx-cloud-sptheme + (package-with-python2 python-sphinx-cloud-sptheme)) + +(define-public python-guzzle-sphinx-theme + (package + (name "python-guzzle-sphinx-theme") + (version "0.7.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "guzzle_sphinx_theme" version)) + (sha256 + (base32 + "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v")))) + (build-system python-build-system) + (propagated-inputs + `(("python-sphinx" ,python-sphinx))) + (home-page "https://github.com/guzzle/guzzle_sphinx_theme") + (synopsis "Sphinx theme used by Guzzle") + (description "This package provides guzzle_sphinx_theme, a theme for the +Sphinx documentation system, used by @uref{http://docs.guzzlephp.org, Guzzle} +and several other projects.") + (license license:expat))) + +(define-public python2-guzzle-sphinx-theme + (package-with-python2 python-guzzle-sphinx-theme)) + +(define-public python-sphinx-rtd-theme + (package + (name "python-sphinx-rtd-theme") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sphinx_rtd_theme" version)) + (sha256 + (base32 + "05rlhjzdyapr2w74jjs7mrm8hi69qskcr5vya9f9drpsys7lpxrd")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; No tests. + (propagated-inputs + `(("python-sphinx" ,python-sphinx))) + (home-page "https://github.com/snide/sphinx_rtd_theme/") + (synopsis "ReadTheDocs.org theme for Sphinx") + (description "A theme for Sphinx used by ReadTheDocs.org.") + (license license:expat))) + +(define-public python2-sphinx-rtd-theme + (package-with-python2 python-sphinx-rtd-theme)) + +(define-public python2-sphinx-me + (package-with-python2 python-sphinx-me)) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8bcc90f126..699f1d63a3 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) #:use-module (gnu packages tcl) #:use-module (gnu packages tex) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 9e7cd10918..503433be10 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -47,6 +47,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml)) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 136ffec9e7..51ed0317bc 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -37,11 +37,11 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages perl) - #:use-module (gnu packages python-xyz) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) #:use-module (gnu packages rsync) #:use-module (gnu packages selinux) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls)) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index a3ea05538b..512e98ec7b 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages serialization) + #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) #:use-module (gnu packages textutils) #:use-module (gnu packages xdisorg) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 11bb64ce8b..f7ac867e5d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -59,6 +59,7 @@ #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages base) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 52cc91a168..fd38a6bf00 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages docbook) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) + #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) #:use-module (gnu packages bison) @@ -118,7 +119,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages valgrind) #:use-module (gnu packages xml) - #:use-module (gnu packages curl) + #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) From patchwork Sun May 12 22:12:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 13968 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A4F9F16FD6; Sun, 12 May 2019 23:13:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0F59D16FD2 for ; Sun, 12 May 2019 23:13:13 +0100 (BST) Received: from localhost ([127.0.0.1]:47851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiT-0004lr-B2 for patchwork@mira.cbaines.net; Sun, 12 May 2019 18:13:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiP-0004jb-BY for guix-patches@gnu.org; Sun, 12 May 2019 18:13:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPwiM-0006bt-L1 for guix-patches@gnu.org; Sun, 12 May 2019 18:13:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58333) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPwiM-0006af-H1 for guix-patches@gnu.org; Sun, 12 May 2019 18:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hPwiM-0007xy-BP for guix-patches@gnu.org; Sun, 12 May 2019 18:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35705] [PATCH 2/9] gnu: Remove python2-sphinx. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2019 22:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35705 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35705@debbugs.gnu.org Received: via spool by 35705-submit@debbugs.gnu.org id=B35705.155769916730545 (code B ref 35705); Sun, 12 May 2019 22:13:02 +0000 Received: (at 35705) by debbugs.gnu.org; 12 May 2019 22:12:47 +0000 Received: from localhost ([127.0.0.1]:43629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwi6-0007wW-8i for submit@debbugs.gnu.org; Sun, 12 May 2019 18:12:46 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:49009) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwhr-0007vH-Lt for 35705@debbugs.gnu.org; Sun, 12 May 2019 18:12:32 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4E69E2104A for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:25 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 12 May 2019 18:12:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=P7Hso7sbiCa8e NaL9nQ4Oy7+RkqHbhcR/+TFGHZolwE=; b=jgCgOoPrcjU8OGcKmkCaypN7+IsIc hPVLfedyTpPt5tIWvAYW6OoySzw2FEV/pKAytegywgiQQ44GIIc0ugo2KScPM5/E SSib/yyfQyOuD/Qd8ocIZ5anlrK/jcQSbt3XdNkUB/fm9QFC4tZJy1o6KOmHbHsg otKMMZQGUQqTj2E0qyDgd7sP1GCnXkAMAwebtNSRmEry7BIJo4rvNfyZxz9tqzPt 7OIqNknHFSZkTM+MmkxPAzqPMECJvdlfTa53fGmrbhLJgO6FoE+OLHsiXD9B37DZ y4FcCtuEnsv9CTeZGJjFv4U3X8SW6lCW41iEQhnDl3MNhrFb0KYJSGTbw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=P7Hso7sbiCa8eNaL9nQ4Oy7+RkqHbhcR/+TFGHZolwE=; b=3lL6IS5E xd+j5ToPhMEi+n7km7+DKo1SdNgCCi/il5911KZUdJcaBQnw4MtCwNPQUAc2OgjR ajiiHvVcOy6vKPK0tFWUg7BQwj5chyhm8ogy0lhvt2W83f4NSVlIs29+BAxVEX+0 TDlNOwOf6U1DgmhsUg0BEJmYu0AxlULMq/x61e2mw8tlILRDmuvY+3K593OSblai qiQ10E12C6XD4h60eK9xSlheJsQEkxVimARsK4vBOmX7yh2UnBeZMmKa6qhmrlcN RBmEPRmy48Fgl5ky7HO3LC5devD6un7+kNHM2ywDRggKiGZPGjXY++fYXOwAc8Up fsnKEpjStOB5bg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrleefgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecuogfuuhhsphgvtghtffhomhgrihhnucdlgeelmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepofgrrhhiuhhs uceurghkkhgvuceomhgsrghkkhgvsehfrghsthhmrghilhdrtghomheqnecuffhomhgrih hnpehrvggrughthhgvughotghsrdhorhhgpdhguhiiiihlvghphhhprdhorhhgpdhgihht hhhusgdrihhopdhgihhthhhusgdrtghomhenucfkphepiedvrdduiedrvddviedrudegtd enucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtgho mhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id A474680061 for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:24 -0400 (EDT) From: Marius Bakke Date: Mon, 13 May 2019 00:12:14 +0200 Message-Id: <20190512221221.17781-2-mbakke@fastmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190512221221.17781-1-mbakke@fastmail.com> References: <20190512221221.17781-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bioinformatics.scm (python2-pbcore)[native-inputs]: Change from PYTHON2-SPHINX to PYTHON-SPHINX. * gnu/packages/image.scm (vigra)[native-inputs]: Likewise. * gnu/packages/mail.scm (notmuch)[native-inputs]: Likewise. * gnu/packages/web.scm (python2-httpretty)[native-inputs]: Likewise. Remove unnecessary PYTHON2-SPHINX-RTD-THEME. * gnu/packages/sphinx.scm (sphinx)[properties]: Remove field. (python2-sphinx, python2-sphinxcontrib-newsfeed, python2-sphinxcontrib-programoutput, python2-sphinx-gallery, python2-sphinx-repoze-autointerface, python2-sphinx-alabaster-theme, python2-sphinx-cloud-sptheme, python2-guzzle-sphinx-theme, python2-sphinx-me, python2-sphinx-rtd-theme): Remove variables. --- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/image.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/sphinx.scm | 44 ++------------------------------- gnu/packages/web.scm | 4 +-- 5 files changed, 7 insertions(+), 47 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0685ca966b..0aa9d97617 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4729,7 +4729,7 @@ interrupted by stop codons. OrfM finds and prints these ORFs.") ("python-h5py" ,python2-h5py))) (native-inputs `(("python-nose" ,python2-nose) - ("python-sphinx" ,python2-sphinx) + ("sphinx" ,python-sphinx) ("python-pyxb" ,python2-pyxb))) (home-page "http://pacificbiosciences.github.io/pbcore/") (synopsis "Library for reading and writing PacBio data files") diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 528f1dcdcb..443457da43 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -894,7 +894,7 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.") (native-inputs `(("doxygen" ,doxygen) ("python2-nose" ,python2-nose) - ("python2-sphinx" ,python2-sphinx))) + ("sphinx" ,python-sphinx))) (arguments `(#:test-target "check" #:phases diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index aeac81d072..8e3a676ce1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -898,7 +898,7 @@ invoking @command{notifymuch} from the post-new hook.") ("pkg-config" ,pkg-config) ("python" ,python-2) ("python-docutils" ,python2-docutils) - ("python-sphinx" ,python2-sphinx) + ("sphinx" ,python-sphinx) ;; The following are required for tests only. ("which" ,which) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 088f0d3b38..82a0df2499 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -38,8 +38,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages python-web) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages time)) + #:use-module (gnu packages python-xyz)) (define-public python-sphinx (package @@ -94,19 +93,7 @@ (description "Sphinx is a tool that makes it easy to create documentation for Python projects or other documents consisting of multiple reStructuredText sources.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-sphinx)))))) - -(define-public python2-sphinx - (let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) - (package - (inherit base) - (native-inputs `(("python2-mock" ,python2-mock) - ("python2-enum34" ,python2-enum34) - ,@(package-native-inputs base))) - (propagated-inputs `(("python2-pytz" ,python2-pytz) - ("python2-typing" ,python2-typing) - ,@(package-propagated-inputs base)))))) + (license license:bsd-3))) (define-public python-sphinxcontrib-newsfeed (package @@ -150,9 +137,6 @@ commands into documents, helping you to keep your command examples up to date.") (home-page "https://github.com/lunaryorn/sphinxcontrib-programoutput") (license license:bsd-2))) -(define-public python2-sphinxcontrib-programoutput - (package-with-python2 python-sphinxcontrib-programoutput)) - (define-public python-sphinxcontrib-svg2pdfconverter (package (name "python-sphinxcontrib-svg2pdfconverter") @@ -193,9 +177,6 @@ Sphinx documentation into your web application. It provides tools to integrate Sphinx documents in web templates and to handle searches.") (license license:bsd-3))) -(define-public python2-sphinxcontrib-websupport - (package-with-python2 python-sphinxcontrib-websupport)) - (define-public python-sphinx-gallery (package (name "python-sphinx-gallery") @@ -223,9 +204,6 @@ integrate Sphinx documents in web templates and to handle searches.") from any set of Python scripts and puts it into an examples gallery.") (license license:bsd-3))) -(define-public python2-sphinx-gallery - (package-with-python2 python-sphinx-gallery)) - (define-public python-sphinx-me (package (name "python-sphinx-me") @@ -269,9 +247,6 @@ introspection of @code{zope.interface} instances in code.") (home-page "https://github.com/repoze/repoze.sphinx.autointerface") (license license:repoze))) -(define-public python2-sphinx-repoze-autointerface - (package-with-python2 python-sphinx-repoze-autointerface)) - (define-public python-sphinx-alabaster-theme (package (name "python-sphinx-alabaster-theme") @@ -291,9 +266,6 @@ introspection of @code{zope.interface} instances in code.") theme for the Sphinx documentation system. It's the default theme of Sphinx.") (license license:bsd-3))) -(define-public python2-sphinx-alabaster-theme - (package-with-python2 python-sphinx-alabaster-theme)) - (define-public python-sphinx-cloud-sptheme (package (name "python-sphinx-cloud-sptheme") @@ -315,9 +287,6 @@ theme for the Sphinx documentation system. It's the default theme of Sphinx.") related extensions.") (license license:bsd-3))) -(define-public python2-sphinx-cloud-sptheme - (package-with-python2 python-sphinx-cloud-sptheme)) - (define-public python-guzzle-sphinx-theme (package (name "python-guzzle-sphinx-theme") @@ -339,9 +308,6 @@ Sphinx documentation system, used by @uref{http://docs.guzzlephp.org, Guzzle} and several other projects.") (license license:expat))) -(define-public python2-guzzle-sphinx-theme - (package-with-python2 python-guzzle-sphinx-theme)) - (define-public python-sphinx-rtd-theme (package (name "python-sphinx-rtd-theme") @@ -361,9 +327,3 @@ and several other projects.") (synopsis "ReadTheDocs.org theme for Sphinx") (description "A theme for Sphinx used by ReadTheDocs.org.") (license license:expat))) - -(define-public python2-sphinx-rtd-theme - (package-with-python2 python-sphinx-rtd-theme)) - -(define-public python2-sphinx-me - (package-with-python2 python-sphinx-me)) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index fd38a6bf00..3870ca8329 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5228,8 +5228,8 @@ inspired by Ruby's @code{fakeweb}.") "0vlp5qkyw3pxwwsg7xmdcfh1csvypvaz4m6abida8s4xmjxpdhc3")))) (build-system python-build-system) (native-inputs - `(("python-sphinx-rtd-theme" ,python2-sphinx-rtd-theme) - ("python-sphinx" ,python2-sphinx) + `(("sphinx" ,python-sphinx) + ("python-coverage" ,python2-coverage) ("python-tornado" ,python2-tornado) ("python-urllib3" ,python2-urllib3) From patchwork Sun May 12 22:12:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 13967 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 771DB16FD6; Sun, 12 May 2019 23:13:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, TVD_SPACE_RATIO,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 154FE16FD2 for ; Sun, 12 May 2019 23:13:07 +0100 (BST) Received: from localhost ([127.0.0.1]:47849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiQ-0004js-L4 for patchwork@mira.cbaines.net; Sun, 12 May 2019 18:13:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32834) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiO-0004jZ-Ay for guix-patches@gnu.org; Sun, 12 May 2019 18:13:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPwiN-0006eA-7C for guix-patches@gnu.org; Sun, 12 May 2019 18:13:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58334) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPwiN-0006dW-3N for guix-patches@gnu.org; Sun, 12 May 2019 18:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hPwiM-0007y6-Rl for guix-patches@gnu.org; Sun, 12 May 2019 18:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35705] [PATCH 3/9] gnu: Add python-sphinxcontrib-serializinghtml Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2019 22:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35705 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35705@debbugs.gnu.org Received: via spool by 35705-submit@debbugs.gnu.org id=B35705.155769916830554 (code B ref 35705); Sun, 12 May 2019 22:13:02 +0000 Received: (at 35705) by debbugs.gnu.org; 12 May 2019 22:12:48 +0000 Received: from localhost ([127.0.0.1]:43631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwi7-0007wh-Ua for submit@debbugs.gnu.org; Sun, 12 May 2019 18:12:48 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:49953) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwhr-0007vJ-MC for 35705@debbugs.gnu.org; Sun, 12 May 2019 18:12:32 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id A51E120EB0 for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:26 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 12 May 2019 18:12:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=OQLI6e8I3yT06 zCOxtSW84E0q2Pv8SCEvxigcaIYRnE=; b=wnegK1yKhq90EDJG2b7xz22lqgofL GorW4D1OwpRz05GmVySwmosNOmUge7E4ItRKbKdtHnUFZYvnJPtkIePOb60eGvHq dtM/xXdN5VuSvD1/jnYVjV7XmxClyJN/YmIGINezgThAb5u71d+e53RmkMXFIFW3 P95UnLYX88isi3kDRgEIdx+lwDjvoqzZpcmc1W1ljvOXaK4MH3S4nRrWzhWtaIQ/ IPFS3Xn/PfTj3C+phfDhC6kbHhzV0eAKtPYoBnMcsNxesfHx/+p1wfg22DkdWhc+ TOBaMnilvw6KVgo9cFnsIUjwghUAm+eM4pu39gDjf2WCMeEalf8CSaVtw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=OQLI6e8I3yT06zCOxtSW84E0q2Pv8SCEvxigcaIYRnE=; b=f4nEX3bU DGGCB2fo7Ii6LTnamYVNz+SVKCuUeVmW2c+YI+X/96gr/4j30JTsUCY9ZqqRO7Ml FOfqW5TwEezNBHtP1ddjsz095HS+pGJ2VQBHbITZvCRPLkkGb+exEvsc1FffXw7Y AGHHH6EKIOhPMoeDqy10LNrvgLnfdawonguhYjDlSYjRdh2PdwrvxVtKXTIX9mLK d82B8JaXhY8rNp762BzJvQg/hyjUv069B5HdAlfr+JaW3PRygB+m8ORP7hl25yad DUErbvDy++FkblVUOrZXjuCHj/3m12nZBMfo+J5tqbtLl14dErp3wIHDeEbwsS1S woOtQE+4Fm3yXA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrleefgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeeivd drudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvges fhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 3D6518005B for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:26 -0400 (EDT) From: Marius Bakke Date: Mon, 13 May 2019 00:12:15 +0200 Message-Id: <20190512221221.17781-3-mbakke@fastmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190512221221.17781-1-mbakke@fastmail.com> References: <20190512221221.17781-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sphinx.scm (python-sphinxcontrib-serializinghtml): New public variable. --- gnu/packages/sphinx.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 82a0df2499..1810716e6b 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -137,6 +137,26 @@ commands into documents, helping you to keep your command examples up to date.") (home-page "https://github.com/lunaryorn/sphinxcontrib-programoutput") (license license:bsd-2))) +(define-public python-sphinxcontrib-serializinghtml + (package + (name "python-sphinxcontrib-serializinghtml") + (version "1.1.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-serializinghtml" version)) + (sha256 + (base32 + "09sj3nwahwr4iymg86gczbh151cfczqhf2kclbblzh2jh0zv7vy0")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;XXX: circular dependency on Sphinx + (home-page "https://github.com/sphinx-doc/sphinxcontrib-serializinghtml") + (synopsis "Sphinx extension to serialize HTML files") + (description + "@code{sphinxcontrib-serializinghtml} is a Sphinx extension which outputs +\"serialized\" HTML files.") + (license license:bsd-2))) + (define-public python-sphinxcontrib-svg2pdfconverter (package (name "python-sphinxcontrib-svg2pdfconverter") From patchwork Sun May 12 22:12:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 13971 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B261116FD6; Sun, 12 May 2019 23:13:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5B8F816FD2 for ; Sun, 12 May 2019 23:13:23 +0100 (BST) Received: from localhost ([127.0.0.1]:47859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwif-0004tn-Lm for patchwork@mira.cbaines.net; Sun, 12 May 2019 18:13:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiP-0004ja-U9 for guix-patches@gnu.org; Sun, 12 May 2019 18:13:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPwiN-0006fE-L0 for guix-patches@gnu.org; Sun, 12 May 2019 18:13:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58335) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPwiN-0006ed-Hi for guix-patches@gnu.org; Sun, 12 May 2019 18:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hPwiN-0007yD-C9 for guix-patches@gnu.org; Sun, 12 May 2019 18:13:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35705] [PATCH 4/9] gnu: Add python-sphinxcontrib-applehelp. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2019 22:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35705 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35705@debbugs.gnu.org Received: via spool by 35705-submit@debbugs.gnu.org id=B35705.155769916830561 (code B ref 35705); Sun, 12 May 2019 22:13:03 +0000 Received: (at 35705) by debbugs.gnu.org; 12 May 2019 22:12:48 +0000 Received: from localhost ([127.0.0.1]:43633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwi8-0007wn-9U for submit@debbugs.gnu.org; Sun, 12 May 2019 18:12:48 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:49493) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwht-0007vM-Cy for 35705@debbugs.gnu.org; Sun, 12 May 2019 18:12:34 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 5D933210DC for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 12 May 2019 18:12:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=UrNbCfisl0ASy 0nezAxuQhIyqjib6BLRc/EcejOfnoQ=; b=Cy+dETlWI90t2vfb2HtKXGIaY5+/+ bBPeOaw2DJhhKGQQH1syJ9V2Up32E1m2L6aMcpQjWigTmWTXSMO/IdXomUTnAnQc gqt76AFeqE2tHY0jN7J9V4N/648aIpRJIYfQ6gSLIrpVAxtm6rNPx2qzKpP2dVCp KLU+f7sLD9UFq6RdBKDgRMW0OlfVV1JQB0fah5Hh5HhmT8+gDy/Y2Pr0/3PeIqF1 qOfv7stCHAlchYkv7D6WteAZ8Aa6MkByEYCJWmFgPQl5mg7fT/HvpyfELh6E7bUg RP4jz65xKf8JFkv2qaeqqCJUlJ1EHt1C+WZIoRCF12UUjLe21Ip24TG8w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=UrNbCfisl0ASy0nezAxuQhIyqjib6BLRc/EcejOfnoQ=; b=a3h+y12f 2kzyC9NdgQyW+TrnDeO8aheCL34Si3NtKjB0RL9d7rmMoGKbm8yoh/B+6aGF6ikC ZWh2cGqUwD+nTiaF4xK6KZPM2INcKQdUUICpo/gpLgfVTHoSMT/72FeB1VZrO722 6k5WFm+GJ7E4g1ru3bylURKH7JYBgHA0e6ljtqMiflWLTmJvsqVdXlr/D5KLVBmE OpzBRBvjlhT6HZUEeNL0G6aPWPidXUhHuizbfE3l4K6INWK/EoOPcUeZ9mkQc7Pu VHI10/BrmYlf3pDYumoUPGdZweQQWc1oHhYB/mOy2FtEK3f1RqvMYmIkRAI5spd/ xK6sNcXB05QkZA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrleefgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeeivd drudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvges fhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id C520B8005B for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:27 -0400 (EDT) From: Marius Bakke Date: Mon, 13 May 2019 00:12:16 +0200 Message-Id: <20190512221221.17781-4-mbakke@fastmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190512221221.17781-1-mbakke@fastmail.com> References: <20190512221221.17781-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sphinx.scm (python-sphinxcontrib-applehelp): New public variable. --- gnu/packages/sphinx.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 1810716e6b..4e5b791a6f 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -95,6 +95,26 @@ for Python projects or other documents consisting of multiple reStructuredText sources.") (license license:bsd-3))) +(define-public python-sphinxcontrib-applehelp + (package + (name "python-sphinxcontrib-applehelp") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-applehelp" version)) + (sha256 + (base32 + "15rqmgphj4wqf4m5wnzxgmwxx5jwfzb0j0nb94ql0x5wnar0mapd")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;XXX: circular dependency on Sphinx + (home-page "https://github.com/sphinx-doc/sphinxcontrib-applehelp") + (synopsis "Sphinx extension for creating Apple help books") + (description + "@code{sphinxcontrib-applehelp} is a Sphinx extension which outputs +Apple help books.") + (license license:bsd-2))) + (define-public python-sphinxcontrib-newsfeed (package (name "python-sphinxcontrib-newsfeed") From patchwork Sun May 12 22:12:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 13974 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 88CD616FD8; Sun, 12 May 2019 23:13:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2867B16FD2 for ; Sun, 12 May 2019 23:13:34 +0100 (BST) Received: from localhost ([127.0.0.1]:47869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwir-00052Y-OV for patchwork@mira.cbaines.net; Sun, 12 May 2019 18:13:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiS-0004kz-6G for guix-patches@gnu.org; Sun, 12 May 2019 18:13:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPwiP-0006la-4O for guix-patches@gnu.org; Sun, 12 May 2019 18:13:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58338) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPwiP-0006ku-0x for guix-patches@gnu.org; Sun, 12 May 2019 18:13:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hPwiN-0007yL-Rm for guix-patches@gnu.org; Sun, 12 May 2019 18:13:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35705] [PATCH 5/9] gnu: Add python-sphinxcontrib-devhelp. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2019 22:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35705 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35705@debbugs.gnu.org Received: via spool by 35705-submit@debbugs.gnu.org id=B35705.155769917030571 (code B ref 35705); Sun, 12 May 2019 22:13:03 +0000 Received: (at 35705) by debbugs.gnu.org; 12 May 2019 22:12:50 +0000 Received: from localhost ([127.0.0.1]:43635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwi8-0007ws-KK for submit@debbugs.gnu.org; Sun, 12 May 2019 18:12:48 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:38955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwhu-0007vO-UJ for 35705@debbugs.gnu.org; Sun, 12 May 2019 18:12:35 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E24FA20A82 for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:29 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 12 May 2019 18:12:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=+YGWpn/uZuVhb u1AcVea6sH7hYcedcbxwHEwrOFybd8=; b=CSdOfjoPPsUx/B2MQqYq5JbxwcUAv cBAkWr6ZBgJ6qY6Ybys8zv8krrtdQKZQ9qzjciMeJsXW/Sga0St/aKgS83z/ckh5 rEnbGdN4yLT5InHeCoEDcnM/vzyGzzA95jsAUMGk9AgdIZzxutjIsKC9aghX2QPn tzFCBRb819IFZhuhaOu0sUW6TB5u2ItswW5iYF2ReTtQIj/pPvx5QbmjvixVJuqR dN07ShmBTZcDtNNlrL4AZq2KW/fu6HAJKFlxxxpSVup/YTabjSwawzjEpTvrfmbB g35UIawOff6iE+UIo2kTlpUS2+F0sqB0gsaZd29myxO7LsdnSIQnJxrNw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=+YGWpn/uZuVhbu1AcVea6sH7hYcedcbxwHEwrOFybd8=; b=ZyrE+8SN +WgNCn9pOFxT7SE6v9qB3hE7aSoeRbqv0USYCYTfacJbVQlBdQLu9JvN+xfRSaeD 5HTLlGqPyMZtCp+WZ3xxQzjFtqmfcdDXYb6bJiMUkmcjKKpD+YJxnWFSKzaKhsWu yluZLacuttM9+xx/a/jDGmi4UrfjhsraMJxY5JTrwKm2WNPFyIZITqRiqQS92oQx D8dI5Mj1aFfzJF9FkBA/GXP5d2kejmRbtwb7q4Kax1eR2UKx3/v7VTL/hzyVfUqs 2SW4CtZgXua0wbylPLBrAXfUhSz5bHWYumvhP6PiSyyWOg0zoOAvgxTg2jIcJ/PP MbVQ7qhCYzlUCA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrleefgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucffohhmrghinhepghhnohhmvgdrohhrghdpghhithhhuhgsrd gtohhmnecukfhppeeivddrudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivg eptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 592228005B for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:29 -0400 (EDT) From: Marius Bakke Date: Mon, 13 May 2019 00:12:17 +0200 Message-Id: <20190512221221.17781-5-mbakke@fastmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190512221221.17781-1-mbakke@fastmail.com> References: <20190512221221.17781-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sphinx.scm (python-sphinxcontrib-devhelp): New public variable. --- gnu/packages/sphinx.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 4e5b791a6f..b184dc4e8c 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -115,6 +115,26 @@ sources.") Apple help books.") (license license:bsd-2))) +(define-public python-sphinxcontrib-devhelp + (package + (name "python-sphinxcontrib-devhelp") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-devhelp" version)) + (sha256 + (base32 + "0d2a57kqxl72i55rns0ly1i044y2x234b9sdi89ajc3kjdvv0r3c")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;XXX: circular dependency on Sphinx + (home-page "https://github.com/sphinx-doc/sphinxcontrib-devhelp") + (synopsis "Sphinx extension for creating Devhelp documents") + (description + "@code{sphinxcontrib-devhelp} is a Sphinx extension which outputs +@url{Devhelp,https://wiki.gnome.org/Apps/Devhelp} documents.") + (license license:bsd-2))) + (define-public python-sphinxcontrib-newsfeed (package (name "python-sphinxcontrib-newsfeed") From patchwork Sun May 12 22:12:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 13970 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A9B8C16FD4; Sun, 12 May 2019 23:13:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1A82F16FD4 for ; Sun, 12 May 2019 23:13:18 +0100 (BST) Received: from localhost ([127.0.0.1]:47857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwia-0004po-KN for patchwork@mira.cbaines.net; Sun, 12 May 2019 18:13:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiQ-0004jh-Vd for guix-patches@gnu.org; Sun, 12 May 2019 18:13:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPwiO-0006jg-LA for guix-patches@gnu.org; Sun, 12 May 2019 18:13:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58336) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPwiO-0006id-H4 for guix-patches@gnu.org; Sun, 12 May 2019 18:13:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hPwiO-0007yR-B9 for guix-patches@gnu.org; Sun, 12 May 2019 18:13:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35705] [PATCH 6/9] gnu: Add python-sphinxcontrib-jsmath. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2019 22:13:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35705 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35705@debbugs.gnu.org Received: via spool by 35705-submit@debbugs.gnu.org id=B35705.155769917130578 (code B ref 35705); Sun, 12 May 2019 22:13:04 +0000 Received: (at 35705) by debbugs.gnu.org; 12 May 2019 22:12:51 +0000 Received: from localhost ([127.0.0.1]:43637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwiA-0007x2-Ih for submit@debbugs.gnu.org; Sun, 12 May 2019 18:12:51 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:47839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwhx-0007vS-7C for 35705@debbugs.gnu.org; Sun, 12 May 2019 18:12:37 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 7E75F21321 for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:31 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 12 May 2019 18:12:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=iQqroBqhrZ9om LDo1Wh2CXBn90m2E36R8F9A/ldEiiE=; b=YE9JGuapoELAThKmn33uPHmfUiRBR Tc+8UvF2YxvPFjUnyyhdqlL8kYnOI0MpYNnpt90B0h20/qLwB4EV2YdTfBE1NW6t BOMJrEBlAxfu7WrtNthHyVPpq2xWzs5qXrNxozwOoCDhOFyNwU2RQmYe1Vs2YVRl Rec8rCvikqtMYtpY/KvX+U+5LLjo/ebeh0jVpXZDS1QfM+Et1qMhmfI/UIEoOogr RwxYevSY0OM4WqiJ13c6BF5ZEv8siuJFmBdnnI5ha9oqRDs/UYYTk7diuHg7ibos EW1AeH9RQ03uzOnyZc6eP69AA4tUsIq0caq/5NdHR7+xg1Z/3VtcpLhXg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=iQqroBqhrZ9omLDo1Wh2CXBn90m2E36R8F9A/ldEiiE=; b=ProXy75y FRO7uPQGJhsitmAPUPJVy1uNTwrJ2+cYvX2NhLh+MFWhWn0goq9o7/2Gu8JXuRRQ ZMBcgXw08GCqDOEF9TSVS+eP0u9r3FOlRU+8ugXZc00kcDFQ9Gb7N9Jnq7oSJB65 pICVRdzu/rXc0FU/+llsYeScfn/oY8r9j63BrZLGLPdzS+RXtPvRHU8epgFX6DVq HAguI5FkSRBec+R7yUPY5LhG58FoXoplc+cWfefJGb7ztFiCya2rDNUhk/YWKKF/ N418/2i5BE4B2Wp0L5B2QYddELDZizKGS8Dzte2uXY0M9jwhJ1GIOxOjS2a3jCIx yz1BIO8h7ere8Q== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrleefgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucffohhmrghinhepghhnohhmvgdrohhrghdpghhithhhuhgsrd gtohhmnecukfhppeeivddrudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivg epud X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id E30B480061 for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:30 -0400 (EDT) From: Marius Bakke Date: Mon, 13 May 2019 00:12:18 +0200 Message-Id: <20190512221221.17781-6-mbakke@fastmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190512221221.17781-1-mbakke@fastmail.com> References: <20190512221221.17781-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sphinx.scm (python-sphinxcontrib-jsmath): New public variable. --- gnu/packages/sphinx.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index b184dc4e8c..b782504d46 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -135,6 +135,26 @@ Apple help books.") @url{Devhelp,https://wiki.gnome.org/Apps/Devhelp} documents.") (license license:bsd-2))) +(define-public python-sphinxcontrib-jsmath + (package + (name "python-sphinxcontrib-jsmath") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-jsmath" version)) + (sha256 + (base32 + "1f64w19j33sp151jimibraw6qrbhd5gxy8hs3797w9478m55x4m9")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;XXX: circular dependency on Sphinx + (home-page "https://github.com/sphinx-doc/sphinxcontrib-jsmath") + (synopsis "Sphinx extension to render math equations") + (description + "@code{sphinxcontrib-jsmath} is a Sphinx extension which renders display +math in HTML via JavaScript.") + (license license:bsd-3))) + (define-public python-sphinxcontrib-newsfeed (package (name "python-sphinxcontrib-newsfeed") From patchwork Sun May 12 22:12:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 13972 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E1A4916FD6; Sun, 12 May 2019 23:13:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 89E0816FD2 for ; Sun, 12 May 2019 23:13:25 +0100 (BST) Received: from localhost ([127.0.0.1]:47865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwij-0004wW-3G for patchwork@mira.cbaines.net; Sun, 12 May 2019 18:13:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiR-0004kU-BR for guix-patches@gnu.org; Sun, 12 May 2019 18:13:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPwiQ-0006qU-4F for guix-patches@gnu.org; Sun, 12 May 2019 18:13:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58337) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPwiP-0006ko-0a for guix-patches@gnu.org; Sun, 12 May 2019 18:13:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hPwiO-0007yZ-Qy for guix-patches@gnu.org; Sun, 12 May 2019 18:13:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35705] [PATCH 7/9] gnu: Add python-sphinxcontrib-htmlhelp. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2019 22:13:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35705 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35705@debbugs.gnu.org Received: via spool by 35705-submit@debbugs.gnu.org id=B35705.155769917130586 (code B ref 35705); Sun, 12 May 2019 22:13:04 +0000 Received: (at 35705) by debbugs.gnu.org; 12 May 2019 22:12:51 +0000 Received: from localhost ([127.0.0.1]:43639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwiB-0007x9-3J for submit@debbugs.gnu.org; Sun, 12 May 2019 18:12:51 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:54697) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwhy-0007ve-3s for 35705@debbugs.gnu.org; Sun, 12 May 2019 18:12:38 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 0DA5720D34 for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:33 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 12 May 2019 18:12:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=JphFMOz6ZlzMW Ig/+v4rCJFJydxdXlLbDMSObbhprCo=; b=sEOKSpM3nBd2S6l3Z0XoxcMTJIyzX YYyke6dwZnC1Csq+DJeS3KlgZtikqNSMnxxhfpQ7W2Mx8yLiKEAI3ORRY8n5niKO ZB3bqgqsuOPfCd6Ilo0V1iMEReNR3IMGY+m+Laq+sgFZh84IPEYdNqhKxCsvMxH2 C2Ex24tQvEtJjc6BSo2VbN2nuIlbCkLtMXhLqgShf1XrGVRyD5vD7tJkz9p8mSf9 DZWO1DOuWrXbCucckq0yRypbr7lFNSfJ6Ts6zip5l+UrVDn3fAxotgrBF4ipy3aQ 0bGR5w5O6XaNm/uFsDLmYo0KnpY6YFX4P1bows4zcLDS9tgfOeyJ70bdQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=JphFMOz6ZlzMWIg/+v4rCJFJydxdXlLbDMSObbhprCo=; b=ePNWjI8u Kut2+Fly2sA64/GhlMtVN2vylDpJS3AzB1WuZfpvJbZVMa6lSVJY7sJMFMl5xJu7 6S+8g+UOJG8fRPHzxZZOAQSZmdgdvNuEZiqe7EdF4z7En3hHXsSZs3i9nMOOGYbT cUf9mODZ/Olj+tPAbCclj50+Hs3vAwzh45Ip4Le6K68IBOar1BZjoi4VMhrj7bVE wwztmOQU427ty/HP9N2tL5p6t5O1NG6OFw/X+XZyY8fTKMLv47fDyw/mITRTkFFW vv0IxPzkMbWxFKPv4xKFMLAAY3VMOWwr1th7k5yV6foxzg9dBszYq0JKotMZ+nQk c5b9GAooDc2esA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrleefgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucffohhmrghinhepghhnohhmvgdrohhrghdpghhithhhuhgsrd gtohhmnecukfhppeeivddrudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivg epud X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 784BE8005B for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:32 -0400 (EDT) From: Marius Bakke Date: Mon, 13 May 2019 00:12:19 +0200 Message-Id: <20190512221221.17781-7-mbakke@fastmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190512221221.17781-1-mbakke@fastmail.com> References: <20190512221221.17781-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sphinx.scm (python-sphinxcontrib-htmlhelp): New public variable. --- gnu/packages/sphinx.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index b782504d46..4bf737b8f2 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -135,6 +135,26 @@ Apple help books.") @url{Devhelp,https://wiki.gnome.org/Apps/Devhelp} documents.") (license license:bsd-2))) +(define-public python-sphinxcontrib-htmlhelp + (package + (name "python-sphinxcontrib-htmlhelp") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-htmlhelp" version)) + (sha256 + (base32 + "08l4x8a2l4xjqdd5rhvmfsqihmlgg4prdayj9b6pigaii6gzjw26")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;XXX: circular dependency on Sphinx + (home-page "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp") + (synopsis "Sphinx exension for rendering HTML help files") + (description + "@code{sphinxcontrib-htmlhelp} is a Sphinx extension which renders +HTML help files.") + (license license:bsd-2))) + (define-public python-sphinxcontrib-jsmath (package (name "python-sphinxcontrib-jsmath") From patchwork Sun May 12 22:12:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 13975 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8F90216FD6; Sun, 12 May 2019 23:13:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 37F0E16FD2 for ; Sun, 12 May 2019 23:13:51 +0100 (BST) Received: from localhost ([127.0.0.1]:47873 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwj8-00055o-RR for patchwork@mira.cbaines.net; Sun, 12 May 2019 18:13:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiw-00055C-Ni for guix-patches@gnu.org; Sun, 12 May 2019 18:13:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPwiv-0000LU-KQ for guix-patches@gnu.org; Sun, 12 May 2019 18:13:38 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58340) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPwiQ-0006rV-FS for guix-patches@gnu.org; Sun, 12 May 2019 18:13:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hPwiP-0007yh-9q for guix-patches@gnu.org; Sun, 12 May 2019 18:13:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35705] [PATCH 8/9] gnu: Add python-sphinxcontrib-qthelp. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2019 22:13:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35705 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35705@debbugs.gnu.org Received: via spool by 35705-submit@debbugs.gnu.org id=B35705.155769917130593 (code B ref 35705); Sun, 12 May 2019 22:13:05 +0000 Received: (at 35705) by debbugs.gnu.org; 12 May 2019 22:12:51 +0000 Received: from localhost ([127.0.0.1]:43641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwiB-0007xH-FE for submit@debbugs.gnu.org; Sun, 12 May 2019 18:12:51 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:45979) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwhz-0007vm-NN for 35705@debbugs.gnu.org; Sun, 12 May 2019 18:12:40 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id AD63520EB0 for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:34 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 12 May 2019 18:12:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=nK18TtUg/2bUs JiexcwBilY0WsffJZ74fT/nlsp+GVU=; b=FEwdZxxmZnNa5cS2jbZiay7F6fvsb EEi4h5thfaGer/9KgbZaXFzCsdcZy6DnVhWwyUjBn7eZ7pEtH/4JA0ct53MnPOor 16WUuQCp9PCFwgQH0Gw+WYHzXdMUJO9MSfjXmXMHijdJzScGxHW72GqGdbFDM0uE QcvUhXDCsUH+WhSNBJJ+LBYwzxzRiTLC6LO5YgHtmq616Tufb2M3oky+jeA5xk0E Wj4f8q0nUxWoIT9aCzcqwGtZ64qCTyu16H8o5VliJdtTgh1oMJuOFk2iafH0ZKIB v0jlXMcnA6nHY1m3K0lSv1KU3ntmecAjZ4IT1fUrVC9RIb7Zc+jqwAlTQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=nK18TtUg/2bUsJiexcwBilY0WsffJZ74fT/nlsp+GVU=; b=1wmXCZ6j NegkxjdNsMIZBeMTF+fBlmVF2dUbv8iR/ZxNNBOi/1RjgUrWaZSnVIeiPjsRUV+E Y4aH2rVefR+TBDJtov3kU8rvH16VPlagTbqmkTb12arfo2Mvt9CuQfCNyOEtKHL2 pMwbWYhqlDUoc3uyP6XXEBi60L+6lLAAzpNiEyNR3+wmIP935fpp8VFUcNc9dIGD HH+HVGUmpr+2Ns7tWFG5smoLin8kAkzhAU1Vjer+DkrFofNhkXItixw+ShHjIStR 2ZVp33z3nkrV/OVvh9/GMLPx9TlDgiswVn5cDltoTe7aPVLZYs8b+JicRUnuLZbP ZkVWvPNEC8YFWw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrleefgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeeivd drudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvges fhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgepvd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 10ABB8005C for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:33 -0400 (EDT) From: Marius Bakke Date: Mon, 13 May 2019 00:12:20 +0200 Message-Id: <20190512221221.17781-8-mbakke@fastmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190512221221.17781-1-mbakke@fastmail.com> References: <20190512221221.17781-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sphinx.scm (python-sphinxcontrib-qthelp): New public variable. --- gnu/packages/sphinx.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 4bf737b8f2..68cd158a3b 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -217,6 +217,26 @@ commands into documents, helping you to keep your command examples up to date.") (home-page "https://github.com/lunaryorn/sphinxcontrib-programoutput") (license license:bsd-2))) +(define-public python-sphinxcontrib-qthelp + (package + (name "python-sphinxcontrib-qthelp") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-qthelp" version)) + (sha256 + (base32 + "0vs09m6kf5vhiivpi5s5pks59iq0lqlsbkdycpqlysg53bhmqikr")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;XXX: circular dependency on Sphinx + (home-page "https://github.com/sphinx-doc/sphinxcontrib-qthelp") + (synopsis "Sphinx extension to output QtHelp documents") + (description + "@code{sphinxcontrib-qthelp} is a Sphinx extension which outputs QtHelp +documents.") + (license license:bsd-2))) + (define-public python-sphinxcontrib-serializinghtml (package (name "python-sphinxcontrib-serializinghtml") From patchwork Sun May 12 22:12:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 13969 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 10CD216FD6; Sun, 12 May 2019 23:13:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 92C5D16FD2 for ; Sun, 12 May 2019 23:13:14 +0100 (BST) Received: from localhost ([127.0.0.1]:47853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiX-0004mU-49 for patchwork@mira.cbaines.net; Sun, 12 May 2019 18:13:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiR-0004kQ-7O for guix-patches@gnu.org; Sun, 12 May 2019 18:13:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPwiQ-0006qM-3F for guix-patches@gnu.org; Sun, 12 May 2019 18:13:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58339) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPwiP-0006p4-Ve for guix-patches@gnu.org; Sun, 12 May 2019 18:13:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hPwiP-0007yn-OF for guix-patches@gnu.org; Sun, 12 May 2019 18:13:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35705] [PATCH 9/9] gnu: python-sphinx: Update to 2.0.1. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2019 22:13:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35705 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35705@debbugs.gnu.org Received: via spool by 35705-submit@debbugs.gnu.org id=B35705.155769917530602 (code B ref 35705); Sun, 12 May 2019 22:13:05 +0000 Received: (at 35705) by debbugs.gnu.org; 12 May 2019 22:12:55 +0000 Received: from localhost ([127.0.0.1]:43643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwiB-0007xO-QU for submit@debbugs.gnu.org; Sun, 12 May 2019 18:12:55 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:56687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwi1-0007vz-Ay for 35705@debbugs.gnu.org; Sun, 12 May 2019 18:12:41 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4C33B2104A for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:36 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 12 May 2019 18:12:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=ph0LOa3Vd31Ih hU8JgNkhYmKUjLrZ846DzJ7zUF1tiE=; b=CqYKMiuuPnZlaD7pRcpaHoIbvYXZ7 BNKX/H4Nlth9U5l0kafY8tCCIYMkjPOCTylpfIpgoCB81L03uaipd4cHjh+nONqb 3wSxP3u2/IgY8Se1LJf97Vwr5g5uIA5hZZXPEhjq3c7ense0ybH1q9HUcBAKs1Zm 6yjWLTWLcBOCl3tsdqLuVZYkDeBJnsujAo6httHNyk+cNgGxT7BiKh4DbySVvpzS XOriBf5FJP/r69lEuhLHJ/uHBc+uvnwXY/4bqy1XozbBjt8p8EX5m3HeEWe3Q4vE 2PsdUgMALlKfeoL3dRlTazve0IwHuqrC39oZsGlN+2tRMo/PkPS+CdV5g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=ph0LOa3Vd31IhhU8JgNkhYmKUjLrZ846DzJ7zUF1tiE=; b=XxrUnL+B wG3HwRl96xzHlKHMaQEqFmHQlSVb4mu36OF94C5xNOAHy+9hbJiMlE+1S7ZKEzS1 bTu1BXeUp+x+JssGuXOAY3WsXd2hdPvV4eO6w4yD85l+kVpOnvdeWXIQDEIwgY2L NT5Qxy/wndk5+0nwbfbsDfvlYsa4Ir/wdrNySonZ9hJWdLF+8SAAPmJP4E/azpTP aI2jt3RLA5JX+iwgyvJIvQcus8Fcy9QOR2+AVsOSng2DFztwfsutNScFctFt36uw ciBPC6MhKnSO38RzHFOkfAIGji9M4/QMRSqKpeeb+kh9BzOt0rescBXcbJJejFcD L7KtyVsf0Rl5bA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrleefgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeeivd drudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvges fhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgepvd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id A43F38005C for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:35 -0400 (EDT) From: Marius Bakke Date: Mon, 13 May 2019 00:12:21 +0200 Message-Id: <20190512221221.17781-9-mbakke@fastmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190512221221.17781-1-mbakke@fastmail.com> References: <20190512221221.17781-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sphinx.scm (python-sphinx): Update to 2.0.1. [arguments]: Remove Python2 workaround. [propagated-inputs]: Remove PYTHON-SIX and PYTHON-SPHINXCONTRIB-WEBSUPPORT. Add PYTHON-SPHINXCONTRIB-APPLEHELP, PYTHON-SPHINXCONTRIB-DEVHELP, PYTHON-SPHINXCONTRIB-HTMLHELP, PYTHON-SPHINXCONTRIB-JSMATH, PYTHON-SPHINXCONTRIB-QTHELP, and PYTHON-SPHINXCONTRIB-SERIALIZINGHTML. --- gnu/packages/sphinx.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 68cd158a3b..eae7eee654 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -43,14 +43,14 @@ (define-public python-sphinx (package (name "python-sphinx") - (version "1.7.7") + (version "2.0.1") (source (origin (method url-fetch) (uri (pypi-uri "Sphinx" version)) (sha256 (base32 - "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi")))) + "0js0rnbzm0nsb4gm2v4z79wlbmr05awqzic57kfl8ydkdxj80cj2")))) (build-system python-build-system) (arguments `(#:phases @@ -62,11 +62,6 @@ (substitute* "tests/test_build_latex.py" (("@pytest.mark.sphinx\\('latex', testroot='images'\\)") "@pytest.mark.skip()")) - (when (which "python") - ;; XXX: These tests are broken when using Python2: - ;; . - (delete-file "tests/test_api_translator.py") - (delete-file "tests/test_setup_command.py")) (invoke "make" "test")))))) (propagated-inputs `(("python-imagesize" ,python-imagesize) @@ -79,8 +74,13 @@ ("python-packaging" ,python-packaging) ("python-pygments" ,python-pygments) ("python-requests" ,python-requests) - ("python-six" ,python-six) - ("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport))) + ("python-sphinxcontrib-applehelp" ,python-sphinxcontrib-applehelp) + ("python-sphinxcontrib-devhelp" ,python-sphinxcontrib-devhelp) + ("python-sphinxcontrib-htmlhelp" ,python-sphinxcontrib-htmlhelp) + ("python-sphinxcontrib-jsmath" ,python-sphinxcontrib-jsmath) + ("python-sphinxcontrib-qthelp" ,python-sphinxcontrib-qthelp) + ("python-sphinxcontrib-serializinghtml" + ,python-sphinxcontrib-serializinghtml))) (native-inputs `(("graphviz" ,graphviz) ("imagemagick" ,imagemagick) ;for "convert"