Browse Source

gnu: Consistently Write ‘file system(s)’.

It is the GNU way.

* doc/guix.texi (Build Systems, DNS Services): Write ‘file system(s)’.
* gnu/build/vm.scm (create-ext-file-system, create-fat-file-system):
Likewise.
* gnu/packages/backup.scm (dirvish, rsnapshot)[description]: Likewise.
* gnu/packages/check.scm (python-testpath)[description]: Likewise.
* gnu/packages/disk.scm (pydf)[description]: Likewise.
* gnu/packages/file-systems.scm (disorderfs)[synopsis, description]: Likewise.
(glusterfs)[description]: Likewise.
* gnu/packages/haskell.scm (ghc-directory, ghc-system-fileio-bootstrap)
(ghc-system-fileio)[synopsis]: Likewise.
(ghc-fsnotify)[description]: Likewise.
* gnu/packages/linux.scm (proot)[description]: Likewise.
(jmtpfs)[synopsis, description]: Likewise.
* gnu/packages/mate.scm (caja, caja-extensions)[description]: Likewise.
* gnu/packages/storage.scm (ceph)[description]: Likewise.
* gnu/packages/sync.scm (lsyncd)[description]: Likewise.
* gnu/packages/syncthing.scm (syncthing)[synopsis]: Likewise.
(go-github-com-zillode-notify)[description]: Likewise.
* gnu/services/nfs.scm (pipefs-service-type): Likewise.
* guix/scripts/system.scm (perform-action): Likewise.
gn-latest-20200428
Tobias Geerinckx-Rice 4 years ago
parent
commit
162a137400
No known key found for this signature in database GPG Key ID: DB0FF884F556D79
  1. 6
      doc/guix.texi
  2. 4
      gnu/build/file-systems.scm
  3. 2
      gnu/build/linux-boot.scm
  4. 8
      gnu/build/vm.scm
  5. 4
      gnu/packages/backup.scm
  6. 2
      gnu/packages/check.scm
  7. 2
      gnu/packages/disk.scm
  8. 8
      gnu/packages/file-systems.scm
  9. 8
      gnu/packages/haskell.scm
  10. 8
      gnu/packages/linux.scm
  11. 4
      gnu/packages/mate.scm
  12. 2
      gnu/packages/storage.scm
  13. 4
      gnu/packages/sync.scm
  14. 4
      gnu/packages/syncthing.scm
  15. 2
      gnu/services/nfs.scm
  16. 2
      gnu/system/vm.scm
  17. 10
      guix/build/go-build-system.scm
  18. 4
      guix/scripts/system.scm

6
doc/guix.texi

