From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 qJklG7prC2OTOwAAbAwnHQ (envelope-from ) for ; Sun, 28 Aug 2022 15:20:58 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id AO3yGrprC2Py4wAAauVa8A (envelope-from ) for ; Sun, 28 Aug 2022 15:20:58 +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 F10583F0B1 for ; Sun, 28 Aug 2022 15:20:57 +0200 (CEST) Received: from localhost ([::1]:50166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oSIDh-0004ZM-3q for larch@yhetil.org; Sun, 28 Aug 2022 09:20:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oSICv-0002wf-4M for guix-patches@gnu.org; Sun, 28 Aug 2022 09:20:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39842) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oSICu-0002fr-QX for guix-patches@gnu.org; Sun, 28 Aug 2022 09:20:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oSICu-0006yy-Ma for guix-patches@gnu.org; Sun, 28 Aug 2022 09:20:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH 13/20] refresh: Allow updating to a specific version (launchpad) Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Aug 2022 13:20:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57460 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57460@debbugs.gnu.org Received: via spool by 57460-submit@debbugs.gnu.org id=B57460.166169278026672 (code B ref 57460); Sun, 28 Aug 2022 13:20:08 +0000 Received: (at 57460) by debbugs.gnu.org; 28 Aug 2022 13:19:40 +0000 Received: from localhost ([127.0.0.1]:57800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSICS-0006w2-0t for submit@debbugs.gnu.org; Sun, 28 Aug 2022 09:19:40 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:55779) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSICD-0006uV-4k for 57460@debbugs.gnu.org; Sun, 28 Aug 2022 09:19:25 -0400 Received: from hermia.goebel-consult.de ([46.87.137.46]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MBDva-1oZOwb2E4E-00Cf86 for <57460@debbugs.gnu.org>; Sun, 28 Aug 2022 15:19:19 +0200 Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 3300665A44; Sun, 28 Aug 2022 15:18:56 +0200 (CEST) From: Hartmut Goebel Date: Sun, 28 Aug 2022 15:18:39 +0200 Message-Id: X-Mailer: git-send-email 2.30.4 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:7uVrN269qPlYhoB5DRN6/lf4fPiM2x0jjUxhiaPg3y+7Uz6FQHX rS0z33+XcHJ8sbSd4D4BSzvfm1+796aVme74EQNJaU90psqQmT6N+2/8qtmzSX6qg2CBQcB FGV8G77/jJGLRJ2Hx5MS5aY/oiLvvo2Vp+xi/K116DRCs2vmyOxmXqklYXMiispIgtlg4a+ yBVlAl5xUcY4byaiETlag== X-UI-Out-Filterresults: notjunk:1;V03:K0:A6MP/1+1JXo=:bPOcaFlU/IF/PzmcYQGt7D fFnZSta+XO9j7aKcryxfp/nzO7eJqmWoyhR869GtU681uRQ1h0nd4zGHk9FzfhUnA8kN18UJv lsAKn1Y5O5/22lvT/dEjke99/iWFjSG2d1BgBgwju3XdbP//2X8dF1THeJlOvxUrofSdytsgt YDtVqXTowZr5smknf5HhAVahXE50h4wnvKxRcgAAJZPeQlnWghImDgjCjt00HHOHuNo6EnJYS Pxw4ouOJG834lAfbeSCp1RwSPR8U8uF/tICI4n7k+u8WbntEIqY31zrbZegbm52wGFDZ8Qlno k+HAkrIr/x4qiptRn6XUaiFJUHGtRu4OSIFR8PURJddn8OH2MVOYmDXNQMCyCncik6TK0/TBb 7lV2G52nwXUUDvftH8C1Ik1eA53YNqKWW6oHGk7NJKhYuRXOjic86Kq1/XNTK78H8ChlE0UWN 1Ge8XP1cBptA9tJmI0hpwjj+4uTAhrtlgfTDzkD1vCGXMdHm5tpisESnMWcoDRlHbxQu01LWo nZIdwhm1HsiOWo246FwbSqw3Is+8qhXWq3AvlaiSpZia3Z/U/jShogHYAfS9/mTbXLLHwv30h 3d+c8UjnLLS/EKGrjJrzr0RzWk3fp+9z4c6Au0Hzw2k/LGSOHZtk2h0aP1kdQyHXzgc0TERcv 7jfxi9oJlDwUW/hgI/zhsC2NMK3T51n/tbGUgNQRxH+aBZ40mHhX7AdrT6qcZEDveeMbbWnjA tCU7N8K5bNGS0OTRyzSAwbwaT5Qfz4j27Hz135j667T/V+2qQVYPjf7K4IY= 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 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=1661692858; 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; bh=2+tGHza+cgaztVZ4CWrTyGxk8snw0uCSyJ85qm/wp+4=; b=WEOHPpWx96D9zLI/PpciMDZJEWAxwf5k/T914Dq2IcNWGFLmt+B8bFMxAVRxcW0jqqRSq1 Uvw2MwzmmZlsvcFY/IQ964SW4gXeBDQhRh2n4CsS2MXeJJ4pN5yenDvl6nEA3sVumm20Pa RuckbEWXOYe5QVmSMWb229RVqHmRU+DYkAtfq1grm1U3oZ4FOL86EqRfOQbd3gY9iUV3Xg yOQNsE4bICa0hcaeH5TvMqm6nBrh8Xl2ZwawdAOl3WEIEfA+5YTKYLIFw1dacCwD/W7s6I NkV5u6VfxZqKYE1wwWS0i2AED/oxSbo9YoEc6xe78HUBBDXBZnGvMP+VMyif3w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1661692858; a=rsa-sha256; cv=none; b=IDMqljWBinJ1TNTjfrxyc6FgpQxpacwQwPMbcMC7sG3cDsqIKTdQzpuf4ubBxwlcSIqWot byGM75jNdRVxTj27YlVv74+jbqW/gdzIKRRG/qryuTm5JAVC6ezyZMm3IE+svH487s7izw WrVvnjc9WrqjqrnElPom7YmxIj66mDyQqxxrEhyjQcBq8p3LQg6rG7yx+juJ5PjlKnDYdP pMHK4zzl6y+PthSP/YbHZWTwbcOyLPHjBu39FeVrpWyIpKxS22s+lcvIxOY5BaMfLu6VZ4 A9GfLWCL8CWbNNz7v1aR3CLkIfxJwsFjhTkZ1CEytaM1fRXpRaP+G2P0ovTxuA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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: -0.30 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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: F10583F0B1 X-Spam-Score: -0.30 X-Migadu-Scanner: scn1.migadu.com X-TUID: t9vP0vGxA+ZU * guix/import/launchpad.scm(latest-release): Rename to (import-release), add keyword-argument 'version'. If version is given, return an upstream-source for this version. --- guix/import/launchpad.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/guix/import/launchpad.scm b/guix/import/launchpad.scm index b7e0295c4e..2112eefe1d 100644 --- a/guix/import/launchpad.scm +++ b/guix/import/launchpad.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019, 2020 Arun Isaac ;;; Copyright © 2021 Matthew James Kraai ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -121,7 +122,7 @@ for example, 'linuxdcpp'. Return #f if there is no releases." (last (remove pre-release? (vector->list (assoc-ref json "entries")))) "version")))) -(define (latest-release pkg) +(define* (import-release pkg #:key (version #f)) "Return an for the latest release of PKG." (define (origin-launchpad-uri origin) (match (origin-uri origin) @@ -132,7 +133,7 @@ for example, 'linuxdcpp'. Return #f if there is no releases." (let* ((source-uri (origin-launchpad-uri (package-source pkg))) (name (package-name pkg)) (repository (launchpad-repository source-uri)) - (newest-version (latest-released-version repository))) + (newest-version (or version (latest-released-version repository)))) (if newest-version (upstream-source (package name) @@ -145,4 +146,4 @@ for example, 'linuxdcpp'. Return #f if there is no releases." (name 'launchpad) (description "Updater for Launchpad packages") (pred launchpad-package?) - (import latest-release))) + (import import-release))) -- 2.30.4