From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id QHQvHCVZ9mZOrQAAqHPOHw:P1 (envelope-from ) for ; Fri, 27 Sep 2024 07:05:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id QHQvHCVZ9mZOrQAAqHPOHw (envelope-from ) for ; Fri, 27 Sep 2024 09:05:09 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=lzxMdaO1; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=PmmlUW2j; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727420709; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=cCt0Wj3brPoqE7CYsmOmiS4MomSHtahp4yDE3AA/eso=; b=uplB976OfJUtK6ySHrvKAdpj8s6B/Zieu8JVuQmaja+WJsu+22bAvXHjjVBhU0+5UV4imz 4bY9dvXZtGz1frAKx/suRNtrt9NMum6AVmUrnGIh0zq0NXcF/QgsVNlNfidcuzjlcvaY/a Bso1e5mXEdabNWFGGSWlu87ekWOjeXqroWVwo2fB3XZ5aRAE6ccdjx9z3r9DrGFTGF6kf+ k9R2UoiNOI2WtlzfihOAoATDOcJ8eRcNomIy0qJ8wbJB1NpRUIBg4JChf6zLy/FKhChLYS kU7av72YExmnmTuLWg3bGtp2d+XxnUgivbpiJZgvp47lZ9GS2sNV02agK9WZMg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727420709; a=rsa-sha256; cv=none; b=qMqsBtV3kpaTLEnhLezFX15edaywni4xC/pmRaMu+RsVoysclFLRJatAO1CN/aX0RHvv4u 0ZMso/QzDTJT3b7mhdoQlN4pgQVwhlcaPWCxwbC8QGzDSYBl9nv2JQpKgK6yvWgf2tUXYe XI079weXGm3ljN/NfDjeTqmMb7xqPFOZZ74ERecwK5dTR2C+sZzBWnaT4ykQn/TutS7yK5 L9Fx3pS/54lT53XIpB6dINvIScFfbnyvaFdChLsAudkNmN6J5rCQIpHcC7+Dy0CcyZWh5N ajmYJzHCdN4BU3r/mbqaah+hZyrHaNDhLzREa668BWVFmIbA/eBiAUPAalDfww== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=lzxMdaO1; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=PmmlUW2j; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" 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 3B499941C8 for ; Fri, 27 Sep 2024 09:05:09 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1su51t-0004jy-Gw; Fri, 27 Sep 2024 03:04:41 -0400 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 1su51s-0004jk-4r for bug-guix@gnu.org; Fri, 27 Sep 2024 03:04:40 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1su51q-0000uf-PC; Fri, 27 Sep 2024 03:04:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=cCt0Wj3brPoqE7CYsmOmiS4MomSHtahp4yDE3AA/eso=; b=lzxMdaO1Mup7InVFBfjnNwBhn5/vSN46ykIatz9qLA5vR703D3sBpSln2yb3Elu2ARNY9ASvUFxylSqS4Sbb1M6TkyRko5S+4U5zjZKPnd/a23/sKxcR4MJJV6QDNVaxaRZJg90l5GOXqhZ/sTI1F9AI4PrvM+38/OyrJ86opME9PFaOK9rM+2FutgjpCiAGhORa/5KhDMjS+dYASfzHR9NcpPOqISL5CiYBtORaRLzsEP+LKb5Td3dJX3wjDMe0rdSK0UjzN5ea10CuZJJeItHNn08PuYM4JRmzYWK9zFevcbUVAmHz3iCONva5AqQ+QFHL+Yey6WnOVBKNXAlJgA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1su52E-0002dn-Lv; Fri, 27 Sep 2024 03:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#73508: [PATCH] upstream: Try the generic importers last. References: <878qvdegl1.fsf@gmail.com> In-Reply-To: <878qvdegl1.fsf@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, bug-guix@gnu.org Resent-Date: Fri, 27 Sep 2024 07:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73508 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 73508@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Maxim Cournoyer , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 73508-submit@debbugs.gnu.org id=B73508.172742065510079 (code B ref 73508); Fri, 27 Sep 2024 07:05:02 +0000 Received: (at 73508) by debbugs.gnu.org; 27 Sep 2024 07:04:15 +0000 Received: from localhost ([127.0.0.1]:45356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1su51T-0002cV-EL for submit@debbugs.gnu.org; Fri, 27 Sep 2024 03:04:15 -0400 Received: from mail-pj1-f47.google.com ([209.85.216.47]:57443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1su51R-0002cB-9o for 73508@debbugs.gnu.org; Fri, 27 Sep 2024 03:04:14 -0400 Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2e06acff261so1362197a91.2 for <73508@debbugs.gnu.org>; Fri, 27 Sep 2024 00:03:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727420558; x=1728025358; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cCt0Wj3brPoqE7CYsmOmiS4MomSHtahp4yDE3AA/eso=; b=PmmlUW2jouyh+I7S/O74d6raRpzuJQgn75dcLSSqfEy4l1UBwI4Tua1ImKlonugave FI7FfCXRwCdmDTTPe2vO2NGlVW/AotWwt3hTEc0k2DBPxuDJt9rBhCnhfwdEMswK+rqD 5sIOvAYHvaxEIf8M3HT6pXrCBQD8obruIajoYHXZgQ3aO8cAEMYMw6m8FRloPN5nN+Ta clOKVwnJ7UzGZWI3qGnCyqPEwyJw6wxU4hHGO2lMT1mqbOvvD1x+Yoa1ZI5i/DXjoHEC N/Pxw+t556OaWHtd6X6p0gTZ5bEMFJW+I2K+/T6PCLroMZFWKwO27HX1e+sp4AhdXNdY mBxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727420558; x=1728025358; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cCt0Wj3brPoqE7CYsmOmiS4MomSHtahp4yDE3AA/eso=; b=Q278M+yTlckzqusk7jBZDkRuVhP9/kt3H1IZiLkMmpfh5b3+8KlZ8VTwtmyDWG9E0w Uc5tjZ/9tDzxyBi0MFQ9+EvyFMJ69NrCej8wxsEKRyOqlqWWAd63rit9NlstksCL9fKz Hbx5YqxHXdpcRLtB6vCHXqpEnsUBSQe74JfxVm9tNhM+qUAfcgZiorlv+/7WyOBB3oIe fjHysz9FwGrS4G8Q/tZkA+XcvarzAKGH22DQskx4vXVm3O5CljaflMP8+1jGlBhjA6nW LVW8eHRDCLuOrq0MugZUztLnvKwzId6UzkQHiAG4XLbbBsxBXuElcls/q6jxqnODzety fyEw== X-Gm-Message-State: AOJu0YxmXJFh44vaFzzRnp9CSPreWSmMpmpdXNk4GoTywr/SotxhhmyE iAjnN4Mp2ee6biTKPMH+cNbP2lYM+GylLgoQw8FxNeeGZD6BrU2gez7AYo+v X-Google-Smtp-Source: AGHT+IEWafuTUSRho0RcbNMr6svhp12ea4HY55zvNr93gpXEWesvdsNBYN8zce1DgrdVGrjEg55omw== X-Received: by 2002:a17:90a:a40c:b0:2e0:8733:6c78 with SMTP id 98e67ed59e1d1-2e0b8a1b6ffmr2645914a91.15.1727420557846; Fri, 27 Sep 2024 00:02:37 -0700 (PDT) Received: from hurd.lan ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e0b6c6cbc8sm1220745a91.13.2024.09.27.00.02.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2024 00:02:37 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 27 Sep 2024 16:02:22 +0900 Message-ID: <6f3b073a68e5dc8f93c54b4427cfd555aee0e9f0.1727420518.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 3B499941C8 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -2.07 X-Migadu-Spam-Score: -2.07 X-TUID: Rywk2fKtWFxV * guix/upstream.scm (%updaters): Ensure the updaters with a name starting by 'generic' appear last in the list. Fixes: https://issues.guix.gnu.org/ Change-Id: I98977f6c925c14303273755b5b4dc36035f78bda --- guix/upstream.scm | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/guix/upstream.scm b/guix/upstream.scm index 753916be64..0593c363aa 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -48,6 +48,7 @@ (define-module (guix upstream) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module (srfi srfi-71) #:use-module (rnrs bytevectors) #:use-module (ice-9 match) #:use-module (ice-9 regex) @@ -226,15 +227,26 @@ (define (importer-modules) (define %updaters ;; The list of publically-known updaters, alphabetically sorted. (delay - (sort (fold-module-public-variables (lambda (obj result) - (if (upstream-updater? obj) - (cons obj result) - result)) - '() - (importer-modules)) - (lambda (updater1 updater2) - (stringstring (upstream-updater-name updater1)) - (symbol->string (upstream-updater-name updater2))))))) + (let* ((updaters + (sort (fold-module-public-variables + (lambda (obj result) + (if (upstream-updater? obj) + (cons obj result) + result)) + '() + (importer-modules)) + (lambda (updater1 updater2) + (stringstring (upstream-updater-name updater1)) + (symbol->string (upstream-updater-name updater2)))))) + (generic-updaters rest (partition + (compose (cut string-prefix? "generic" <>) + symbol->string + upstream-updater-name) + updaters))) + ;; Ensure the generic updaters are tried last, as otherwise they could + ;; return less accurate results. + (append rest generic-updaters)))) ;; Tests need to mock this variable so mark it as "non-declarative". (set! %updaters %updaters) base-commit: a4ea332bc219e14560d3a5daaa658425d898ec37 -- 2.46.0