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 0KHgB0vdzWOOTwEAbAwnHQ (envelope-from ) for ; Mon, 23 Jan 2023 02:05:15 +0100 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 6OGrB0vdzWNAfQAAauVa8A (envelope-from ) for ; Mon, 23 Jan 2023 02:05:15 +0100 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 BF7003A918 for ; Mon, 23 Jan 2023 02:05:14 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJlGg-0000sZ-Qe; Sun, 22 Jan 2023 20:05:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pJlGg-0000sQ-2b for guix-patches@gnu.org; Sun, 22 Jan 2023 20:05:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJlGf-0003bW-Qk for guix-patches@gnu.org; Sun, 22 Jan 2023 20:05:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJlGf-0007Kn-MN for guix-patches@gnu.org; Sun, 22 Jan 2023 20:05:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60941] Update diffoscope to 232 Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Jan 2023 01:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Vagrant Cascadian Cc: 60941@debbugs.gnu.org Received: via spool by 60941-submit@debbugs.gnu.org id=B60941.167443589428178 (code B ref 60941); Mon, 23 Jan 2023 01:05:01 +0000 Received: (at 60941) by debbugs.gnu.org; 23 Jan 2023 01:04:54 +0000 Received: from localhost ([127.0.0.1]:52870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJlGY-0007KQ-9C for submit@debbugs.gnu.org; Sun, 22 Jan 2023 20:04:54 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:39919) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJlGW-0007KD-VZ for 60941@debbugs.gnu.org; Sun, 22 Jan 2023 20:04:53 -0500 Received: by mail-qt1-f178.google.com with SMTP id s4so8643393qtx.6 for <60941@debbugs.gnu.org>; Sun, 22 Jan 2023 17:04:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=xfOnZxH7FY21KvJU/Hx33Wkkiws7MW/CeUzPrLDujBQ=; b=VnYjSfPqeCqZhgSviXgxE7GcjEg4O7K4zDMi8y0uNgpyDhyMuA6N/Tnfauu6Y8cQWQ ZtWVqVHgxOkrwKxBzzpo12VrLKoHxLHUCh6iRFpAh4WYXYwWx1LeVPnPgVMBipQQUnqt nuwpHXPc0jx1mV9G7OXRcD9oS3j1VHGx2z+BYDV+XCAKyRRuTcbNKoetWQMeJw+TlPgr rIhYQeDamTRAf+l0iuGgdhOICg6Qmo4C9PnilXcyVIs/jtoiaR7iG2RSRfDHNpHtDkYo +2fL6csoYOzZHYTAvNqpikMEAhFSAJO3XKFht09prd2lTWC3XBiey8kFzgsKuieLQcpk MPKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xfOnZxH7FY21KvJU/Hx33Wkkiws7MW/CeUzPrLDujBQ=; b=pMJnannQihWvYO8oMdrjPc8xE8afCuPIyigTJwXYKUwJ6+oVYoJ8bW8/8q6LCC/Nk8 2JA2YWO/HkQNJcsQy35p0RHxzg/arr3koyjq0a0RB8LhuZsor4tB2u0B6kBQSNJDQsuZ 8huwy9ZekEB4VyuBcolzji8vlro8vsd1vmHrhufbCAGlDFDeZSJfBrRXiHqXdNGiddYN V13lZMNpcORrLop4dQIUB4XhgFiVIgujBxIKLQ3eek9qCR+AGWUbWAuUXYpNXHiZC9Bf NR3OfGbVivPZ3DTfdqt+JOuSgHmfUnSGCGEgbHaV9KZ35aW6kAbxJVmkrf2a0bPbPoQf y17A== X-Gm-Message-State: AFqh2kqAKY0qgs/+lvKgiobacFk73THUI20KPCx4lYtLAz375GDI8Gaj Fsy+ih/DXjOLxVTEZaydSCOqm6mJPADhdQ== X-Google-Smtp-Source: AMrXdXuoWzvzIAcfxKResSAJLTlGlr+B5nkr3qf/SsbdPXZG0JEQCHjmaDLNX6hvkXbyOc6Di2sjZw== X-Received: by 2002:a05:622a:508a:b0:3ac:77ed:3995 with SMTP id fp10-20020a05622a508a00b003ac77ed3995mr29279056qtb.26.1674435887143; Sun, 22 Jan 2023 17:04:47 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id b1-20020ac844c1000000b003b34650039bsm14109603qto.76.2023.01.22.17.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Jan 2023 17:04:46 -0800 (PST) From: Maxim Cournoyer References: <87ilh3z4vo.fsf@contorta> <87edrrz4nd.fsf@contorta> <87a62fz4lj.fsf@contorta> <87lelze1ll.fsf_-_@gmail.com> <87fsc36yh4.fsf@contorta> Date: Sun, 22 Jan 2023 20:04:45 -0500 In-Reply-To: <87fsc36yh4.fsf@contorta> (Vagrant Cascadian's message of "Sat, 21 Jan 2023 19:26:47 -0800") Message-ID: <87wn5eysb6.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1674435915; a=rsa-sha256; cv=none; b=GCOK4iMWWFIs/CGV8UOtmlwAAcl5u3NBNPAFrk7HJXwsYBcFUgUh1NyQuZ1MAtVHom/En6 YwwvjIxiXCjTTUB3XDCpBbFerQVAe9p8VeKFwOzHR5sPkLneA/G+KE09wp6D81WixfHH59 0hss8RVG3h+rcJrwcGUxKQWdXNegkeeFUQSs8tpxa+6gj7J8hkj9od//aZYSxw2aeMFS7N L83ngUAGcQZqtUPNEEgmvMjVMJrjCeJ6PNUtkg565u2ToqwQTXsPXgu6osdG7bNitjt2Ej hTsePHvRf9lxZepVX7gyLJo4XF/krldsy216oeQ0PPQmBkUYmAxbeJCz5zRhfA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=VnYjSfPq; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1674435915; 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-cc: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=xfOnZxH7FY21KvJU/Hx33Wkkiws7MW/CeUzPrLDujBQ=; b=tB0oiADLjWpZzRH2TrtI8xpkzpFtmcqiAh5zcEhwKVoOj1xL5urrvGdqIjBhSw1zemm4bx lrenSo4CgYVM8N9OhTF8vVC5TJZPYGsLQmtUMrGiAZV53/8P9fkXOb1fyGMAbKw1F1VYLF wGiRI1Eij1wVA0ejQImn/fvW0qIeLZ5PA/x9B3gGAmtqpkfxy5qBRJ0JWpcOIha5eZQI65 LzAePXe45TDF9yR09fzB5dz5YesW9SThIlf7yWeTsvIRIJRstl+cNz1xjbDqVJjg10ecsc UmpPkFjgy/rTh2aX0hwrAS2gh/PYcymtWyWRsPiPA12q+qsujCOG5tWTaLlDxg== X-Spam-Score: 5.62 X-Migadu-Queue-Id: BF7003A918 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=VnYjSfPq; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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-Scanner: scn0.migadu.com X-Migadu-Spam-Score: 5.62 X-TUID: FY8lzqlQMQfl Hi, Vagrant Cascadian writes: [...] >>> diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm >>> index f730d976fe..59875c2e8e 100644 >>> --- a/gnu/packages/diffoscope.scm >>> +++ b/gnu/packages/diffoscope.scm > ... >>> + (add-after 'unpack 'remove-mono-external-tool >>> + ;; Fixed upstream, remove this phase when updating to >>> + ;; diffoscope 233 >>> + (lambda _ >>> + (substitute* "diffoscope/external_tools.py" >>> + ;; "guix": "mono", >>> + ((".guix.: .mono.,") >>> + "")))) >>> (add-after 'build 'build-man-page >>> (lambda* (#:key (make-flags '()) #:allow-other-keys) >> >> There are no #:make-flags argument for the python or pyproject build >> systems, so that's useless. > > I would welcome a fix for that... I could not figure out how to make it > build successfully without it, but that does not say a whole lot. :) I addressed it in a subsequent commit ("gnu: diffoscope: Simplify the build-man-page phase."). -- Thanks, Maxim