[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/36: system: hurd: Export system variables.
From: |
guix-commits |
Subject: |
23/36: system: hurd: Export system variables. |
Date: |
Fri, 1 May 2020 11:54:01 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit e9d8175054f7aff3a806e4a786a44fd0ac87cbda
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sat Apr 25 12:38:19 2020 +0200
system: hurd: Export system variables.
* gnu/system/hurd.scm (%base-packages/hurd, %base-services/hurd): Export.
(%hurd-default-operating-system): Rename from %hurd-os and exxport. Add
kernel. Update users.
---
gnu/system/hurd.scm | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 0d38b56..c5cc09a 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -54,7 +54,10 @@
#:use-module (gnu system pam)
#:use-module (gnu system shadow)
#:use-module (gnu system vm)
- #:export (cross-hurd-image))
+ #:export (cross-hurd-image
+ %base-packages/hurd
+ %base-services/hurd
+ %hurd-default-operating-system))
;;; Commentary:
;;;
@@ -97,11 +100,11 @@
"--disable-deduplication"
"--max-jobs=1"))))))
-(define %hurd-os
+(define %hurd-default-operating-system
(operating-system
(host-name "guixygnu")
(bootloader #f)
- (kernel #f)
+ (kernel hurd)
(initrd-modules '())
(file-systems '())
(swap-devices '())
@@ -117,8 +120,10 @@
(allow-empty-passwords? #t)
(password-authentication? #t)))
%base-services/hurd))
+ (packages %base-packages/hurd)
(pam-services '())
- (setuid-programs '())))
+ (setuid-programs '())
+ (users '())))
(define (input->packages input)
"Return the list of packages in INPUT."
@@ -129,7 +134,7 @@
(define %hurd-os-development
(operating-system
- (inherit %hurd-os)
+ (inherit %hurd-default-operating-system)
(packages
(append
(list git-minimal)
@@ -149,7 +154,7 @@
(define (hurd-shepherd-services os)
(append-map hurd-service->shepherd-service (operating-system-services os)))
-(define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach) (os %hurd-os))
+(define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach) (os
%hurd-default-operating-system))
"Return a cross-built GNU/Hurd image."
(define (cross-built thing)
- 14/36: DRAFT: hurd: use static-networking instead of dummy loopback hack., (continued)
- 14/36: DRAFT: hurd: use static-networking instead of dummy loopback hack., guix-commits, 2020/05/01
- 01/36: services: Add hurd., guix-commits, 2020/05/01
- 13/36: system: hurd: Add openssh service., guix-commits, 2020/05/01
- 15/36: Revert "DRAFT: hurd: use static-networking instead of dummy loopback hack.", guix-commits, 2020/05/01
- 05/36: HACK services: Add guix-daemon-service as a Hurd service., guix-commits, 2020/05/01
- 07/36: HACK services: hurd: Add dummy loopback., guix-commits, 2020/05/01
- 16/36: system: hurd: Create system profile for guix development., guix-commits, 2020/05/01
- 17/36: system: gnu: Add %bootstrap-{gcc, binutils, glibc} for devel profile., guix-commits, 2020/05/01
- 08/36: squash! Use static-networking for loopback, guix-commits, 2020/05/01
- 24/36: services: hurd: Use hurd-file-systems-service., guix-commits, 2020/05/01
- 23/36: system: hurd: Export system variables.,
guix-commits <=
- 06/36: HACK services: hurd: Add dummy syslog., guix-commits, 2020/05/01
- 11/36: DRAFT system: hurd: Add the Shepherd., guix-commits, 2020/05/01
- 18/36: system: hurd: Add guix., guix-commits, 2020/05/01
- 21/36: services: Add hurd-file-systems-service-type., guix-commits, 2020/05/01
- 22/36: services: hurd: Move hurd-default-essential-services., guix-commits, 2020/05/01
- 20/36: services: hurd: Move hurd-etc-sevcices., guix-commits, 2020/05/01
- 25/36: system: hurd: Add hurd-grub-configuration-file., guix-commits, 2020/05/01
- 36/36: HACK Don't fail on running host's localedef., guix-commits, 2020/05/01
- 28/36: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/01
- 29/36: gnu: glibc/hurd-headers: Cross-build fix for the Hurd., guix-commits, 2020/05/01