guix: 1.0.0 -> 1.0.1

4 files changed, 14 insertions, 107 deletions

diff --git a/guix/.SRCINFO b/guix/.SRCINFO
index 408a61f..66b01e4 100644
--- a/guix/.SRCINFO
+++ b/guix/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = guix
 	pkgdesc = A purely functional package manager for the GNU system
-	pkgver = 1.0.0
+	pkgver = 1.0.1
 	pkgrel = 1
 	url = https://www.gnu.org/software/guix/
 	install = guix.install
@@ -26,22 +26,13 @@ pkgbase = guix
 	optdepends = guile-json1: to import packages from cpan, gem, pypi
 	optdepends = guile-ssh: to offload builds to other machines
 	options = !strip
-	source = https://ftp.gnu.org/gnu/guix/guix-1.0.0.tar.gz
-	source = https://ftp.gnu.org/gnu/guix/guix-1.0.0.tar.gz.sig
-	source = guix-1.0.0-docker-image.tmpl::https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/system/examples/docker-image.tmpl?h=v1.0.0
-	source = guix-1.0.0-tests-gremlin.patch
-	source = guix-1.0.0-tests-guix-pack-localstatedir.patch
+	source = https://ftp.gnu.org/gnu/guix/guix-1.0.1.tar.gz
+	source = https://ftp.gnu.org/gnu/guix/guix-1.0.1.tar.gz.sig
 	validpgpkeys = 3CE464558A84FDC69DB40CFB090B11993D9AEBB5
-	sha1sums = fd64cd4347214a4e75d611696c9929cba8995323
-	sha1sums = 42fef4a882b71b0413d33a6f9199a53cc92bba74
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = f0567476a202c1c3bc3eacf991f3b5f5af030ed165a1846d045a9a375f4851ba
-	sha256sums = 6dd16cbf6b8d03e866e8dcc29a9b3ae689438de7041e05cb303a7585634ae80a
-	sha256sums = 2038b2e2282ce29b837701688d86339ccdf1df6f7d842c45f663046489d47415
+	sha1sums = f6e32b17e034124edeec11d841e687ba0ee59242
+	sha1sums = 551bf83df2771573403bcd1fe048d74dcb98e4cf
+	sha256sums = 3939b6cfa11661290fee0b82f91d2a0d39c2e36fdf4e53d8afd31dd34430ea5f
+	sha256sums = 15e59f63f95527f7126ed85c66435850a82c17f015568e1432f1fcbabc70dabb
 
 pkgname = guix
 
diff --git a/guix/PKGBUILD b/guix/PKGBUILD
index 7b99df1..a8e7c69 100644
--- a/guix/PKGBUILD
+++ b/guix/PKGBUILD
@@ -6,7 +6,7 @@
 #   gpg --recv-keys 3CE464558A84FDC69DB40CFB090B11993D9AEBB5
 
 pkgname=guix
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
 pkgdesc="A purely functional package manager for the GNU system"
 arch=('x86_64' 'i686' 'armv7h')
