GNU bug report logs - #56795
[PATCH core-updates] gnu: texlive-xcolor: Fix merge.

Previous Next

Package: guix-patches;

Reported by: Greg Hogan <code <at> greghogan.com>

Date: Wed, 27 Jul 2022 14:19:01 UTC

Severity: normal

Tags: patch

Done: Marius Bakke <marius <at> gnu.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 56795 in the body.
You can then email your comments to 56795 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#56795; Package guix-patches. (Wed, 27 Jul 2022 14:19:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Greg Hogan <code <at> greghogan.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Wed, 27 Jul 2022 14:19:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: guix-patches <at> gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH core-updates] gnu: texlive-xcolor: Fix merge.
Date: Wed, 27 Jul 2022 14:18:47 +0000
* gnu/packages/tex.scm (texlive-xcolor)[arguments]<#:phases>: Restore
code from commit 5e796bfc22076a1126beaa853d9cac16f5c9a23d which was
reverted by the merge commit 8c3e9da13a3c92a7db308db8c0d81cb474ad7799.
---
 gnu/packages/tex.scm | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3ad16a1b46..482f18505c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3391,14 +3391,21 @@ (define-public texlive-xcolor
           #~(modify-phases #$phases
               (add-after 'unpack 'chdir
                 (lambda _ (chdir "source/latex/xcolor") #t))
-              (add-after 'install 'move-files
-                (lambda* (#:key outputs #:allow-other-keys)
-                  (let ((share (string-append (assoc-ref outputs "out")
-                                              "/share/texmf-dist")))
-                    (mkdir-p (string-append share "/dvips/xcolor"))
-                    (rename-file (string-append share "/tex/latex/xcolor/xcolor.pro")
-                                 (string-append share "/dvips/xcolor/xcolor.pro"))
-                    #t)))))))
+              (replace 'copy-files
+                (lambda* (#:key inputs outputs #:allow-other-keys)
+                  (let ((origin (assoc-ref inputs "source"))
+                        (source (string-append #$output
+                                               "/share/texmf-dist/source"))
+                        (doc (string-append #$output:doc
+                                            "/share/texmf-dist/doc")))
+                    (copy-recursively (string-append origin "/source") source)
+                    (copy-recursively (string-append origin "/doc") doc)
+                    (let ((share (string-append #$output
+                                                "/share/texmf-dist")))
+                      (mkdir-p (string-append share "/dvips/xcolor"))
+                      (rename-file
+                       (string-append share "/tex/latex/xcolor/xcolor.pro")
+                       (string-append share "/dvips/xcolor/xcolor.pro"))))))))))
       ;; TODO: Propagate texlive-hyperref and many others in the next rebuild
       ;; cycle.  Grep for '\usepackage' to see what packages it requires.
       ;; (propagated-inputs (list texlive-hyperref ...))
-- 
2.37.1





Reply sent to Marius Bakke <marius <at> gnu.org>:
You have taken responsibility. (Thu, 01 Sep 2022 20:58:01 GMT) Full text and rfc822 format available.

Notification sent to Greg Hogan <code <at> greghogan.com>:
bug acknowledged by developer. (Thu, 01 Sep 2022 20:58:02 GMT) Full text and rfc822 format available.

Message #10 received at 56795-close <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <marius <at> gnu.org>
To: Greg Hogan <code <at> greghogan.com>, 56795-close <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: Re: [bug#56795] [PATCH core-updates] gnu: texlive-xcolor: Fix merge.
Date: Thu, 01 Sep 2022 22:57:24 +0200
[Message part 1 (text/plain, inline)]
Greg Hogan <code <at> greghogan.com> skriver:

> * gnu/packages/tex.scm (texlive-xcolor)[arguments]<#:phases>: Restore
> code from commit 5e796bfc22076a1126beaa853d9cac16f5c9a23d which was
> reverted by the merge commit 8c3e9da13a3c92a7db308db8c0d81cb474ad7799.

Nice catch!  Unfortunately I did not see this patch before going on the
same debugging journey and arriving at the exact same solution in
121f6e0b0c45dba24301fbd405d07123e82c2de6.

Sorry for the duplicate work.  :-(

By the way, you have been around for a while now and generally produce
high quality patches.  Consider applying for commit access.  :-)

Thanks!
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 30 Sep 2022 11:24:14 GMT) Full text and rfc822 format available.

This bug report was last modified 1 year and 180 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.