[PATCH 1/2] gnu: hurd: Add gnumach-source-url procedure.

[PATCH 1/2] gnu: hurd: Add gnumach-source-url procedure.

[manolis837]

From: Manolis Ragkousis <manolis837@gmail.com>

* gnu/packages/hurd.scm (gnumach-source-url): New procedure.
  (gnumach-headers)[source]: Adjust accordingly.
---
 gnu/packages/hurd.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 557091d05..ba91b60be 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -35,6 +35,10 @@
   (and (string-suffix? "-gnu" triplet)
        (not (string-contains triplet "linux"))))
 
+(define (gnumach-source-url version)
+  (string-append "mirror://gnu/gnumach/gnumach-"
+                 version ".tar.gz"))
+
 (define-public gnumach-headers
   (package
     (name "gnumach-headers")
@@ -42,8 +46,7 @@
     (source
      (origin
       (method url-fetch)
-      (uri (string-append "mirror://gnu/gnumach/gnumach-"
-                          version ".tar.gz"))
+      (uri (gnumach-source-url version))
       (sha256
        (base32
         "02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f"))))
-- 
2.11.0

[PATCH 2/2] gnu: Add GNU Mach.

[manolis837]

From: Manolis Ragkousis <manolis837@gmail.com>

* gnu/packages/hurd.scm (gnumach): New variable.
---
 gnu/packages/hurd.scm | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index ba91b60be..e745c73d6 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
+;;; Copyright © 2014, 2015, 2016, 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -210,3 +210,34 @@ Library for GNU/Hurd.")
 Hurd-minimal package which are needed for both glibc and GCC.")
     (home-page (package-home-page hurd-headers))
     (license (package-license hurd-headers))))
+
+(define-public gnumach
+  (package
+    (name "gnumach")
+    (version "1.8")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (gnumach-source-url version))
+      (sha256
+       (base32
+        "02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after 'install 'produce-image
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out  (assoc-ref outputs "out"))
+                             (boot (string-append out "/boot")))
+                        (system* "make" "gnumach.gz")
+                        (copy-file "gnumach.gz"
+                                   (string-append boot "/gnumach.gz"))))))))
+    (native-inputs
+     `(("mig" ,mig)
+       ("perl" ,perl)))
+    (supported-systems %hurd-systems)
+    (home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html")
+    (synopsis "Microkernel of the GNU system")
+    (description
+     "GNU Mach is the microkernel upon which a GNU Hurd system is based.")
+    (license gpl2+)))
-- 
2.11.0

Re: [PATCH 1/2] gnu: hurd: Add gnumach-source-url procedure.

[Ludovic Courtès]

manolis837@gmail.com skribis:

> From: Manolis Ragkousis <manolis837@gmail.com>
>
> * gnu/packages/hurd.scm (gnumach-source-url): New procedure.
>   (gnumach-headers)[source]: Adjust accordingly.

OK!

Re: [PATCH 2/2] gnu: Add GNU Mach.

[Ludovic Courtès]

manolis837@gmail.com skribis:

> From: Manolis Ragkousis <manolis837@gmail.com>
>
> * gnu/packages/hurd.scm (gnumach): New variable.

[...]

> +     `(#:phases (modify-phases %standard-phases
> +                  (add-after 'install 'produce-image
> +                    (lambda* (#:key outputs #:allow-other-keys)
> +                      (let* ((out  (assoc-ref outputs "out"))
> +                             (boot (string-append out "/boot")))
> +                        (system* "make" "gnumach.gz")
> +                        (copy-file "gnumach.gz"
> +                                   (string-append boot "/gnumach.gz"))))))))

Make sure the phase returns #t on success:

  (and (zero? (system* "make" …))
       (begin
         (copy-file …)
         #t))

> +    (synopsis "Microkernel of the GNU system")
> +    (description
> +     "GNU Mach is the microkernel upon which a GNU Hurd system is based.")
> +    (license gpl2+)))

Does it build both on GNU/Linux and GNU/Hurd?

We probably need a ‘supported-systems’ field to restrict to i686 and
x86_64(?) GNU/Hurd and possibly GNU/Linux.

OK with these changes, thank you!

Ludo’.

Re: [PATCH 2/2] gnu: Add GNU Mach.

[rennes]

