ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

file-systems: Remove dependency on (guix store).

Browse source 
(gnu system file-systems) is used on the "build" side since commit
5970e8e248.

* gnu/system/file-systems.scm: Remove dependency on (guix store).
(%store-prefix): New procedure.
* tests/file-systems.scm ("does not pull (guix config)"): New test.
This commit is contained in:
Ludovic Courtès 2017-02-03 11:26:25 +01:00
parent cf98d342b0
commit ad167d028e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/system/file-systems.scm
View file

@ -19,7 +19,6 @@
(define-module (gnu system file-systems)
#:use-module (ice-9 match)
#:use-module (guix records)
#:use-module (guix store)
#:use-module ((gnu build file-systems)
#:select (string->uuid uuid->string))
#:re-export (string->uuid
@ -97,6 +96,20 @@ (define-record-type* <file-system> file-system
(dependencies file-system-dependencies ; list of <file-system>
(default '()))) ; or <mapped-device>
;; Note: This module is used both on the build side and on the host side.
;; Arrange not to pull (guix store) and (guix config) because the latter
;; differs from user to user.
(define (%store-prefix)
"Return the store prefix."
(cond ((resolve-module '(guix store) #:ensure #f)
=>
(lambda (store)
((module-ref store '%store-prefix))))
((getenv "NIX_STORE")
=> identity)
(else
"/gnu/store")))
(define %not-slash
(char-set-complement (char-set #\/)))

8
tests/file-systems.scm
View file

@ -18,6 +18,7 @@
(define-module (test-file-systems)
#:use-module (guix store)
#:use-module (guix modules)
#:use-module (gnu system file-systems)
#:use-module (srfi srfi-64)
#:use-module (rnrs bytevectors))
@ -72,4 +73,11 @@ (define-module (test-file-systems)
(device "/foo")
(flags '(bind-mount read-only)))))))))
(test-assert "does not pull (guix config)"
;; This module is meant both for the host side and "build side", so make
;; sure it doesn't pull in (guix config), which depends on the user's
;; config.
(not (member '(guix config)
(source-module-closure '((gnu system file-systems))))))
(test-end)