pcr/guix: updated to 0.14.0

2 files changed, 181 insertions, 42 deletions

diff --git a/pcr/guix/PKGBUILD b/pcr/guix/PKGBUILD
index 477c1829e..f1c279ec4 100644
--- a/pcr/guix/PKGBUILD
+++ b/pcr/guix/PKGBUILD
@@ -1,26 +1,29 @@
-# Maintainer (Arch): lantw44 (at) gmail (dot) com
+# Maintainer (AUR): lantw44 (at) gmail (dot) com
 # Modified from guix-git 20130119 PKGBUILD
 
+# parabola changes and rationale:
+#  no changes.
+
 # 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
 
 pkgname=guix
-pkgver=0.11.0
-pkgrel=2
+pkgver=0.14.0
+pkgrel=1
 pkgdesc="A purely functional package manager for the GNU system"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'armv7h')
 url="https://www.gnu.org/software/guix/"
-license=('GPL')
+license=('GPL3')
 options=('!strip')
 makedepends=(
   'bash-completion'
-  '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'
+  'guile>=2.0.9'
+  'guile-git-lib'
   'sqlite>=3.6.19'
   'bzip2'
   'gnutls'
@@ -28,43 +31,125 @@ depends=(
   'zlib')
 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})
+  "https://alpha.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
+  "aarch64-linux-20170217-guile-2.0.14.tar.xz::https://alpha.gnu.org/gnu/${pkgname}/bootstrap/aarch64-linux/20170217/guile-2.0.14.tar.xz"
+  "aarch64-linux-20170217-guile-2.0.14.tar.xz.sig::https://alpha.gnu.org/gnu/${pkgname}/bootstrap/aarch64-linux/20170217/guile-2.0.14.tar.xz.sig"
+  "armhf-linux-20150101-guile-2.0.11.tar.xz::https://alpha.gnu.org/gnu/${pkgname}/bootstrap/armhf-linux/20150101/guile-2.0.11.tar.xz"
+  "armhf-linux-20150101-guile-2.0.11.tar.xz.sig::https://alpha.gnu.org/gnu/${pkgname}/bootstrap/armhf-linux/20150101/guile-2.0.11.tar.xz.sig"
+  "i686-linux-20131110-guile-2.0.9.tar.xz::https://alpha.gnu.org/gnu/${pkgname}/bootstrap/i686-linux/20131110/guile-2.0.9.tar.xz"
+# "i686-linux-20131110-guile-2.0.9.tar.xz.sig::https://alpha.gnu.org/gnu/${pkgname}/bootstrap/i686-linux/20131110/guile-2.0.9.tar.xz.sig"
+  "mips64el-linux-20131110-guile-2.0.9.tar.xz::https://alpha.gnu.org/gnu/${pkgname}/bootstrap/mips64el-linux/20131110/guile-2.0.9.tar.xz"
+# "mips64el-linux-20131110-guile-2.0.9.tar.xz.sig::https://alpha.gnu.org/gnu/${pkgname}/bootstrap/mips64el-linux/20131110/guile-2.0.9.tar.xz.sig"
+  "x86_64-linux-20131110-guile-2.0.9.tar.xz::https://alpha.gnu.org/gnu/${pkgname}/bootstrap/x86_64-linux/20131110/guile-2.0.9.tar.xz"
+# "x86_64-linux-20131110-guile-2.0.9.tar.xz.sig::https://alpha.gnu.org/gnu/${pkgname}/bootstrap/x86_64-linux/20131110/guile-2.0.9.tar.xz.sig"
+)
 install="${pkgname}.install"
-sha1sums=('bd12d65a46c8eef3b490efea6ac953b995d524eb'
-          'a9080412df96832d22e57a1bcc76e3016f93f0b0')
+sha1sums=(
+  '1bc53c49d88600d63a1f195707a6f2cb0df83123'
+  '1c3ce54c829b93d6f9cb72367c1f669b6b5f381f'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+# 'SKIP'
+  'SKIP'
+# 'SKIP'
+  'SKIP'
+# 'SKIP'
+)
+sha256sums=(
+  'SKIP'
+  'SKIP'
+  '3939909f24dcb955621aa7f81ecde6844bea8a083969c2d275c55699af123ebe'
+  'bfceb1a0cb92c9182e5bc2bfe9e728078df0f5f86e6580820ead845d7f11f3c5'
+  'e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6'
+  '4ceb3b490e2eed1631ec204d68ebf2a91806f6d1c438fc3a8d744b3f0351633d'
+  'b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846'
+# '5c710ad8efa927711347cb585ceec25d99c3b3065955060275076be55f46f228'
+  '994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b'
+# 'd22c325e7d64b805679cc449b8865f7ac7629b83c71a6ae9812541408bac1952'
+  '037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0'
+# '50ec32f47dd659583d7ee633b8d6d4180b413c3680b1628ab6346241ac2c2b46'
+)
 validpgpkeys=('3CE464558A84FDC69DB40CFB090B11993D9AEBB5')
