summaryrefslogtreecommitdiff
path: root/gnu/system
AgeCommit message (Expand)Author
2014-04-28system: grub: Rewrite using gexps....* gnu/system/grub.scm (grub-configuration-file): Rewrite using 'gexp->derivation'. * gnu/system.scm (operating-system-derivation): Adjust accordingly. Ludovic Courtès
2014-04-28services: Rewrite using gexps....* gnu/services.scm (<service>)[inputs]: Remove. * gnu/system.scm (links): Remove. (etc-directory): Add PASSWD and SHADOW to #:inputs. (operating-system-boot-script): Pass ETC to 'dmd-configuration-file'. (operating-system-derivation): Remove EXTRAS from the union. * gnu/system/linux.scm (pam-service->configuration): Rewrite in terms of 'gexp->derivation'. Compute the contents on the build side. Expect 'arguments' to contain a list of gexps. (pam-services->directory): Rewrite in terms of 'gexp->derivation'. (unix-pam-service): Change 'arguments' to a list of one gexp. * gnu/system/shadow.scm (<user-account>)[inputs]: Remove. [shell]: Change default value to a gexp. (passwd-file): Rewrite in terms of 'gexp->derivation'. Compute contents on the build side. * gnu/services/base.scm (host-name-service, mingetty-service, nscd-service, syslog-service, guix-service): Change 'start' and 'stop' to gexps; remove 'inputs' field. (guix-build-accounts): Change 'shell' field to a gexp. * gnu/services/networking.scm (static-networking-service): Change 'start' and 'stop' to gexps; remove 'inputs' field. * gnu/services/xorg.scm (slim-service): Likewise. * gnu/services/dmd.scm (dmd-configuration-file): Expect ETC to be a derivation. Change 'config' to a gexp. Use 'gexp->file' instead of 'text-file'. * doc/guix.texi (Defining Services): Update nscd example with gexps, and without 'inputs'. Add xref to "G-Expressions". Ludovic Courtès
2014-04-28vm: Rewrite support procedures to use gexps....* gnu/system/vm.scm (%imported-modules): Remove. (expression->derivation-in-linux-vm): Remove 'inputs' parameter. Rename 'imported-modules' to 'modules'. Rewrite using gexps and 'gexp->derivation'. (qemu-image): Add 'qemu' parameter. Pass NAME to 'expression->derivation-in-linux-vm'. Rewrite using gexps. Remove #:inputs argument to 'expression->derivation-in-linux-vm'. (operating-system-default-contents): Rewrite using gexps. * gnu/system.scm (operating-system-profile-derivation): Rename to... (operating-system-profile): ... this. Adjust callers. (operating-system-profile-directory): Remove. Ludovic Courtès
2014-04-28gnu: Use gexps in obvious places in (gnu system ...)....* gnu/system.scm (operating-system-boot-script): Use 'gexp->file' instead of 'text-file*'. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Likewise. (system-qemu-image/shared-store-script)[builder]: Turn into a gexp. Use 'gexp->derivation' instead of 'derivation-expression'. Ludovic Courtès
2014-04-23vm: Clarify 'system-qemu-image/shared-store-script'....* gnu/system/vm.scm (system-qemu-image/shared-store-script): Move 'initrd' definition to the top-level. Have a single definition of 'initrd', 'image', and 'os-drv'. Ludovic Courtès
2014-04-14linux-initrd: Mount / as a unionfs when asking for a volatile root....* guix/build/linux-initrd.scm (make-essential-device-nodes): Make /dev/fuse. (boot-system): Add #:unionfs parameter. Invoke UNIONFS instead of copying files over when VOLATILE-ROOT? is true. * gnu/system/linux-initrd.scm (expression->initrd): Add #:inputs parameter. [files-to-copy]: New procedure. [builder]: Add 'to-copy' parameter; honor it. (qemu-initrd)[linux-modules]: Add 'fuse.ko' when VOLATILE-ROOT?. Pass UNIONFS-FUSE/STATIC as #:inputs; change builder to pass #:unionfs to 'boot-system'. Ludovic Courtès
2014-04-11vm: Move image creation to (guix build vm); split into several procedures....* guix/build/vm.scm (read-reference-graph, initialize-partition-table, install-grub, populate-store, evaluate-populate-directive, reset-timestamps, initialize-hard-disk): New procedures. * gnu/system/vm.scm (qemu-image): Change 'builder' to a call to 'initialize-hard-disk'. Ludovic Courtès
2014-04-11vm: 'expression->derivation-in-linux-vm' can import modules in the VM....* gnu/system/vm.scm (%imported-modules): New procedure. (expression->derivation-in-linux-vm): Add #:imported-modules parameter; remove #:modules. Add LOADER, and change BUILDER to load it. (qemu-image): Remove useless #:modules argument. Ludovic Courtès
2014-04-11vm: Strip import list....* gnu/system/vm.scm: Strip #:select for (gnu packages base). Ludovic Courtès
2014-04-11vm: Factorize input conversion....* gnu/system/vm.scm (input->name+output): New procedure. (expression->derivation-in-linux-vm): Use it for 'input-alist'. (qemu-image)[input->name+derivation]: Remove. Use 'input->name+output' instead. Ludovic Courtès
2014-04-11vm: Add (guix build vm) module....* guix/build/vm.scm: New file. * Makefile.am (MODULES): Add it. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Use it. Ludovic Courtès
2014-04-10vm: Use QEMU's para-virtualized file system support for all VMs....* gnu/system/vm.scm (system-qemu-image/shared-store-script): Change #:qemu to default to QEMU. Change INITRD to use a 9p mount for the store. Change command-line to use -virtfs. Ludovic Courtès
2014-04-09gnu: guix: Upgrade to 0.6....* gnu/packages/package-management.scm (guix): Upgrade to 0.6. * gnu/services/dmd.scm (dmd-configuration-file): Change /var/nix to /var/guix. * gnu/system/vm.scm (operating-system-default-contents): Likewise. Ludovic Courtès
2014-04-09vm: Add #:memory-size parameter for 'expression->derivation-in-linux-vm'....* gnu/system/vm.scm (expression->derivation-in-linux-vm): Add #:memory-size parameter, defaulting to 256 (QEMU defaults to 128.) Ludovic Courtès
2014-04-09gnu: linux-initrd: Default initrd has no network mounts....* gnu/system/linux-initrd.scm (gnu-system-initrd): Add #:mounts argument. Ludovic Courtès
2014-04-09vm: 'expression->derivation-in-linux-vm' uses QEMU virtfs/9p....* gnu/system/vm.scm (expression->derivation-in-linux-vm): Change #:qemu to default to QEMU-HEADLESS. Use "-net nic,model=virtio". Remove "-net user,smb=..." and add "-virtfs" options. Change default initrd to include two 9p mounts. Ludovic Courtès
2014-03-10More /gnu/store replacements....* gnu/packages/gcc.scm (gcc-4.7): Change /nix/store in comment. * gnu/system/vm.scm (operating-system-default-contents): Use (%store-prefix) instead of "/nix/store". * guix/derivations.scm (derivation-path->output-path, derivation-path->output-paths): Change to /gnu/store in docstring. Ludovic Courtès
2014-03-10gnu: linux-initrd: Make the pseudo-tty device nodes....* guix/build/linux-initrd.scm (make-essential-device-nodes): Create /dev/ptmx and /dev/pts. * gnu/system/vm.scm (qemu-image): Umount /fs/dev/pts before /fs. Ludovic Courtès
2014-02-19gnu: vm: Remove '%demo-operating-system'....* gnu/system/vm.scm (%demo-operating-system): Remove. (system-qemu-image, system-qemu-image/shared-store, system-qemu-image/shared-store-script): Adjust accordingly. Ludovic Courtès
2014-02-19gnu: Introduce the (gnu services ...) modules....* gnu/system/dmd.scm: Remove file. Move contents to... * gnu/services.scm, gnu/services/base.scm, gnu/services/dmd.scm, gnu/services/networking.scm, gnu/services/xorg.scm: ... here. New files. * gnu/system.scm, gnu/system/vm.scm: Adjust accordingly. * guix/scripts/system.scm (%user-module): Likewise. * doc/guix.texi (Using the Configuration System): Likewise. (Defining Services): Likewise. Ludovic Courtès
2014-02-09gnu: dmd: Add SLiM service....* gnu/system/dmd.scm (xorg-service): Remove. (xorg-start-command, slim-service): New procedure. Ludovic Courtès
2014-02-09gnu: dmd: Fix X font directory name in X service....* gnu/system/dmd.scm (xorg-service)[xserver.conf]: Fix directory name in 'FontPath' entry for FONT-ADOBE75DPI. Ludovic Courtès
2014-02-08gnu: Move root's home directory to /root....* gnu/system.scm (operating-system-derivation): Change root's 'home-directory' to "/root". * gnu/system/vm.scm (operating-system-default-contents): Add /root. Ludovic Courtès
2014-02-03gnu: dmd: Use 'text-file*' when building Xorg's config file....* gnu/system/dmd.scm (xorg-service)[xserver.conf]: Change to use 'text-file*' instead of 'text-file'. Adjust body accordingly. Remove now extraneous packages from the service's 'inputs' field. Ludovic Courtès
2014-02-02gnu: vm: Create all the user directories....* gnu/system/vm.scm (operating-system-default-contents)[user-directories]: New procedure. Use it to create each user's home and GC root directories. Ludovic Courtès
2014-02-02gnu: vm: Add /run/current-system and /bin/sh....* gnu/system/vm.scm (operating-system-default-contents): Populate /run/current-system and create /bin/sh. * gnu/system.scm (operating-system-profile-derivation, operating-system-profile-directory): New procedures. (operating-system-derivation): Use it. Ludovic Courtès
2014-02-01gnu: Add preliminary Xorg service....* gnu/system/dmd.scm (xorg-service): New procedure. Ludovic Courtès
2014-01-31gnu: vm: Add support for running a VM that shares its store with the host....* gnu/system/vm.scm (qemu-image): Check whether GUIX is #f. (operating-system-build-gid, operating-system-default-contents): New procedures. (system-qemu-image): Use 'operating-system-build-gid'. (system-qemu-image/shared-store, system-qemu-image/shared-store-script): New procedures. * gnu/system.scm: Add missing exports. Ludovic Courtès
2014-01-31gnu: linux-initrd: Allow the root file system to be volatile....* gnu/system/linux-initrd.scm (qemu-initrd): Add 'volatile-root?' parameter. * guix/build/linux-initrd.scm (boot-system): Likewise. Honor it. Ludovic Courtès
2014-01-31gnu: linux-initrd: Recognize 9p file systems....* gnu/system/linux-initrd.scm (qemu-initrd)[virtio-9p-modules]: New variable. [linux-modules]: Append VIRTIO-9P-MODULES when a 9p file system is in MOUNTS. * guix/build/linux-initrd.scm (mount-qemu-9p): New procedure. (boot-system): Recognize '9p' in MOUNTS, and use 'mount-qemu-9p'. Ludovic Courtès
2014-01-31gnu: linux-initrd: Match kernel module file names exactly....* gnu/system/linux-initrd.scm (expression->initrd)[string->regexp]: New procedure. Use it in the call to 'find-files'. Ludovic Courtès
2014-01-31gnu: linux-initrd: Properly distinguish between /dev/sda* and /dev/vda*....* guix/build/linux-initrd.scm (make-essential-device-nodes): Rename devices with major = 8 to /dev/sda*. Make /dev/vda* devices. * gnu/system/vm.scm (qemu-image): Change '/dev/vda' to '/dev/sda'. * gnu/system.scm (operating-system-derivation): Likewise. Ludovic Courtès
2014-01-30gnu: vm: Run QEMU with '-enable-kvm'....* gnu/system/vm.scm (expression->derivation-in-linux-vm): Pass QEMU '-enable-kvm'. Ludovic Courtès
2014-01-29gnu: linux-initrd: Factorize boot code....* guix/build/linux-initrd.scm (boot-system): New procedure. * gnu/system/linux-initrd.scm (qemu-initrd): Add keyword parameters 'guile-modules-in-chroot?' and 'mounts'. Change builder to simply call 'boot-system'. (gnu-system-initrd): Change to a simple call to 'qemu-initrd'. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Call 'qemu-initrd' with #:guile-modules-in-chroot?. Ludovic Courtès
2014-01-29gnu: Lower initrd makers from packages to monadic procedures....* gnu/packages/linux-initrd.scm: Remove. * gnu/system/linux-initrd.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly. * gnu/system.scm (<operating-system>): Change default 'initrd' value to (gnu-system-initrd). (operating-system-derivation): Bind 'operating-system-initrd'. Pass 'menu-entry' an initrd file name instead of a package. * gnu/system/grub.scm (grub-configuration-file): Expect 'initrd' to be file name. Ludovic Courtès
2014-01-13gnu: Changes references to (gnu packages admin)....* gnu/packages/version-control.scm, gnu/packages/vim.scm, gnu/system.scm, gnu/system/dmd.scm, gnu/system/shadow.scm, gnu/system/vm.scm: Change references to (gnu packages system) to (gnu packages admin). This is a followup to commit 4aeea89. Ludovic Courtès
2013-12-11gnu: vm: Increase size of VM image....* gnu/system/vm.scm (system-qemu-image): Add 'disk-image-size' parameter; increase it. Ludovic Courtès
2013-12-10gnu: Honor the operating system's locale and timezone....* gnu/system.scm (etc-directory): Add 'locale' and 'timezone' parameters. Set 'LC_ALL', 'TZ', and 'TZDIR' in /etc/profile. (operating-system-derivation): Adjust call accordingly. * gnu/system/vm.scm (%demo-operating-system): Change locale to 'en_US.UTF-8'. Add TZDATA to 'packages'. Ludovic Courtès
2013-12-10gnu: Allow a plain list of packages in 'operating-system'....* gnu/system.scm (union): Allow (PACKAGE OUTPUT), (PACKAGE), and PACKAGE. (<operating-system>)[packages]: Make the default a list of package? objects. * gnu/system/vm.scm (%demo-operating-system): Likewise. Add a few packages. Ludovic Courtès
2013-12-10gnu: Add 'inputs' field to <user-account>; make 'shell' a monadic value....* gnu/system/shadow.scm (<user-account>)[inputs]: New field. (passwd-file): Bind the 'shell' field of each account. * gnu/system/vm.scm (%demo-operating-system): Remove 'shell' field. * gnu/system/dmd.scm (guix-build-accounts): Store a monadic value in 'shell'. Add 'inputs' field. * gnu/system.scm (operating-system-derivation): Remove 'shell' field for 'root' account. Add all the 'user-account-inputs' to EXTRAS. Ludovic Courtès
2013-12-10gnu: dmd: Avoid "already exists" error on startup....* gnu/system/dmd.scm (dmd-configuration-file)[config]: Remove "/var/nix/gcroots/etc-directory" before trying to recreate it. Ludovic Courtès
2013-12-10gnu: Add (gnu system)....* gnu/system/vm.scm (lower-inputs): Move to monads.scm. (qemu-image): Don't add GRUB-CONFIGURATION to the INPUTS-TO-COPY. (union, file-union, etc-directory): Move to gnu/system.scm. (%demo-operating-system): New variable. (system-qemu-image): Add 'os' parameter. Rewrite in terms of 'operating-system-derivation'. * guix/monads.scm (lower-inputs): New procedure. * gnu/system/grub.scm (grub-configuration-file): Change 'entries' to be a plain list instead of a list of monadic values. * gnu/system.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. Ludovic Courtès
2013-12-08gnu: Populate /etc upon startup....* gnu/packages/patches/dmd-getpw.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/system.scm (dmd): Use it. * gnu/system/vm.scm (system-qemu-image): Don't explicitly populate /etc; don't add ETC to the GC roots. * gnu/system/dmd.scm (dmd-configuration-file): Add 'etc' parameter. [config]: Populate /etc from there. Ludovic Courtès
2013-12-07gnu: dmd: Add 'pam-services' field to <service>....* gnu/system/dmd.scm (<service>)[pam-services]: New field. (mingetty-service): Add #:motd and #:allow-empty-passwords? parameters. Add MOTD to 'inputs' field; add 'pam-services' field. * gnu/system/vm.scm (system-qemu-image): Aggregate PAM entries from SERVICES. Ludovic Courtès
2013-12-07gnu: vm: Fix inputs in 'file-union'....* gnu/system/vm.scm (file-union): Filter out members of FILES that are outputs of INPUTS. Ludovic Courtès
2013-12-07gnu: dmd: Add 'user-accounts' and 'user-groups' fields to <service>....* gnu/system/shadow.scm (guix-build-accounts): Move to... * gnu/system/dmd.scm (guix-build-accounts): ... here. (<service>)[user-accounts, user-groups]: New fields. (guix-service): New #:build-user-id and #:build-accounts parameters. Use 'guix-build-accounts' and set the 'user-accounts' and 'user-groups' fields accordingly. * gnu/system/vm.scm (system-qemu-image): Remove use of 'guix-build-accounts'. Augment ACCOUNTS and GROUPS from what SERVICES demand. Ludovic Courtès
2013-12-07gnu: Move /etc/resolv.conf handling to the networking service....* gnu/system/vm.scm (etc-directory): Remove 'resolv.conf'. (system-qemu-image): Use 'static-networking-service' with #:name-servers. Don't populate the image with /etc/resolv.conf. * gnu/system/dmd.scm (static-networking-service): Add #:name-servers parameter. Use it to populate /etc/resolv.conf. Ludovic Courtès
2013-12-07gnu: vm: Factorize /etc creation....* gnu/system/vm.scm (expression->derivation-in-linux-vm)[lower-inputs]: Move to top-level... (lower-inputs): ... here. New variable. (file-union, etc-directory): New procedures. (system-qemu-image): Use 'etc-directory'; remove redundant code, and register the result of 'etc-directory' as a GC root. Ludovic Courtès
2013-12-04derivations: Use more keyword parameters for 'build-expression->derivation'....* guix/derivations.scm (build-expression->derivation): Turn 'system' and 'inputs' into keyword parameters. Adjust callers accordingly. * gnu/system/linux.scm, gnu/system/vm.scm, guix/build-system/cmake.scm, guix/build-system/gnu.scm, guix/build-system/perl.scm, guix/build-system/python.scm, guix/build-system/trivial.scm, guix/download.scm, guix/packages.scm, guix/profiles.scm, guix/scripts/pull.scm, tests/derivations.scm, tests/guix-build.sh, tests/monads.scm, tests/store.scm, tests/union.scm: Adjust users of 'build-expression->derivation' and 'derivation-expression' accordingly. * doc/guix.texi (Derivations): Adjust 'build-expression->derivation' documentation accordingly. (The Store Monad): Likewise for 'derivation-expression'. Ludovic Courtès
2013-12-02gnu: dmd: Update start/stop of standard service definitions....* gnu/system/dmd.scm (mingetty-service): Add 'stop' field. (nscd-service): Run with '--foreground'. Change 'stop' to use 'make-kill-destructor'. (syslog-service): Run with '--no-detach'; change 'stop' similarly. (guix-service): Likewise for 'stop'. (static-networking-service): Remove 'sleep' call from 'start'. Change 'stop' to return #f when networking was actually stopped. Ludovic Courtès