guix-commits
[Top][All Lists]
Advanced

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

52/52: HACK gnu: guix: Bump to HEAD~1: daemon: Create wrapper for mount


From: guix-commits
Subject: 52/52: HACK gnu: guix: Bump to HEAD~1: daemon: Create wrapper for mount (2).
Date: Thu, 9 Apr 2020 13:29:16 -0400 (EDT)

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

commit 8229a0e244df37280b0c332fbd1edcf66fd34b66
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Wed Apr 8 00:14:43 2020 +0200

    HACK gnu: guix: Bump to HEAD~1: daemon: Create wrapper for mount (2).
    
    XXX instead: run update-guix-package
    
    We need a guix based on core-updates, that supports the Hurd.
    Bumping to a much newer version: wip-hurd-vm~15, just before
    
        9ae76b7b83 DRAFT daemon: Create wrapper for mount (2).
    
    which would be nice to try on the Hurd, but does not build.
    
    * gnu/packages/package-management.scm (guix): Use 1.0.1-16-hurd.
    * gnu/packages/package-management.scm (guix)[source]: Bump to DRAFT chroot.
    [inputs]: If hurd-target? is true, add hurd.
---
 gnu/packages/package-management.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 4d91d71..2899d09 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -114,14 +114,14 @@
   ;; Note: the 'update-guix-package.scm' script expects this definition to
   ;; start precisely like this.
   (let ((version "1.0.1")
-        (commit "09844816c77caaa60f4149f99a34733966724627")
-        (revision 15))
+        (commit "9ae76b7b8317789d66a909b767abb6edf1cda79b")
+        (revision 16))
     (package
       (name "guix")
 
       (version (if (zero? revision)
                    version
-                   (string-append version "-"
+                   (string-append version "-hurd-"
                                   (number->string revision)
                                   "." (string-take commit 7))))
       (source (origin
@@ -131,7 +131,7 @@
                       (commit commit)))
                 (sha256
                  (base32
-                  "1fciffls6cw9zz13vig5x37r73qxc0irzyh0caimciddlksvabf7"))
+                  "1v9kxhm1grsbxcg440xw3pvrpg8fcp8ykifzjxqs35fgn5q6mi4y"))
                 (file-name (string-append "guix-" version "-checkout"))))
       (build-system gnu-build-system)
       (arguments
@@ -379,6 +379,10 @@ $(prefix)/etc/init.d\n")))
            ,@(if (%current-target-system)
                  `(("bash" ,bash-minimal))
                  '())
+           ,@(if (hurd-target?)
+                 `(("hurd" ,hurd)) ;for `libhurdutil' XXX TODO: hurd-headers +
+                                   ;hurd-libhurdutil.patch
+                 '())
 
            ;; Tests also rely on these bootstrap executables.
            ("bootstrap/bash" ,(bootstrap-executable "bash" target))



reply via email to

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