aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerman Rimm <herman@rimm.ee>2025-01-11 15:37:06 +0100
committerEfraim Flashner <efraim@flashner.co.il>2025-01-26 09:59:22 +0200
commit17477101dd138aa2b7d01f796b48d6452ab9a27c (patch)
treee61f5417064f049fc61824277de57b27f707c2c3
parent1b1b3040119e081065fc05dbf41b0a22538cdbed (diff)
downloadguix-17477101dd138aa2b7d01f796b48d6452ab9a27c.tar.gz
guix-17477101dd138aa2b7d01f796b48d6452ab9a27c.zip
import: crate: Fix find-package-version.
Fixes bug from 5ce1512b0f68cf39cb399623a14302f309c06129, where the earliest existing package (if any) was returned instead. See also: https://issues.guix.gnu.org/68346#3-lineno97 * guix/import/crate.scm (crate->guix-package)[find-package-version]: Invert boolean expression. Change-Id: I1d05f55a027241e7c5f62cc98a50a09b5639bdcf Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
-rw-r--r--guix/import/crate.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index b4806c8bb2..a7134b8572 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -335,9 +335,9 @@ look up the development dependencs for the given crate."
(find-packages-by-name
(crate-name->package-name name))))
(match-lambda* (((semver1 yanked1) (semver2 yanked2))
- (or (and yanked1 (not yanked2))
- (and (eq? yanked1 yanked2)
- (semver<? semver1 semver2))))))))
+ (and (or (not yanked1) yanked2)
+ (or (not (eq? yanked1 yanked2))
+ (semver>? semver1 semver2))))))))
(and (not (eq? #f version))
(match-let (((semver yanked) version))
(list (semver->string semver) yanked)))))