From 8a43ff101e28c432cf96333018c4b0c35acf9d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 11 Dec 2013 13:55:17 +0100
Subject: gnu: guix: Upgrade to 0.5.

* gnu/packages/package-management.scm (guix): Upgrade to 0.5.  Update
  the bootstrap binaries; add mips64el; add
  'guix-test-networking.patch'.
---
 gnu-system.am                                   |  1 +
 gnu/packages/package-management.scm             | 19 +++++++++++++------
 gnu/packages/patches/guix-test-networking.patch | 15 +++++++++++++++
 3 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 gnu/packages/patches/guix-test-networking.patch

diff --git a/gnu-system.am b/gnu-system.am
index 89018cad05..312ca1c61d 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -252,6 +252,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/guile-default-utf8.patch			\
   gnu/packages/patches/guile-linux-syscalls.patch		\
   gnu/packages/patches/guile-relocatable.patch			\
+  gnu/packages/patches/guix-test-networking.patch		\
   gnu/packages/patches/hop-bigloo-4.0b.patch			\
   gnu/packages/patches/libevent-dns-tests.patch			\
   gnu/packages/patches/libffi-mips-n32-fix.patch		\
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 44651f4511..f94f8fc919 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -21,6 +21,7 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module ((guix licenses) #:select (gpl3+))
+  #:use-module (gnu packages)
   #:use-module (gnu packages guile)
   #:use-module ((gnu packages compression) #:select (bzip2 gzip))
   #:use-module (gnu packages gnupg)
@@ -30,14 +31,15 @@
 (define-public guix
   (package
     (name "guix")
-    (version "0.4")
+    (version "0.5")
     (source (origin
              (method url-fetch)
              (uri (string-append "ftp://alpha.gnu.org/gnu/guix/guix-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "1mmh28ds5p8mpzm2yfvgm6z92wgknqc3dlw6r6z16s13sk386igk"))))
+               "15azhc3lb1m64545q8cs8dzcgjbd2wjxhl6nw0rq6lnvrxz2wjmv"))
+             (patches (list (search-patch "guix-test-networking.patch")))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list
@@ -54,11 +56,12 @@
                                                              arch)))
                            (target (string-append "gnu/packages/bootstrap/"
                                                   arch "-linux/"
-                                                  "/guile-2.0.7.tar.xz")))
+                                                  "/guile-2.0.9.tar.xz")))
                        (copy-file guile target)))
 
                    (copy "i686")
                    (copy "x86_64")
+                   (copy "mips64el")
                    #t)
                  %standard-phases)))
     (inputs
@@ -68,7 +71,7 @@
                           (uri (string-append
                                 "http://alpha.gnu.org/gnu/guix/bootstrap/"
                                 arch "-linux"
-                                "/20130105/guile-2.0.7.tar.xz"))
+                                "/20131110/guile-2.0.9.tar.xz"))
                           (sha256 hash)))))
        `(("bzip2" ,bzip2)
          ("gzip" ,gzip)
@@ -81,11 +84,15 @@
          ("boot-guile/i686"
           ,(boot-guile "i686"
                        (base32
-                        "0z11rlyclnh9palrsk0xhgm84rmvzza0gkwvlsiazsjnqpscd9zr")))
+                        "0im800m30abgh7msh331pcbjvb4n02smz5cfzf1srv0kpx3csmxp")))
          ("boot-guile/x86_64"
           ,(boot-guile "x86_64"
                        (base32
-                        "0b5a2ngd9a7z2wnm01wc27rlwb61x854ndadxwmj8v8lrl6j2hxw"))))))
+                        "1w2p5zyrglzzniqgvyn1b55vprfzhgk8vzbzkkbdgl5248si0yq3")))
+         ("boot-guile/mips64el"
+          ,(boot-guile "mips64el"
+                       (base32
+                        "0fzp93lvi0hn54acc0fpvhc7bvl0yc853k62l958cihk03q80ilr"))))))
     (home-page "http://www.gnu.org/software/guix")
     (synopsis "Functional package manager for installed software packages and versions")
     (description
diff --git a/gnu/packages/patches/guix-test-networking.patch b/gnu/packages/patches/guix-test-networking.patch
new file mode 100644
index 0000000000..a8d1f4fd2f
--- /dev/null
+++ b/gnu/packages/patches/guix-test-networking.patch
@@ -0,0 +1,15 @@
+Skip that test when the network is unreachable.
+
+diff --git a/tests/packages.scm b/tests/packages.scm
+index 04e3b0b..6ac215b 100644
+--- a/tests/packages.scm
++++ b/tests/packages.scm
+@@ -139,6 +139,8 @@
+     (and (direct-store-path? source)
+          (string-suffix? "utils.scm" source))))
+ 
++(unless (false-if-exception (getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV))
++  (test-skip 1))
+ (test-equal "package-source-derivation, snippet"
+   "OK"
+   (let* ((file   (search-bootstrap-binary "guile-2.0.9.tar.xz"
-- 
cgit v1.2.3