+noextract=(
+  'aarch64-linux-20170217-guile-2.0.14.tar.xz'
+  'armhf-linux-20150101-guile-2.0.11.tar.xz'
+  'i686-linux-20131110-guile-2.0.9.tar.xz'
+  'mips64el-linux-20131110-guile-2.0.9.tar.xz'
+  'x86_64-linux-20131110-guile-2.0.9.tar.xz')
+_noextract_dest_map=(
+  'gnu/packages/bootstrap/aarch64-linux/guile-2.0.14.tar.xz'
+  'gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz'
+  'gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz'
+  'gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz'
+  'gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	for index in $(seq 0 $((${#noextract[@]} - 1))); do
+		cp "${srcdir}/${noextract[${index}]}" "${_noextract_dest_map[${index}]}"
+	done
+}
 
 build() {
-	bash_completion_dir="`pkg-config --variable=completionsdir bash-completion`"
-	cd ${srcdir}/${pkgname}-${pkgver}
+	local bash_completion_dir="`pkg-config --variable=completionsdir bash-completion`"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr --sbindir=/usr/bin \
-		--libexecdir=/usr/lib/${pkgname} --localstatedir=/var \
+		--libexecdir="/usr/lib/${pkgname}" --localstatedir=/var \
 		--sysconfdir=/etc --with-bash-completion-dir="${bash_completion_dir}" \
 		--disable-rpath
 	make
 }
 
 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
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	# 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
+	SHELL=/bin/sh make check || true # noncritical test failure on arm
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	# Remove the unused upstart service file
-	rm -r ${pkgdir}/usr/lib/upstart
+	# Remove unused upstart service files
+	rm -r "${pkgdir}/usr/lib/upstart"
+	# Rename systemd service files provided by upstream because they are not
+	# usable without previous guix installation
+	local system_unit_dir="${pkgdir}/usr/lib/systemd/system"
+	local guix_daemon_default="${system_unit_dir}/guix-daemon.service"
+	local guix_daemon_upstream="${system_unit_dir}/guix-daemon-latest.service"
+	local guix_publish_default="${system_unit_dir}/guix-publish.service"
+	local guix_publish_upstream="${system_unit_dir}/guix-publish-latest.service"
+	mv "${guix_daemon_default}" "${guix_daemon_upstream}"
+	mv "${guix_publish_default}" "${guix_publish_upstream}"
+	# Generate default systemd service files from upstream ones by fixing paths
+	local guix_profile_root="/var/guix/profiles/per-user/root/guix-profile"
+	sed -e "s|^ExecStart=${guix_profile_root}/bin|ExecStart=/usr/bin|" \
+		-e "s|^Description=\(.*\)|Description=\1 (default)|" \
+		-e "/^Environment=/d" "${guix_daemon_upstream}" \
+		> "${guix_daemon_default}"
+	sed -e "s|^ExecStart=${guix_profile_root}/bin|ExecStart=/usr/bin|" \
+		-e "s|^Description=\(.*\)|Description=\1 (default)|" \
+		-e "/^Environment=/d" "${guix_publish_upstream}" \
+		> "${guix_publish_default}"
+	# Make sure the above sed commands really work
+	! cmp "${guix_daemon_default}" "${guix_daemon_upstream}"
+	! cmp "${guix_publish_default}" "${guix_publish_upstream}"
+	# Edit the description of upstream systemd service files
+	sed -i "s|^Description=\(.*\)|Description=\1 (upstream)|" \
+		"${guix_daemon_upstream}" "${guix_publish_upstream}"
 	# The default makepkg strip option cannot be used here because binaries
 	# installed in /usr/share must not be stripped.
 	# To keep user-defined 'strip' and 'debug' options useful, we still
