From patchwork Fri Apr 9 09:05:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 28422 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 D14B927BC6F; Fri, 9 Apr 2021 10:06:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0823F27BC6E for ; Fri, 9 Apr 2021 10:06:57 +0100 (BST) Received: from localhost ([::1]:42604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUn6O-00028g-8T for patchwork@mira.cbaines.net; Fri, 09 Apr 2021 05:06:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUn5W-0001hb-N3 for guix-patches@gnu.org; Fri, 09 Apr 2021 05:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUn5W-0000DP-Fg for guix-patches@gnu.org; Fri, 09 Apr 2021 05:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUn5W-0003oK-A8 for guix-patches@gnu.org; Fri, 09 Apr 2021 05:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47670] [PATCH 1/2] upstream: Add predicate for Git URLs. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Apr 2021 09:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47670@debbugs.gnu.org Received: via spool by 47670-submit@debbugs.gnu.org id=B47670.161795911214566 (code B ref 47670); Fri, 09 Apr 2021 09:06:02 +0000 Received: (at 47670) by debbugs.gnu.org; 9 Apr 2021 09:05:12 +0000 Received: from localhost ([127.0.0.1]:49070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUn4i-0003ms-IO for submit@debbugs.gnu.org; Fri, 09 Apr 2021 05:05:12 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:37382 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUn4g-0003mX-Ec for 47670@debbugs.gnu.org; Fri, 09 Apr 2021 05:05:11 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1617959104; bh=yk7J3hhjFTEnNotmuLNGq4iYXnfKKScjpIRuxhvMPYY=; h=From:To:Subject:In-Reply-To:References:Date; b=PawVXOqXSDD0oQZOF7UyvfbGmFu2lhbdRvE4OwvfUhEfZVW28ThQqQsAtftoDTM0K OcI+VbBHj2xK7xzLq3ZuQo2Uy/uLL30pye6ETOfPgqGlgEaUn7BJIa7NH4o+ALEDzq qh1LJMafquR4h5/mJKIBx+gp7EcZnGbOV78sLLqA= In-Reply-To: References: Message-Id: <834e423bf8682e98d55bddb8f7c9b50389f7326c.1617958554.git.public@yoctocell.xyz> Date: Fri, 09 Apr 2021 11:05:03 +0200 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/upstream.scm (git-url-predicate): New procedure. --- guix/upstream.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/guix/upstream.scm b/guix/upstream.scm index 632e9ebc4f..47d11043dd 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ #:use-module (guix discovery) #:use-module ((guix download) #:select (download-to-store url-fetch)) + #:use-module (guix git-download) #:use-module (guix gnupg) #:use-module (guix packages) #:use-module (guix diagnostics) @@ -54,6 +56,7 @@ url-predicate url-prefix-predicate + git-url-predicate coalesce-sources upstream-updater @@ -185,6 +188,23 @@ MATCHING-URL?." source URLs starts with PREFIX." (url-predicate (cut string-prefix? prefix <>))) +(define (git-url-predicate matching-url?) + "Return a predicate that returns true when passed a package whose source is +an with the GIT-FETCH method, and one of its URLs passes +MATCHING-URL?." + (lambda (package) + (match (package-source package) + ((? origin? origin) + (and (eq? (origin-method origin) git-fetch) + (match (origin-uri origin) + ((? git-reference? git-reference) + (matching-url? (git-reference-url git-reference))) + (((? git-reference? git-reference) ...) + (any matching-url? (git-reference-url git-reference))) + (_ + #f)))) + (_ #f)))) + (define (upstream-source-archive-types release) "Return the available types of archives for RELEASE---a list of strings such as \"gz\" or \"xz\"."