From 30cacb63f8d01ca667a2d66eb9734c11db26a80c Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 21 Jan 2024 18:16:16 +0100
Subject: gnu: gnumach: Update to 1.8-0.2556fde.

* gnu/packages/hurd.scm (gnumach-headers): Update to latest master,
2556fdece900d67529d5eda01f1bdaae4ffe96b0.
* gnu/packages/patches/gnumach-fix-i686-linux-build.patch,
gnu/packages/patches/gnumach-fix-task_info.patch,
gnu/packages/patches/gnumach-support-noide.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.
(gnumach)[source]: Do not use them.

Change-Id: Ifc6d15f7889854cd85698f4133f70d2046ca4bc8
---
 gnu/packages/hurd.scm | 70 +++++++++++++++++++++++----------------------------
 1 file changed, 32 insertions(+), 38 deletions(-)

(limited to 'gnu/packages/hurd.scm')

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index f42f20c36e..80101bb463 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -57,36 +57,38 @@
                  version ".tar.gz"))
 
 (define-public gnumach-headers
-  (package
-    (name "gnumach-headers")
-    (version "1.8+git20230410") ;; This is an upstream tag
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://git.savannah.gnu.org/git/hurd/gnumach.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name "gnumach" version))
-       (sha256
-        (base32
-         "1s09256g2ny46idrn8frzs7r51la9ni45bmglmswlsmz9ii7dpi4"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'install
-           (lambda _
-             (invoke "make" "install-data" "install-data-hook")))
-         (delete 'build))
-       #:tests? #f))
-    (native-inputs
-     (list autoconf automake texinfo-4))
-    (supported-systems %hurd-systems)
-    (home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html")
-    (synopsis "GNU Mach kernel headers")
-    (description
-     "Headers of the GNU Mach kernel.")
-    (license gpl2+)))
+  (let ((revision "0")
+        (commit "2556fdece900d67529d5eda01f1bdaae4ffe96b0"))
+    (package
+      (name "gnumach-headers")
+      (version (git-version "1.8" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://git.savannah.gnu.org/git/hurd/gnumach.git")
+               (commit commit)))
+         (file-name (git-file-name "gnumach" version))
+         (sha256
+          (base32
+           "1lzsbix0l4jhab38pvwnmk7ip1lsn7m5smhnrciqajsqnadsnlzs"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (replace 'install
+             (lambda _
+               (invoke "make" "install-data" "install-data-hook")))
+           (delete 'build))
+         #:tests? #f))
+      (native-inputs
+       (list autoconf automake texinfo-4))
+      (supported-systems %hurd-systems)
+      (home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html")
+      (synopsis "GNU Mach kernel headers")
+      (description
+       "Headers of the GNU Mach kernel.")
+      (license gpl2+))))
 
 (define-public mig
   (package
@@ -251,14 +253,6 @@ Hurd-minimal package which are needed for both glibc and GCC.")
   (package
     (inherit gnumach-headers)
     (name "gnumach")
-    (source (origin
-              (inherit (package-source gnumach-headers))
-              (patches
-               (append
-                (search-patches "gnumach-support-noide.patch"
-                                "gnumach-fix-i686-linux-build.patch"
-                                "gnumach-fix-task_info.patch")
-                (origin-patches (package-source gnumach-headers))))))
     (arguments
      (substitute-keyword-arguments (package-arguments gnumach-headers)
        ((#:configure-flags flags ''())
-- 
cgit v1.2.3