diff options
| -rw-r--r-- | etc/teams/rust/rust-manifest.scm | 11 | ||||
| -rw-r--r-- | etc/teams/rust/rusty-packages.scm | 31 |
2 files changed, 21 insertions, 21 deletions
diff --git a/etc/teams/rust/rust-manifest.scm b/etc/teams/rust/rust-manifest.scm index f34b7489ec8..40f031f401f 100644 --- a/etc/teams/rust/rust-manifest.scm +++ b/etc/teams/rust/rust-manifest.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il> | 2 | ;;; Copyright © 2024, 2026 Efraim Flashner <efraim@flashner.co.il> |
| 3 | ;;; | 3 | ;;; |
| 4 | ;;; This file is part of GNU Guix. | 4 | ;;; This file is part of GNU Guix. |
| 5 | ;;; | 5 | ;;; |
| @@ -27,8 +27,9 @@ | |||
| 27 | (map package->manifest-entry | 27 | (map package->manifest-entry |
| 28 | (fold-packages | 28 | (fold-packages |
| 29 | (lambda (package lst) | 29 | (lambda (package lst) |
| 30 | (if (eq? (build-system-name (package-build-system package)) | 30 | (if (and (eq? (build-system-name (package-build-system package)) |
| 31 | (quote cargo)) | 31 | (quote cargo)) |
| 32 | (cons package lst) | 32 | (supported-package? package)) |
| 33 | lst)) | 33 | (cons package lst) |
| 34 | lst)) | ||
| 34 | (list)))) | 35 | (list)))) |
diff --git a/etc/teams/rust/rusty-packages.scm b/etc/teams/rust/rusty-packages.scm index 3f8285f40a9..4bef448a3cd 100644 --- a/etc/teams/rust/rusty-packages.scm +++ b/etc/teams/rust/rusty-packages.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il> | 2 | ;;; Copyright © 2024, 2026 Efraim Flashner <efraim@flashner.co.il> |
| 3 | ;;; | 3 | ;;; |
| 4 | ;;; This file is part of GNU Guix. | 4 | ;;; This file is part of GNU Guix. |
| 5 | ;;; | 5 | ;;; |
| @@ -17,10 +17,9 @@ | |||
| 17 | ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. | 17 | ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. |
| 18 | 18 | ||
| 19 | ;;; This file returns a manifest of packages built using the cargo-build-system | 19 | ;;; This file returns a manifest of packages built using the cargo-build-system |
| 20 | ;;; which are NOT prefixed with 'rust-' and the packages which use rust itself | 20 | ;;; and the packages which use rust itself as an input. This is a short list of |
| 21 | ;;; as an input. This is a short list of packages which can be checked to see | 21 | ;;; packages which can be checked to see if a rust update has gone smoothly. It |
| 22 | ;;; if a rust update has gone smoothly. It is used to assist continuous | 22 | ;;; is used to assist continuous integration of the rust-team branch. |
| 23 | ;;; integration of the rust-team branch. | ||
| 24 | 23 | ||
| 25 | (use-modules (guix packages) | 24 | (use-modules (guix packages) |
| 26 | (guix profiles) | 25 | (guix profiles) |
| @@ -31,15 +30,15 @@ | |||
| 31 | (map package->manifest-entry | 30 | (map package->manifest-entry |
| 32 | (fold-packages | 31 | (fold-packages |
| 33 | (lambda (package lst) | 32 | (lambda (package lst) |
| 34 | (if (or | 33 | (if (and (supported-package? package) |
| 35 | (eq? (build-system-name (package-build-system package)) | 34 | (or (eq? (build-system-name (package-build-system package)) |
| 36 | (quote cargo)) | 35 | (quote cargo)) |
| 37 | (any | 36 | (any |
| 38 | (lambda (pkg) | 37 | (lambda (pkg) |
| 39 | (member (specification->package "rust") pkg)) | 38 | (member (specification->package "rust") pkg)) |
| 40 | (append (package-native-inputs package) | 39 | (append (package-native-inputs package) |
| 41 | (package-propagated-inputs package) | 40 | (package-propagated-inputs package) |
| 42 | (package-inputs package)))) | 41 | (package-inputs package))))) |
| 43 | (cons package lst) | 42 | (cons package lst) |
| 44 | lst)) | 43 | lst)) |
| 45 | (list)))) | 44 | (list)))) |