summary refs log tree commit diff
path: root/gnu/system.scm
AgeCommit message (Collapse)Author
2020-07-05system: Do not use "hurd-target?".Mathieu Othacehe
Fix the following issue, that happens during CI evaluation: In guix/gexp.scm: 782:4 19 (_ _) In guix/store.scm: 1907:12 18 (_ #<store-connection 256.99 7f3727b6de10>) 1340:2 17 (map/accumulate-builds #<store-connection 256.99 7f372…> …) In srfi/srfi-1.scm: 586:29 16 (map1 ((#<file-append #<package hurd@0.9-1.91a516…> …) …)) 586:29 15 (map1 ((#<file-append #<<parameterized> bindings:…> …) …)) 586:29 14 (map1 ((#<file-append #<package hurd@0.9-1.91a516…> …) …)) 586:17 13 (map1 ((#<<operating-system> kernel: #<<parameter…> …) …)) In guix/store.scm: 1299:8 12 (call-with-build-handler #<procedure build-accumulator…> …) 2025:24 11 (run-with-store #<store-connection 256.99 7f3727b6de10> …) In guix/gexp.scm: 785:13 10 (_ _) In guix/store.scm: 1859:8 9 (_ _) In guix/gexp.scm: 243:18 8 (_ _) In guix/store.scm: 1894:38 7 (_ #<store-connection 256.99 7f3727b6de10>) In gnu/system.scm: 1012:19 6 (_ #<store-connection 256.99 7f3727b6de10>) 634:11 5 (operating-system-services #<<operating-system> kernel:…>) 611:17 4 (hurd-default-essential-services #<<operating-system> k…>) 555:18 3 (operating-system-directory-base-entries #<<operating-s…>) 1270:18 2 (operating-system-boot-parameters-file #<<operating-sy…> …) 1225:35 1 (operating-system-boot-parameters #<<operating-system>…> …) 1225:35 0 (operating-system-boot-parameters (#<<file-system> de…>) …) gnu/system.scm:1225:35: In procedure operating-system-boot-parameters: Wrong type to apply: #f "hurd-target?" is returning false when it should return true in that context. * gnu/system.scm (operating-system-boot-parameters): Check for "hurd" target field of "os" instead of using the "hurd-target?" procedure.
2020-07-03services: system-service-type: Add entries support for the Hurd.Jan (janneke) Nieuwenhuizen
When creating a disk-image using --save-provenance, "guix system describe" now works. * gnu/system.scm (operating-system-directory-base-entries): Add conditional "hurd" parameter, make "initrd" parameter conditional. (hurd-default-essential-services): Use them. (operating-system-boot-parameters-file): Only add 'initrd' when set.
2020-07-03system: 'read-boot-parameters' allow initrd to be missing.Jan (janneke) Nieuwenhuizen
* gnu/system.scm (read-boot-parameters): Allow initrd to be missing.
2020-07-03system: 'read-boot-parameters' bugfix for multiboot.Jan (janneke) Nieuwenhuizen
* gnu/system.scm (read-boot-parameters): Oops, only return value for multiboot-modules instead of (key value).
2020-06-21system: Add 'sg' and 'newgrp' to %SETUID-PROGRAMS.Brice Waegeneire
* gnu/system.scm (%setuid-programs): Add 'sg' and 'newgrp'. Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
2020-06-19hurd-boot: Use 'setxattr' instead of invoking settrans.Jan (janneke) Nieuwenhuizen
Note: Using `getxattr' on the Hurd instead of running showtrans does not work (yet?). * gnu/build/hurd-boot.scm (setup-translator): Use 'setxattr' instead of invoking settrans. * gnu/system.scm (hurd-multiboot-modules): Add --x-xattr-translator-records to enable xattr-embedding of translators.
2020-06-09services: etc: Add '/etc/ttys' symlink for the Hurd.Jan (janneke) Nieuwenhuizen
Reported by Vitaliy Shatrov <D0dyBo0D0dyBo0@protonmail.com> via IRC. * gnu/system.scm (operating-system-etc-service): For the Hurd, add '/etc/ttys' symlink. This fixes terminal behavior in the console by setting TERM=hurd.
2020-06-09system: Fix typo that breaks grub.cfg generation.Royce Strange
* gnu/system.scm (boot-parameters->menu-entry): Delete quote to evalutate and get kernel boot parameters. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2020-06-08gnu: services: Add %hurd-startup-service.Jan (janneke) Nieuwenhuizen
This decouples startup of the Hurd from the "hurd" package, moving the RC script into SYSTEM. * gnu/packages/hurd.scm (hurd)[inputs]: Remove hurd-rc-script. [arguments]: Do not substitute it. Update "runsystem.sh" to parse kernel arguments and exec into --system=SYSTEM/rc. (hurd-rc-script): Move to... * gnu/services.scm (%hurd-rc-file): ...this new variable. (hurd-rc-entry): New procedure. (%hurd-startup-service): Use it in new variable. * gnu/system.scm (hurd-default-essential-services): Use it.
2020-06-08system: hurd: Populate services.Jan (janneke) Nieuwenhuizen
* gnu/system/hurd.scm (%base-services/hurd): Add hurd-console-service, hurd-getty-services, guix-service. Also add sylog and loopback, needed for ... * gnu/system.scm (hurd-default-essential-services): ... add %shepherd-root-service with dependencies: %boot-service, %activation-service, user-processes, root-file-system-service, file-system-service, pam-root-service.
2020-06-08services: hurd: Populate system profile.Jan (janneke) Nieuwenhuizen
* gnu/system.scm (hurd-default-essential-services): Populate profile with packages.
2020-06-08services: Support etc-service for the Hurd.Jan (janneke) Nieuwenhuizen
* gnu/system.scm (operating-system-etc-service): Cater for missing nsswitch and missing sudoers-file. For the Hurd, add "login" and "motd". (hurd-default-essential-services): Add operating-system-etc-service.
2020-06-08system: Support activation service for the Hurd.Jan (janneke) Nieuwenhuizen
* gnu/build/activation.scm (boot-time-system): Use "command-line" for the Hurd. * gnu/system.scm (hurd-default-essential-services): Add %boot-service and %activation-service.
2020-06-08system: Use 'hurd' package in label.Jan (janneke) Nieuwenhuizen
* gnu/system.scm (kernel->boot-label): Add keyword parameter 'hurd'. If set, use it for label. (operating-system-default-label): Call with it with operating-system-hurd.
2020-06-08system: Add 'multiboot-modules' field to <boot-parameters>.Jan (janneke) Nieuwenhuizen
* gnu/system.scm (<boot-parameters>)[multiboot-modules]: New field. (read-boot-parameters): Initialize it. (operating-system-multiboot-modules, hurd-multiboot-modules): New procedure. (operating-system-boot-parameters): Cater for multiboot the Hurd and initialize it; avoid initrd in that case. (operating-system-kernel-file): Cater for for Gnumach (the Hurd) besides Linux. (boot-parameters->menu-entry): Use it to support a multiboot <menu-entry>.
2020-06-08system: Add 'hurd' field to <operating-system>.Jan (janneke) Nieuwenhuizen
* gnu/system.scm (<operating-system>)[hurd]: New field. * doc/guix.texi (operating-system Reference): Document 'hurd'.
2020-06-08system: hurd: Add hurd-default-essential-services.Jan (janneke) Nieuwenhuizen
* gnu/system.scm (hurd-default-essential-services): New procedure.
2020-06-06system: 'system-linux-image-file-name' takes an optional parameter.Ludovic Courtès
* gnu/system.scm (system-linux-image-file-name): Make 'target' an optional parameter.
2020-05-29bootloader: grub: Rename the btrfs-subvolume-file-name parameter.Maxim Cournoyer
Following discussion in <https://issues.guix.gnu.org/37305>, it seems more appropriate to give the parameter a more generic name that better describes what it does. * gnu/bootloader/grub.scm (normalize-file): Rename the BTRFS-SUBVOLUME-FILE-NAME parameter to STORE-DIRECTORY-PREFIX, and always assume this argument to be a string. (eye-candy): Likewise. Default STORE-DIRECTORY-PREFIX to "". (grub-configuration-file): Likewise. * gnu/system.scm (operating-system-bootcfg): Adapt.
2020-05-20bootloader: grub: Allow booting from a Btrfs subvolume.Maxim Cournoyer
* gnu/bootloader/grub.scm (strip-mount-point): Remove procedure. (normalize-file): Add procedure. (grub-configuration-file): New BTRFS-SUBVOLUME-FILE-NAME parameter. When defined, prepend its value to the kernel and initrd file names, using the NORMALIZE-FILE procedure. Adjust the call to EYE-CANDY to pass the BTRFS-SUBVOLUME-FILE-NAME argument. Normalize the KEYMAP file as well. (eye-candy): Add a BTRFS-SUBVOLUME-FILE-NAME parameter, and use it, along with the NORMALIZE-FILE procedure, to normalize the FONT-FILE and IMAGE nested variables. Adjust doc. * gnu/bootloader/depthcharge.scm (depthcharge-configuration-file): Adapt. * gnu/bootloader/extlinux.scm (extlinux-configuration-file): Likewise. * gnu/system/file-systems.scm (btrfs-subvolume?) (btrfs-store-subvolume-file-name): New procedures. * gnu/system.scm (operating-system-bootcfg): Specify the Btrfs subvolume file name the store resides on to the `operating-system-bootcfg' procedure, using the new BTRFS-SUBVOLUME-FILE-NAME argument. * doc/guix.texi (File Systems): Add a Btrfs subsection to document the use of subvolumes. * gnu/tests/install.scm (%btrfs-root-on-subvolume-os) (%btrfs-root-on-subvolume-os-source) (%btrfs-root-on-subvolume-installation-script) (%test-btrfs-root-on-subvolume-os): New variables.
2020-05-05Merge branch 'master' into core-updatesMarius Bakke
2020-05-05system: vm: Move operating-system-uuid.Mathieu Othacehe
* gnu/system/vm.scm (operating-system-uuid): Move to ... * gnu/system.scm: ... here.
2020-05-02Merge branch 'master' into core-updatesMarius Bakke
2020-05-01system: Blacklist usbkbd kernel module in default kernel-arguments.Florian Pelz
This is said to avoid a race with the usbhid kernel module. See <https://issues.guix.gnu.org/35574#18>. * gnu/system.scm (%default-modprobe-blacklist): Blacklist it.
2020-05-01system: Blacklist usbmouse kernel module in default kernel-arguments.Florian Pelz
This avoids a race with the bcm5974 kernel module. Fixes <https://bugs.gnu.org/35574>. * gnu/system.scm (%default-modprobe-blacklist): New variable. (<operating-system>)[kernel-arguments]: Default to ... (%default-kernel-arguments): ... this new variable. * doc/guix.texi (operating-system Reference): Document the change.
2020-04-30Merge branch 'master' into core-updatesMarius Bakke
Conflicts: gnu/local.mk gnu/packages/backup.scm gnu/packages/emacs-xyz.scm gnu/packages/guile.scm gnu/packages/lisp.scm gnu/packages/openldap.scm gnu/packages/package-management.scm gnu/packages/web.scm gnu/packages/xorg.scm
2020-04-26services: system: Initial entries are non-monadic.Ludovic Courtès
* gnu/system.scm (operating-system-directory-base-entries): Return a regular, non-monadic value. * gnu/services.scm (system-derivation): Adjust accordingly. * gnu/system/linux-container.scm (container-essential-services): Likewise.
2020-04-26system: 'operating-system-directory-base-entries' uses 'profile'.Ludovic Courtès
* gnu/system.scm (operating-system-directory-base-entries): Use a declarative profile instead of 'profile-derivation'.
2020-04-23Merge branch 'master' into core-updatesMarius Bakke
Conflicts: etc/news.scm gnu/local.mk gnu/packages/bootloaders.scm gnu/packages/linphone.scm gnu/packages/linux.scm gnu/packages/tls.scm gnu/system.scm
2020-04-22system: Automatically adjust linux-module packages to use theDanny Milosavljevic
operating-system's kernel. * gnu/system.scm (package-for-kernel): New procedure. (operating-system-directory-base-entries): Use it. * gnu/tests/linux-module.scm: Test it.
2020-04-22system: Split %BASE-PACKAGES in smaller parts.Brice Waegeneire
* gnu/system.scm: (%base-packages-interactive, %base-packages-linux, %base-packages-networking, %base-packages-utils): New variables. (%base-packages): Use those new variables. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2020-04-22system: 'operating-system-boot-parameters-file' uses 'scheme-file'.Ludovic Courtès
* gnu/system.scm (operating-system-boot-parameters-file): Use 'scheme-file' instead of 'gexp->file'. (operating-system-directory-base-entries): Adjust accordingly.
2020-04-21Revert "system: Don’t create a module database when no modules are available."Ludovic Courtès
This reverts commit b2fff3b5de7d510fe4809e9a97089dddf2a39ffc. Fixes <https://bugs.gnu.org/40713>. Reported by pkill9 <pkill9@runbox.com>. This commit is incorrect: its effect depends on whether KERNEL's build output is already available in the store, it breaks with non-package kernels as reported at <https://bugs.gnu.org/40713>, and the LINUX-MODULE-DATABASE hook is required at all times since 5c79f238634c5adb6657f1b4b1bb4ddb8bb73ef1 removed the relevant bits from the 'linux-libre' package.
2020-04-08Merge branch 'master' into core-updatesMarius Bakke
Conflicts: etc/news.scm gnu/local.mk gnu/packages/check.scm gnu/packages/cross-base.scm gnu/packages/gimp.scm gnu/packages/java.scm gnu/packages/mail.scm gnu/packages/sdl.scm gnu/packages/texinfo.scm gnu/packages/tls.scm gnu/packages/version-control.scm
2020-04-04system: Don’t create a module database when no modules are available.Ivan Kozlov
* gnu/system.scm (operating-system-directory-base-entries): Don't create a module database when no modules are available. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
2020-03-27Merge branch 'master' into core-updatesMarius Bakke
Conflicts: gnu/packages/icu4c.scm gnu/packages/man.scm gnu/packages/python-xyz.scm guix/scripts/environment.scm guix/scripts/pack.scm guix/scripts/package.scm guix/scripts/pull.scm guix/store.scm
2020-03-23system: Export 'operating-system-kernel-loadable-modules'.Brice Waegeneire
* gnu/system.scm: Export 'operating-system-kernel-loadable-modules'. Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
2020-03-22system: Add kernel-loadable-modules to operating-system.Danny Milosavljevic
* gnu/system.scm (<operating-system>): Add kernel-loadable-modules. (operating-system-directory-base-entries): Use it. * doc/guix.texi (operating-system Reference): Document KERNEL-LOADABLE-MODULES. * gnu/build/linux-modules.scm (depmod): New procedure. (make-linux-module-directory): New procedure. Export it. * guix/profiles.scm (linux-module-database): New procedure. Export it. * gnu/tests/linux-modules.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/linux.scm (make-linux-libre*)[arguments]<#:phases>[install]: Disable depmod. Remove "build" and "source" symlinks. [native-inputs]: Remove kmod.
2020-03-20system: Switch to Guile 3.0.Marius Bakke
* gnu/system.scm (%base-packages): Change from GUILE-2.2 to GUILE-3.0.
2020-03-18Merge branch 'master' into core-updatesMarius Bakke
2020-03-17gnu: system: Export %sudoers-specification.Maxim Cournoyer
Exporting this variable allows reusing the default value of the `sudoers-file' field when configuring it. * gnu/system.scm (gnu): Export %sudoers-specification. * doc/guix.texi (Invoking guix deploy): Document an example, to use with 'guix deploy'.
2020-03-10Merge branch 'master' into core-updatesMarius Bakke
2020-03-08system: Export 'operating-system' missing fields.Brice Waegeneire
* gnu/system.scm: Export 'operating-system-firmware', 'operating-system-keyboard-layout', 'operating-system-name-service-switch', 'operating-system-pam-services', 'operating-system-setuid-programs', 'operating-system-skeletons', 'operating-system-sudoers-file', 'operating-system-swap-devices'. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2020-03-04Merge branch 'master' into core-updatesMarius Bakke
2020-03-02file-systems: Add a 'file-system-device->string' procedure.Maxim Cournoyer
* gnu/system/file-systems.scm (file-system-device->string): New procedure. * gnu/system.scm (bootable-kernel-arguments): Use it. * gnu/system/vm.scm (operating-system-uuid): Likewise. * guix/scripts/system.scm (display-system-generation): Likewise.
2020-02-11system: Stop using canonical-package.Mathieu Othacehe
Usage of canonical-package outside of thunked fields breaks cross-compilation, see: https://lists.gnu.org/archive/html/guix-devel/2019-12/msg00410.html. * gnu/installer.scm (installer-program): Remove canonical-package. * gnu/services/base.scm (<nscd-cache>): Ditto, (%base-services): ditto. * gnu/services/xorg.scm: Remove useless canonical-package import. * gnu/system.scm (%base-packages): Remove canonical-package. * gnu/system/install.scm (%installation-services): Ditto, (installation-os): ditto. * gnu/system/locale.scm (single-locale-directory): Ditto.
2020-01-12system: Drop net-tools from %BASE-PACKAGES (replaced by iproute2).Simon Josefsson
* gnu/system.scm (%base-packages): Remove net-tools. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2020-01-08system: Use the udev-enabled util-linux variant.Marius Bakke
Fixes <https://bugs.gnu.org/37931>. Reported by Bengt Richter <bokr@bokr.com>. * gnu/system.scm (%base-packages): Change from UTIL-LINUX to UTIL-LINUX+UDEV.
2019-12-07services: Add 'provenance-service-type'.Ludovic Courtès
* gnu/services.scm (object->pretty-string) (channel->code, channel->sexp, provenance-file) (provenance-entry): New procedures. (provenance-service-type): New variable. * gnu/system.scm (operating-system-with-provenance): New procedure. * doc/guix.texi (Service Reference): Document 'provenance-service-type'.
2019-12-01system: vm: Support cross-compilation.Mathieu Othacehe
* gnu/system.scm (system-linux-image-file-name): Add support for cross-built systems. Remove system argument that was ignored, (operating-system-kernel-file): adapt by removing ignored os argument. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Add target argument and turn inputs into native-inputs. Pass target to qemu-command and gexp->derivation calls. (iso9660-image): Add target argument and pass it to expression->derivation-in-linux-vm. Remove qemu from inputs as it is not necessary. (qemu-image): Add target argument, also remove qemu from inputs. Pass target argument to expression->derivation-in-linux-vm call.