From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id yC/xDIuEEGO0cgAAbAwnHQ (envelope-from ) for ; Thu, 01 Sep 2022 12:08:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id QFwQDYuEEGM/PQEA9RJhRA (envelope-from ) for ; Thu, 01 Sep 2022 12:08:11 +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 EAA713E6AA for ; Thu, 1 Sep 2022 12:08:10 +0200 (CEST) Received: from localhost ([::1]:59344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTh7K-000243-0O for larch@yhetil.org; Thu, 01 Sep 2022 06:08:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTg6K-0004Ao-1f for guix-patches@gnu.org; Thu, 01 Sep 2022 05:03:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51459) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oTg6J-0005eP-MW for guix-patches@gnu.org; Thu, 01 Sep 2022 05:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oTg6J-0008QR-HY for guix-patches@gnu.org; Thu, 01 Sep 2022 05:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57515] [PATCH 7/8] gnu-maintenance: Simplify latest-kernel.org-release. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Sep 2022 09:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57515 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57515@debbugs.gnu.org Received: via spool by 57515-submit@debbugs.gnu.org id=B57515.166202292432253 (code B ref 57515); Thu, 01 Sep 2022 09:03:03 +0000 Received: (at 57515) by debbugs.gnu.org; 1 Sep 2022 09:02:04 +0000 Received: from localhost ([127.0.0.1]:41196 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTg5M-0008O6-Hv for submit@debbugs.gnu.org; Thu, 01 Sep 2022 05:02:04 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:48542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTg5G-0008MK-Nw for 57515@debbugs.gnu.org; Thu, 01 Sep 2022 05:02:02 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by michel.telenet-ops.be with bizsmtp id EZ1v2800K20ykKC06Z1ypl; Thu, 01 Sep 2022 11:01:58 +0200 From: Maxime Devos Date: Thu, 1 Sep 2022 11:01:54 +0200 Message-Id: <257f93bd56925c02cd7b42ccda3607a048c38f61.1662022775.git.maximedevos@telenet.be> X-Mailer: git-send-email 2.37.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1662022918; bh=VzHBqdK/iz3zrJvWiF7iy38ySu/L4mhgy/lgdXM0JeM=; h=From:To:Subject:Date:In-Reply-To:References:Reply-To; b=hutIZBkL9dvgkUlwRAoTD5ceG/jxMM+wNTnAT5zXmkZK2tdZXPYLHDQs9ialQ6o0B L7Cw75kmng4vxDTsGdzZogucQaRR2hBrrQZMLYpfclS7N8ElqxTczapR7U/Qi98J2g xq5Iqle6XegfGaigTw9B0qee8j6RIsHzhftbdLNfVn6i9HX2J8oVyf4AQv2fHOlPE8 uM7AuhcOoROgoud9TaTHZ42Rp28OkihnUdpdZ5W3Uf5PeX/WTt3263U1kqW9AUNKJH ZB2rsF0t+4LWhRuaNEfCKR6zTaJ6Wuh1zNVKiilxxLNjJnBcAl4YW9JXwxAmTPCGkz 2SNif1pD4qbYw== 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: , Reply-To: 57515@debbugs.gnu.org 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=1662026891; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=VzHBqdK/iz3zrJvWiF7iy38ySu/L4mhgy/lgdXM0JeM=; b=RxJks/j7n/3COjZSx6b+BReNnR8HHDQL+zllbPX8fzL8p/AXHqX+qxE6zYm0xYmUhJ+tJ/ aFwnETXBERcGK0d50qSp6bsKjfJZiKoX54jrYOwf8qgKm35E5Zx49liqEGcCgOohuuD5u7 rAsENyNToyP6/KOjhsbbJ9o31FNn42L5vzatnLmzs5kibcYfi09xvTbtcRNtck/RjgLGYJ BvC/hqONqPhbIrKFLPyAsm5rhD0kkGxNbKreGTqwqWalQ9bsQAgeS2O6ee3EEXVIP56Ubb OXy4Tn2RiXLqgvFnNBdf1JAKX6IDJmRJWVjc6+6D3XClHrmYjo1oWTbZ6BEDZA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662026891; a=rsa-sha256; cv=none; b=rVP7vSQIEeOP3gzUn2bTYVI906KllxjdWNibvarUgXGjWsLB+8ZSVxFQClW2fOeRiruFf9 NKsnUoKPz551VNIcezQK6fe0MhUMJcuJi5tT/hUGcY2awzPft448EK0JfejvgEcwKstScc xAa2dXKlK3XwTNHyXxa24tO6izahtyeC7elTxq/i1driCbHDp65AHSNcsahIJmWQ5V/7hF vGpBaSVE/ooJQHQqIOFxw8mkSZ4gRxThLSSgd/qnM1odk+Kzeyc4Gw2FX9pabX9NtcHe2f sL0SJGoaoAM4FYzexT29FeQf2sMSnbXuAcVBPF43KOx4yBMP/xwV3goBkMdTxA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=hutIZBkL; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (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-Spam-Score: 7.72 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=hutIZBkL; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (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-Queue-Id: EAA713E6AA X-Spam-Score: 7.72 X-Migadu-Scanner: scn1.migadu.com X-TUID: Ug2PsjKu5ZSI As latest-html-release now produces mirror:// URIs where possible, the additional post-processing is not necessary anymore. As a test, revert the dtc package back to 1.6.0 and try updating 'gash', the mirror:// URI remains. * gnu-maintenance.scm (latest-kernel.org-release): Do not call adjusted-upstream-source on the result. --- guix/gnu-maintenance.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 853ad91ea0..7cb830b849 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -786,14 +786,11 @@ (define (file->signature file) ((? string? uri) uri) ((uri mirrors ...) uri)))) (package (package-upstream-name package)) - (directory (dirname (uri-path uri))) - (rewrite (url-prefix-rewrite %kernel.org-base - "mirror://kernel.org"))) - (and=> (latest-html-release package - #:base-url %kernel.org-base - #:directory directory - #:file->signature file->signature) - (cut adjusted-upstream-source <> rewrite)))) + (directory (dirname (uri-path uri)))) + (latest-html-release package + #:base-url %kernel.org-base + #:directory directory + #:file->signature file->signature))) (define html-updatable-package? ;; Return true if the given package may be handled by the generic HTML -- 2.37.2