@@ -34,50 +34,22 @@ optdepends=(
   'guile-json1: to import packages from cpan, gem, pypi'
   'guile-ssh: to offload builds to other machines')
 source=(
-  "https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-  "${pkgname}-${pkgver}-docker-image.tmpl::https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/system/examples/docker-image.tmpl?h=v${pkgver}"
-  'guix-1.0.0-tests-gremlin.patch'
-  'guix-1.0.0-tests-guix-pack-localstatedir.patch')
+  "https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
 install="${pkgname}.install"
 sha1sums=(
-  'fd64cd4347214a4e75d611696c9929cba8995323'
-  '42fef4a882b71b0413d33a6f9199a53cc92bba74'
-  'SKIP'
-  'SKIP'
-  'SKIP')
+  'f6e32b17e034124edeec11d841e687ba0ee59242'
+  '551bf83df2771573403bcd1fe048d74dcb98e4cf')
 sha256sums=(
-  'SKIP'
-  'SKIP'
-  'f0567476a202c1c3bc3eacf991f3b5f5af030ed165a1846d045a9a375f4851ba'
-  '6dd16cbf6b8d03e866e8dcc29a9b3ae689438de7041e05cb303a7585634ae80a'
-  '2038b2e2282ce29b837701688d86339ccdf1df6f7d842c45f663046489d47415')
+  '3939b6cfa11661290fee0b82f91d2a0d39c2e36fdf4e53d8afd31dd34430ea5f'
+  '15e59f63f95527f7126ed85c66435850a82c17f015568e1432f1fcbabc70dabb')
 validpgpkeys=('3CE464558A84FDC69DB40CFB090B11993D9AEBB5')
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	# Obtain the file from the git repository and put it into the source tree.
-	# It is required by the test tests/guix-system.sh.
-	# https://debbugs.gnu.org/35774
-	cp "${srcdir}/${source[2]%%::*}" gnu/system/examples/docker-image.tmpl
-	# Apply patches to avoid unexpected test failure.
-	# https://debbugs.gnu.org/35775
-	# https://debbugs.gnu.org/35776
-	local source_file
-	for source_file in "${source[@]}"; do
-		case "${source_file}" in
-			*.patch)
-				patch -p1 < "${srcdir}/${source_file}"
-				;;
-		esac
-	done
-}
-
 build() {
 	local bash_completion_dir="$(pkg-config --variable=completionsdir bash-completion)"
 	local fish_completion_dir="$(pkg-config --variable=completionsdir fish)"
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
-		--libexecdir="/usr/lib/${pkgname}" --localstatedir=/var \
+		--libexecdir=/usr/lib --localstatedir=/var \
 		--with-bash-completion-dir="${bash_completion_dir}" \
 		--with-fish-completion-dir="${fish_completion_dir}" \
 		--disable-rpath \
diff --git a/guix/guix-1.0.0-tests-gremlin.patch b/guix/guix-1.0.0-tests-gremlin.patch
deleted file mode 100644
index 74cdda5..0000000
--- a/guix/guix-1.0.0-tests-gremlin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://debbugs.gnu.org/35775
-
-diff --git a/tests/gremlin.scm b/tests/gremlin.scm
-index 77a5dc1998..b0bb7a8e49 100644
---- a/tests/gremlin.scm
-+++ b/tests/gremlin.scm
-@@ -52,7 +52,7 @@
-     (or (not dyninfo)                             ;static executable
-         (lset<= string=?
-                 (list (string-append "libguile-" (effective-version))
--                      "libgc" "libunistring" "libffi")
-+                      "libc")
-                 (map (lambda (lib)
-                        (string-take lib (string-contains lib ".so")))
-                      (elf-dynamic-info-needed dyninfo))))))
-@@ -79,7 +79,7 @@
-          (lambda (port)
-            (display "int main () { puts(\"hello\"); }" port)))
-        (invoke c-compiler "t.c"
--               "-Wl,-rpath=/foo" "-Wl,-rpath=/bar")
-+               "-Wl,--enable-new-dtags" "-Wl,-rpath=/foo" "-Wl,-rpath=/bar")
-        (let* ((dyninfo (elf-dynamic-info
-                         (parse-elf (call-with-input-file "a.out"
-                                      get-bytevector-all))))
diff --git a/guix/guix-1.0.0-tests-guix-pack-localstatedir.patch b/guix/guix-1.0.0-tests-guix-pack-localstatedir.patch
deleted file mode 100644
index 30dcfd8..0000000
--- a/guix/guix-1.0.0-tests-guix-pack-localstatedir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://debbugs.gnu.org/35776
-
-diff --git a/tests/guix-pack-localstatedir.sh b/tests/guix-pack-localstatedir.sh
-index b734b0f..41afda1 100644
---- a/tests/guix-pack-localstatedir.sh
-+++ b/tests/guix-pack-localstatedir.sh
-@@ -27,8 +27,9 @@ guix pack --version
- # the test in the user's global store if possible, on the grounds that
- # binaries may already be there or can be built or downloaded inexpensively.
- 
--NIX_STORE_DIR="`guile -c '(use-modules (guix config))(display %storedir)'`"
-+nix_store_dir="`guile -c '(use-modules (guix config))(display %storedir)'`"
- localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`"
-+NIX_STORE_DIR="$nix_store_dir"
- GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
- export NIX_STORE_DIR GUIX_DAEMON_SOCKET
- 
-diff --git a/tests/guix-pack-relocatable.sh b/tests/guix-pack-relocatable.sh
-index 38dcf1e..b276fdc 100644
---- a/tests/guix-pack-relocatable.sh
-+++ b/tests/guix-pack-relocatable.sh
-@@ -27,8 +27,9 @@ guix pack --version
- # run it on the user's global store if possible, on the grounds that binaries
- # may already be there or can be built or downloaded inexpensively.
- 
--NIX_STORE_DIR="`guile -c '(use-modules (guix config))(display %storedir)'`"
-+nix_store_dir="`guile -c '(use-modules (guix config))(display %storedir)'`"
- localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`"
-+NIX_STORE_DIR="$nix_store_dir"
- GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
- export NIX_STORE_DIR GUIX_DAEMON_SOCKET
-