01/05: squash! system: hurd: Create system profile for guix development.

[guix-commits]

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

commit 1ff61b0f62eb5213dffecc2b5b8f6a04683b951d
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Fri Apr 17 22:39:50 2020 +0200

    squash! system: hurd: Create system profile for guix development.
---
 gnu/system/hurd.scm | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 3db2eef..b730d49 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -21,6 +21,7 @@
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 match)
+  #:use-module (guix build-system gnu)
   #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (guix profiles)
@@ -29,12 +30,17 @@
   #:use-module (gnu packages admin)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
+  #:use-module (gnu packages commencement)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages cross-base)
   #:use-module (gnu packages file)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages guile-xyz)
   #:use-module (gnu packages hurd)
   #:use-module (gnu packages less)
+  #:use-module (gnu packages m4)
   #:use-module (gnu packages package-management)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages version-control)
@@ -113,27 +119,24 @@
     (pam-services '())
     (setuid-programs '())))
 
-(define (package-node-edges package) ;c&p from guix/scripts/graph.scm
-  "Return the list of dependencies of PACKAGE."
-  (match (package-direct-inputs package)
-    (((labels packages . outputs) ...)
-     ;; Filter out origins and other non-package dependencies.
-     (filter package? packages))))
-
-(define (disjoin . predicates)
-  (lambda (. arguments)
-    (any (cut apply <> arguments) predicates)))
+(define (input->packages input)
+  "Return the list of packages in INPUT."
+  (match input
+    ((label (and (? package?) package) . output)
+     (list package))
+    (_ '())))
 
 (define %hurd-os-development
   (operating-system
     (inherit %hurd-os)
-    (packages (append (list git-minimal)
-                      (filter (negate (compose
-                                       (disjoin (cut member <> '("graphviz" 
"po4a"))
-                                                (cut string-prefix? 
"bootstrap/" <>))
-                                       package-name))
-                              (package-node-edges guix))
-                      %base-packages/hurd))))
+    (packages
+     (append
+      (list git-minimal)
+      (append-map input->packages
+                  (fold alist-delete (package-direct-inputs guix)
+                        '("graphviz" "po4a")))
+      (list gawk diffutils gnu-make m4 tar xz)
+      %base-packages/hurd))))
 
 (define operating-system-accounts
   (@@ (gnu system) operating-system-accounts))