From 2d69c2271e5654b7b977b465028417392219c482 Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <lantw44@gmail.com>
Date: Sat, 31 Dec 2016 22:49:27 +0800
Subject: guix: Guix 0.11.0 -> 0.12.0
Guix needs Guile-SSH to offload builds to other machines.
---
guix/guile-ssh/guile-ssh.spec | 65 +++++++++++++++++++++++++++++
guix/guix/guix-delete-go-files-SIGINT.patch | 31 --------------
guix/guix/guix-guile-2.2-compat.patch | 45 --------------------
guix/guix/guix.spec | 45 ++++++++++----------
4 files changed, 87 insertions(+), 99 deletions(-)
create mode 100644 guix/guile-ssh/guile-ssh.spec
delete mode 100644 guix/guix/guix-delete-go-files-SIGINT.patch
delete mode 100644 guix/guix/guix-guile-2.2-compat.patch
(limited to 'guix')
diff --git a/guix/guile-ssh/guile-ssh.spec b/guix/guile-ssh/guile-ssh.spec
new file mode 100644
index 0000000..cd6514a
--- /dev/null
+++ b/guix/guile-ssh/guile-ssh.spec
@@ -0,0 +1,65 @@
+Name: guile-ssh
+Version: 0.10.2
+Release: 1%{?dist}
+Summary: A library that provides access to the SSH protocol for GNU Guile
+
+License: GPLv3+
+URL: https://github.com/artyom-poptsov/guile-ssh
+Source0: https://github.com/artyom-poptsov/guile-ssh/archive/v%{version}.tar.gz
+
+BuildRequires: autoconf, automake, libtool, texinfo
+BuildRequires: pkgconfig(guile-2.0), pkgconfig(libssh)
+Requires: guile
+Requires(post): info
+Requires(preun): info
+
+%description
+Guile-SSH is a library that provides access to the SSH protocol for programs
+written in GNU Guile interpreter. It is built upon the libssh library.
+
+
+%prep
+%setup -q
+
+
+%build
+autoreconf -fi
+%configure --disable-rpath --disable-static
+make %{?_smp_mflags}
+
+
+%install
+%make_install
+rm %{buildroot}%{_libdir}/libguile-ssh.la
+
+
+%post
+/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
+
+
+%preun
+if [ "$1" = 0 ]; then
+ /sbin/install-info --del %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
+fi
+
+
+%files
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README THANKS TODO
+%dir %{_libdir}/guile/2.0/site-ccache/ssh
+%{_libdir}/guile/2.0/site-ccache/ssh/*.go
+%dir %{_libdir}/guile/2.0/site-ccache/ssh/dist
+%{_libdir}/guile/2.0/site-ccache/ssh/dist/*.go
+%{_libdir}/libguile-ssh.so*
+%{_datadir}/%{name}
+%dir %{_datadir}/guile/site/2.0/ssh
+%{_datadir}/guile/site/2.0/ssh/*.scm
+%dir %{_datadir}/guile/site/2.0/ssh/dist
+%{_datadir}/guile/site/2.0/ssh/dist/*.scm
+%{_infodir}/%{name}.info.gz
+%exclude %{_infodir}/dir
+
+
+%changelog
+* Sat Dec 31 2016 Ting-Wei Lan <lantw44@gmail.com> - 0.10.2-1
+- Initial packaging
diff --git a/guix/guix/guix-delete-go-files-SIGINT.patch b/guix/guix/guix-delete-go-files-SIGINT.patch
deleted file mode 100644
index c2423f8..0000000
--- a/guix/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/guix-guile-2.2-compat.patch b/guix/guix/guix-guile-2.2-compat.patch
deleted file mode 100644
index 50a8f8e..0000000
--- a/guix/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
-
diff --git a/guix/guix/guix.spec b/guix/guix/guix.spec
index 0547d97..1e2d6d0 100644
--- a/guix/guix/guix.spec
+++ b/guix/guix/guix.spec
@@ -1,20 +1,12 @@
Name: guix
-Version: 0.11.0
-Release: 3%{?dist}
+Version: 0.12.0
+Release: 1%{?dist}
Summary: A purely functional package manager for the GNU system
License: GPLv3+
URL: https://www.gnu.org/software/guix
Source0: ftp://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
-# Add a patch from upstream to fix build issue on Guile 2.0.13
-# http://git.savannah.gnu.org/cgit/guix.git/commit/?id=5a88b2d
-Patch0: guix-guile-2.2-compat.patch
-
-# Add a patch from upstream to delete compiled files on interrupt
-# http://git.savannah.gnu.org/cgit/guix.git/commit/?id=402bb3b
-Patch1: guix-delete-go-files-SIGINT.patch
-
%global guix_user guixbuild
%global guix_group guixbuild
%global completionsdir %(pkg-config --variable=completionsdir bash-completion)
@@ -24,7 +16,7 @@ BuildRequires: pkgconfig(sqlite3)
BuildRequires: zlib-devel, bzip2-devel, libgcrypt-devel
BuildRequires: gettext, help2man, graphviz
BuildRequires: emacs, emacs-geiser, emacs-magit, bash-completion
-BuildRequires: guile-json, gnutls-guile
+BuildRequires: guile-json, guile-ssh, gnutls-guile
BuildRequires: systemd
Requires: gzip, bzip2, xz
@@ -42,7 +34,7 @@ Requires(preun): info
Requires(preun): systemd
Requires(postun): systemd
-Recommends: guile-json, gnutls-guile
+Recommends: guile-json, guile-ssh, gnutls-guile
Suggests: emacs, emacs-geiser, emacs-magit
Obsoletes: %{name}-emacs <= 0.8.3-1
@@ -71,11 +63,6 @@ make %{?_smp_mflags}
%check
-# guix-environment-container.sh doesn't work on tmpfs
-if [ "`stat -c %%T -f`" = "tmpfs" ]; then
- sed -i 's|tests/guix-environment-container.sh||' Makefile
-fi
-
# user namespace is not supported in chroot
if unshare -Ur true; then :; else
sed -i 's|tests/syscalls.scm||' Makefile
@@ -90,6 +77,7 @@ make %{?_smp_mflags} check
make install DESTDIR=%{buildroot} systemdservicedir=%{_unitdir}
# drop useless upstart service file
rm %{buildroot}%{_libdir}/upstart/system/guix-daemon.conf
+rm %{buildroot}%{_libdir}/upstart/system/guix-publish.conf
rmdir %{buildroot}%{_libdir}/upstart/system
rmdir %{buildroot}%{_libdir}/upstart
# move the autoload script
@@ -97,6 +85,8 @@ mkdir -p %{buildroot}%{_emacs_sitestartdir}
%{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/guix/guix*.el
mv %{buildroot}%{_emacs_sitelispdir}/guix/guix-autoloads.el \
%{buildroot}%{_emacs_sitestartdir}/guix.el
+# own the configuration directory
+mkdir -p %{buildroot}%{_sysconfdir}/guix
%find_lang guix
%find_lang guix-packages
@@ -112,18 +102,18 @@ elif [ "$1" -gt 1 ]; then
/usr/sbin/groupmod -n %{guix_group} guix-builder 2>/dev/null || :
/usr/sbin/usermod -l %{guix_user} -d /gnu/store guix-builder 2>/dev/null || :
fi
-%systemd_post guix-daemon.service
+%systemd_post guix-daemon.service guix-publish.service
%preun
if [ "$1" = 0 ]; then
/sbin/install-info --del %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
fi
-%systemd_preun guix-daemon.service
+%systemd_preun guix-daemon.service guix-publish.service
%postun
-%systemd_postun_with_restart guix-daemon.service
+%systemd_postun_with_restart guix-daemon.service guix-publish.service
%files -f guix.lang -f guix-packages.lang
@@ -132,6 +122,7 @@ fi
%{_bindir}/guix
%{_bindir}/guix-daemon
%{_sbindir}/guix-register
+%{_libexecdir}/guix/download
%{_libexecdir}/guix/list-runtime-roots
%{_libexecdir}/guix/offload
%{_libexecdir}/guix/substitute
@@ -207,6 +198,9 @@ fi
%dir %{_datadir}/guile/site/2.0/guix/build
%{_datadir}/guile/site/2.0/guix/build/*.scm
%{_datadir}/guile/site/2.0/guix/build/*.go
+%dir %{_datadir}/guile/site/2.0/guix/build-system
+%{_datadir}/guile/site/2.0/guix/build-system/*.scm
+%{_datadir}/guile/site/2.0/guix/build-system/*.go
%dir %{_datadir}/guile/site/2.0/guix/emacs
%{_datadir}/guile/site/2.0/guix/emacs/guix-helper.scm
%{_datadir}/guile/site/2.0/guix/emacs/guix-main.scm
@@ -222,9 +216,8 @@ fi
%dir %{_datadir}/guile/site/2.0/guix/scripts/import
%{_datadir}/guile/site/2.0/guix/scripts/import/*.scm
%{_datadir}/guile/site/2.0/guix/scripts/import/*.go
-%dir %{_datadir}/guile/site/2.0/guix/build-system
-%{_datadir}/guile/site/2.0/guix/build-system/*.scm
-%{_datadir}/guile/site/2.0/guix/build-system/*.go
+%dir %{_datadir}/guile/site/2.0/guix/tests
+%{_datadir}/guile/site/2.0/guix/tests/*.go
%{_infodir}/%{name}.info*
%dir %{_infodir}/images
%{_infodir}/images/bootstrap-graph.png.gz
@@ -254,15 +247,21 @@ fi
%{_mandir}/man1/guix-system.1*
%{_mandir}/man1/guix.1*
%{completionsdir}/guix
+%{_datadir}/zsh/site-functions/_guix
%dir %{_emacs_sitelispdir}/guix
%{_emacs_sitelispdir}/guix/guix*.elc
%{_emacs_sitelispdir}/guix/guix*.el
%{_emacs_sitestartdir}/guix.el
+%dir %{_sysconfdir}/guix
%{_unitdir}/guix-daemon.service
+%{_unitdir}/guix-publish.service
%changelog
+* Sat Dec 31 2016 Ting-Wei Lan <lantw44@gmail.com> - 0.12.0-1
+- Update to 0.12.0
+
* Fri Nov 04 2016 Ting-Wei Lan <lantw44@gmail.com> - 0.11.0-3
- Use autosetup macro
- Fix build failure on Guile 2.0.13
--
cgit v1.2.3