Add (gnu) module.

* gnu.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/hydra/demo-os.scm: Use (gnu) and strip import list
  accordingly.
* doc/guix.texi (Using the Configuration System): Adjust example
  accordingly.
This commit is contained in:
Ludovic Courtès 2014-05-22 23:20:12 +02:00
parent f19c6e5fe7
commit c938494598
4 changed files with 51 additions and 10 deletions

View File

@ -22,9 +22,10 @@
;;; machine images that we build. ;;; machine images that we build.
;;; ;;;
(use-modules (gnu packages zile) (use-modules (gnu)
(gnu packages zile)
(gnu packages xorg) (gnu packages xorg)
(gnu packages base)
(gnu packages admin) (gnu packages admin)
(gnu packages guile) (gnu packages guile)
(gnu packages bash) (gnu packages bash)
@ -33,12 +34,6 @@
(gnu packages tor) (gnu packages tor)
(gnu packages package-management) (gnu packages package-management)
(gnu system grub) ; 'grub-configuration'
(gnu system shadow) ; 'user-account'
(gnu system linux) ; 'base-pam-services'
(gnu system file-systems) ; 'file-systems'
(gnu services base)
(gnu services networking) (gnu services networking)
(gnu services xorg)) (gnu services xorg))

View File

@ -3109,9 +3109,8 @@ Linux-Libre kernel, initial RAM disk, and boot loader looks like this:
@findex operating-system @findex operating-system
@lisp @lisp
(use-modules (gnu services base) ; for '%base-services' (use-modules (gnu) ; for 'user-account', '%base-services', etc.
(gnu services ssh) ; for 'lsh-service' (gnu services ssh) ; for 'lsh-service'
(gnu system shadow) ; for 'user-account'
(gnu packages base) ; Coreutils, grep, etc. (gnu packages base) ; Coreutils, grep, etc.
(gnu packages bash) ; Bash (gnu packages bash) ; Bash
(gnu packages admin) ; dmd, Inetutils (gnu packages admin) ; dmd, Inetutils

View File

@ -22,6 +22,7 @@
# binaries. # binaries.
GNU_SYSTEM_MODULES = \ GNU_SYSTEM_MODULES = \
gnu.scm \
gnu/packages.scm \ gnu/packages.scm \
gnu/packages/acct.scm \ gnu/packages/acct.scm \
gnu/packages/acl.scm \ gnu/packages/acl.scm \

46
gnu.scm Normal file
View File

@ -0,0 +1,46 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu))
;;; Commentary:
;;;
;;; This composite module re-exports core parts the (gnu …) public modules.
;;;
;;; Code:
(eval-when (eval load compile)
(begin
(define %public-modules
'((gnu system)
(gnu system file-systems)
(gnu system grub) ; 'grub-configuration'
(gnu system linux) ; 'base-pam-services'
(gnu system shadow) ; 'user-account'
(gnu system linux-initrd)
(gnu services)
(gnu services base)
(gnu packages)
(gnu packages base)))
(for-each (let ((i (module-public-interface (current-module))))
(lambda (m)
(module-use! i (resolve-interface m))))
%public-modules)))
;;; gnu.scm ends here