From patchwork Tue Dec 20 09:34:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45455 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 34D0727BBEB; Tue, 20 Dec 2022 10:08:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 276BB27BBE9 for ; Tue, 20 Dec 2022 10:08:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2s-00058O-1v; Tue, 20 Dec 2022 04:36:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7Z2Y-0004us-W5 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7Z2X-00038n-Tv for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z2X-0003Tw-N2 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 13/18] import: kde: Allow updating to a specific version. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Dec 2022 09:36:01 +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 moreinfo To: 57460@debbugs.gnu.org Received: via spool by 57460-submit@debbugs.gnu.org id=B57460.167152891513308 (code B ref 57460); Tue, 20 Dec 2022 09:36:01 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:35:15 +0000 Received: from localhost ([127.0.0.1]:43771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1m-0003Sa-Ev for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:14 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:55173) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1b-0003Ph-IK for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:04 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MCbZL-1oz4iI3t5f-009eLV for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:57 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 2EB95669AA; Tue, 20 Dec 2022 10:34:24 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:18 +0100 Message-Id: <18bade2491a673e87847d531c66119fc1478dd4d.1671527962.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.6 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:2qCal+xhLp59t8yhLlQnOTDDMYaxdyhM+Bd64eF7LW8v24Z2E76 zcvVP8YZDWXMgg/hHUdLS8tjnEeSjb8BxcPLt06vnwq7u+0XbPW3oz7ak0OlQM37j0Z86KV Dr/vn7QPj4uU+5ucJRErz/dOwfiHYkc69Po6kkVaeRdT3oGyr6fxJ4qf4/79UNUWXAFAiL0 ZkTpZnzGO+vEateciXsrw== UI-OutboundReport: notjunk:1;M01:P0:v/hyhiAv5s0=;zBqmOg1yPD/3vs/54q5MQeRJCeQ wpGvnVxRMtToenMusFmA/FUV6fvu+UBwV+wwKiLcAhLN9bmBdM0RaCDIKX9veMhs81I522bgv v+7MScg06fynZGUOTjX/Mb6dq7FIxUFeZA9nBRnQZQjBLzOyK2kOipjUdaD8EXfu4bJpab+Oy /CDQ/rUrquWfhFn+f5NGD7LZXkWqgiJItKoaSIYCNIJ850OBCqbeUwjXKapnL/44rmFQfzNtr 8713R3WntIc2kT/g8ru2D0yEbPnbAXJZZbLrz5hbIbCtu1rdSyQt2IxunerXKrpPCk8nGiYB1 /HEdpa4Gt5hIKP1hje7PNuCmEnGhmQjrk/EjCJnBm1Rf9muqK0H0xrvaniH2iTAu+98obOl2e n2XoJu4iUUrR60xfu6Rr5Ipxgnb2Sz7oayPAh6KMfr/qy8YijbPKDV3+Bu7plYJQZpWzOqkYH Zz5PW9BLC9Lq/R+gB/o+6KFzZYHJ0bkMD6a225OeFsvC1x8dw4oEiRq0SPqePsnr70hu9C/Ig SfuIYYjCZ6z2H4ZmzY13l+wSgKR9x65rBPtGc2rnfcEAJRKwDL9dlPAgjD1Vw0JCFt86UKfnC ACEin2+s7rEMeIHvjuR9AzG60aLKBaj8CjjU3Mmbli30SRsYXO4tqETS7unDBZhj3JmPVDCr4 Oa4RkWLXjM3tzyYE1Wa0L2KFUptLE6ptP2eYESKYWA== 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/kde.scm (latest-kde-release): Rename to 'import-kde-release', add #:version argument. Rework the code to not sort the relevant files, but just find the requested or latest version. [find-latest-archive-version]: New function. --- guix/import/kde.scm | 61 ++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/guix/import/kde.scm b/guix/import/kde.scm index 510d823a4f..3566312eca 100644 --- a/guix/import/kde.scm +++ b/guix/import/kde.scm @@ -28,6 +28,7 @@ #:use-module (ice-9 match) #:use-module (ice-9 rdelim) #:use-module (ice-9 regex) + #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (web uri) @@ -149,42 +150,52 @@ Output: (string-join (map version->pattern directory-parts) "/") "/")))) -(define (latest-kde-release package) +(define* (import-kde-release package #:key (version #f)) "Return the latest release of PACKAGE, a KDE package, or #f if it could -not be determined." +not be determined. Optionally include a VERSION string to fetch a specific +version." + + (define (find-latest-archive-version archives) + (fold (lambda (file1 file2) + (if (and file2 + (version>? (tarball-sans-extension (basename file2)) + (tarball-sans-extension (basename file1)))) + file2 + file1)) + #f + archives)) + (let* ((uri (string->uri (origin-uri (package-source package)))) (path-rx (uri->kde-path-pattern uri)) (name (package-upstream-name package)) (files (download.kde.org-files)) + ;; select archives for this package (relevant (filter (lambda (file) (and (regexp-exec path-rx file) (release-file? name (basename file)))) - files))) - (match (sort relevant (lambda (file1 file2) - (version>? (tarball-sans-extension - (basename file1)) - (tarball-sans-extension - (basename file2))))) - ((and tarballs (reference _ ...)) - (let* ((version (tarball->version reference)) - (tarballs (filter (lambda (file) - (string=? (tarball-sans-extension - (basename file)) - (tarball-sans-extension - (basename reference)))) - tarballs))) - (upstream-source - (package name) - (version version) - (urls (map (lambda (file) - (string-append "mirror://kde/" file)) - tarballs))))) - (() - #f)))) + files)) + ;; Find latest version. + (version (or version + (and (not (null? relevant)) + (tarball->version (find-latest-archive-version relevant))))) + ;; Find archives matching this version. + (tarballs (filter (lambda (file) + (string=? version (tarball->version file))) + relevant))) + (match tarballs + (() #f) + (_ + (upstream-source + (package name) + (version version) + (urls (map (lambda (file) + (string-append "mirror://kde/" file)) + tarballs))))))) + (define %kde-updater (upstream-updater (name 'kde) (description "Updater for KDE packages") (pred (url-prefix-predicate "mirror://kde/")) - (import latest-kde-release))) + (import import-kde-release)))