@ -3695,10 +3695,10 @@ Go build mechanisms}.
The user is expected to provide a value for the key @code{#:import-path}
and, in some cases, @code{#:unpack-path}. The
@url{https://golang.org/doc/code.html#ImportPaths, import path}
corresponds to the filesystem path expected by the package's build
corresponds to the file system path expected by the package's build
scripts and any referring packages, and provides a unique way to
refer to a Go package. It is typically based on a combination of the
package source code's remote URI and filesystem hierarchy structure. In
package source code's remote URI and file system hierarchy structure. In
some cases, you will need to unpack the package's source code to a
different directory structure than the one indicated by the import path,
and @code{#:unpack-path} should be used in such cases.
@ -15848,7 +15848,7 @@ The backend to store the keys in. Can be @code{'pem} or @code{'pkcs11}.
@item @code{config} (default: @code{"/var/lib/knot/keys/keys"})
The configuration string of the backend. An example for the PKCS#11 is:
@code{"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/libsofthsm2.so"}.
For the pem backend, the string reprensents a path in the filesystem.
For the pem backend, the string reprensents a path in the file system.
@end table
@end deftp

4
gnu/build/file-systems.scm

@ -261,11 +261,11 @@ volume descriptor from ~s"
"Return the raw contents of DEVICE's iso9660 primary volume descriptor
as a bytevector, or #f if DEVICE does not contain an iso9660 file system."
;; Start reading at sector 16.
;; Since we are not sure that the device contains an ISO9660 filesystem,
;; Since we are not sure that the device contains an ISO9660 file system,
;; we have to find that out first.
(if (read-superblock device (* 2048 16) 2048 iso9660-superblock?)
(read-iso9660-primary-volume-descriptor device (* 2048 16))
#f)) ; Device does not contain an iso9660 filesystem.
#f)) ; Device does not contain an iso9660 file system.
(define (iso9660-superblock-uuid sblock)
"Return the modification time of an iso9660 primary volume descriptor

2
gnu/build/linux-boot.scm

@ -188,7 +188,7 @@ with the given MAJOR number, starting with MINOR."
(lambda args
(apply report-system-error name args))))
;; Create a device node like the <device-node> passed here on the filesystem.
;; Create a device node like the <device-node> passed here on the file system.
(define create-device-node
(match-lambda
(($ <device-node> xname type major minor module)

8
gnu/build/vm.scm

@ -262,7 +262,7 @@ actual /dev name based on DEVICE."
(define* (create-ext-file-system partition type
#:key label uuid)
"Create an ext-family filesystem of TYPE on PARTITION. If LABEL is true,
"Create an ext-family file system of TYPE on PARTITION. If LABEL is true,
use that as the volume name. If UUID is true, use it as the partition UUID."
(format #t "creating ~a partition...\n" type)
(unless (zero? (apply system* (string-append "mkfs." type)
@ -277,8 +277,8 @@ use that as the volume name. If UUID is true, use it as the partition UUID."
(define* (create-fat-file-system partition
#:key label uuid)
"Create a FAT filesystem on PARTITION. The number of File Allocation Tables
will be determined based on filesystem size. If LABEL is true, use that as the
"Create a FAT file system on PARTITION. The number of File Allocation Tables
will be determined based on file system size. If LABEL is true, use that as the
volume name."
;; FIXME: UUID is ignored!
(format #t "creating FAT partition...\n")
@ -425,7 +425,7 @@ GRUB configuration and OS-DRV as the stuff in it."
"run=/tmp/root/run"
;; /mnt is used as part of the installation
;; process, as the mount point for the target
;; filesystem, so create it.
;; file system, so create it.
"mnt=/tmp/root/mnt"
"--"
"-volid" ,(string-upcase volume-id)

4
gnu/packages/backup.scm

@ -418,7 +418,7 @@ rdiff-backup is easy to use and settings have sensible defaults.")
("rsync" ,rsync)))
(home-page "http://rsnapshot.org")
(synopsis "Deduplicating snapshot backup utility based on rsync")
(description "rsnapshot is a filesystem snapshot utility based on rsync.
(description "rsnapshot is a file system snapshot utility based on rsync.
rsnapshot makes it easy to make periodic snapshots of local machines, and
remote machines over SSH. To reduce the disk space required for each backup,
rsnapshot uses hard links to deduplicate identical files.")
@ -811,7 +811,7 @@ any special software, on top of SSH.")
(synopsis "Fast, disk based, rotating network backup system")
(description
"With dirvish you can maintain a set of complete images of your
filesystems with unattended creation and expiration. A dirvish backup vault
file systems with unattended creation and expiration. A dirvish backup vault
is like a time machine for your data. ")
(license (license:fsf-free "file://COPYING"
"Open Software License 2.0"))))

2
gnu/packages/check.scm

@ -1040,7 +1040,7 @@ testing frameworks.")
(synopsis "Test utilities for code working with files and commands")
(description
"Testpath is a collection of utilities for Python code working with files
and commands. It contains functions to check things on the filesystem, and
and commands. It contains functions to check things on the file system, and
tools for mocking system commands and recording calls to those.")
(license license:expat)))

2
gnu/packages/disk.scm

@ -371,7 +371,7 @@ permit managing file systems not included in libparted.")
(synopsis "Colourised @command{df} clone")
(description "All-singing, all-dancing, fully colourised @command{df} clone
written in Python. It displays the amount of disk space available on the
mounted filesystems, using different colours for different types of file
mounted file systems, using different colours for different types of file
systems. Output format is completely customizable.")
(license license:public-domain)))

8
gnu/packages/file-systems.scm

@ -132,10 +132,10 @@ single file can be mounted.")
;; FIXME: Tests require 'run-parts' which is not in Guix yet.
#:tests? #f))
(home-page "https://github.com/ReproducibleBuilds/disorderfs")
(synopsis "FUSE filesystem that introduces non-determinism")
(synopsis "FUSE file system that introduces non-determinism")
(description
"An overlay FUSE filesystem that introduces non-determinism
into filesystem metadata. For example, it can randomize the order
"An overlay FUSE file system that introduces non-determinism
into file system metadata. For example, it can randomize the order
in which directory entries are read. This is useful for detecting
non-determinism in the build process.")
(license license:gpl3+)))
@ -201,7 +201,7 @@ non-determinism in the build process.")
("zlib" ,zlib)))
(home-page "https://www.gluster.org")
(synopsis "Distributed file system")
(description "GlusterFS is a distributed scalable network filesystem
(description "GlusterFS is a distributed scalable network file system
suitable for data-intensive tasks such as cloud storage and media streaming.
It allows rapid provisioning of additional storage based on your storage
consumption needs. It incorporates automatic failover as a primary feature.

8
gnu/packages/haskell.scm

@ -5942,7 +5942,7 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.")
"0zkqihmdfz7bzv3sxh1p9ijl4vra880kfy3qy9h96flq7d2if0f2"))))
(build-system haskell-build-system)
(home-page "http://hackage.haskell.org/package/directory")
(synopsis "Platform-agnostic library for filesystem operations")
(synopsis "Platform-agnostic library for file system operations")
(description
"This library provides a basic set of operations for manipulating
files and directories in a portable way.")
@ -6203,7 +6203,7 @@ increasing type safety.")
("ghc-text" ,ghc-text)
("ghc-temporary" ,ghc-temporary)))
(home-page "https://github.com/fpco/haskell-filesystem")
(synopsis "Consistent filesystem interaction across GHC versions")
(synopsis "Consistent file system interaction across GHC versions")
(description
"This is a small wrapper around the directory, unix, and Win32 packages,
for use with system-filepath. It provides a consistent API to the various
@ -6424,7 +6424,7 @@ increasing type safety.")
("ghc-chell" ,ghc-chell)
("ghc-temporary" ,ghc-temporary)))
(home-page "https://github.com/fpco/haskell-filesystem")
(synopsis "Consistent filesystem interaction across GHC versions")
(synopsis "Consistent file system interaction across GHC versions")
(description
"This is a small wrapper around the directory, unix, and Win32 packages,
for use with system-filepath. It provides a consistent API to the various
@ -6744,7 +6744,7 @@ accessed or modified.")
(synopsis "Cross platform library for file change notification.")
(description "Cross platform library for file creation, modification, and
deletion notification. This library builds upon existing libraries for platform
specific Windows, Mac, and Linux filesystem event notification.")
specific Windows, Mac, and Linux file system event notification.")
(license license:bsd-3)))
(define-public ghc-ieee754

8
gnu/packages/linux.scm

@ -4304,7 +4304,7 @@ userspace queueing component and the logging subsystem.")
"PRoot is a user-space implementation of @code{chroot}, @code{mount --bind},
and @code{binfmt_misc}. This means that users don't need any privileges or
setup to do things like using an arbitrary directory as the new root
filesystem, making files accessible somewhere else in the file system
file system, making files accessible somewhere else in the file system
hierarchy, or executing programs built for another CPU architecture
transparently through QEMU user-mode. Also, developers can use PRoot as a
generic process instrumentation engine thanks to its extension mechanism.
@ -4391,10 +4391,10 @@ NexGen, Rise, and SiS CPUs.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://github.com/JasonFerrara/jmtpfs")
(synopsis "Use a FUSE filesystem to access data over MTP")
(description "jmtpfs uses FUSE (filesystem in userspace) to provide access
(synopsis "Use a FUSE file system to access data over MTP")
(description "jmtpfs uses FUSE (file system in userspace) to provide access
to data over the Media Transfer Protocol (MTP). Unprivileged users can mount
the MTP device as a filesystem.")
the MTP device as a file system.")
(license license:gpl3)))
(define-public procenv

4
gnu/packages/mate.scm

@ -842,7 +842,7 @@ infamous 'Wanda the Fish'.")
"Caja is the official file manager for the MATE desktop.
It allows for browsing directories, as well as previewing files and launching
applications associated with them. Caja is also responsible for handling the
icons on the MATE desktop. It works on local and remote filesystems.")
icons on the MATE desktop. It works on local and remote file systems.")
;; There is a note about a TRADEMARKS_NOTICE file in COPYING which
;; does not exist. It is safe to assume that this is of no concern
;; for us.
@ -900,7 +900,7 @@ icons on the MATE desktop. It works on local and remote filesystems.")
"Caja is the official file manager for the MATE desktop.
It allows for browsing directories, as well as previewing files and launching
applications associated with them. Caja is also responsible for handling the
icons on the MATE desktop. It works on local and remote filesystems.")
icons on the MATE desktop. It works on local and remote file systems.")
(license license:gpl2+)))
(define-public mate-control-center

2
gnu/packages/storage.scm

@ -340,7 +340,7 @@
(description
"Ceph is a distributed storage system designed for reliability and
performance. It provides network-based block devices (RBD), a POSIX
compliant filesystem (CephFS), and offers compatibility with various
compliant file system (CephFS), and offers compatibility with various
storage protocols (S3, NFS, and others) through the RADOS gateway.")
;; The Ceph libraries are LGPL2.1 and most of the utilities fall under
;; GPL2. The installed erasure code plugins are BSD-3 licensed and do

4
gnu/packages/sync.scm

@ -204,6 +204,6 @@ interface (inotify or fsevents). It aggregates and combines events for a few
seconds and then spawns one (or more) process(es) to synchronize the changes.
By default this is rsync, which must be installed on all source and target
machines. Lsyncd is thus a light-weight live mirror solution that is
comparatively easy to install not requiring new filesystems or block devices
and does not hamper local filesystem performance.")
comparatively easy to install not requiring new file systems or block devices
and does not hamper local file system performance.")
(license license:gpl2+)))

4
gnu/packages/syncthing.scm

@ -160,7 +160,7 @@
("go-github-com-zillode-notify" ,go-github-com-zillode-notify)
;; For tests
("go-github-com-d4l3k-messagediff" ,go-github-com-d4l3k-messagediff)))
(synopsis "Decentralized continuous filesystem synchronization")
(synopsis "Decentralized continuous file system synchronization")
(description "Syncthing is a peer-to-peer file synchronization tool that
supports a wide variety of computing platforms. It uses the Block Exchange
Protocol.")
@ -1873,7 +1873,7 @@ Authentication and Privacy Infrastructure).")
(propagated-inputs
`(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
(synopsis "Filesystem event notification library")
(description "This package provides @code{notify}, a filesystem event
(description "This package provides @code{notify}, a file system event
notification library in Go.")
(home-page "https://github.com/zillode/notify")
(license expat))))

2
gnu/services/nfs.scm

@ -88,7 +88,7 @@
(define pipefs-directory (pipefs-configuration-mount-point config))
(shepherd-service
(documentation "Mount the pipefs pseudo filesystem.")
(documentation "Mount the pipefs pseudo file system.")
(provision '(rpc-pipefs))
(start #~(lambda ()

2
gnu/system/vm.scm

@ -346,7 +346,7 @@ the image."
(label "GNU-ESP") ;cosmetic only
;; Use "vfat" here since this property is used
;; when mounting. The actual FAT-ness is based
;; on filesystem size (16 in this case).
;; on file system size (16 in this case).
(file-system "vfat")
(flags '(esp))))))))
(initialize-hard-disk "/dev/vda"

10
guix/build/go-build-system.scm

@ -37,7 +37,7 @@
;; process for Go libraries, so we use `go install`, which preserves the
;; results. [0]
;; Go software is developed and built within a particular filesystem hierarchy
;; Go software is developed and built within a particular file system hierarchy
;; structure called a 'workspace' [1]. This workspace is found by Go
;; via the GOPATH environment variable. Typically, all Go source code
;; and compiled objects are kept in a single workspace, but it is
@ -48,7 +48,7 @@
;; an 'import path'. The import path is based on the URL of the
;; software's source. Since most source code is provided over the
;; internet, the import path is typically a combination of the remote
;; URL and the source repository's filesystem structure. For example,
;; URL and the source repository's file system structure. For example,
;; the Go port of the common `du` command is hosted on github.com, at
;; <https://github.com/calmh/du>. Thus, the import path is
;; <github.com/calmh/du>. [3]
@ -58,12 +58,12 @@
;; the go-build-system.
;;
;; Modules of modular Go libraries are named uniquely with their
;; filesystem paths. For example, the supplemental but "standardized"
;; file system paths. For example, the supplemental but "standardized"
;; libraries developed by the Go upstream developers are available at
;; <https://golang.org/x/{net,text,crypto, et cetera}>. The Go IPv4
;; library's import path is <golang.org/x/net/ipv4>. The source of
;; such modular libraries must be unpacked at the top-level of the
;; filesystem structure of the library. So the IPv4 library should be
;; file system structure of the library. So the IPv4 library should be
;; unpacked to <golang.org/x/net>. This is handled in the
;; go-build-system with the optional #:unpack-path key.
;;
@ -72,7 +72,7 @@
;; that all modules of modular libraries cannot be built with a single
;; command. Each module must be built individually. This complicates
;; certain cases, and these issues are currently resolved by creating a
;; filesystem union of the required modules of such libraries. I think
;; file system union of the required modules of such libraries. I think
;; this could be improved in future revisions of the go-build-system.
;;
;; [0] `go build`:

4
guix/scripts/system.scm

@ -709,8 +709,8 @@ and TARGET arguments."
"Perform ACTION for OS. INSTALL-BOOTLOADER? specifies whether to install
bootloader; BOOTLOADER-TAGET is the target for the bootloader; TARGET is the
target root directory; IMAGE-SIZE is the size of the image to be built, for
the 'vm-image' and 'disk-image' actions. The root filesystem is created as a
FILE-SYSTEM-TYPE filesystem. FULL-BOOT? is used for the 'vm' action; it
the 'vm-image' and 'disk-image' actions. The root file system is created as a
FILE-SYSTEM-TYPE file system. FULL-BOOT? is used for the 'vm' action; it
determines whether to boot directly to the kernel or to the bootloader.
When DERIVATIONS-ONLY? is true, print the derivation file name(s) without

Loading…
Cancel
Save