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 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'doc/guix.texi') 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 -- cgit v1.2.3 From 13f62aef2d87dc888f89fea3260eaa39938e6640 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 13 Mar 2019 16:24:36 +0100 Subject: maint: Change Guix System file names from guixsd-*. * Makefile.am (GUIXSD_SUPPORTED_SYSTEMS): Rename to... (GUIX_SYSTEM_SUPPORTED_SYSTEMS): ... this. (GUIXSD_VM_SYSTEMS): Rename to... (GUIX_SYSTEM_VM_SYSTEMS): ... this. (GUIXSD_IMAGE_BASE): Rename to... (GUIX_SYSTEM_IMAGE_BASE): ... this. Change "guixsd-" to "guix-system-". (GUIXSD_VM_IMAGE_BASE): Rename to... (GUIX_SYSTEM_VM_IMAGE_BASE): ... this. Change "guixsd-" to "guix-system-". (release): Adjust accordingly. * doc/guix.texi (USB Stick and DVD Installation) (Installing Guix in a VM, Invoking guix system) (Running Guix in a VM): Adjust file names accordingly. --- Makefile.am | 38 +++++++++++++++++++------------------- doc/guix.texi | 20 ++++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'doc/guix.texi') diff --git a/Makefile.am b/Makefile.am index cf35770ba7..e7109ec69c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -661,17 +661,17 @@ SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux BINARY_TARBALLS = \ $(foreach system,$(SUPPORTED_SYSTEMS),guix-binary.$(system).tar.xz) -# Systems supported by GuixSD. -GUIXSD_SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux +# Systems supported by Guix System. +GUIX_SYSTEM_SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux -# Systems for which we build GuixSD VMs. -GUIXSD_VM_SYSTEMS ?= x86_64-linux +# Systems for which we build Guix VMs. +GUIX_SYSTEM_VM_SYSTEMS ?= x86_64-linux -# Prefix of the GuixSD installation image file name. -GUIXSD_IMAGE_BASE = guixsd-install-$(PACKAGE_VERSION) +# Prefix of the Guix installation image file name. +GUIX_SYSTEM_IMAGE_BASE = guix-system-install-$(PACKAGE_VERSION) -# Prefix of the GuixSD VM image file name. -GUIXSD_VM_IMAGE_BASE = guixsd-vm-image-$(PACKAGE_VERSION) +# Prefix of the Guix VM image file name. +GUIX_SYSTEM_VM_IMAGE_BASE = guix-system-vm-image-$(PACKAGE_VERSION) # The release process works in several phases: # @@ -680,7 +680,7 @@ GUIXSD_VM_IMAGE_BASE = guixsd-vm-image-$(PACKAGE_VERSION) # 2. Update the 'guix' package so that it corresponds to the 'vX.Y' tag. # 3. Build the binary tarballs for that 'guix' package. # 4. Update the 'guix' package again. -# 5. Build the GuixSD installation images. The images will run 'guix' +# 5. Build the installation images. The images will run 'guix' # corresponding to 'vX.Y' + 1 commit, and they will install 'vX.Y'. # # This 'release' target takes care of everything and copies the resulting @@ -713,32 +713,32 @@ release: dist "`git rev-parse HEAD`" git add $(top_srcdir)/gnu/packages/package-management.scm git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`." - for system in $(GUIXSD_SUPPORTED_SYSTEMS) ; do \ + for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ image=`$(top_builddir)/pre-inst-env \ guix system disk-image \ --file-system-type=iso9660 \ --system=$$system \ gnu/system/install.scm` ; \ if [ ! -f "$$image" ] ; then \ - echo "failed to produced GuixSD installation image for $$system" >&2 ; \ + echo "failed to produced Guix installation image for $$system" >&2 ; \ exit 1 ; \ fi ; \ - xz < "$$image" > "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.iso.xz.tmp" ; \ - mv "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.iso.xz.tmp" \ - "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.iso.xz" ; \ + xz < "$$image" > "$(releasedir)/$(GUIX_SYSTEM_IMAGE_BASE).$$system.iso.xz.tmp" ; \ + mv "$(releasedir)/$(GUIX_SYSTEM_IMAGE_BASE).$$system.iso.xz.tmp" \ + "$(releasedir)/$(GUIX_SYSTEM_IMAGE_BASE).$$system.iso.xz" ; \ done - for system in $(GUIXSD_VM_SYSTEMS) ; do \ + for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \ image=`$(top_builddir)/pre-inst-env \ guix system vm-image \ --system=$$system \ gnu/system/examples/vm-image.tmpl` ; \ if [ ! -f "$$image" ] ; then \ - echo "failed to produced GuixSD VM image for $$system" >&2 ; \ + echo "failed to produced Guix VM image for $$system" >&2 ; \ exit 1 ; \ fi ; \ - xz < "$$image" > "$(releasedir)/$(GUIXSD_VM_IMAGE_BASE).$$system.xz.tmp" ; \ - mv "$(releasedir)/$(GUIXSD_VM_IMAGE_BASE).$$system.xz.tmp" \ - "$(releasedir)/$(GUIXSD_VM_IMAGE_BASE).$$system.xz" ; \ + xz < "$$image" > "$(releasedir)/$(GUIX_SYSTEM_VM_IMAGE_BASE).$$system.xz.tmp" ; \ + mv "$(releasedir)/$(GUIX_SYSTEM_VM_IMAGE_BASE).$$system.xz.tmp" \ + "$(releasedir)/$(GUIX_SYSTEM_VM_IMAGE_BASE).$$system.xz" ; \ done @echo @echo "Congratulations! All the release files are now in $(releasedir)." diff --git a/doc/guix.texi b/doc/guix.texi index 82cf2babb2..cf0e6d0ca2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1866,7 +1866,7 @@ about their support in GNU/Linux. An ISO-9660 installation image that can be written to a USB stick or burnt to a DVD can be downloaded from -@indicateurl{https://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.iso.xz}, +@indicateurl{https://alpha.gnu.org/gnu/guix/guix-system-install-@value{VERSION}.@var{system}.iso.xz}, where @var{system} is one of: @table @code @@ -1882,8 +1882,8 @@ Make sure to download the associated @file{.sig} file and to verify the authenticity of the image against it, along these lines: @example -$ wget https://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.iso.xz.sig -$ gpg --verify guixsd-install-@value{VERSION}.@var{system}.iso.xz.sig +$ wget https://alpha.gnu.org/gnu/guix/guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig +$ gpg --verify guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig @end example If that command fails because you do not have the required public key, @@ -1910,7 +1910,7 @@ To copy the image to a USB stick, follow these steps: Decompress the image using the @command{xz} command: @example -xz -d guixsd-install-@value{VERSION}.@var{system}.iso.xz +xz -d guix-system-install-@value{VERSION}.@var{system}.iso.xz @end example @item @@ -1919,7 +1919,7 @@ its device name. Assuming that the USB stick is known as @file{/dev/sdX}, copy the image with: @example -dd if=guixsd-install-@value{VERSION}.@var{system}.iso of=/dev/sdX +dd if=guix-system-install-@value{VERSION}.@var{system}.iso of=/dev/sdX sync @end example @@ -1935,7 +1935,7 @@ To copy the image to a DVD, follow these steps: Decompress the image using the @command{xz} command: @example -xz -d guixsd-install-@value{VERSION}.@var{system}.iso.xz +xz -d guix-system-install-@value{VERSION}.@var{system}.iso.xz @end example @item @@ -1944,7 +1944,7 @@ its device name. Assuming that the DVD drive is known as @file{/dev/srX}, copy the image with: @example -growisofs -dvd-compat -Z /dev/srX=guixsd-install-@value{VERSION}.@var{system}.iso +growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.@var{system}.iso @end example Access to @file{/dev/srX} usually requires root privileges. @@ -2364,7 +2364,7 @@ Boot the USB installation image in an VM: @example qemu-system-x86_64 -m 1024 -smp 1 \ -net user -net nic,model=virtio -boot menu=on \ - -drive file=guixsd-install-@value{VERSION}.@var{system}.iso \ + -drive file=guix-system-install-@value{VERSION}.@var{system}.iso \ -drive file=guixsd.img @end example @@ -23360,7 +23360,7 @@ system configuration file. You can then load the image and launch a Docker container using commands like the following: @example -image_id="$(docker load < guixsd-docker-image.tar.gz)" +image_id="$(docker load < guix-system-docker-image.tar.gz)" docker run -e GUIX_NEW_SYSTEM=/var/guix/profiles/system \\ --entrypoint /var/guix/profiles/system/profile/bin/guile \\ $image_id /var/guix/profiles/system/boot @@ -23546,7 +23546,7 @@ example graph. @cindex virtual machine To run Guix in a virtual machine (VM), one can either use the pre-built Guix VM image distributed at -@indicateurl{https://alpha.gnu.org/gnu/guix/guixsd-vm-image-@value{VERSION}.@var{system}.xz} +@indicateurl{https://alpha.gnu.org/gnu/guix/guix-system-vm-image-@value{VERSION}.@var{system}.xz} , or build their own virtual machine image using @command{guix system vm-image} (@pxref{Invoking guix system}). The returned image is in qcow2 format, which the @uref{http://qemu.org/, QEMU emulator} can -- 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 'doc/guix.texi') 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 From e1c15e8b8e25e14c253ff1212e289565736f6ea7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 13 Mar 2019 21:57:14 +0100 Subject: doc: Document the graphical installer some more. * doc/guix.texi (Preparing for Installation): Rewrite to specify the two installation modes. (Guided Graphical Installation): New node. (Manual Installation): New node, with the former sections. (After System Installation): New node. * doc/images/installer-network.png, doc/images/installer-partitions.png, doc/images/installer-resume.png: New files. * doc/local.mk (dist_infoimage_DATA): Add them. --- doc/guix.texi | 121 +++++++++++++++++++++++++++--------- doc/images/installer-network.png | Bin 0 -> 24342 bytes doc/images/installer-partitions.png | Bin 0 -> 55847 bytes doc/images/installer-resume.png | Bin 0 -> 35829 bytes doc/local.mk | 7 ++- 5 files changed, 98 insertions(+), 30 deletions(-) create mode 100644 doc/images/installer-network.png create mode 100644 doc/images/installer-partitions.png create mode 100644 doc/images/installer-resume.png (limited to 'doc/guix.texi') diff --git a/doc/guix.texi b/doc/guix.texi index 1b2ef37367..043aad1b65 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -165,10 +165,17 @@ System Installation * Hardware Considerations:: Supported hardware. * USB Stick and DVD Installation:: Preparing the installation medium. * Preparing for Installation:: Networking, partitioning, etc. -* Proceeding with the Installation:: The real thing. +* Guided Graphical Installation:: Easy graphical installation. +* Manual Installation:: Manual installation for wizards. +* After System Installation:: When installation succeeded. * Installing Guix in a VM:: Guix System playground. * Building the Installation Image:: How this comes to be. +Manual Installation + +* Keyboard Layout and Networking and Partitioning:: Initial setup. +* Proceeding with the Installation:: Installing. + Package Management * Features:: How Guix will make your life brighter. @@ -1777,7 +1784,9 @@ available. * Hardware Considerations:: Supported hardware. * USB Stick and DVD Installation:: Preparing the installation medium. * Preparing for Installation:: Networking, partitioning, etc. -* Proceeding with the Installation:: The real thing. +* Guided Graphical Installation:: Easy graphical installation. +* Manual Installation:: Manual installation for wizards. +* After System Installation:: When installation succeeded. * Installing Guix in a VM:: Guix System playground. * Building the Installation Image:: How this comes to be. @end menu @@ -1963,21 +1972,19 @@ Guix System in a virtual machine (VM). @node Preparing for Installation @section Preparing for Installation -Once you have successfully booted your computer using the installation medium, -you should end up with the welcome page of the graphical installer. The -graphical installer is a text-based user interface built upon the newt -library. It shall guide you through all the different steps needed to install -GNU@tie{}Guix System. However, as the graphical installer is still under heavy -development, you might want to fallback to the original, shell based install -process, by switching to TTYs 3 to 6 with the shortcuts CTRL-ALT-F[3-6]. The -following sections describe the installation procedure assuming you're using -one of those TTYs. They are configured and can be used to run commands as -root. +Once you have booted, you can use the guided graphical installer, which makes +it easy to get started (@pxref{Guided Graphical Installation}). Alternately, +if you are already familiar with GNU/Linux and if you want more control than +what the graphical installer provides, you can choose the ``manual'' +installation process (@pxref{Manual Installation}). -TTY2 shows this documentation, browsable using the Info reader commands -(@pxref{Top,,, info-stnd, Stand-alone GNU Info}). The installation system -runs the GPM mouse daemon, which allows you to select text with the left mouse -button and to paste it with the middle button. +The graphical installer is available on TTY1. You can obtain root shells on +TTYs 3 to 6 by hitting @kbd{ctrl-alt-f3}, @kbd{ctrl-alt-f4}, etc. TTY2 shows +this documentation and you can reach it with @kbd{ctrl-alt-f2}. Documentation +is browsable using the Info reader commands (@pxref{Top,,, info-stnd, +Stand-alone GNU Info}). The installation system runs the GPM mouse daemon, +which allows you to select text with the left mouse button and to paste it +with the middle button. @quotation Note Installation requires access to the Internet so that any missing @@ -1985,12 +1992,65 @@ dependencies of your system configuration can be downloaded. See the ``Networking'' section below. @end quotation -The installation system includes many common tools needed for this task. -But it is also a full-blown Guix System, which means that you can -install additional packages, should you need it, using @command{guix -package} (@pxref{Invoking guix package}). +@node Guided Graphical Installation +@section Guided Graphical Installation + +The graphical installer is a text-based user interface. It will guide you, +with dialog boxes, through the steps needed to install GNU@tie{}Guix System. + +The first dialog boxes allow you to set up the system as you use it during the +installation: you can choose the language, keyboard layout, and set up +networking, which will be used during the installation. The image below shows +the networking dialog. + +@image{images/installer-network,5in,, networking setup with the graphical installer} + +Later steps allow you to partition your hard disk, as shown in the image +below, to choose whether or not to use encrypted file systems, to enter the +host name and root password, and to create an additional account, among other +things. + +@image{images/installer-partitions,5in,, partitioning with the graphical installer} + +Note that, at any time, the installer allows you to exit the current +installation step and resume at a previous step, as show in the image below. + +@image{images/installer-resume,5in,, resuming the installation process} + +Once you're done, the installer produces an operating system configuration and +displays it (@pxref{Using the Configuration System}). At that point you can +hit ``OK'' and installation will proceed. On success, you can reboot into the +new system and enjoy. @xref{After System Installation}, for what's next! + -@subsection Keyboard Layout +@node Manual Installation +@section Manual Installation + +This section describes how you would ``manually'' install GNU@tie{}Guix System +on your machine. This option requires familiarity with GNU/Linux, with the +shell, and with common administration tools. If you think this is not for +you, consider using the guided graphical installer (@pxref{Guided Graphical +Installation}). + +The installation system provides root shells on TTYs 3 to 6; press +@kbd{ctrl-alt-f3}, @kbd{ctrl-alt-f4}, and so on to reach them. It includes +many common tools needed to install the system. But it is also a full-blown +Guix System, which means that you can install additional packages, should you +need it, using @command{guix package} (@pxref{Invoking guix package}). + +@menu +* Keyboard Layout and Networking and Partitioning:: Initial setup. +* Proceeding with the Installation:: Installing. +@end menu + +@node Keyboard Layout and Networking and Partitioning +@subsection Keyboard Layout, Networking, and Partitioning + +Before you can install the system, you may want to adjust the keyboard layout, +set up networking, and partition your target hard disk. This section will +guide you through this. + +@subsubsection Keyboard Layout @cindex keyboard layout The installation image uses the US qwerty keyboard layout. If you want @@ -2005,7 +2065,7 @@ See the files under @file{/run/current-system/profile/share/keymaps} for a list of available keyboard layouts. Run @command{man loadkeys} for more information. -@subsection Networking +@subsubsection Networking Run the following command to see what your network interfaces are called: @@ -2098,7 +2158,7 @@ herd start ssh-daemon Make sure to either set a password with @command{passwd}, or configure OpenSSH public key authentication before logging in. -@subsection Disk Partitioning +@subsubsection Disk Partitioning Unless this has already been done, the next step is to partition, and then format the target partition(s). @@ -2219,7 +2279,7 @@ file in its file system as described above, then the encryption also protects the swap file, just like any other file in that file system. @node Proceeding with the Installation -@section Proceeding with the Installation +@subsection Proceeding with the Installation With the target partitions ready and the target root mounted on @file{/mnt}, we're ready to go. First, run: @@ -2303,9 +2363,14 @@ in the new system is initially empty; other users' passwords need to be initialized by running the @command{passwd} command as @code{root}, unless your configuration specifies otherwise (@pxref{user-account-password, user account passwords}). +@xref{After System Installation}, for what's next! + -@cindex upgrading Guix System -From then on, you can update the system whenever you want by running, say: +@node After System Installation +@section After System Installation + +Success, you've now booted into Guix System! From then on, you can update the +system whenever you want by running, say: @example guix pull @@ -2326,8 +2391,8 @@ explicitly run root's @command{guix}, type @command{sudo -i guix @dots{}}. @end quotation Join us on @code{#guix} on the Freenode IRC network or on -@email{guix-devel@@gnu.org} to share your experience---good or not so -good. +@email{guix-devel@@gnu.org} to share your experience! + @node Installing Guix in a VM @section Installing Guix in a Virtual Machine diff --git a/doc/images/installer-network.png b/doc/images/installer-network.png new file mode 100644 index 0000000000..bd72f7f341 Binary files /dev/null and b/doc/images/installer-network.png differ diff --git a/doc/images/installer-partitions.png b/doc/images/installer-partitions.png new file mode 100644 index 0000000000..2632e9a209 Binary files /dev/null and b/doc/images/installer-partitions.png differ diff --git a/doc/images/installer-resume.png b/doc/images/installer-resume.png new file mode 100644 index 0000000000..db10169080 Binary files /dev/null and b/doc/images/installer-resume.png differ diff --git a/doc/local.mk b/doc/local.mk index adb7b5102d..18115fb295 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -1,6 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2016 Eric Bavier -# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès # Copyright © 2013 Andreas Enge # Copyright © 2016 Taylan Ulrich Bayırlı/Kammer # Copyright © 2016, 2018 Mathieu Lirzin @@ -111,7 +111,10 @@ $(srcdir)/%D%/contributing.%.texi: po/doc/guix-manual.%.po infoimagedir = $(infodir)/images dist_infoimage_DATA = \ $(DOT_FILES:%.dot=%.png) \ - %D%/images/coreutils-size-map.png + %D%/images/coreutils-size-map.png \ + %D%/images/installer-network.png \ + %D%/images/installer-partitions.png \ + %D%/images/installer-resume.png # Try hard to obtain an image size and aspect that's reasonable for inclusion # in an Info or PDF document. -- cgit v1.2.3