Merge branch 'master' into core-updates

Most conflicts are from 6fd52309b8f52c9bb59fccffac53e029ce94b698.

1 files changed, 4 insertions, 4 deletions

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index cabfc862ac..330623216c 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -198,7 +198,7 @@
        ("guile-json" ,guile-json)
        ("guile-ssh" ,guile-ssh)))
 
-    (home-page "http://www.gnu.org/software/guix")
+    (home-page "https://www.gnu.org/software/guix/")
     (synopsis "Functional package manager for installed software packages and versions")
     (description
      "GNU Guix is a functional package manager for the GNU system, and is
@@ -214,9 +214,9 @@ the Nix package manager.")
   ;;
   ;; Note: use a very short commit id; with a longer one, the limit on
   ;; hash-bang lines would be exceeded while running the tests.
-  (let ((commit "73a46451af333c77d2e79aa8764f51be8c34d1ae"))
+  (let ((commit "aabece2ef8f87c35ceb3678f39fcfd244b15bb0f"))
     (package (inherit guix-0.12.0)
-      (version (string-append "0.12.0-6." (string-take commit 4)))
+      (version (string-append "0.12.0-7." (string-take commit 4)))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -226,7 +226,7 @@ the Nix package manager.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "1zfa6c1vf52rg7ba1nrz4hzgdwl16brc4iylcdnhl9mnkjg2fbr5"))
+                  "0n8rrwwax9g6i38vq4y2xwb30irkv4c53mqcm5hqv78rb33x8z1l"))
                 (file-name (string-append "guix-" version "-checkout"))))
       (arguments
        (substitute-keyword-arguments (package-arguments guix-0.12.0)