From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uGjnCzIZcGCdQQAAgWs5BA (envelope-from ) for ; Fri, 09 Apr 2021 11:06:58 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id cCPaBTIZcGBuKwAAbx9fmQ (envelope-from ) for ; Fri, 09 Apr 2021 09:06:58 +0000 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 CB1772805B for ; Fri, 9 Apr 2021 11:06:57 +0200 (CEST) Received: from localhost ([::1]:42604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUn6O-00028g-OF for larch@yhetil.org; 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617959217; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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=d1mcFKxfQh5eL9nBBLnaALwu3WixB0Xn7aOr60QWUQk=; b=SOsdwoakyMRWmKB+YEzMGSpK+nYK2w2iBeT/Vavx0ByZiFDe94ngG/97dEynjIsrOG1htg B5Hbc3E4smlyyz4R9YzHVTpRFwNdh1OHfAHjn+kLQ/Mw7BSxwHS0db11QcQmGvBXFRTmwu ya3YWlgrKXYcFZXc4GKrtHgr5TnZN+kfXUP/vm5cAbYdqeOfZLL6/7smGDAmbpeHjdN9sB 9a518d6Vkl5+UPbaQS/m123tTzKRZtkZ45Yz1KZlFi/C0WWh0Adxz4BxW8KzAAVeM6Cuh8 oOCNb+/M5BxtRtzoww+kqjzTh2G23kdI//tfO4/hL1At+Vm1rAZfpPLN9Af0xg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617959217; a=rsa-sha256; cv=none; b=X/L1neTbLQLWdrj/a/DHyBjCp5WgWKw1QmT6RiicfNqBpfRvIDxFmzf57jIO+EXZxr4pTb j7uiiIxN0lzgz4tX+hB2uB3MCsJMJKJA0xSDdpDDlUuqmS7YmLIeCEzNMkv49g5YDhaoEj QOw8FLdWpnJ//xA3PhwY2BzosyRpgODiwQ3h6HRNLNHZpILkwPlbJ3QCbGsxEOYZemrTSo VTKYkGSh6SO7nmfAw5P7ddQ/HT/Rqe7LJ3/ls3DAHq59jEqnCHAPW5kVqv755xJsscfWsn MqP+hX+sKXegnWK7AOrno2PhnwFWiCD9OobW7gjQcOLM+vwVaCxTWruMU4ruMw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=PawVXOqX; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.34 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=PawVXOqX; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: CB1772805B X-Spam-Score: -0.34 X-Migadu-Scanner: scn0.migadu.com X-TUID: AXwGB8zWY25R * 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 =C2=A9 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,= 2019, 2020, 2021 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2015 Alex Kost ;;; Copyright =C2=A9 2019 Ricardo Wurmus +;;; Copyright =C2=A9 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 @@ =20 url-predicate url-prefix-predicate + git-url-predicate coalesce-sources =20 upstream-updater @@ -185,6 +188,23 @@ MATCHING-URL?." source URLs starts with PREFIX." (url-predicate (cut string-prefix? prefix <>))) =20 +(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\"." --=20 2.31.1