guix-commits
[Top][All Lists]
Advanced

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

01/03: Revert "HACK gnu: guix: Bump to HEAD~1: daemon: Create wrapper fo


From: guix-commits
Subject: 01/03: Revert "HACK gnu: guix: Bump to HEAD~1: daemon: Create wrapper for mount (2)."
Date: Fri, 10 Apr 2020 04:22:26 -0400 (EDT)

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

commit 24d1c4003c063f49cefc4edf1e1450cf4503168e
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Thu Apr 9 21:23:06 2020 +0200

    Revert "HACK gnu: guix: Bump to HEAD~1: daemon: Create wrapper for mount 
(2)."
    
    This reverts commit 8229a0e244df37280b0c332fbd1edcf66fd34b66.
---
 gnu/packages/package-management.scm | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 2899d09..4d91d71 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 "9ae76b7b8317789d66a909b767abb6edf1cda79b")
-        (revision 16))
+        (commit "09844816c77caaa60f4149f99a34733966724627")
+        (revision 15))
     (package
       (name "guix")
 
       (version (if (zero? revision)
                    version
-                   (string-append version "-hurd-"
+                   (string-append version "-"
                                   (number->string revision)
                                   "." (string-take commit 7))))
       (source (origin
@@ -131,7 +131,7 @@
                       (commit commit)))
                 (sha256
                  (base32
-                  "1v9kxhm1grsbxcg440xw3pvrpg8fcp8ykifzjxqs35fgn5q6mi4y"))
+                  "1fciffls6cw9zz13vig5x37r73qxc0irzyh0caimciddlksvabf7"))
                 (file-name (string-append "guix-" version "-checkout"))))
       (build-system gnu-build-system)
       (arguments
@@ -379,10 +379,6 @@ $(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]