From: Danny Milosavljevic <dannym@scratchpost.org>
To: Marius Bakke <mbakke@fastmail.com>
Cc: 25177@debbugs.gnu.org
Subject: bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8.
Date: Sat, 14 Jan 2017 14:54:06 +0100 [thread overview]
Message-ID: <20170114145402.084adfbb@scratchpost.org> (raw)
In-Reply-To: <20170113231408.273c065e@scratchpost.org>
Hi,
I've fixed python-matplotlib locally. It builds fine now.
The fix itself would be:
+ (substitute* "users/intro.rst"
+ ;; Fix reST markup error (see <https://github.com/sphinx-doc/sphinx/issues/3044>)
+ (("[[][*][]]") "[#]"))
However, I've also changed alist-cons* phase construction to modify-phases. That would make the patch look real scary.
So here is a weird patch created via "git diff -b" where you can actually see what's happening without all the noise caused by indentation changes:
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c540d7b5a..a5220e05e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3723,8 +3723,8 @@ transcendental functions).")
("texinfo" ,texinfo)))
(arguments
`(#:phases
- (alist-cons-before
- 'build 'configure-environment
+ (modify-phases %standard-phases
+ (add-before 'build 'configure-environment
(lambda* (#:key outputs inputs #:allow-other-keys)
(let ((cairo (assoc-ref inputs "cairo"))
(gtk+ (assoc-ref inputs "gtk+")))
@@ -3740,9 +3740,8 @@ basedirlist = ~a,~a~%
[rc_options]~%
backend = TkAgg~%"
(assoc-ref inputs "tcl")
- (assoc-ref inputs "tk"))))))
- (alist-cons-after
- 'install 'install-doc
+ (assoc-ref inputs "tk")))))))
+ (add-after 'install 'install-doc
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((data (string-append (assoc-ref outputs "doc") "/share"))
(doc (string-append data "/doc/" ,name "-" ,version))
@@ -3756,6 +3755,9 @@ backend = TkAgg~%"
(substitute* (find-files "." "conf\\.py")
(("latex_paper_size = 'letter'")
"latex_paper_size = 'a4'"))
+ (substitute* "users/intro.rst"
+ ;; Fix reST markup error (see <https://github.com/sphinx-doc/sphinx/issues/3044>)
+ (("[[][*][]]") "[#]"))
(mkdir-p html)
(mkdir-p info)
;; The doc recommends to run the 'html' target twice.
@@ -3777,8 +3779,7 @@ backend = TkAgg~%"
(copy-file "build/texinfo/matplotlib.info"
(string-append info "/matplotlib.info"))
(copy-file "build/latex/Matplotlib.pdf"
- (string-append doc "/Matplotlib.pdf")))))
- %standard-phases))))
+ (string-append doc "/Matplotlib.pdf")))))))))
(home-page "http://matplotlib.org")
(synopsis "2D plotting library for Python")
(description
Should I split this into two commits - one for modify-phases and one for the actual change? Should I post them to the list? If so, should I mark that it's for python-tests somehow?
next prev parent reply other threads:[~2017-01-14 13:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170105161431.9803-1-dannym@scratchpost.org>
[not found] ` <878tqpjw93.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me>
2017-01-13 12:34 ` bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8 Marius Bakke
2017-01-13 13:07 ` Danny Milosavljevic
2017-01-13 15:24 ` Leo Famulari
2017-01-14 15:35 ` Marius Bakke
2017-01-16 1:32 ` Leo Famulari
2017-01-17 0:06 ` Leo Famulari
2017-01-13 22:14 ` Danny Milosavljevic
2017-01-14 13:54 ` Danny Milosavljevic [this message]
2017-01-14 15:28 ` Marius Bakke
2017-01-14 21:08 ` Danny Milosavljevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170114145402.084adfbb@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=25177@debbugs.gnu.org \
--cc=mbakke@fastmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).