summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-07-26 22:59:49 +0200
committerLudovic Courtès <ludo@gnu.org>2018-07-26 22:59:49 +0200
commit8c7bebd6ea99f0ee4fb46a48ecb1883754c8cdde (patch)
tree3fe9cb15090244e65434cf553cdf8de182c05164 /tests
parent28c4905b123e7de85e5d2b654f4d15289625f2c0 (diff)
downloadpatches-8c7bebd6ea99f0ee4fb46a48ecb1883754c8cdde.tar
patches-8c7bebd6ea99f0ee4fb46a48ecb1883754c8cdde.tar.gz
gexp: Remove backward compatibility hack for 'imported-files'.
* guix/gexp.scm (gexp->derivation): Remove #:import-creates-derivation?. (imported-files): Remove #:derivation? and adjust callers. (imported-modules), compiled-modules): Likewise. * guix/packages.scm (patch-and-repack): Adjust 'gexp->derivation' call.
Diffstat (limited to 'tests')
-rw-r--r--tests/gexp.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm
index b22e635805..a0ed34aa6d 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -654,11 +654,11 @@
(drv (imported-files files)))
(define (file=? file1 file2)
;; Assume deduplication is in place.
- (= (stat:ino (lstat file1))
- (stat:ino (lstat file2))))
+ (= (stat:ino (stat file1))
+ (stat:ino (stat file2))))
(mbegin %store-monad
- (built-derivations (list drv))
+ (built-derivations (list (pk 'drv drv)))
(mlet %store-monad ((dir -> (derivation->output-path drv))
(plain* (text-file "foo" "bar!"))
(q-scm* (interned-file q-scm "c")))