[-- Attachment #1: Type: text/plain, Size: 541 bytes --]

Hello,
I'm helping Manolis forward some pending patches.
Attach the patch with suggested corrections.

Make sure the phase returns #t on success:

   (and (zero? (system* "make" …))
        (begin
          (copy-file …)
          #t))


> +    (synopsis "Microkernel of the GNU system")
> +    (description
> +     "GNU Mach is the microkernel upon which a GNU Hurd system is 
> based.")
> +    (license gpl2+)))

Does it build both on GNU/Linux and GNU/Hurd?

For GNU/Linux (core-updates) works, also works in Hurd.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-GNU-Mach.patch --]
[-- Type: text/x-diff; name=0001-gnu-Add-GNU-Mach.patch, Size: 2424 bytes --]

From 2128b50a0dda9e4e6dbad74f2706aee58f81708d Mon Sep 17 00:00:00 2001
From: rennes <rennes@openmailbox.org>
Date: Thu, 16 Mar 2017 09:29:55 -0600
Subject: [PATCH 2/2] gnu: Add GNU Mach.

* gnu/packages/hurd.scm (gnumach): New variable.

Co-authored-by: Rene Saavedra <rennes@openmailbox.org>
---
 gnu/packages/hurd.scm | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index ba91b60be..66608f2d8 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
+;;; Copyright © 2014, 2015, 2016, 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -210,3 +210,37 @@ Library for GNU/Hurd.")
 Hurd-minimal package which are needed for both glibc and GCC.")
     (home-page (package-home-page hurd-headers))
     (license (package-license hurd-headers))))
+
+(define-public gnumach
+  (package
+    (name "gnumach")
+    (version "1.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (gnumach-source-url version))
+       (sha256
+        (base32
+         "02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after 'install 'produce-image
+                             (lambda* (#:key outputs #:allow-other-keys)
+                               (let* ((out  (assoc-ref outputs "out"))
+                                      (boot (string-append out "/boot")))
+                                 (and (zero? (system* "make" "gnumach.gz"))
+                                      (begin
+                                        (copy-file "gnumach.gz"
+                                                   (string-append boot "/gnumach.gz"))
+                                        #t))))))))
+    (native-inputs
+     `(("mig" ,mig)
+       ("perl" ,perl)))
+    (supported-systems %hurd-systems)
+    (home-page
+     "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html")
+    (synopsis "Microkernel of the GNU system")
+    (description
+      "GNU Mach is the microkernel upon which a GNU Hurd system is based.")
+    (license gpl2+)))
-- 
2.12.0

Re: [PATCH 2/2] gnu: Add GNU Mach.

[Ludovic Courtès]

Hi rennes,

rennes@openmailbox.org skribis:

>> +    (synopsis "Microkernel of the GNU system")
>> +    (description
>> +     "GNU Mach is the microkernel upon which a GNU Hurd system is
>> based.")
>> +    (license gpl2+)))
>
> Does it build both on GNU/Linux and GNU/Hurd?
>
> For GNU/Linux (core-updates) works, also works in Hurd.

It builds on i686-linux so I’ve added it to ‘supported-systems’ (as long
as we’re on one of the CPUs that Mach supports, that’s fine I guess.)

> From 2128b50a0dda9e4e6dbad74f2706aee58f81708d Mon Sep 17 00:00:00 2001
> From: rennes <rennes@openmailbox.org>
> Date: Thu, 16 Mar 2017 09:29:55 -0600
> Subject: [PATCH 2/2] gnu: Add GNU Mach.
>
> * gnu/packages/hurd.scm (gnumach): New variable.
>
> Co-authored-by: Rene Saavedra <rennes@openmailbox.org>

Committed with Manolis as the author (I think that’s what you intended
to do, right?).

Thanks!

Ludo’.

Re: [PATCH 2/2] gnu: Add GNU Mach.

[rennes]

>> For GNU/Linux (core-updates) works, also works in Hurd.
> 
> It builds on i686-linux so I’ve added it to ‘supported-systems’ (as 
> long
> as we’re on one of the CPUs that Mach supports, that’s fine I guess.)
> 
>> From 2128b50a0dda9e4e6dbad74f2706aee58f81708d Mon Sep 17 00:00:00 2001
>> From: rennes <rennes@openmailbox.org>
>> Date: Thu, 16 Mar 2017 09:29:55 -0600
>> Subject: [PATCH 2/2] gnu: Add GNU Mach.
>> 
>> * gnu/packages/hurd.scm (gnumach): New variable.
>> 
>> Co-authored-by: Rene Saavedra <rennes@openmailbox.org>
> 
> Committed with Manolis as the author (I think that’s what you intended
> to do, right?).
> 

Yeah that's right! Thanks

Re: [PATCH 2/2] gnu: Add GNU Mach.

[Manolis Ragkousis]

Awesome Rene, thank you.

Manolis