guix: 0.11.0 -> 0.12.0

4 files changed, 26 insertions, 112 deletions

diff --git a/guix/.SRCINFO b/guix/.SRCINFO
index c2e82d3..f099637 100644
--- a/guix/.SRCINFO
+++ b/guix/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Nov  4 12:11:55 UTC 2016
+# Sat Dec 31 08:34:24 UTC 2016
 pkgbase = guix
 	pkgdesc = A purely functional package manager for the GNU system
-	pkgver = 0.11.0
-	pkgrel = 3
+	pkgver = 0.12.0
+	pkgrel = 1
 	url = https://www.gnu.org/software/guix/
 	install = guix.install
 	arch = x86_64
@@ -13,6 +13,7 @@ pkgbase = guix
 	makedepends = emacs
 	makedepends = graphviz
 	makedepends = guile-json
+	makedepends = guile-ssh>=0.10.2
 	makedepends = help2man
 	depends = guile>=2.0.7
 	depends = sqlite>=3.6.19
@@ -24,15 +25,12 @@ pkgbase = guix
 	optdepends = emacs: to enable Emacs Interface
 	optdepends = graphviz: to enable Emacs Interface
 	optdepends = guile-json: to import packages from cpan, gem, pypi
+	optdepends = guile-ssh: to offload builds to other machines
 	options = !strip
-	source = ftp://alpha.gnu.org/gnu/guix/guix-0.11.0.tar.gz
-	source = ftp://alpha.gnu.org/gnu/guix/guix-0.11.0.tar.gz.sig
-	source = guix-guile-2.2-compat.patch
-	source = guix-delete-go-files-SIGINT.patch
-	sha1sums = bd12d65a46c8eef3b490efea6ac953b995d524eb
-	sha1sums = a9080412df96832d22e57a1bcc76e3016f93f0b0
-	sha1sums = 0b976fe5862798b34fdb90d9f9f405b39ccedb1b
-	sha1sums = 3506f8bb7cf35776739a6cc1afceff31555cebc0
+	source = ftp://alpha.gnu.org/gnu/guix/guix-0.12.0.tar.gz
+	source = ftp://alpha.gnu.org/gnu/guix/guix-0.12.0.tar.gz.sig
+	sha1sums = 2189ab3a658040e51b036b1bca11594c3d6e4966
+	sha1sums = 3300991092ba2eea2b2113456cd0409d11b00ca6
 
 pkgname = guix
 
diff --git a/guix/PKGBUILD b/guix/PKGBUILD
index ba86e19..3c5b76b 100644
--- a/guix/PKGBUILD
+++ b/guix/PKGBUILD
@@ -3,11 +3,11 @@
 
 # In order to verify the PGP signature of the source archive, you may need to
 # use this command to download the needed public key:
-#   gpg --recv-keys 3CE464558A84FDC69DB40CFB090B11993D9AEBB5
+#   gpg --recv-keys BCA689B636553801C3C62150197A5888235FACAC
 
 pkgname=guix
-pkgver=0.11.0
-pkgrel=3
+pkgver=0.12.0
+pkgrel=1
 pkgdesc="A purely functional package manager for the GNU system"
 arch=('x86_64' 'i686')
 url="https://www.gnu.org/software/guix/"
@@ -18,6 +18,7 @@ makedepends=(
   'emacs'    # Please remove this if you are not going to use guix in emacs
   'graphviz' # Please remove this if you are not going to use guix in emacs
   'guile-json'
+  'guile-ssh>=0.10.2'
   'help2man')
 depends=(
   'guile>=2.0.7'
@@ -30,25 +31,14 @@ optdepends=(
   'bash-completion: to enable bash programmable completion'
   'emacs: to enable Emacs Interface'
   'graphviz: to enable Emacs Interface'
-  'guile-json: to import packages from cpan, gem, pypi')
+  'guile-json: to import packages from cpan, gem, pypi'
+  'guile-ssh: to offload builds to other machines')
 source=(
-  "ftp://alpha.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-  "guix-guile-2.2-compat.patch"
-  "guix-delete-go-files-SIGINT.patch")
+  "ftp://alpha.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
 install="${pkgname}.install"
