From f1082ec16cccfe81882a29ad11733e187c0c67c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 28 Jan 2015 23:36:58 +0100
Subject: [PATCH 1/2] gnu: guix: Update to 0.8.1.

* gnu/packages/package-management.scm (guix-0.8): Rename to...
  (guix-0.8.1): ... this.  Add 'propagated-inputs'.
  (guix-devel): Append ".0" to version number.  Remove
  'propagated-inputs'.
  (guix): Set to GUIX-0.8.1.
---
 gnu/packages/package-management.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 6f51a32eca..83964b2580 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -50,17 +50,17 @@
                      arch "-linux"
                      "/20131110/guile-2.0.9.tar.xz")))
 
-(define-public guix-0.8
+(define-public guix-0.8.1
   (package
     (name "guix")
-    (version "0.8")
+    (version "0.8.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "ftp://alpha.gnu.org/gnu/guix/guix-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "1p7yqbnhjc1yjzinbjzphgj6wasc7p8ki9yj0vql5bsz01dp28zv"))))
+               "12h5ldj1yf0za6ladlr8h7nx2gqrv2dxcsiwyqayvrza93lijkf5"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list
@@ -125,6 +125,10 @@
           ,(boot-guile "armhf"
                        (base32
                         "1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5"))))))
+    (propagated-inputs
+     `(("guile-json" ,guile-json)
+       ("geiser" ,geiser)))                       ;for guix.el
+
     (home-page "http://www.gnu.org/software/guix")
     (synopsis "Functional package manager for installed software packages and versions")
     (description
@@ -138,8 +142,8 @@ the Nix package manager.")
 (define guix-devel
   ;; Development version of Guix.
   (let ((commit "4ad8789"))
-    (package (inherit guix-0.8)
-      (version (string-append "0.8." commit))
+    (package (inherit guix-0.8.1)
+      (version (string-append "0.8.0." commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -149,7 +153,7 @@ the Nix package manager.")
                  (base32
                   "058gf7fg5k8ldchz63j5ssqr2lx8dn1wa1rllg7krrfr6g8abi34"))))
       (arguments
-       (substitute-keyword-arguments (package-arguments guix-0.8)
+       (substitute-keyword-arguments (package-arguments guix-0.8.1)
          ((#:phases phases)
           `(alist-cons-before
             'configure 'bootstrap
@@ -167,13 +171,9 @@ the Nix package manager.")
          ("gettext" ,gnu-gettext)
          ("texinfo" ,texinfo)
          ("graphviz" ,graphviz)
-         ,@(package-native-inputs guix-0.8)))
-      (propagated-inputs
-       `(("guile-json" ,guile-json)
-         ("geiser" ,geiser)                       ;for guix.el
-         ,@(package-propagated-inputs guix-0.8))))))
+         ,@(package-native-inputs guix-0.8.1))))))
 
-(define-public guix guix-devel)
+(define-public guix guix-0.8.1)
 
 (define-public nix
   (package

From ae5e3d3a62bafefc7f592b6a7eb60a06598ae9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 28 Jan 2015 23:53:09 +0100
Subject: [PATCH 2/2] gnu: guix: Update snapshot.

* gnu/packages/package-management.scm (guix-devel): Update snapshot.
  (guix): Change to GUIX-DEVEL.
---
 gnu/packages/package-management.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 83964b2580..acb72f6bc6 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -141,9 +141,9 @@ the Nix package manager.")
 
 (define guix-devel
   ;; Development version of Guix.
-  (let ((commit "4ad8789"))
+  (let ((commit "f1082ec"))
     (package (inherit guix-0.8.1)
-      (version (string-append "0.8.0." commit))
+      (version (string-append "0.8.1." commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -151,7 +151,7 @@ the Nix package manager.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "058gf7fg5k8ldchz63j5ssqr2lx8dn1wa1rllg7krrfr6g8abi34"))))
+                  "0mmwmv3wbrgzs49gnxraj11fp1mxfry4r0n222l3p4yga27vzw6d"))))
       (arguments
        (substitute-keyword-arguments (package-arguments guix-0.8.1)
          ((#:phases phases)
@@ -173,7 +173,7 @@ the Nix package manager.")
          ("graphviz" ,graphviz)
          ,@(package-native-inputs guix-0.8.1))))))
 
-(define-public guix guix-0.8.1)
+(define-public guix guix-devel)
 
 (define-public nix
   (package