stellarskylark/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove traces of "GuixSD".

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2019-03-13 16:44:02 +01:00
parent 13f62aef2d
commit 59e8044588
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
27 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/guix.texi
View file

@ -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

4
gnu/bootloader/extlinux.scm
View file

@ -57,10 +57,10 @@ (define builder
#~(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)

8
gnu/bootloader/grub.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@ -334,7 +334,7 @@ (define builder
#~(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 @@ (define install-grub-efi
;; 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 @@ (define install-grub-efi
;; 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)")))))

6
gnu/build/vm.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@ -422,7 +422,7 @@ (define (install-efi grub esp config-file)
(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 @@ (define (partition-esp? partition)
(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...")

4
gnu/ci.scm
View file

@ -235,7 +235,7 @@ (define drv
(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 @@ (define (->alist drv)
`((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"))))

4
gnu/installer/newt/welcome.scm
View file

@ -92,8 +92,8 @@ (define (run-welcome-page logo)
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. \

2
gnu/packages/audio.scm
View file

@ -2270,7 +2270,7 @@ (define-public supercollider
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

2
gnu/packages/curl.scm
View file

@ -108,7 +108,7 @@ (define-public curl
(("/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:
;;

2
gnu/packages/emacs.scm
View file

@ -92,7 +92,7 @@ (define-public emacs
'("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".

2
gnu/packages/gnome.scm
View file

@ -5161,7 +5161,7 @@ (define-public network-manager
(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"

2
gnu/packages/julia.scm
View file

@ -148,7 +148,7 @@ (define-public julia
(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")

2
gnu/packages/kde-frameworks.scm
View file

@ -3487,7 +3487,7 @@ (define-public kdelibs4support
("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.

6
gnu/packages/linux.scm
View file

@ -1112,7 +1112,7 @@ (define-public alsa-plugins
(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 @@ (define-public powertop
'(#: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 @@ (define-public wireless-regdb
#: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")

4
gnu/packages/package-management.scm
View file

@ -142,8 +142,8 @@ (define-public guix
;; 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,

2
gnu/packages/polkit.scm
View file

@ -73,7 +73,7 @@ (define-public polkit
(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\"")

2
gnu/packages/tex.scm
View file

@ -185,7 +185,7 @@ (define-public texlive-bin
;; 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"))

2
gnu/services/base.scm
View file

@ -331,7 +331,7 @@ (define (file-systems->fstab file-systems)
`(("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)

2
gnu/services/cups.scm
View file

@ -862,7 +862,7 @@ (define (escape-char str chr)
(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)

2
gnu/services/mail.scm
View file

@ -1485,7 +1485,7 @@ (define (escape-char str chr)
(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)

2
gnu/services/messaging.scm
View file

@ -461,7 +461,7 @@ (define-all-configurations prosody-configuration
(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

2
gnu/system/examples/vm-image.tmpl
View file

@ -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):

2
gnu/system/install.scm
View file

@ -353,7 +353,7 @@ (define installation-os
;; 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

4
gnu/system/mapped-devices.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org>
;;;
@ -120,7 +120,7 @@ (define (check-device-initrd-modules device linux-modules location)
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 ()

6
gnu/system/vm.scm
View file

@ -463,8 +463,8 @@ (define* (system-docker-image os
"Build a docker image. OS is the desired <operating-system>. 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 @@ (define normalize-label
(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.

4
gnu/tests/install.scm
View file

@ -47,7 +47,7 @@ (define-module (gnu tests install)
;;; 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 @@ (define* (run-install target-os target-os-source
(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."

4
guix/modules.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -112,7 +112,7 @@ (define (module-name->file-name module)
".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)

2
nix/libstore/optimise-store.cc
View file

@ -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);