From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id EECBEOIcEWOGhAAAbAwnHQ (envelope-from ) for ; Thu, 01 Sep 2022 22:58:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id gMNvEOIcEWNDagAAauVa8A (envelope-from ) for ; Thu, 01 Sep 2022 22:58:10 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DCE5110DD9 for ; Thu, 1 Sep 2022 22:58:09 +0200 (CEST) Received: from localhost ([::1]:49302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTrGK-00020x-Kp for larch@yhetil.org; Thu, 01 Sep 2022 16:58:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTrGF-0001z3-6u for guix-patches@gnu.org; Thu, 01 Sep 2022 16:58:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54504) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oTrGE-0001Hw-BR for guix-patches@gnu.org; Thu, 01 Sep 2022 16:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oTrGE-0000iQ-26 for guix-patches@gnu.org; Thu, 01 Sep 2022 16:58:02 -0400 Subject: bug#56795: [PATCH core-updates] gnu: texlive-xcolor: Fix merge. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Thu, 01 Sep 2022 20:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 56795 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Greg Hogan , 56795-close@debbugs.gnu.org Cc: Greg Hogan Mail-Followup-To: 56795@debbugs.gnu.org, marius@gnu.org, code@greghogan.com Received: via spool by 56795-done@debbugs.gnu.org id=D56795.16620658592719 (code D ref 56795); Thu, 01 Sep 2022 20:58:01 +0000 Received: (at 56795-close) by debbugs.gnu.org; 1 Sep 2022 20:57:39 +0000 Received: from localhost ([127.0.0.1]:44252 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTrFq-0000hm-Ot for submit@debbugs.gnu.org; Thu, 01 Sep 2022 16:57:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTrFp-0000hb-MD for 56795-close@debbugs.gnu.org; Thu, 01 Sep 2022 16:57:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49812) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTrFj-0001E4-A2; Thu, 01 Sep 2022 16:57:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=iT8/3hlnmwYyQ3lZQDPPDAK0qE3VBaDz2jbMNRgxiZk=; b=H50diI2VenGVA3vQvH/N WTiV+96/Ho4XY3tfUTtNGS12eM7syBX+9vjm81kXqpLyXQ3jm5r4dzaFbGkONjzzc/f4DXzBSFfUt Nxuj+y72vYiGbdgtGrJ/Ukot4E+8UXJX+rFI8E/laKxU83LrWWIfKLSq5zAs1uccE4QgdIlgfzm9B nrIcQiKjR1RU+ObiVa6dR2RC38n7N+aVKN3Bq2SWEihniqN7vPUtcwmYjdEU81OFu0G24NIdkOlzZ ZcMI0a8ljKnDTCufl7Duq5FaP+XuoNMmpCwC58eW3aypIReKT5XPRFrR3n5/MMg+Z8q8gM2zRGbgf nxWQHE9HMCZwYw==; Received: from [84.214.173.6] (port=60684 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTrFg-0005yR-IQ; Thu, 01 Sep 2022 16:57:30 -0400 From: Marius Bakke In-Reply-To: References: Date: Thu, 01 Sep 2022 22:57:24 +0200 Message-ID: <87ler2byob.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1662065889; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=iT8/3hlnmwYyQ3lZQDPPDAK0qE3VBaDz2jbMNRgxiZk=; b=RVgUBATUl/O0g7BGKUuV3IzpyEXE1tOx+AnR9zBkDdC71QhYgY4ISZubxhDypCNI9X0an7 DbFL5/xYqIdScERCcdrYutu97hUf/N3QsL0SUhauM9BzSvvzSCLH+Mg4LBGImE73q6qY/p HKA1G/Du2iugbbbXP+GXTiTK7enOm+Cqg6YbIJI0M+BJnVz154WFMpl3qMrxf9Dztfhfao jhtjgRqTJm+Zzr1FgGKTzIXXvHurqt1bVS0fOyQ4UYJAzRSuqcDijfsGrxT/ZZ1C1jotu9 hkDtOXKEwXm9UxdEvCm5VT5o7pq7A+4qs3k/tIbEPDu28FGhsBGN9QyM1yoKwQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662065889; a=rsa-sha256; cv=none; b=kYK9oiPonuB9H/4i/SieT6Z9PhdkZbYnMX3oLVLliPxio/RCELdJBsbP8yuIBZWoMQmLeI PN8+AOu7ocs5GNTUdrzgbnFuGoY0/h8hN6sCVBzQ6qrkNlyqHxmkEYpe4Hs95p41yRL46p R13fSp1DPpiVbvBViXTqr0Md4nWPbZ09hstXD+1NhH9zdGvgDLjfUaJzGmul2SY+FhV4IF XpDH8FNJP1OXAfDlhxDK6WcsN+rLMVXftWeWgCS9L0BktY5Rqe4h11+rZozw+24SGsIeAv TpAec4o5JL0WRHj/SWViITkHM2emnBnUYBkRyMx7bgHBsxvIgi5vDglLg5IMsQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=H50diI2V; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -6.98 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=H50diI2V; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: DCE5110DD9 X-Spam-Score: -6.98 X-Migadu-Scanner: scn0.migadu.com X-TUID: 2A9LxNaLUmTQ --=-=-= Content-Type: text/plain Greg Hogan 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! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYxEctA8cbWFyaXVzQGdu dS5vcmcACgkQ6HGLpZEUEHfDFwD8DRi3m5KPs9l1hetjvyBOhMwp6lP8Sf6xaTt1 TtnVrusA/j9NmpYMJybImzG8y1sE3TfeTx7J3Lmow/RvE8j+Y0sA =v5hn -----END PGP SIGNATURE----- --=-=-=--