From 742554f9b973610a54ada9dee2971939cc36ddd7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 15:15:46 +0300 Subject: guix: import: Don't import yanked rust crates. * guix/import/crate.scm (): Add yanked? field. (crate->guix-package)[find-crate-version]: Remove versions which have been yanked. * tests/crate.scm: Adjust tests for new yanked? field. --- guix/import/crate.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'guix/import/crate.scm') diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 6e10ebb5d4..43823d006e 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Nicolas Goaziou ;;; Copyright © 2022 Hartmut Goebel ;;; Copyright © 2023 Simon Tournier +;;; Copyright © 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,6 +83,7 @@ (match-lambda ('null #f) ((? string? str) str))) + (yanked? crate-version-yanked? "yanked") ;boolean (links crate-version-links)) ;alist ;; Crate dependency. Each dependency (each edge in the graph) is annotated as @@ -255,13 +257,16 @@ look up the development dependencs for the given crate." (and (not (null-list? versions)) (semver->string (last versions))))) - ;; find the highest version of a crate that fulfills the semver + ;; Find the highest version of a crate that fulfills the semver + ;; and hasn't been yanked. (define (find-crate-version crate range) (let* ((semver-range (string->semver-range range)) (versions (sort (filter (lambda (entry) - (semver-range-contains? semver-range (first entry))) + (and + (not (crate-version-yanked? (second entry))) + (semver-range-contains? semver-range (first entry)))) (map (lambda (ver) (list (string->semver (crate-version-number ver)) ver)) -- cgit v1.2.3