From mboxrd@z Thu Jan 1 00:00:00 1970 From: Danny Milosavljevic Subject: bug#25177: [PATCH v6] gnu: python-sphinx: Update to 1.4.8. Date: Sat, 14 Jan 2017 14:54:06 +0100 Message-ID: <20170114145402.084adfbb@scratchpost.org> References: <20170105161431.9803-1-dannym@scratchpost.org> <878tqpjw93.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <8760lj5eb6.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170113231408.273c065e@scratchpost.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSOnR-0001M3-IH for bug-guix@gnu.org; Sat, 14 Jan 2017 08:55:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cSOnO-0006cF-HF for bug-guix@gnu.org; Sat, 14 Jan 2017 08:55:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:38035) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cSOnO-0006c7-E8 for bug-guix@gnu.org; Sat, 14 Jan 2017 08:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cSOnO-0003Vy-1o for bug-guix@gnu.org; Sat, 14 Jan 2017 08:55:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20170113231408.273c065e@scratchpost.org> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Marius Bakke Cc: 25177@debbugs.gnu.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 ) + (("[[][*][]]") "[#]")) 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 ) + (("[[][*][]]") "[#]")) (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?