[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/17: packages: 'expand-input' accepts any file-like object.
From: |
guix-commits |
Subject: |
12/17: packages: 'expand-input' accepts any file-like object. |
Date: |
Mon, 22 Mar 2021 18:02:39 -0400 (EDT) |
civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.
commit acad95972cc422d64f47345d2bdac7dca563052d
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Mar 7 14:40:03 2021 +0100
packages: 'expand-input' accepts any file-like object.
* guix/packages.scm (expand-input)[valid?]: Remove.
Call 'file-like?' instead of 'valid?'. Remove 'struct?' clause.
* tests/packages.scm ("&package-input-error"): Adjust accordingly.
---
guix/packages.scm | 12 ++----------
tests/packages.scm | 2 +-
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index bd3a190..34f3ec4 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -1211,13 +1211,10 @@ Return the cached result when available."
(define* (expand-input package input #:key native?)
"Expand INPUT, an input tuple, to a name/<gexp-input> tuple. PACKAGE is
only used to provide contextual information in exceptions."
- (define (valid? x)
- (or (package? x) (origin? x) (derivation? x)))
-
(match input
- (((? string? name) (? valid? thing))
+ (((? string? name) (? file-like? thing))
(list name (gexp-input thing #:native? native?)))
- (((? string? name) (? valid? thing) (? string? output))
+ (((? string? name) (? file-like? thing) (? string? output))
(list name (gexp-input thing output #:native? native?)))
(((? string? name)
(and (? string?) (? file-exists? file)))
@@ -1226,11 +1223,6 @@ only used to provide contextual information in
exceptions."
;; source.
(list name (gexp-input (local-file file #:recursive? #t)
#:native? native?)))
- (((? string? name) (? struct? source))
- ;; 'package-source-derivation' calls 'lower-object', which can throw
- ;; '&gexp-input-error'. However '&gexp-input-error' lacks source
- ;; location info, so we used to catch and rethrow here (FIXME!).
- (list name (gexp-input source)))
(x
(raise (condition (&package-input-error
(package package)
diff --git a/tests/packages.scm b/tests/packages.scm
index f68b078..97c4c17 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -744,7 +744,7 @@
(let ((dummy (dummy-package "foo" (inputs `(("x" ,(current-module)))))))
(test-equal "&package-input-error"
- (list dummy (current-module))
+ (list dummy `("x" ,(current-module)))
(guard (c ((package-input-error? c)
(list (package-error-package c)
(package-error-invalid-input c))))
- branch wip-build-systems-gexp created (now 082df93), guix-commits, 2021/03/22
- 01/17: gexp: Add 'with-build-variables'., guix-commits, 2021/03/22
- 03/17: build-system: Rewrite using gexps., guix-commits, 2021/03/22
- 04/17: packages: Turn 'bag->derivation' into a monadic procedure., guix-commits, 2021/03/22
- 05/17: packages: Simplify patch instantiation., guix-commits, 2021/03/22
- 02/17: gexp: Optimize 'with-build-variables'., guix-commits, 2021/03/22
- 07/17: packages: Default origin 'patch-flags' is a gexp., guix-commits, 2021/03/22
- 12/17: packages: 'expand-input' accepts any file-like object.,
guix-commits <=
- 13/17: packages: Call 'bag-grafts' only on the tip of the package graph., guix-commits, 2021/03/22
- 06/17: packages: Core procedures are written in monadic style., guix-commits, 2021/03/22
- 08/17: gexp: Add 'sexp->gexp'., guix-commits, 2021/03/22
- 16/17: gexp: Do not add derivations to the object cache., guix-commits, 2021/03/22
- 17/17: gnu: docbook-xsl: Move 'use-modules' form to the top level., guix-commits, 2021/03/22
- 10/17: build-system: Use 'input-tuples->gexp' and 'outputs->gexp'., guix-commits, 2021/03/22
- 09/17: build-system: Use 'sexp->gexp' for plain sexps., guix-commits, 2021/03/22
- 11/17: packages: '%standard-patch-inputs' is not influenced by '%current-target-system'., guix-commits, 2021/03/22
- 15/17: gexp: Allowed/disallowed references and graphs never refer to grafted inputs., guix-commits, 2021/03/22
- 14/17: grafts: Add 'without-grafting'., guix-commits, 2021/03/22