nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui: Remove dependency on (gnu system file-systems). 

* guix/ui.scm (specification->file-system-mapping): Move to...
* gnu/system/file-systems.scm (specification->file-system-mapping):
... here.
This commit is contained in:
Ludovic Courtès 2016-08-04 19:08:08 +02:00
parent 44210f84e2
commit d77a0bd6f1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/system/file-systems.scm
View File

@ -40,6 +40,7 @@
file-system-dependencies file-system-dependencies
file-system->spec file-system->spec
specification->file-system-mapping
uuid uuid
%fuse-control-file-system %fuse-control-file-system
@ -105,6 +106,23 @@ initrd code."
(($ <file-system> device title mount-point type flags options _ _ check?) (($ <file-system> device title mount-point type flags options _ _ check?)
(list device title mount-point type flags options check?)))) (list device title mount-point type flags options check?))))
(define (specification->file-system-mapping spec writable?)
"Read the SPEC and return the corresponding <file-system-mapping>. SPEC is
a string of the form \"SOURCE\" or \"SOURCE=TARGET\". The former specifies
that SOURCE from the host should be mounted at SOURCE in the other system.
The latter format specifies that SOURCE from the host should be mounted at
TARGET in the other system."
(let ((index (string-index spec #\=)))
(if index
(file-system-mapping
(source (substring spec 0 index))
(target (substring spec (+ 1 index)))
(writable? writable?))
(file-system-mapping
(source spec)
(target spec)
(writable? writable?)))))
(define-syntax uuid (define-syntax uuid
(lambda (s) (lambda (s)
"Return the bytevector corresponding to the given UUID representation." "Return the bytevector corresponding to the given UUID representation."

19
guix/ui.scm
View File

@ -36,7 +36,6 @@
#:use-module ((guix build utils) #:select (mkdir-p)) #:use-module ((guix build utils) #:select (mkdir-p))
#:use-module ((guix licenses) #:select (license? license-name)) #:use-module ((guix licenses) #:select (license? license-name))
#:use-module ((guix build syscalls) #:select (terminal-columns)) #:use-module ((guix build syscalls) #:select (terminal-columns))
#:use-module (gnu system file-systems)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-11) #:use-module (srfi srfi-11)
#:use-module (srfi srfi-19) #:use-module (srfi srfi-19)
@ -83,7 +82,6 @@
string->recutils string->recutils
package->recutils package->recutils
package-specification->name+version+output package-specification->name+version+output
specification->file-system-mapping
string->generations string->generations
string->duration string->duration
matching-generations matching-generations
@ -1126,23 +1124,6 @@ optionally contain a version number and an output name, as in these examples:
(package-name->name+version name))) (package-name->name+version name)))
(values name version sub-drv))) (values name version sub-drv)))
(define (specification->file-system-mapping spec writable?)
"Read the SPEC and return the corresponding <file-system-mapping>. SPEC is
a string of the form \"SOURCE\" or \"SOURCE=TARGET\". The former specifies
that SOURCE from the host should be mounted at SOURCE in the other system.
The latter format specifies that SOURCE from the host should be mounted at
TARGET in the other system."
(let ((index (string-index spec #\=)))
(if index
(file-system-mapping
(source (substring spec 0 index))
(target (substring spec (+ 1 index)))
(writable? writable?))
(file-system-mapping
(source spec)
(target spec)
(writable? writable?)))))
;;; ;;;
;;; Command-line option processing. ;;; Command-line option processing.