From patchwork Tue Jan 9 13:07:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58696 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 B3D2927BBE9; Tue, 9 Jan 2024 13:09:20 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 6A0E827BBE2 for ; Tue, 9 Jan 2024 13:09:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNBqr-0006Oa-6U; Tue, 09 Jan 2024 08:09:05 -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 1rNBqn-0006O2-1P for guix-patches@gnu.org; Tue, 09 Jan 2024 08:09:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNBqi-0003z3-01 for guix-patches@gnu.org; Tue, 09 Jan 2024 08:08:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNBqo-0003JW-Md; Tue, 09 Jan 2024 08:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68346] [PATCH 1/2] import: crate: Update to latest semver version. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Tue, 09 Jan 2024 13:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68346 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68346@debbugs.gnu.org Cc: David Elsing , Jaeme Sifat , Efraim Flashner , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 68346-submit@debbugs.gnu.org id=B68346.170480568512655 (code B ref 68346); Tue, 09 Jan 2024 13:09:02 +0000 Received: (at 68346) by debbugs.gnu.org; 9 Jan 2024 13:08:05 +0000 Received: from localhost ([127.0.0.1]:38664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNBpt-0003I2-8r for submit@debbugs.gnu.org; Tue, 09 Jan 2024 08:08:05 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:51677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNBpr-0003HI-65 for 68346@debbugs.gnu.org; Tue, 09 Jan 2024 08:08:04 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40e461c1f44so23066625e9.3 for <68346@debbugs.gnu.org>; Tue, 09 Jan 2024 05:07:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704805670; x=1705410470; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=dGdCCmKnAbyuiop/5p13zS4pouvBWcBYvN3OcEkbuFc=; b=N3+4S8Om+6LHE79H3h2IAdc3R8KXTfW6W3m3SQW9sZrA39N0mBinIF3bAxfKtFNnpq 9c+o6A+rTqVAwQTCsVI6NMuVQvrM4TgPoS/Ez0UlphbU4xA+Z0iHAD+HVQY6A91FgKGR VbxXl2iwpJvp3Cs6wKV/jOiJSU0DoOvfvC0okLTWipqyxJBUVqZBsKl62dqYMkFEXjss bgfSZbUoFmQ8L79zVifJAzHS//rBItUcWGijxfd+J34kkfzoxssjZ2w18dhJvLfwgz13 ByNWM4KEPFbWRtOlxCXMv53STlEZwb+Gg8Z1sli1x9KqU7d/kUJMdbLIWoWDX9xFqYEs LtSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704805670; x=1705410470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=dGdCCmKnAbyuiop/5p13zS4pouvBWcBYvN3OcEkbuFc=; b=JHrW8RkHXNRepc6a6DnkJFLX/JViuXRv78+1PSoc97FnBd/pSgVOhi8mZeoN6pgIis WNA62XEGSualZmRLfCC3Ke6U/mNI/hBeVXU4ftGyVkr3pmJETvtDCExIcfiSkNva54s4 VLDQWzRk1R90z3ct3Ie47ce2cfz7JtA0U4vVG0ADFO0gXPRcTEsBBFrml6w1rd1h4RnD /Fbi+SZz7C9hZ+xrlssjBPhl79W5ed0cnrIgE5WsAJ3FSR8X3vgLizYS0mfTCjLdqigS o/Qd6MGmRt3zpRx9igNcJe/kvlyUgJ/B3DVdJxK021zIpipeNKDFRUJwWVRm9ixt/KOU rhCA== X-Gm-Message-State: AOJu0YwAtHLMQEOnIEdLDmtVs4/o+f1KCAmYrso8qKJxasNo+lRLXa/x SjlugTZFRNI5yYoFzrjMTaqAM8HTJoLsYQ== X-Google-Smtp-Source: AGHT+IFJp0GF1wf1O6WvcNuFIYz++ItyezYOL/XFtVeM8GcSDSskG2Fm4zFiyXabFmL4CF4zVkzbTg== X-Received: by 2002:a5d:678c:0:b0:336:5f5b:f0bb with SMTP id v12-20020a5d678c000000b003365f5bf0bbmr544861wru.69.1704805670174; Tue, 09 Jan 2024 05:07:50 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id f16-20020adff450000000b0033664ffaf5dsm2373773wrp.37.2024.01.09.05.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 05:07:49 -0800 (PST) From: Efraim Flashner Date: Tue, 9 Jan 2024 15:07:36 +0200 Message-ID: <95ec7b98522617a6e033bfba98384b88c5535264.1704805408.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/crate.scm (max-crate-version-of-semver, nonyanked-crate-versions): New procedures. (import-release)[version]: Update to the requested version or the newest semver-compatible version. Change-Id: I72b081147c4eb9faf482f159b7145aaaf9f91f29 --- guix/import/crate.scm | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index c57bd0bc6a..43f80f3fb7 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2021 Nicolas Goaziou ;;; Copyright © 2022 Hartmut Goebel ;;; Copyright © 2023 Simon Tournier -;;; Copyright © 2023 Efraim Flashner +;;; Copyright © 2023, 2024 Efraim Flashner ;;; Copyright © 2023 David Elsing ;;; ;;; This file is part of GNU Guix. @@ -233,6 +233,27 @@ (define (string->license string) 'unknown-license!))) (string-split string (string->char-set " /")))) +(define (max-crate-version-of-semver semver-range range) + "Returns a of the highest version within the semver range." + (let ((matching-crates + (sort + (filter (lambda (entry) + (semver-range-contains? + semver-range + (string->semver (crate-version-number entry)))) + range) + (lambda (entry1 entry2) + (version>? (crate-version-number entry1) + (crate-version-number entry2)))))) + (and (not (null-list? matching-crates)) + (first matching-crates)))) + +(define (nonyanked-crate-versions crate) + "Returns a list of s which are not yanked by upstream." + (filter (lambda (entry) + (not (crate-version-yanked? entry))) + (crate-versions crate))) + (define* (crate->guix-package crate-name #:key version include-dev-deps? allow-yanked? #:allow-other-keys) @@ -427,6 +448,7 @@ (define (guix-package->crate-name package) (define (crate-name->package-name name) (guix-name "rust-" name)) + ;;; ;;; Updater @@ -440,7 +462,12 @@ (define* (import-release package #:key (version #f)) include a VERSION string to fetch a specific version." (let* ((crate-name (guix-package->crate-name package)) (crate (lookup-crate crate-name)) - (version (or version (crate-latest-version crate))) + (version (or version + (crate-version-number + (max-crate-version-of-semver + (string->semver-range + (string-append "^" (package-version package))) + (nonyanked-crate-versions crate))))) (url (crate-uri crate-name version))) (upstream-source (package (package-name package)) From patchwork Tue Jan 9 13:07:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 58697 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 A90BE27BBEA; Tue, 9 Jan 2024 13:09:27 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham 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 6B3BD27BBE2 for ; Tue, 9 Jan 2024 13:09:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNBqt-0006Ot-BB; Tue, 09 Jan 2024 08:09:07 -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 1rNBqn-0006O3-4Q for guix-patches@gnu.org; Tue, 09 Jan 2024 08:09:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNBqi-0003z4-D8 for guix-patches@gnu.org; Tue, 09 Jan 2024 08:08:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNBqp-0003Je-5V; Tue, 09 Jan 2024 08:09:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68346] [PATCH 2/2] import: crate: Simplify find-crate-version. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Tue, 09 Jan 2024 13:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68346 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68346@debbugs.gnu.org Cc: David Elsing , Jaeme Sifat , Efraim Flashner , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 68346-submit@debbugs.gnu.org id=B68346.170480568712664 (code B ref 68346); Tue, 09 Jan 2024 13:09:03 +0000 Received: (at 68346) by debbugs.gnu.org; 9 Jan 2024 13:08:07 +0000 Received: from localhost ([127.0.0.1]:38666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNBpu-0003IA-OT for submit@debbugs.gnu.org; Tue, 09 Jan 2024 08:08:07 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:52342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNBps-0003HK-M4 for 68346@debbugs.gnu.org; Tue, 09 Jan 2024 08:08:05 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3374eb61cbcso2811908f8f.0 for <68346@debbugs.gnu.org>; Tue, 09 Jan 2024 05:07:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704805672; x=1705410472; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=g/W8nYDqFh679RVf0hdtXSW/H8wqarwhROdcPD8bo78=; b=kcKKQxEGsP/fKW1vpyygf7ARv73DVYFPWcACBgBnL1ltCZatgoLvxo/yniAoHVlwJQ WFBmmKjeyCGcyf3Ja99W4rARcdV9ygWZW1m5odTkDf42MLGDAn1SCrGA1QmkVi2bSKhZ dkUqFXUoauTOTpcKKaTgacsMXB1Fgq5xBx4AE+SfhleKUnhhdsDCQ5A9B801iRhOy5Uu tbWPIt0F3CKDRTo1miCbAOWLNhOIfaCNa/DISeI6fRWp+HBK3qPJ0qkGwzTCTtDQTlI/ cPr2CLTV6V87GZ21gsFuEVo5hVwrkDARQkmvdM/aqsPSGghohqnafEDQNiOF1sm0Ionh Y8CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704805672; x=1705410472; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=g/W8nYDqFh679RVf0hdtXSW/H8wqarwhROdcPD8bo78=; b=mD3epZzxlyZoYXV5d37vdvpZfYhkHPv/m5WkXABLpTE9OEDeJQ/gCtwmN1H/nDYqOn VsCW2yXw+maE+rxK7e1/HIglHjE1smf8+U0q3OkzujZQBLmBRpR6jA8WkC+fdICL2dUM i1ZNhJwU5j0kHtp1rFerGkq3LhilE82h5o08TN2SNzIz7UI9dSyp29oZh29TR9IChVwL 7ovp6GKi8W+ik1AaXam38u7IJri4BndK1q53TXu4o9i4RD42zAnqZx1A2XnwhjqO56S7 hKm4Gjj54ChjOv7i64+tOWOxtZi9Xnhmue3UaAD5Njno1YKjYKmKwuJBwJ8rdsPbNi9V 8flA== X-Gm-Message-State: AOJu0Yx1qQefXoVyefkrLnsgsRgh00mi17AonQ7gAvJlwh9S/jtjg/YD 20dQtcNzdobfgouFD199Wf7vMOk98lIFLw== X-Google-Smtp-Source: AGHT+IFmzjk6JijvfxzBPAuYMMOuz30Dtqe33fLNB+/dxmVFJeQgXdYsWfJjczjxvMMbnBOXv+Rtzw== X-Received: by 2002:adf:e7c6:0:b0:336:81b:7b3e with SMTP id e6-20020adfe7c6000000b00336081b7b3emr675638wrn.84.1704805672077; Tue, 09 Jan 2024 05:07:52 -0800 (PST) Received: from localhost ([141.226.15.142]) by smtp.gmail.com with ESMTPSA id g8-20020a5d46c8000000b003372befd19bsm2369934wrs.104.2024.01.09.05.07.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 05:07:51 -0800 (PST) From: Efraim Flashner Date: Tue, 9 Jan 2024 15:07:37 +0200 Message-ID: <3caa53187f36dbc95f7b9ef982632cc284981e28.1704805408.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/crate.scm (find-crate-version): Reuse nonyanked-crate-versions, max-crate-version-of-semver. Change-Id: I976a3b5a397f0d6a7d723804a98356544bfc7da3 --- guix/import/crate.scm | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 43f80f3fb7..ba2bc1573e 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -310,26 +310,14 @@ (define* (crate->guix-package ;; If no matching non-yanked version has been found and allow-yanked? is #t, ;; also consider yanked packages. (define (find-crate-version crate range) - (let* ((semver-range (string->semver-range range)) - (versions - (sort - (filter (lambda (entry) - (and - (or allow-yanked? - (not (crate-version-yanked? (second entry)))) - (semver-range-contains? semver-range (first entry)))) - (map (lambda (ver) - (list (string->semver (crate-version-number ver)) - ver)) - (crate-versions crate))) - (match-lambda* (((semver ver) ...) - (match-let (((yanked1 yanked2) - (map crate-version-yanked? ver))) - (or (and yanked1 (not yanked2)) - (and (eq? yanked1 yanked2) - (apply semversemver-range range)) + (versions (nonyanked-crate-versions crate))) + (or (and (not (null-list? versions)) + (max-crate-version-of-semver semver-range versions)) + (and allow-yanked? + (not (null-list? (crate-versions crate))) + (max-crate-version-of-semver semver-range + (crate-versions crate)))))) ;; If no non-yanked existing package version was found, check the upstream ;; versions. If a non-yanked upsteam version exists, use it instead,