From patchwork Thu Sep 1 09:01:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 42109 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 5CD4B27BBEA; Thu, 1 Sep 2022 10:50:22 +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 1967727BBE9 for ; Thu, 1 Sep 2022 10:50:22 +0100 (BST) Received: from localhost ([::1]:37390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTgq4-0003H6-Tm for patchwork@mira.cbaines.net; Thu, 01 Sep 2022 05:50:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTg6L-0004Em-NO for guix-patches@gnu.org; Thu, 01 Sep 2022 05:03:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51461) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oTg6L-0005em-DT for guix-patches@gnu.org; Thu, 01 Sep 2022 05:03:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oTg6K-0008Qf-8M for guix-patches@gnu.org; Thu, 01 Sep 2022 05:03:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57515] [PATCH 8/8] gnu-maintenance: Remove unused procedures. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Sep 2022 09:03:04 +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.166202292532268 (code B ref 57515); Thu, 01 Sep 2022 09:03:04 +0000 Received: (at 57515) by debbugs.gnu.org; 1 Sep 2022 09:02:05 +0000 Received: from localhost ([127.0.0.1]:41200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTg5N-0008OJ-Bn for submit@debbugs.gnu.org; Thu, 01 Sep 2022 05:02:05 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:48570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTg5H-0008MM-1V 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 EZ1v2800K20ykKC06Z1ypo; Thu, 01 Sep 2022 11:01:58 +0200 From: Maxime Devos Date: Thu, 1 Sep 2022 11:01:55 +0200 Message-Id: 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=Xh2MF+WpZdM5OexEnj8iytn8oG05m5B11sJLCDYTDq8=; h=From:To:Subject:Date:In-Reply-To:References:Reply-To; b=cPAGP8YD+gmKcTLkzc27oUCfR3MQ4/up98ElSZ1FHNLMSZLpC1DkzlKJlUtD9WWhM yYOA54t9F3TR6E0dPLAF7WF6AP+e4IcQWtyQl2b5E9G6heqZJiNpM1psPgmJ1G5+5z 2oHtAEXhbbW24yI7nnqZMep3y1tfFmY8ifnVtytxh7+JlrAQYKC2948K/v4LUOjtLN D8Rj4jbj9UAv11x8FgHxOAMkffauPQgL4UMzOrK98Vu5/kMyklqJgoQTtvQQdd9rG0 MZzKHCydv5EdYS05cIm9G6kMTPZxSlgTIuIZUXLtp8rr3jKYt1zWtMApH/iWLgypct R1GzmalJELavQ== 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 * guix/gnu-maintenance.scm (url-prefix-rewrite, adjusted-upstream-source): Remove. --- guix/gnu-maintenance.scm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 7cb830b849..2e8b08caa3 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -654,13 +654,6 @@ (define (pure-gnu-package? package) (define gnu-hosted? (url-prefix-predicate "mirror://gnu/")) -(define (url-prefix-rewrite old new) - "Return a one-argument procedure that rewrites URL prefix OLD to NEW." - (lambda (url) - (if (and url (string-prefix? old url)) - (string-append new (string-drop url (string-length old))) - url))) - (define (uri-mirror-rewrite uri) "Rewrite URI to a mirror:// URI if possible. When not, return URI unmodified." (if (string-prefix? "mirror://" uri) @@ -679,15 +672,6 @@ (define (uri-mirror-rewrite uri) mirror-id (string-drop uri (string-length prefix)))))))))) -(define (adjusted-upstream-source source rewrite-url) - "Rewrite URLs in SOURCE by apply REWRITE-URL to each of them." - (upstream-source - (inherit source) - (urls (map rewrite-url (upstream-source-urls source))) - (signature-urls (and=> (upstream-source-signature-urls source) - (lambda (urls) - (map rewrite-url urls)))))) - (define %savannah-base ;; One of the Savannah mirrors listed at ;; that serves valid