[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/16: packages: 'package-transitive-supported-systems' detects cycles.
From: |
guix-commits |
Subject: |
06/16: packages: 'package-transitive-supported-systems' detects cycles. |
Date: |
Wed, 14 Jun 2023 17:50:03 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit e4259d4e9e3251e4c4b45d1cce4008ac32b504c8
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Jun 5 23:41:37 2023 +0200
packages: 'package-transitive-supported-systems' detects cycles.
With this change, commands such as 'guix build' or 'guix package' report
obvious package-level cycles upfront. Derivation-level cycles are not
detected.
* guix/packages.scm (&package-cyclic-dependency-error): New condition
type.
(package-transitive-supported-systems): Define 'visited', check it, and
parameterize it.
* guix/ui.scm (call-with-error-handling): Handle
'&package-cyclic-dependency-error'.
* tests/packages.scm ("package-transitive-supported-systems detects
cycles"): Add test.
---
guix/packages.scm | 41 ++++++++++++++++++++++++++++++-----------
guix/ui.scm | 9 +++++++++
tests/packages.scm | 17 +++++++++++++++++
3 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index e26602d589..ba98bb0fb4 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -168,6 +168,9 @@
package-error-invalid-license
&package-input-error
package-input-error?
+ &package-cyclic-dependency-error
+ package-cyclic-dependency-error?
+ package-error-dependency-cycle
package-error-invalid-input
&package-cross-build-system-error
package-cross-build-system-error?
@@ -806,6 +809,10 @@ exist, return #f instead."
package-input-error?
(input package-error-invalid-input))
+(define-condition-type &package-cyclic-dependency-error &package-error
+ package-cyclic-dependency-error?
+ (cycle package-error-dependency-cycle))
+
(define-condition-type &package-cross-build-system-error &package-error
package-cross-build-system-error?)
@@ -1317,17 +1324,29 @@ in INPUTS and their transitive propagated inputs."
(let ()
(define (supported-systems-procedure system)
(define supported-systems
- (mlambdaq (package)
- (parameterize ((%current-system system))
- (fold (lambda (input systems)
- (match input
- ((label (? package? package) . _)
- (lset-intersection string=? systems
- (supported-systems package)))
- (_
- systems)))
- (package-supported-systems package)
- (bag-direct-inputs (package->bag package system #f))))))
+ ;; The VISITED parameter allows for cycle detection. This is a pretty
+ ;; strategic place to do that: most commands call it upfront, yet it's
+ ;; not on the hot path of 'package->derivation'. The downside is that
+ ;; only package-level cycles are detected.
+ (let ((visited (make-parameter (setq))))
+ (mlambdaq (package)
+ (when (set-contains? (visited) package)
+ (raise (condition
+ (&package-cyclic-dependency-error
+ (package package)
+ (cycle (set->list (visited)))))))
+
+ (parameterize ((visited (set-insert package (visited)))
+ (%current-system system))
+ (fold (lambda (input systems)
+ (match input
+ ((label (? package? package) . _)
+ (lset-intersection string=? systems
+ (supported-systems package)))
+ (_
+ systems)))
+ (package-supported-systems package)
+ (bag-direct-inputs (package->bag package system #f)))))))
supported-systems)
diff --git a/guix/ui.scm b/guix/ui.scm
index 7540e2194f..47a118364a 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -722,6 +722,15 @@ evaluating the tests and bodies of CLAUSES."
(leave (G_ "~a:~a:~a: package `~a' has an invalid input: ~s~%")
file line column
(package-full-name package) input)))
+ ((package-cyclic-dependency-error? c)
+ (let ((package (package-error-package c)))
+ (leave (package-location package)
+ (G_ "~a: dependency cycle detected:
+ ~a~{ -> ~a~}~%")
+ (package-full-name package)
+ (package-full-name package)
+ (map package-full-name
+ (package-error-dependency-cycle c)))))
((package-cross-build-system-error? c)
(let* ((package (package-error-package c))
(loc (package-location package))
diff --git a/tests/packages.scm b/tests/packages.scm
index 5e8eac99dc..2b7ab01f7d 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -368,6 +368,23 @@
(package-transitive-supported-systems d)
(package-transitive-supported-systems e))))
+(test-equal "package-transitive-supported-systems detects cycles"
+ '("c" "a" "b" "c")
+ (letrec* ((a (dummy-package "a"
+ (build-system trivial-build-system)
+ (native-inputs (list c))))
+ (b (dummy-package "b"
+ (build-system trivial-build-system)
+ (inputs (list a))))
+ (c (dummy-package "c"
+ (build-system trivial-build-system)
+ (inputs (list b)))))
+ (guard (c ((package-cyclic-dependency-error? c)
+ (map package-name
+ (cons (package-error-package c)
+ (package-error-dependency-cycle c)))))
+ (package-transitive-supported-systems c))))
+
(test-assert "package-development-inputs"
;; Note: Due to propagated inputs, 'package-development-inputs' returns a
;; couple more inputs, such as 'linux-libre-headers'.
- branch master updated (09449ef6f6 -> 26602f4063), guix-commits, 2023/06/14
- 03/16: gnu: cuirass: Use guile-fibers 1.3.1., guix-commits, 2023/06/14
- 02/16: gnu: shepherd@0.10: Use guile-fibers 1.3.1., guix-commits, 2023/06/14
- 05/16: gnu: gnunet-scheme: Use guile-fibers 1.3.1., guix-commits, 2023/06/14
- 07/16: gnu: libtree: fix building on non-x86 systems., guix-commits, 2023/06/14
- 08/16: gnu: Add nwipe., guix-commits, 2023/06/14
- 14/16: gnu: browserpass-native: Use new package style., guix-commits, 2023/06/14
- 06/16: packages: 'package-transitive-supported-systems' detects cycles.,
guix-commits <=
- 04/16: gnu: guile-fibers: Remove 'guile-fibers-next'., guix-commits, 2023/06/14
- 09/16: gnu: Add bdf2sfd., guix-commits, 2023/06/14
- 11/16: gnu: gnushogi: Fix build., guix-commits, 2023/06/14
- 10/16: gnu: Add pngcheck., guix-commits, 2023/06/14
- 15/16: gnu: guile-netlink: Update to 1.2., guix-commits, 2023/06/14
- 13/16: gnu: browserpass-native: Update to 3.1.0., guix-commits, 2023/06/14
- 12/16: gnu: Add systemtap, guix-commits, 2023/06/14
- 01/16: gnu: guile-fibers: Add 1.3.1., guix-commits, 2023/06/14
- 16/16: services: static-netwoking: Wait for devices to show up., guix-commits, 2023/06/14