From 43c082b3618f667ee163dfc6831e6afd1890bf63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 4 Nov 2015 14:07:26 +0100
Subject: [PATCH 1/2] gnu: guix: Update to 0.9.0.

* gnu/packages/package-management.scm (guix-0.8.3): Rename to...
  (guix-0.9.0): ... this.  Adjust users.
  (guix): Set to GUIX-0.9.0.
---
 gnu/packages/package-management.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 1c480be67e..d7dbb7a3b1 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -60,17 +60,17 @@
                      arch "-linux"
                      "/20131110/guile-2.0.9.tar.xz")))
 
-(define-public guix-0.8.3
+(define-public guix-0.9.0
   (package
     (name "guix")
-    (version "0.8.3")
+    (version "0.9.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "ftp://alpha.gnu.org/gnu/guix/guix-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "14n0nkj0ckhdwhghx1pml99hbjr1xdkn8x145j0xp1357vqlisnz"))))
+               "0h573z2br0bf43sxyzia9xlm03n3y43zg1snds3c2piq2m6kabrn"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list
@@ -196,8 +196,8 @@ the Nix package manager.")
   ;; Note: use a short commit id; when using the long one, the limit on socket
   ;; file names is exceeded while running the tests.
   (let ((commit "b485f75"))
-    (package (inherit guix-0.8.3)
-      (version (string-append "0.8.3." commit))
+    (package (inherit guix-0.9.0)
+      (version (string-append "0.9.0." commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -208,7 +208,7 @@ the Nix package manager.")
                   "1frn74y5c3n91qxs5b3sxbr8ai43s6svlb2djfnp7nqbr1ax3mph"))
                 (file-name (string-append "guix-" version "-checkout"))))
       (arguments
-       (substitute-keyword-arguments (package-arguments guix-0.8.3)
+       (substitute-keyword-arguments (package-arguments guix-0.9.0)
          ((#:configure-flags flags)
           ;; Set 'DOT_USER_PROGRAM' to the empty string so we don't keep a
           ;; reference to Graphviz, whose closure is pretty big (too big for
@@ -232,9 +232,9 @@ the Nix package manager.")
          ("texinfo" ,texinfo)
          ("graphviz" ,graphviz)
          ("help2man" ,help2man)
-         ,@(package-native-inputs guix-0.8.3))))))
+         ,@(package-native-inputs guix-0.9.0))))))
 
-(define-public guix guix-devel)
+(define-public guix guix-0.9.0)
 
 (define-public nix
   (package

From f8c0c8e4bfadf999fac1822a6ac3ce7d22139aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 4 Nov 2015 18:22:21 +0100
Subject: [PATCH 2/2] gnu: guix: Update development snapshot.

* gnu/packages/package-management.scm (guix-devel): Update to commit 43c082b.
  (guix): Set to GUIX-DEVEL.
---
 gnu/packages/package-management.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index d7dbb7a3b1..ae52ab8300 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -195,7 +195,7 @@ the Nix package manager.")
   ;;
   ;; Note: use a short commit id; when using the long one, the limit on socket
   ;; file names is exceeded while running the tests.
-  (let ((commit "b485f75"))
+  (let ((commit "43c082b"))
     (package (inherit guix-0.9.0)
       (version (string-append "0.9.0." commit))
       (source (origin
@@ -205,7 +205,7 @@ the Nix package manager.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "1frn74y5c3n91qxs5b3sxbr8ai43s6svlb2djfnp7nqbr1ax3mph"))
+                  "12ffsyrabsisyf5va4p2csvig6r8g4b7w1dxgsy446l4pjdl7ndh"))
                 (file-name (string-append "guix-" version "-checkout"))))
       (arguments
        (substitute-keyword-arguments (package-arguments guix-0.9.0)
@@ -234,7 +234,7 @@ the Nix package manager.")
          ("help2man" ,help2man)
          ,@(package-native-inputs guix-0.9.0))))))
 
-(define-public guix guix-0.9.0)
+(define-public guix guix-devel)
 
 (define-public nix
   (package