From 278d486b0c0e3ec0378f6a2ccf6946fb176d088b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 21 Mar 2017 21:55:20 +0100 Subject: =?UTF-8?q?file-systems:=20Do=20not=20use=20(gnu=20packages=20?= =?UTF-8?q?=E2=80=A6).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a regression introduced in 7208995426714c9fc3ad59cadc3cc0f52df0f018 whereby (gnu system file-systems) would pull in (gnu packages …) module, which in turn breaks when importing things like (gnu build shepherd). * gnu/system/file-systems.scm (file-system-type-predicate): Export. (file-system-packages): Move to... * gnu/system/linux-initrd.scm (file-system-packages): ... here. Add docstring. * gnu/services/base.scm: Use it. * tests/file-systems.scm ("does not pull (gnu packages …)"): New test. --- tests/file-systems.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/file-systems.scm b/tests/file-systems.scm index 467ee8ca5d..12f4f09c57 100644 --- a/tests/file-systems.scm +++ b/tests/file-systems.scm @@ -20,8 +20,10 @@ #:use-module (guix store) #:use-module (guix modules) #:use-module (gnu system file-systems) + #:use-module (srfi srfi-1) #:use-module (srfi srfi-64) - #:use-module (rnrs bytevectors)) + #:use-module (rnrs bytevectors) + #:use-module (ice-9 match)) ;; Test the (gnu system file-systems) module. @@ -80,4 +82,12 @@ (not (member '(guix config) (source-module-closure '((gnu system file-systems)))))) +(test-equal "does not pull (gnu packages …)" + ;; Same story: (gnu packages …) should not be pulled. + #f + (find (match-lambda + (('gnu 'packages _ ..1) #t) + (_ #f)) + (source-module-closure '((gnu system file-systems))))) + (test-end) -- cgit v1.2.3