diff --git a/etc/teams/rust/rust-manifest.scm b/etc/teams/rust/rust-manifest.scm index f34b7489ec..40f031f401 100644 --- a/etc/teams/rust/rust-manifest.scm +++ b/etc/teams/rust/rust-manifest.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2024 Efraim Flashner +;;; Copyright © 2024, 2026 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,8 +27,9 @@ (map package->manifest-entry (fold-packages (lambda (package lst) - (if (eq? (build-system-name (package-build-system package)) - (quote cargo)) - (cons package lst) - lst)) + (if (and (eq? (build-system-name (package-build-system package)) + (quote cargo)) + (supported-package? package)) + (cons package lst) + lst)) (list)))) diff --git a/etc/teams/rust/rusty-packages.scm b/etc/teams/rust/rusty-packages.scm index 3f8285f40a..4bef448a3c 100644 --- a/etc/teams/rust/rusty-packages.scm +++ b/etc/teams/rust/rusty-packages.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2024 Efraim Flashner +;;; Copyright © 2024, 2026 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,10 +17,9 @@ ;;; along with GNU Guix. If not, see . ;;; This file returns a manifest of packages built using the cargo-build-system -;;; which are NOT prefixed with 'rust-' and the packages which use rust itself -;;; as an input. This is a short list of packages which can be checked to see -;;; if a rust update has gone smoothly. It is used to assist continuous -;;; integration of the rust-team branch. +;;; and the packages which use rust itself as an input. This is a short list of +;;; packages which can be checked to see if a rust update has gone smoothly. It +;;; is used to assist continuous integration of the rust-team branch. (use-modules (guix packages) (guix profiles) @@ -31,15 +30,15 @@ (map package->manifest-entry (fold-packages (lambda (package lst) - (if (or - (eq? (build-system-name (package-build-system package)) - (quote cargo)) - (any - (lambda (pkg) - (member (specification->package "rust") pkg)) - (append (package-native-inputs package) - (package-propagated-inputs package) - (package-inputs package)))) - (cons package lst) - lst)) + (if (and (supported-package? package) + (or (eq? (build-system-name (package-build-system package)) + (quote cargo)) + (any + (lambda (pkg) + (member (specification->package "rust") pkg)) + (append (package-native-inputs package) + (package-propagated-inputs package) + (package-inputs package))))) + (cons package lst) + lst)) (list))))