-sha1sums=('bd12d65a46c8eef3b490efea6ac953b995d524eb'
-          'a9080412df96832d22e57a1bcc76e3016f93f0b0'
-          '0b976fe5862798b34fdb90d9f9f405b39ccedb1b'
-          '3506f8bb7cf35776739a6cc1afceff31555cebc0')
-validpgpkeys=('3CE464558A84FDC69DB40CFB090B11993D9AEBB5')
-
-prepare() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	# http://git.savannah.gnu.org/cgit/guix.git/commit/?id=5a88b2d
-	patch -Np1 < "${srcdir}/${source[2]}"
-	# http://git.savannah.gnu.org/cgit/guix.git/commit/?id=402bb3b
-	patch -Np1 < "${srcdir}/${source[3]}"
-}
+sha1sums=('2189ab3a658040e51b036b1bca11594c3d6e4966'
+          '3300991092ba2eea2b2113456cd0409d11b00ca6')
+validpgpkeys=('BCA689B636553801C3C62150197A5888235FACAC')
 
 build() {
 	bash_completion_dir="`pkg-config --variable=completionsdir bash-completion`"
@@ -62,11 +52,13 @@ build() {
 
 check() {
 	cd ${srcdir}/${pkgname}-${pkgver}
-	# Don't run tests requiring user namespace
-	if unshare -Ur true; then :; else
-		sed -i 's|tests/syscalls.scm||' Makefile
-		sed -i 's|tests/containers.scm||' Makefile
-		sed -i 's|tests/guix-environment-container.sh||' Makefile
+	# Check whether the current working directory is too long
+	cwd_str="$(pwd)"
+	cwd_len="${#cwd_str}"
+	if [ "${cwd_len}" -gt 46 ]; then
+		error "${cwd_str} is too long."
+		error "The working directory cannot be longer than 46 bytes."
+		false
 	fi
 	# Make sure we have a valid shell accepting -c option
 	SHELL=/bin/sh make check
diff --git a/guix/guix-delete-go-files-SIGINT.patch b/guix/guix-delete-go-files-SIGINT.patch
deleted file mode 100644
index c2423f8..0000000
--- a/guix/guix-delete-go-files-SIGINT.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 402bb3b9f7eaaa66f2652fda2d9e0d2e34cf59f8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
-Date: Wed, 12 Oct 2016 14:55:32 +0200
-Subject: [PATCH] build: Arrange so temporary .go files are deleted upon
- SIGINT.
-
-* build-aux/compile-all.scm: Install SIGINT handler.
----
- build-aux/compile-all.scm | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/build-aux/compile-all.scm b/build-aux/compile-all.scm
-index 46b3817..6ce4040 100644
---- a/build-aux/compile-all.scm
-+++ b/build-aux/compile-all.scm
-@@ -76,6 +76,12 @@
-                         #:output-file go
-                         #:opts `(#:warnings ,warnings)))))))
- 
-+;; Install a SIGINT handler to give unwind handlers in 'compile-file' an
-+;; opportunity to run upon SIGINT and to remove temporary output files.
-+(sigaction SIGINT
-+  (lambda args
-+    (exit 1)))
-+
- (match (command-line)
-   ((_ . files)
-    (let ((files (filter file-needs-compilation? files)))
--- 
-2.7.4
-
diff --git a/guix/guix-guile-2.2-compat.patch b/guix/guix-guile-2.2-compat.patch
deleted file mode 100644
index 50a8f8e..0000000
--- a/guix/guix-guile-2.2-compat.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5a88b2d1304ad57c1249558a261a8d191daf9758 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
- <taylanbayirli@gmail.com>
-Date: Tue, 27 Sep 2016 22:34:06 +0200
-Subject: [PATCH] build: Improve Guile 2.2 compatibility.
-
-* build-aux/compile-all.scm (compile-file*): Ensure loading of
-  compilation related modules before going parallel.
-* guix/build/pull.scm (build-guix): Ditto.
----
- build-aux/compile-all.scm | 3 +++
- guix/build/pull.scm       | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/build-aux/compile-all.scm b/build-aux/compile-all.scm
-index 7c937a0..46b3817 100644
---- a/build-aux/compile-all.scm
-+++ b/build-aux/compile-all.scm
-@@ -81,6 +81,9 @@
-    (let ((files (filter file-needs-compilation? files)))
-      (for-each load-module-file files)
-      (let ((mutex (make-mutex)))
-+       ;; Make sure compilation related modules are loaded before starting to
-+       ;; compile files in parallel.
-+       (compile #f)
-        (par-for-each (lambda (file)
-                        (compile-file* file mutex))
-                      files)))))
-diff --git a/guix/build/pull.scm b/guix/build/pull.scm
-index ccf1868..871bf6f 100644
---- a/guix/build/pull.scm
-+++ b/guix/build/pull.scm
-@@ -125,6 +125,9 @@ containing the source code.  Write any debugging output to DEBUG-PORT."
-       (newline)
-       (let ((mutex (make-mutex))
-             (completed 0))
-+        ;; Make sure compilation related modules are loaded before starting to
-+        ;; compile files in parallel.
-+        (compile #f)
-         (par-for-each
-          (lambda (file)
-            (with-mutex mutex
--- 
-2.7.4
-