From d132d9f96ba34bca58b18e293e03b393054fd962 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 22 Dec 2018 23:30:40 +0300 Subject: services: configuration: Add '%location'. * gnu/services/configuration.scm (define-configuration): Add '%location'. --- gnu/services/configuration.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/services') diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index 707944cbe0..90f12a8d39 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -22,6 +22,7 @@ #:use-module (guix packages) #:use-module (guix records) #:use-module (guix gexp) + #:use-module ((guix utils) #:select (source-properties->location)) #:autoload (texinfo) (texi-fragment->stexi) #:autoload (texinfo serialize) (stexi->texi) #:use-module (ice-9 match) @@ -129,6 +130,10 @@ #,(id #'stem #'% #'stem) #,(id #'stem #'make- #'stem) #,(id #'stem #'stem #'?) + (%location #,(id #'stem #'-location) + (default (and=> (current-source-location) + source-properties->location)) + (innate)) (field field-getter (default def)) ...) (define #,(id #'stem #'stem #'-fields) -- cgit v1.2.3 From e44de1d2fb16be66cf736481579b9a71fc8a0918 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 22 Dec 2018 23:32:05 +0300 Subject: services: zabbix-front-end: Show location in messages. * gnu/services/monitoring.scm (zabbix-front-end-config): Show location in messages. --- gnu/services/monitoring.scm | 57 ++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 24 deletions(-) (limited to 'gnu/services') diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm index 611448b733..e1b1d9b236 100644 --- a/gnu/services/monitoring.scm +++ b/gnu/services/monitoring.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018 Gábor Boskovits -;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2018, 2019 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +29,8 @@ #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix records) - #:use-module ((guix ui) #:select (display-hint)) + #:use-module (guix utils) + #:use-module ((guix ui) #:select (display-hint G_)) #:use-module (ice-9 match) #:use-module (ice-9 rdelim) #:use-module (srfi srfi-26) @@ -509,13 +510,12 @@ create it manually.") (number 10051) "Zabbix server port.")) -(define zabbix-front-end-config - (match-lambda - (($ - _ db-host db-port db-name db-user db-password db-secret-file - zabbix-host zabbix-port) - (mixed-text-file "zabbix.conf.php" - "\ +(define (zabbix-front-end-config config) + (match-record config + (%location db-host db-port db-name db-user db-password db-secret-file + zabbix-host zabbix-port) + (mixed-text-file "zabbix.conf.php" + "\ string db-port) "'; $DB['DATABASE'] = '" db-name "'; $DB['USER'] = '" db-user "'; -$DB['PASSWORD'] = '" (if (string-null? db-password) - (if (string-null? db-secret-file) - (raise (condition - (&message - (message "\ -you must provide either 'db-secret-file' or 'db-password'")))) - (string-trim-both - (with-input-from-file db-secret-file - read-string))) - (begin - (display-hint "\ -Consider using @code{db-secret-file} instead of @code{db-password} and unset -@code{db-password} for security in @code{zabbix-front-end-configuration}.") - db-password)) "'; +$DB['PASSWORD'] = '" (let ((file (location-file %location)) + (line (location-line %location)) + (column (location-column %location))) + (if (string-null? db-password) + (if (string-null? db-secret-file) + (raise (make-compound-condition + (condition + (&message + (message + (format #f "no '~A' or '~A' field in your '~A' record" + 'db-secret-file 'db-password + 'zabbix-front-end-configuration)))) + (condition + (&error-location + (location %location))))) + (string-trim-both + (with-input-from-file db-secret-file + read-string))) + (begin + (display-hint (format #f (G_ "~a:~a:~a: ~a: +Consider using @code{db-secret-file} instead of @code{db-password} for better +security.") file line column 'zabbix-front-end-configuration)) + db-password))) "'; // Schema name. Used for IBM DB2 and PostgreSQL. $DB['SCHEMA'] = ''; @@ -548,7 +557,7 @@ $ZBX_SERVER_PORT = '" (number->string zabbix-port) "'; $ZBX_SERVER_NAME = ''; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; -")))) +"))) (define %maintenance.inc.php ;; Empty php file to allow us move zabbix-frontend configs to ‘/etc/zabbix’ -- cgit v1.2.3 From 309d87c3aa8df1a0784efa903f63d0d9b95cace6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 10 Mar 2019 23:32:18 +0100 Subject: services: guix: Allocate build user UIDs in the system range. Until now we were allocating the UIDs of build users above 30000, which is in "normal" user UID range. This static allocation was unnecessary, so this change lets the system allocate UIDs in the system range (below 1000). * gnu/services/base.scm (guix-build-accounts): Remove #:first-uid, and remove 'uid' field from 'user-account'. --- gnu/services/base.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/services') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index d2baea0dd0..fffb7b301b 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1481,16 +1481,14 @@ pam-limits-entry specified in LIMITS via pam_limits.so." (define* (guix-build-accounts count #:key (group "guixbuild") - (first-uid 30001) (shadow shadow)) - "Return a list of COUNT user accounts for Guix build users, with UIDs -starting at FIRST-UID, and under GID." + "Return a list of COUNT user accounts for Guix build users with the given +GID." (unfold (cut > <> count) (lambda (n) (user-account (name (format #f "guixbuilder~2,'0d" n)) (system? #t) - (uid (+ first-uid n -1)) (group group) ;; guix-daemon expects GROUP to be listed as a -- cgit v1.2.3 From 8b3ad455be7e8ace35a2eaebf7fffbb611280852 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 10 Mar 2019 23:39:14 +0100 Subject: services: guix: Pre-compute the default ACL. This makes the first boot slightly faster. * gnu/services/base.scm (not-config?): New procedure. (hydra-key-authorization): Rewrite to pre-compute the default ACL, and pre-compute it using (guix pki) directly. --- gnu/services/base.scm | 69 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 18 deletions(-) (limited to 'gnu/services') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index fffb7b301b..67df4d1379 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -43,6 +43,7 @@ #:select (canonical-package glibc glibc-utf8-locales)) #:use-module (gnu packages bash) #:use-module (gnu packages package-management) + #:use-module ((gnu packages gnupg) #:select (guile-gcrypt)) #:use-module (gnu packages linux) #:use-module (gnu packages terminals) #:use-module ((gnu build file-systems) @@ -50,6 +51,7 @@ #:use-module (guix gexp) #:use-module (guix records) #:use-module (guix modules) + #:use-module ((guix self) #:select (make-config.scm)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match) @@ -1502,27 +1504,58 @@ GID." 1+ 1)) +(define not-config? + ;; Select (guix …) and (gnu …) modules, except (guix config). + (match-lambda + (('guix 'config) #f) + (('guix rest ...) #t) + (('gnu rest ...) #t) + (rest #f))) + (define (hydra-key-authorization keys guix) "Return a gexp with code to register KEYS, a list of files containing 'guix archive' public keys, with GUIX." - #~(unless (file-exists? "/etc/guix/acl") - (for-each (lambda (key) - (let ((pid (primitive-fork))) - (case pid - ((0) - (let* ((port (open-file key "r0b"))) - (format #t "registering public key '~a'...~%" key) - (close-port (current-input-port)) - (dup port 0) - (execl #$(file-append guix "/bin/guix") - "guix" "archive" "--authorize") - (primitive-exit 1))) - (else - (let ((status (cdr (waitpid pid)))) - (unless (zero? status) - (format (current-error-port) "warning: \ -failed to register public key '~a': ~a~%" key status))))))) - '(#$@keys)))) + (define aaa + ;; XXX: Terrible hack to work around : this + ;; forces (guix config) and (guix utils) to be loaded upfront, so that + ;; their run-time symbols are defined. + (scheme-file "aaa.scm" + #~(define-module (guix aaa) + #:use-module (guix config) + #:use-module (guix memoization)))) + + (define default-acl + (with-extensions (list guile-gcrypt) + (with-imported-modules `(((guix config) => ,(make-config.scm)) + ((guix aaa) => ,aaa) + ,@(source-module-closure '((guix pki)) + #:select? not-config?)) + (computed-file "acl" + #~(begin + (use-modules (guix pki) + (gcrypt pk-crypto) + (ice-9 rdelim)) + + (define keys + (map (lambda (file) + (call-with-input-file file + (compose string->canonical-sexp + read-string))) + '(#$@keys))) + + (call-with-output-file #$output + (lambda (port) + (write-acl (public-keys->acl keys) + port)))))))) + + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + + (unless (file-exists? "/etc/guix/acl") + (mkdir-p "/etc/guix") + (copy-file #+default-acl "/etc/guix/acl") + (chmod "/etc/guix/acl" #o600))))) (define %default-authorized-guix-keys ;; List of authorized substitute keys. -- cgit v1.2.3 From 984a61624c458e558415414dec027232dad4502d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 11 Mar 2019 14:06:39 +0100 Subject: services: mate-desktop: Add default value. * gnu/services/desktop.scm (mate-desktop-service-type)[default-value]: New field. --- gnu/services/desktop.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/services') diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 7940f28a26..d52ea2dc05 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -906,6 +906,7 @@ and extends polkit with the actions from @code{gnome-settings-daemon}." (service-extension profile-service-type (compose list mate-package)))) + (default-value (mate-desktop-configuration)) (description "Run the MATE desktop environment."))) (define* (mate-desktop-service #:key (config (mate-desktop-configuration))) -- cgit v1.2.3 From 082c648d281dce035f8d72e64cfd369a0f775c45 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 11 Mar 2019 14:37:26 +0100 Subject: services: mate-desktop: Deprecate the 'mate-desktop-service' procedure. * gnu/services/desktop.scm (mate-desktop-service): Deprecate. * doc/guix.texi (Desktop Services): Document 'mate-desktop-service-type' and 'mate-desktop-configuration'. Fix spelling of "Enlightenment". --- doc/guix.texi | 25 +++++++++++++++++++------ gnu/services/desktop.scm | 5 ++++- 2 files changed, 23 insertions(+), 7 deletions(-) (limited to 'gnu/services') diff --git a/doc/guix.texi b/doc/guix.texi index 11ce9d6f62..82cf2babb2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14165,7 +14165,7 @@ field of an @code{operating-system} declaration (@pxref{operating-system Reference, @code{services}}). Additionally, the @code{gnome-desktop-service}, -@code{xfce-desktop-service}, @code{mate-desktop-service} and +@code{xfce-desktop-service}, @code{mate-desktop-service-type} and @code{enlightenment-desktop-service-type} procedures can add GNOME, XFCE, MATE and/or Enlightenment to a system. To ``add GNOME'' means that system-level services like the backlight adjustment helpers and the power management @@ -14181,8 +14181,8 @@ administrator's password via the standard polkit graphical interface. To ``add MATE'' means that @code{polkit} and @code{dbus} are extended appropriately, allowing MATE to operate with elevated privileges on a limited number of special-purpose system interfaces. Additionally, -adding a service made by @code{mate-desktop-service} adds the MATE -metapackage to the system profile. ``Adding ENLIGHTENMENT'' means that +adding a service of type @code{mate-desktop-service-type} adds the MATE +metapackage to the system profile. ``Adding Enlightenment'' means that @code{dbus} is extended appropriately, and several of Enlightenment's binaries are set as setuid, allowing Enlightenment's screen locker and other functionality to work as expetected. @@ -14209,13 +14209,26 @@ file system as root from within a user session, after the user has authenticated with the administrator's password. @end deffn -@deffn {Scheme Procedure} mate-desktop-service -Return a service that adds the @code{mate} package to the system +@deffn {Scheme Variable} mate-desktop-service-type +This is the type of the service that runs the @uref{https://mate-desktop.org/, +MATE desktop environment}. Its value is a @code{mate-desktop-configuration} +object (see below.) + +This service adds the @code{mate} package to the system profile, and extends polkit with the actions from @code{mate-settings-daemon}. @end deffn -@deffn {Scheme Procedure} enlightenment-desktop-service-type +@deftp {Data Type} mate-desktop-configuration +Configuration record for the MATE desktop environment. + +@table @asis +@item @code{mate} (default @code{mate}) +The MATE package to use. +@end table +@end deftp + +@deffn {Scheme Variable} enlightenment-desktop-service-type Return a service that adds the @code{enlightenment} package to the system profile, and extends dbus with actions from @code{efl}. @end deffn diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index d52ea2dc05..0dee57e3bc 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -909,7 +909,10 @@ and extends polkit with the actions from @code{gnome-settings-daemon}." (default-value (mate-desktop-configuration)) (description "Run the MATE desktop environment."))) -(define* (mate-desktop-service #:key (config (mate-desktop-configuration))) +(define-deprecated (mate-desktop-service #:key + (config + (mate-desktop-configuration))) + mate-desktop-service-type "Return a service that adds the @code{mate} package to the system profile, and extends polkit with the actions from @code{mate-settings-daemon}." (service mate-desktop-service-type config)) -- cgit v1.2.3 From 59e80445882f8b0379e54916f89510c0deda6698 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 13 Mar 2019 16:44:02 +0100 Subject: Remove traces of "GuixSD". * gnu/bootloader/extlinux.scm (extlinux-configuration-file): Remove mentions of "GuixSD". * gnu/bootloader/grub.scm (install-grub-efi): Likewise. * gnu/build/vm.scm (make-iso9660-image): Change default #:volume-id to "Guix_image". (initialize-hard-disk): Search for the "Guix_image" label. * gnu/ci.scm (system-test-jobs, tarball-jobs): Remove "GuixSD". * gnu/installer/newt/welcome.scm (run-welcome-page): Likewise. * gnu/packages/audio.scm (supercollider)[description]: Likewise. * gnu/packages/curl.scm (curl): Likewise. * gnu/packages/emacs.scm (emacs): Likewise. * gnu/packages/gnome.scm (network-manager): Likewise. * gnu/packages/julia.scm (julia): Likewise. * gnu/packages/linux.scm (alsa-plugins): Likewise. (powertop, wireless-regdb): Likewise. * gnu/packages/package-management.scm (guix): Likewise. * gnu/packages/polkit.scm (polkit): Likewise. * gnu/packages/tex.scm (texlive-bin): Likewise. * gnu/services/base.scm (file-systems->fstab): Likewise. * gnu/services/cups.scm (%cups-activation): Likewise. * gnu/services/mail.scm (%dovecot-activation): Likewise. * gnu/services/messaging.scm (prosody-configuration)[log]: Likewise. * gnu/system/examples/vm-image.tmpl (vm-image-motd): Likewise. * gnu/system/install.scm (installation-os)[file-systems]: Change root file system label to "Guix_image". * gnu/system/mapped-devices.scm (check-device-initrd-modules): Remove "GuixSD". * gnu/system/vm.scm (system-docker-image): Likewise. (system-disk-image)[root-label]: Change to "Guix_image". * gnu/tests/install.scm (run-install): Remove "GuixSD". * guix/modules.scm (guix-module-name?): Likewise. * nix/libstore/optimise-store.cc: Likewise. --- doc/guix.texi | 2 +- gnu/bootloader/extlinux.scm | 4 ++-- gnu/bootloader/grub.scm | 8 ++++---- gnu/build/vm.scm | 6 +++--- gnu/ci.scm | 4 ++-- gnu/installer/newt/welcome.scm | 4 ++-- gnu/packages/audio.scm | 2 +- gnu/packages/curl.scm | 2 +- gnu/packages/emacs.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/julia.scm | 2 +- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/linux.scm | 6 +++--- gnu/packages/package-management.scm | 4 ++-- gnu/packages/polkit.scm | 2 +- gnu/packages/tex.scm | 2 +- gnu/services/base.scm | 2 +- gnu/services/cups.scm | 2 +- gnu/services/mail.scm | 2 +- gnu/services/messaging.scm | 2 +- gnu/system/examples/vm-image.tmpl | 2 +- gnu/system/install.scm | 2 +- gnu/system/mapped-devices.scm | 4 ++-- gnu/system/vm.scm | 6 +++--- gnu/tests/install.scm | 4 ++-- guix/modules.scm | 4 ++-- nix/libstore/optimise-store.cc | 2 +- 27 files changed, 43 insertions(+), 43 deletions(-) (limited to 'gnu/services') diff --git a/doc/guix.texi b/doc/guix.texi index cf0e6d0ca2..1b2ef37367 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -16484,7 +16484,7 @@ Defaults to @samp{"internal_plain"}. @deftypevr {@code{prosody-configuration} parameter} maybe-string log Set logging options. Advanced logging configuration is not yet supported -by the Guix Prosody Service. See @url{https://prosody.im/doc/logging}. +by the Prosody service. See @url{https://prosody.im/doc/logging}. Defaults to @samp{"*syslog"}. @end deftypevr diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm index b48596c496..2bb711eed1 100644 --- a/gnu/bootloader/extlinux.scm +++ b/gnu/bootloader/extlinux.scm @@ -57,10 +57,10 @@ corresponding to old generations of the system." #~(call-with-output-file #$output (lambda (port) (let ((timeout #$(bootloader-configuration-timeout config))) - (format port "# This file was generated from your GuixSD configuration. Any changes + (format port "# This file was generated from your Guix configuration. Any changes # will be lost upon reconfiguration. UI menu.c32 -MENU TITLE GuixSD Boot Options +MENU TITLE GNU Guix Boot Options PROMPT ~a TIMEOUT ~a~%" (if (> timeout 0) 1 0) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 161e8b3d02..51d5787364 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe @@ -334,7 +334,7 @@ entries corresponding to old generations of the system." #~(call-with-output-file #$output (lambda (port) (format port - "# This file was generated from your GuixSD configuration. Any changes + "# This file was generated from your Guix configuration. Any changes # will be lost upon reconfiguration. ") #$sugar @@ -380,7 +380,7 @@ submenu \"GNU system, old configurations...\" {~%") ;; system whose root is mounted at MOUNT-POINT. (let ((grub-install (string-append bootloader "/sbin/grub-install")) (install-dir (string-append mount-point "/boot")) - ;; When installing GuixSD, it's common to mount EFI-DIR below + ;; When installing Guix, it's common to mount EFI-DIR below ;; MOUNT-POINT rather than /boot/efi on the live image. (target-esp (if (file-exists? (string-append mount-point efi-dir)) (string-append mount-point efi-dir) @@ -389,7 +389,7 @@ submenu \"GNU system, old configurations...\" {~%") ;; root partition. (setenv "GRUB_ENABLE_CRYPTODISK" "y") (unless (zero? (system* grub-install "--boot-directory" install-dir - "--bootloader-id=GuixSD" + "--bootloader-id=Guix" "--efi-directory" target-esp)) (error "failed to install GRUB (EFI)"))))) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 0aef73d26d..6d6a0c4cb4 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe @@ -422,7 +422,7 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation." (string-append "boot/grub/grub.cfg=" config-file)))) (define* (make-iso9660-image grub config-file os-drv target - #:key (volume-id "GuixSD_image") (volume-uuid #f) + #:key (volume-id "Guix_image") (volume-uuid #f) register-closures? (closures '())) "Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as GRUB configuration and OS-DRV as the stuff in it." @@ -550,7 +550,7 @@ passing it a directory name where it is mounted." (lambda (port) (format port "insmod part_msdos~@ - search --set=root --label GuixSD_image~@ + search --set=root --label Guix_image~@ configfile /boot/grub/grub.cfg~%"))) (display "creating EFI firmware image...") diff --git a/gnu/ci.scm b/gnu/ci.scm index 2c04b7189d..e108b4b15b 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -235,7 +235,7 @@ system.") (system-test-value test)))) `((derivation . ,(derivation-file-name drv)) - (description . ,(format #f "GuixSD '~a' system test" + (description . ,(format #f "Guix '~a' system test" (system-test-name test))) (long-description . ,(system-test-description test)) (license . ,(license-name gpl3+)) @@ -270,7 +270,7 @@ system.") `((derivation . ,(derivation-file-name drv)) (description . "Stand-alone binary Guix tarball") (long-description . "This is a tarball containing binaries of Guix and -all its dependencies, and ready to be installed on non-GuixSD distributions.") +all its dependencies, and ready to be installed on \"foreign\" distributions.") (license . ,(license-name gpl3+)) (home-page . ,%guix-home-page-url) (maintainers . ("bug-guix@gnu.org")))) diff --git a/gnu/installer/newt/welcome.scm b/gnu/installer/newt/welcome.scm index eec98e291a..b0b5429c0f 100644 --- a/gnu/installer/newt/welcome.scm +++ b/gnu/installer/newt/welcome.scm @@ -92,8 +92,8 @@ we want this page to occupy all the screen space available." the page. Ask the user to choose between manual installation, graphical installation and reboot." (run-menu-page - (G_ "GNU GuixSD install") - (G_ "Welcome to GNU GuixSD installer! + (G_ "GNU Guix install") + (G_ "Welcome to GNU Guix system installer! Please note that the present graphical installer is still under heavy \ development, so you might want to prefer using the shell based process. \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 91bb467de6..8bcd3c4b85 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2270,7 +2270,7 @@ for experimenting with sound synthesis and algorithmic composition. SuperCollider requires jackd to be installed in your user profile and your user must be allowed to access the realtime features of the kernel. Search for \"realtime\" in the index of the Guix manual to learn how to achieve this -using GuixSD.") +using Guix System.") (license license:gpl2+))) (define-public raul diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 822fe17036..456a18012d 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -108,7 +108,7 @@ (("/bin/sh") (which "sh"))) ;; XXX FIXME: Test #1510 seems to work on some machines and not - ;; others, possibly based on the kernel version. It works on GuixSD + ;; others, possibly based on the kernel version. It works on Guix System ;; on x86_64 with linux-libre-4.1, but fails on Hydra for both i686 ;; and x86_64 with the following error: ;; diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1e76f0821c..74005972db 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -92,7 +92,7 @@ '("eshell/esh-groups.el"))) ;; Make sure Tramp looks for binaries in the right places on - ;; remote GuixSD machines, where 'getconf PATH' returns + ;; remote Guix System machines, where 'getconf PATH' returns ;; something bogus. (substitute* "net/tramp-sh.el" ;; Patch the line after "(defcustom tramp-remote-path". diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0344e42444..3d67b7b9c1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5161,7 +5161,7 @@ users.") (doc (assoc-ref %outputs "doc")) (dhclient (string-append (assoc-ref %build-inputs "isc-dhcp") "/sbin/dhclient"))) - (list "--with-systemd-logind=yes" ;In GuixSD, this is provided by elogind. + (list "--with-systemd-logind=yes" ;In Guix System, this is provided by elogind. "--with-consolekit=no" "--with-crypto=gnutls" "--disable-config-plugin-ibft" diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index a2e1264503..fa9709c40c 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -148,7 +148,7 @@ (use-modules (ice-9 match)) (substitute* "src/runtime_ccall.cpp" ;; Patch out invocations of '/sbin/ldconfig' to avoid getting - ;; error messages about missing '/sbin/ldconfig' on GuixSD. + ;; error messages about missing '/sbin/ldconfig' on Guix System. (("popen\\(.*ldconfig.*\\);") "NULL;\n") diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 2ae5feaf52..10a1dfe0d1 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -3487,7 +3487,7 @@ workspace.") ("qtsvg" ,qtsvg) ("qttools" ,qttools) ("qtx11extras" ,qtx11extras))) - ;; FIXME: Use GuixSD ca-bundle.crt in etc/xdg/ksslcalist and + ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and ;; share/kf5/kssl/ca-bundle.crt ;; TODO: NixOS has nix-kde-include-dir.patch to change std-dir "include" ;; into "@dev@/include/". Think about whether this is needed for us, too. diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e4a58834a9..1cdffb8c79 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1112,7 +1112,7 @@ MIDI functionality to the Linux-based operating system.") (outputs '("out" "pulseaudio" "jack")) (arguments `(#:configure-flags '(;; Do not install a "local" configuration targeted - ;; for /etc/alsa. On GuixSD plugins are loaded from + ;; for /etc/alsa. On Guix System plugins are loaded from ;; the ALSA service, and other distributions likely ;; won't use these files. "--with-alsalconfdir=/tmp/noop") @@ -1579,7 +1579,7 @@ devices. It replaces @code{iwconfig}, which is deprecated.") '(#:phases (modify-phases %standard-phases ;; TODO: Patch some hardcoded "wlan0" in calibrate/calibrate.cpp to - ;; allow calibrating the network interface in GuixSD. + ;; allow calibrating the network interface in Guix System. (add-after 'unpack 'patch-absolute-file-names (lambda* (#:key inputs #:allow-other-keys) (let ((kmod (assoc-ref inputs "kmod"))) @@ -2379,7 +2379,7 @@ compliance.") #:tests? #f ;no tests #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "PREFIX=" out) - (string-append "LSB_ID=GuixSD") + (string-append "LSB_ID=Guix") (string-append "DISTRO_PUBKEY=/dev/null") (string-append "DISTRO_PRIVKEY=/dev/null") (string-append "REGDB_PUBKEY=/dev/null") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 1244cf2fc3..86e8fce1dc 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -142,8 +142,8 @@ ;; Set 'DOT_USER_PROGRAM' to the empty string so ;; we don't keep a reference to Graphviz, whose - ;; closure is pretty big (too big for the GuixSD - ;; installation image.) + ;; closure is pretty big (too big for the Guix + ;; system installation image.) "ac_cv_path_DOT_USER_PROGRAM=dot" ;; To avoid problems with the length of shebangs, diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 0433b423eb..ba74a5c905 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -73,7 +73,7 @@ (substitute* "src/polkitbackend/polkitbackendjsauthority.cpp" (("systemd") "elogind")) - ;; GuixSD's polkit service stores actions under + ;; Guix System's polkit service stores actions under ;; /etc/polkit-1/actions. (substitute* "src/polkitbackend/polkitbackendinteractiveauthority.c" (("PACKAGE_DATA_DIR \"/polkit-1/actions\"") diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 584b2bcfa5..5b29937672 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -185,7 +185,7 @@ ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows, ;; and the "gs" ghostscript executable on Unix. It detects Unix by ;; checking for the existence of the /usr/bin directory. Since - ;; GuixSD does not have /usr/bin, it is also detected as Windows. + ;; Guix System does not have /usr/bin, it is also detected as Windows. (lambda* (#:key inputs #:allow-other-keys) (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl" (("gswin32c") "gs")) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 67df4d1379..04b123b833 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -331,7 +331,7 @@ seconds after @code{SIGTERM} has been sent are terminated with `(("fstab" ,(plain-file "fstab" (string-append "\ -# This file was generated from your GuixSD configuration. Any changes +# This file was generated from your Guix configuration. Any changes # will be lost upon reboot or reconfiguration.\n\n" (string-join (map file-system->fstab-entry file-systems) diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index 715d333a71..9125139ef3 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -862,7 +862,7 @@ IPP specifications.") (define* (create-self-signed-certificate-if-absent #:key private-key public-key (owner (getpwnam "root")) (common-name (gethostname)) - (organization-name "GuixSD") + (organization-name "Guix") (organization-unit-name "Default Self-Signed Certificate") (subject-parameters `(("CN" . ,common-name) ("O" . ,organization-name) diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index fcaedd038b..a7e8c41d3a 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -1485,7 +1485,7 @@ greyed out, instead of only later giving \"not selectable\" popup error. (define* (create-self-signed-certificate-if-absent #:key private-key public-key (owner (getpwnam "root")) (common-name (gethostname)) - (organization-name "GuixSD") + (organization-name "Guix") (organization-unit-name "Default Self-Signed Certificate") (subject-parameters `(("CN" . ,common-name) ("O" . ,organization-name) diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index e70f1b70ef..11b41f2bf6 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -461,7 +461,7 @@ about using the hashed backend. See also (log (maybe-string "*syslog") "Set logging options. Advanced logging configuration is not yet supported -by the GuixSD Prosody Service. See @url{https://prosody.im/doc/logging}." +by the Prosody service. See @url{https://prosody.im/doc/logging}." common) (pidfile diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index 4d292c1bc6..6dc67b0901 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -8,7 +8,7 @@ (define vm-image-motd (plain-file "motd" " This is the GNU system. Welcome! -This instance of GuixSD is a bare-bones template for virtualized environments. +This instance of Guix System is a bare-bones template for virtualized environments. You will probably want to do these things first if you booted in a virtual private server (VPS): diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 0ba2066d11..bad318d06b 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -353,7 +353,7 @@ You have been warned. Thanks for being so brave.\x1b[0m ;; the appropriate one. (cons* (file-system (mount-point "/") - (device (file-system-label "GuixSD_image")) + (device (file-system-label "Guix_image")) (type "ext4")) ;; Make /tmp a tmpfs instead of keeping the overlayfs. This diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm index a874666463..e29ad3ad38 100644 --- a/gnu/system/mapped-devices.scm +++ b/gnu/system/mapped-devices.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017, 2018 Mark H Weaver ;;; @@ -120,7 +120,7 @@ DEVICE must be a \"/dev\" file name." (define aliases ;; Attempt to load 'modules.alias' from the current kernel, assuming we're - ;; on GuixSD, and assuming that corresponds to the kernel we'll be + ;; on Guix System, and assuming that corresponds to the kernel we'll be ;; installing. Skip the whole thing if that file cannot be read. (catch 'system-error (lambda () diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index e09c687a04..e561285964 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -463,8 +463,8 @@ the image." "Build a docker image. OS is the desired . NAME is the base name to use for the output file. When REGISTER-CLOSURES? is not #f, register the closure of OS with Guix in the resulting Docker image. This only -makes sense when you want to build a GuixSD Docker image that has Guix -installed inside of it. If you don't need Guix (e.g., your GuixSD Docker +makes sense when you want to build a Guix System Docker image that has Guix +installed inside of it. If you don't need Guix (e.g., your Docker image just contains a web server that is started by the Shepherd), then you should set REGISTER-CLOSURES? to #f." (define schema @@ -610,7 +610,7 @@ to USB sticks meant to be read-only." (define root-label ;; Volume name of the root file system. - (normalize-label "GuixSD_image")) + (normalize-label "Guix_image")) (define root-uuid ;; UUID of the root file system, computed in a deterministic fashion. diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index ec29064118..277908cc49 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -47,7 +47,7 @@ ;;; Commentary: ;;; -;;; Test the installation of GuixSD using the documented approach at the +;;; Test the installation of Guix using the documented approach at the ;;; command line. ;;; ;;; Code: @@ -204,7 +204,7 @@ reboot\n") (guix combinators)))) (installation-disk-image-file-system-type "ext4") (target-size (* 2200 MiB))) - "Run SCRIPT (a shell script following the GuixSD installation procedure) in + "Run SCRIPT (a shell script following the system installation procedure) in OS to install TARGET-OS. Return a VM image of TARGET-SIZE bytes containing the installed system. The packages specified in PACKAGES will be appended to packages defined in installation-os." diff --git a/guix/modules.scm b/guix/modules.scm index 65928f67f2..1a6fafe35b 100644 --- a/guix/modules.scm +++ b/guix/modules.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -112,7 +112,7 @@ depends on." ".scm")) (define (guix-module-name? name) - "Return true if NAME (a list of symbols) denotes a Guix or GuixSD module." + "Return true if NAME (a list of symbols) denotes a Guix module." (match name (('guix _ ...) #t) (('gnu _ ...) #t) diff --git a/nix/libstore/optimise-store.cc b/nix/libstore/optimise-store.cc index 71dc1be07f..d8f8d2394b 100644 --- a/nix/libstore/optimise-store.cc +++ b/nix/libstore/optimise-store.cc @@ -114,7 +114,7 @@ void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path, InodeHa /* Sometimes SNAFUs can cause files in the store to be modified, in particular when running programs as root under - GuixSD (example: $fontconfig/var/cache being modified). Skip + Guix System (example: $fontconfig/var/cache being modified). Skip those files. FIXME: check the modification time. */ if (S_ISREG(st.st_mode) && (st.st_mode & S_IWUSR)) { printMsg(lvlError, format("skipping suspicious writable file `%1%'") % path); -- cgit v1.2.3