From patchwork Wed Jul 27 14:18:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 41014 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 6981027BBEA; Wed, 27 Jul 2022 15:20:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,T_PDS_PRO_TLD, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CAF4427BBE9 for ; Wed, 27 Jul 2022 15:20:03 +0100 (BST) Received: from localhost ([::1]:35836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGhtK-00070m-TV for patchwork@mira.cbaines.net; Wed, 27 Jul 2022 10:20:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGhsM-0006Is-Ek for guix-patches@gnu.org; Wed, 27 Jul 2022 10:19:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38631) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGhsM-0002e5-5T for guix-patches@gnu.org; Wed, 27 Jul 2022 10:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oGhsL-0005Pa-Vq for guix-patches@gnu.org; Wed, 27 Jul 2022 10:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56795] [PATCH core-updates] gnu: texlive-xcolor: Fix merge. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Jul 2022 14:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56795 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56795@debbugs.gnu.org Cc: Greg Hogan X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165893153820790 (code B ref -1); Wed, 27 Jul 2022 14:19:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Jul 2022 14:18:58 +0000 Received: from localhost ([127.0.0.1]:56613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGhsI-0005PG-0X for submit@debbugs.gnu.org; Wed, 27 Jul 2022 10:18:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:50382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGhsH-0005P9-6A for submit@debbugs.gnu.org; Wed, 27 Jul 2022 10:18:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGhsE-0006Er-FB for guix-patches@gnu.org; Wed, 27 Jul 2022 10:18:57 -0400 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]:46871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGhsC-0002ci-Nj for guix-patches@gnu.org; Wed, 27 Jul 2022 10:18:54 -0400 Received: by mail-qk1-x731.google.com with SMTP id v28so13296096qkg.13 for ; Wed, 27 Jul 2022 07:18:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=y48Dkitvj7oyzF+U6wlikEgAZVzwUHbo0QuRiLm/ak0=; b=RhuDOTuezB5Ag8P+DlsyC4qTwwSvZw5DkMz3qUtcqjdxmg5y3opJA4zOlvzWF4/WnM MDzQ7GX0nVNSrLJn185OJ2Fn8mCOAOCvpXTnQoKzKDKGHpv6atQo/VgdRj6JoYq8lSNR DBBjrMNNL7qARJey8Plv/CWPzmXOoVrXxlbJvkcI0oqcHWXlWuD8UG+Y/fJlSmkk+NQx PHhfQVvO+1U+giGtDiZohYoB2lFNF5VJr3MDZFkMKOFdeY3C71anos0ljAQ0Kr2Bktrq Qv5b18zp4QwnG9HiDbbCr10COmTRvs3nNIrGD9Y/3hWBHFNrwhmBc4WfSgG1p2i8ZMnt hfdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=y48Dkitvj7oyzF+U6wlikEgAZVzwUHbo0QuRiLm/ak0=; b=bCFmcFdDh0xxMz0DOgxhZur3IvgGirpRFk6A3XKvZwaoEs6Jrxk3eqKTQc8bKeV2lf NCd7umW4FxNaaNhKoSlNCHa/CR2Qd25uSVzG/s5u7WGGQ0IW33f3RwaPnyEbRVlg/1bF ahydKf6KckJzfumTVaVlMyn0WyXTgM6d8d9zfyUUaXbg0EU78HP0H09f9HUjZevYw9Ih ki0TYIZmWYxBAdrxaN6y92n9rEYdUSpxGTvK2Wz5WyGqGXWUjtHQdHrzDRf/BjNu81+l qPPxulvlI/SSm0LYbGz2Wi3OzNpTSXg1WK2MmkbblMeSgfdFADWhg3nyHLZM/lY/+JE+ CC1Q== X-Gm-Message-State: AJIora8WUVsxUNW3J0ixBDie6ngetP6/6VbHga5WSJIxFB33zgc26g3n brqpY5xZhz6m7NEvB06nJYz2/Y5Igeb3ptUy X-Google-Smtp-Source: AGRyM1sg4jUHvpdMPol4gkGZ1+HMAoLh1EgQWthN2k9y0k3w7vtpFpLtxsPAGonTT2koCc9qPXG8Rw== X-Received: by 2002:a05:620a:17a6:b0:6b5:fe97:8c3d with SMTP id ay38-20020a05620a17a600b006b5fe978c3dmr16803244qkb.468.1658931531197; Wed, 27 Jul 2022 07:18:51 -0700 (PDT) Received: from ip-10-114-89-251.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id g11-20020a05620a40cb00b006af08c26774sm14160560qko.47.2022.07.27.07.18.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jul 2022 07:18:50 -0700 (PDT) From: Greg Hogan Date: Wed, 27 Jul 2022 14:18:47 +0000 Message-Id: X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::731; envelope-from=code@greghogan.com; helo=mail-qk1-x731.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_PDS_PRO_TLD=0.01, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 ...))