guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/07: system: hurd: Export system variables.


From: guix-commits
Subject: 04/07: system: hurd: Export system variables.
Date: Sat, 25 Apr 2020 06:53:38 -0400 (EDT)

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit 41400c8bc0430d43cb8c0006fb7f96b96d9fab41
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 abec220..4bf75f2 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)
@@ -209,7 +214,7 @@
     (scheme-file "shepherd.conf" config)))
 
 
-(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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]