@@ -74,9 +159,33 @@ package() {
 	# cause mksrcinfo to insert wrong lines to .SRCINFO, so they have to be
 	# put in eval.
 	eval 'options=()'
-	cd ${pkgdir}/usr/bin
+	cd "${pkgdir}/usr/bin"
 	tidy_strip
-	cd ${pkgdir}/usr/lib
+	cd "${pkgdir}/usr/lib/guix"
 	tidy_strip
 	eval 'options=("!strip")'
+	# Make sure bootstrap binaries are not modified
+	cd "${pkgdir}/usr/share/guile/site/2.2/gnu/packages/bootstrap"
+	cat << EOF | sha256sum -c
+e3bf6ffe357eebcc28221ffdbb5b00b4ed1237cb101aba4b1b8119b08c732387  aarch64-linux/bash
+444c2af9fefd11d4fc20ee9281fa2c46cbe3cfb3df89cc30bcd50d20cdb6d6c0  aarch64-linux/mkdir
+05273f978a072269193e3a09371c23d6d149f6d807f8e413a4f79aa5a1bb6f25  aarch64-linux/tar
+48e9baa8a6c2527a5b4ecb8f0ac87767e2b055979256acab2a3dbff4f6171637  aarch64-linux/xz
+2ad82bb9ee6e77eaff284222e1d43a2829b5a1e2bcf158b08564a26da48e0045  armhf-linux/bash
+a19e386b31ebc8a46b5f934c11bca86e28f8aa997272a5fcd052b52d5019f790  armhf-linux/mkdir
+da56be0b332fac3880b151abe60c1eeb2649cd192379b18658b1d872f7aa53e8  armhf-linux/tar
+6507d04d55210e3a8cdc2e5758d79a4b0da3cb53bb142f60a78788af7b915ab1  armhf-linux/xz
+ed059a9ae964d538605c923c4e73128bd5ca912994709b3fe2d71d061751e8c5  i686-linux/bash
+b369264bda7bbb98d1acf0bf53ebc9077e82f48b190f3956fa23cb73d6e99f92  i686-linux/mkdir
+9f7e79e52aa369fc9ed69359e503d4f8179117842df8261fc0cae5629cc896cb  i686-linux/tar
+d23173dfe66c41e1c8d8eef905d14d1f39aaa52c9d70621f366c275e9139b415  i686-linux/xz
+213cfb8794ffdf4a71cb321a89987ee61704edcec5d1203912575f0a626a239c  mips64el-linux/bash
+d436070fde044366d72d7e59d8d12b1ba72b32d7b0f13e409b61118bdc8254c8  mips64el-linux/mkdir
+d27fcb52f9b4a42fafdae3164fffd200f52e04d142574dcf06212dbf7701cbb8  mips64el-linux/tar
+107eac7523b0148d18f461d81bec9d0db6154d6c61e4caf3a4cdb43a9a6afb3c  mips64el-linux/xz
+265d2f633a5ab35747fc4836b5e3ca32bf56ad44cc24f3bd358f1ff6cf0779a5  x86_64-linux/bash
+50689abdf2d5374e17ea8c51801f04f7590ad604af33a12a940cc11d137a4a2f  x86_64-linux/mkdir
+16440b4495a2ff9c6aa50c05a8c9066e1004a5990b75aa891f08cdf8753c8689  x86_64-linux/tar
+930ad7e88ca0b2275dc459b24aea912fadd5b7c9e95be06788d4b61efc7ef470  x86_64-linux/xz
+EOF
 }
diff --git a/pcr/guix/guix.install b/pcr/guix/guix.install
index c2baacd9f..abca2dc18 100644
--- a/pcr/guix/guix.install
+++ b/pcr/guix/guix.install
@@ -1,16 +1,46 @@
-post_install() {
-  echo "Guix 0.8.3 already provides a systemd service file in its release,"
-  echo "so the one included in AUR package is now removed. Please use the"
-  echo "following commands to keep your installation compatible with the"
-  echo "new service file:"
-  echo
-  echo "  systemctl disable guix"
-  echo "  systemctl enable guix-daemon"
-  echo "  groupmod -n guixbuild guix-builder"
-  echo "  usermod -l guixbuild guix-builder"
-  echo
-  echo "If you have /etc/systemd/system/guix.service.d, please also remember"
-  echo "to review its content and rename it to guix-daemon.service.d."
+post_upgrade() {
+  if [ "$(vercmp "$2" "0.8.3-2")" -lt "0" ]; then
+    echo "(NOTES FOR UPGRADING FROM VERSIONS BEFORE 0.8.3-2)"
+    echo
+    echo "The systemd service file used to run guix-daemon is renamed from"
+    echo "guix.service to guix-daemon.service. Please use the following"
+    echo "commands to keep your installation compatible with the new version."
+    echo
+    echo "  systemctl disable guix"
+    echo "  systemctl enable guix-daemon"
+    echo "  groupmod -n guixbuild guix-builder"
+    echo "  usermod -l guixbuild guix-builder"
+    echo
+    echo "If you have /etc/systemd/system/guix.service.d, please also remember"
+    echo "to review its content and rename it to guix-daemon.service.d."
+    echo
+  fi
+  if [ "$(vercmp "$2" "0.13.0-1")" -lt "0" ]; then
+    echo "(NOTES FOR UPGRADING FROM VERSIONS BEFORE 0.13.0-1)"
+    echo
+    echo "The systemd service file provided by upstream is no longer usable"
+    echo "by default because it includes path to the guix profile of root"
+    echo "user, which does not exist unless you installed guix with guix"
+    echo "itself as root user before. Therefore, guix-daemon.service provided"
+    echo "by upstream is renamed to guix-daemon-latest.service, and"
+    echo "guix-daemon.service is generated from the upstream one by replacing"
+    echo "and removing unavailable paths."
+    echo
+    echo "To use the systemd service file provided by upstream, run the"
+    echo "following commands as root."
+    echo
+    echo "  systemctl disable guix-daemon"
+    echo "  systemctl start guix-daemon"
+    echo "  guix package -i guix"
+    echo "  systemctl stop guix-daemon"
+    echo "  systemctl start guix-daemon-latest"
+    echo "  systemctl enable guix-daemon-latest"
+    echo
+    echo "Please note that only one of guix-daemon.service or"
+    echo "guix-daemon-latest.service can be started or enabled since"
+    echo "they use the same /var/guix directory."
+    echo
+  fi
 }
 
 # vim:set ts=2 sw=2 ft=sh et: