unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH 1/2] gnu: hurd: Add gnumach-source-url procedure.
@ 2017-01-10 17:36 manolis837
  2017-01-10 17:36 ` [PATCH 2/2] gnu: Add GNU Mach manolis837
  2017-01-12 14:09 ` [PATCH 1/2] gnu: hurd: Add gnumach-source-url procedure Ludovic Courtès
  0 siblings, 2 replies; 8+ messages in thread
From: manolis837 @ 2017-01-10 17:36 UTC (permalink / raw)
  To: guix-devel

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

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] gnu: Add GNU Mach.
@ 2017-03-16 16:06 rennes
  2017-03-19 16:21 ` Ludovic Courtès
  0 siblings, 1 reply; 8+ messages in thread
From: rennes @ 2017-03-16 16:06 UTC (permalink / raw)
  To: guix-devel

[-- 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


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-03-21 10:27 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-10 17:36 [PATCH 1/2] gnu: hurd: Add gnumach-source-url procedure manolis837
2017-01-10 17:36 ` [PATCH 2/2] gnu: Add GNU Mach manolis837
2017-01-12 14:11   ` Ludovic Courtès
2017-01-12 14:09 ` [PATCH 1/2] gnu: hurd: Add gnumach-source-url procedure Ludovic Courtès
  -- strict thread matches above, loose matches on Subject: below --
2017-03-16 16:06 [PATCH 2/2] gnu: Add GNU Mach rennes
2017-03-19 16:21 ` Ludovic Courtès
2017-03-19 16:35   ` rennes
2017-03-21 10:27     ` Manolis Ragkousis

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).