diff options
| author | Marius Bakke <marius@gnu.org> | 2020-05-29 23:36:38 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-05-29 23:36:38 +0200 |
| commit | fe6d003908fd8278de65761bc550240c520ef9f4 (patch) | |
| tree | abe88c7905a8907ddafc554fbeef5b0af08f835d /gnu/system/hurd.scm | |
| parent | 8a7a5dc7805f4628e60f90af6b2416f951d0c034 (diff) | |
| parent | 031315e4f0fbc4e04ffc8adee04128c23173a1f7 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system/hurd.scm')
| -rw-r--r-- | gnu/system/hurd.scm | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 58bfdf88f6..3ccf47aa21 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -41,16 +41,6 @@ ;;; ;;; Code: -;; XXX: Surely this belongs in (guix profiles), but perhaps we need high-level -;; <profile> objects so one can specify hooks, etc.? -(define-gexp-compiler (compile-manifest (manifest - (@@ (guix profiles) <manifest>)) - system target) - "Lower MANIFEST as a profile." - (profile-derivation manifest - #:system system - #:target target)) - (define %base-packages/hurd (list hurd bash coreutils file findutils grep sed guile-3.0 guile-colorized guile-readline @@ -71,8 +61,10 @@ (manifest-entry-dependencies entry))))) (define system-profile - (map-manifest-entries cross-built-entry - (packages->manifest %base-packages/hurd))) + (profile + (content + (map-manifest-entries cross-built-entry + (packages->manifest %base-packages/hurd))))) (define grub.cfg (let ((hurd (cross-built hurd)) |