From patchwork Thu Sep 1 09:01:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 42113 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 7DF1D27BBEA; Thu, 1 Sep 2022 11:08:34 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, 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 279C627BBE9 for ; Thu, 1 Sep 2022 11:08:34 +0100 (BST) Received: from localhost ([::1]:59344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTh7h-000243-9O for patchwork@mira.cbaines.net; Thu, 01 Sep 2022 06:08:33 -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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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