From 2a5e3a6f524bf11efdeb698485ea9eae7542d091134d512f87e21f7065adffd3 Mon Sep 17 00:00:00 2001
From: Tomas Cech <sleep_walker@opensuse.org>
Date: Sun, 9 Aug 2020 10:02:34 +0000
Subject: [PATCH] Accepting request 825136 from
home:sleep_walker:branches:devel:languages:misc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- update to 1.1.0
* New ‘guix deploy’ command to deploy several machines at once
* Channels can now provide news, viewed with ‘guix pull --news’
* ‘guix system reconfigure’ saves provenance data
* New ‘guix system describe’ command to view system provenance info
* New /run/current-system/{channels,configuration}.scm files
* New ‘guix time-machine’ command
* ‘guix pack’ has a new ‘--entry-point’ option
* ‘guix pack’ saves environment variables for ‘docker’ and ‘singularity’
* ‘guix pack’ provides a meaningful repository name for ‘docker’
* New ‘--target’ option for ‘guix system’
* ‘--no-build-hook’ was renamed to ‘--no-offload’
* ‘--keep-failed’ now implies ‘--no-offload’
* ‘--dry-run’ no longer implies ‘--no-grafts’
* ‘guix import crate’ has a new ‘--recursive’ option
* ‘guix import crate’ can import a specific package version
* ‘guix pull’ returns Guix on Guile 3.0
* ‘guix pull’ and ‘--with-git-url’ can clone repositories over SSH
* ‘--with-commit’ now accepts tags
* ‘guix challenge’ has a new ‘--diff’ option to show differences
* ‘guix weather’ has a new ‘--display-missing’ option
* Guix can now fetch lzip-compressed substitutes in addition to gzip
* ‘guix publish’ supports lzip compression via ‘-C’
* ‘guix lint -c archival’ queries Software Heritage
* ‘guix archive’ has a new ‘-t’ option to list archive contents
* ‘guix describe’ and similar commands emit terminal hyperlinks
* ‘guix build’ now attempts to substitute missing .drv files
* ‘guix package’ etc. now lock the profile they operate on
* ‘guix pull’ honors /etc/guix/channels.scm when it exists
* New ‘guix show’ command, synonymous with ‘guix package --show’
OBS-URL: https://build.opensuse.org/request/show/825136
OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guix?expand=0&rev=34
---
guix-1.0.1.tar.gz | 3 ---
guix-1.0.1.tar.gz.sig | 16 ----------------
guix-1.1.0.tar.gz | 3 +++
guix-1.1.0.tar.gz.sig | 16 ++++++++++++++++
guix.changes | 41 +++++++++++++++++++++++++++++++++++++++++
guix.spec | 27 +++++++++++----------------
6 files changed, 71 insertions(+), 35 deletions(-)
delete mode 100644 guix-1.0.1.tar.gz
delete mode 100644 guix-1.0.1.tar.gz.sig
create mode 100644 guix-1.1.0.tar.gz
create mode 100644 guix-1.1.0.tar.gz.sig
diff --git a/guix-1.0.1.tar.gz b/guix-1.0.1.tar.gz
deleted file mode 100644
index e8f211b..0000000
--- a/guix-1.0.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3939b6cfa11661290fee0b82f91d2a0d39c2e36fdf4e53d8afd31dd34430ea5f
-size 31992360
diff --git a/guix-1.0.1.tar.gz.sig b/guix-1.0.1.tar.gz.sig
deleted file mode 100644
index 77c60cb..0000000
--- a/guix-1.0.1.tar.gz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEPORkVYqE/cadtAz7CQsRmT2a67UFAlzhwN4ACgkQCQsRmT2a
-67UroQ/+PI+2BZBmT+9X4eVp3evyCK7P7AcGisEMrhnwtWY6FEF+1BcGtn35JKWu
-xDQj1LBU44iy+4Px2+mkQuJ2SDoN4QHz13sN4C+L1aEANsIZZIUDKmwUWPCM7A4N
-hR7rIeVF+2B/f9gwAN6hsGHn/dcNqRWNqc7uGHsZvyZmyc45RWViSRjUd7g49S2C
-B0yfuUQJQuL/tb/+SdD+eKdpN8E5xoSOVGEUa+FOn9zqwAJ0ohvGWSh2NW3SZYNE
-sFVxE9mZODqhuAJ3+D2XrBA8CmtKS5dtwG5rixAyc2J1elA2KasmvhcgFBINUNq0
-zFHJNgWHPZ9nUscNJW67mlJ8+kAwd2FtMOo41naCMAWvFjeYBHsG6NfnmrZb3fab
-LgnsCAqW/6hfN1RXCDh4S7qN/bE1Z1gdBQXjogSCiVU60vrTvKRtT1VlK60Zgkg3
-mMzd3i6OawDLdqB9YBhGlAS0c8pK/rjfbwacCP4hJndSRFDQfWivg0cUwapGEEXk
-3xgkpCoCCKkzi38TKAZ+++3/q6lT24Xd8NiYagVCAYMr+zyCBFlukJRh027EJZmw
-hZt2bNWv6L7FNPGplvcAv1vv/WTJn61FiO9ngsE87j4I38wwwGP3ehvUzKmh9ay5
-bcEaVBJKpNGJ3Ku8cqrlgPkCMOkUNO4R0ypY/jRytQ+RReKLw4Q=
-=iiWj
------END PGP SIGNATURE-----
diff --git a/guix-1.1.0.tar.gz b/guix-1.1.0.tar.gz
new file mode 100644
index 0000000..dbed409
--- /dev/null
+++ b/guix-1.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c59106ff4ac497c6097686834b0c914109cf5e44eb6b94ebce818923043640f
+size 26600502
diff --git a/guix-1.1.0.tar.gz.sig b/guix-1.1.0.tar.gz.sig
new file mode 100644
index 0000000..a09c0fa
--- /dev/null
+++ b/guix-1.1.0.tar.gz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEPORkVYqE/cadtAz7CQsRmT2a67UFAl6W80wACgkQCQsRmT2a
+67XFWBAAmIezipz2sQATiBosRtEo+yXzqxalUjNsoRQ99W8tjkdzJGk8RcamK0+j
+7ef/XUCsrSfLaGO2f0vaQsM+vsfHjwEZTEOa6K/hIq5gLVgOYZ+cWyr06kd9d+yh
+1dIY02O4xCzZjxvBxdsE8iyAeemEBiE8P7P6l/Hzpo5YF+j8uUBckNRv6MZsVBm0
+BKtMqs/Ujx5Bq0VWfPr3NreTIbIjF/QkwU5KndmQWabddUNeZ0wdUIusV+n/pd6C
+zb/en0rEISivHz7Vc5WGiIxp07HKBev05NMfBpINlnIMjZcKVA2eHr1zhHSh5waT
+mEyhmouHtVdQP46zaMVyMWbOc6u2Jn2RDrfPJxRgxjTkKe172YKX8Un3/yZ+TFE3
+SETeb327kvD36cV1BiXGBhzU4ttiLSXV3jDuyVCI9PnaSLUPHtHYduuK6wwl0OnK
+wC1HmywT7o1ao2FGBUCL3ZrjXZ2MMA+dzFbgkYTvQQUd7sra2gvzZWK7c7ucyLNC
+1vBWA5n4AkCM5Qm97p0q6CITt+2DzI1BnVW2yULNRDAe8sYSeksW4/GYl6AxJNh6
+hMqm6rh8qAAzHS6yT3F0WYgPu7hMMGA7jCYtWE5/oFUmDv/ACZLOVnIDoXUpZi55
+2+lf+zjCvlG70as2ge/IjIs6+nXGfTh/N3MIhi5rdO41XJqDM3s=
+=hJ0B
+-----END PGP SIGNATURE-----
diff --git a/guix.changes b/guix.changes
index 7c2961a..2cbe352 100644
--- a/guix.changes
+++ b/guix.changes
@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Sun Aug 9 09:11:40 UTC 2020 - Tomas Cech <sleep_walker@opensuse.org>
+
+- update to 1.1.0
+ * New ‘guix deploy’ command to deploy several machines at once
+ * Channels can now provide news, viewed with ‘guix pull --news’
+ * ‘guix system reconfigure’ saves provenance data
+ * New ‘guix system describe’ command to view system provenance info
+ * New /run/current-system/{channels,configuration}.scm files
+ * New ‘guix time-machine’ command
+ * ‘guix pack’ has a new ‘--entry-point’ option
+ * ‘guix pack’ saves environment variables for ‘docker’ and ‘singularity’
+ * ‘guix pack’ provides a meaningful repository name for ‘docker’
+ * New ‘--target’ option for ‘guix system’
+ * ‘--no-build-hook’ was renamed to ‘--no-offload’
+ * ‘--keep-failed’ now implies ‘--no-offload’
+ * ‘--dry-run’ no longer implies ‘--no-grafts’
+ * ‘guix import crate’ has a new ‘--recursive’ option
+ * ‘guix import crate’ can import a specific package version
+ * ‘guix pull’ returns Guix on Guile 3.0
+ * ‘guix pull’ and ‘--with-git-url’ can clone repositories over SSH
+ * ‘--with-commit’ now accepts tags
+ * ‘guix challenge’ has a new ‘--diff’ option to show differences
+ * ‘guix weather’ has a new ‘--display-missing’ option
+ * Guix can now fetch lzip-compressed substitutes in addition to gzip
+ * ‘guix publish’ supports lzip compression via ‘-C’
+ * ‘guix lint -c archival’ queries Software Heritage
+ * ‘guix archive’ has a new ‘-t’ option to list archive contents
+ * ‘guix describe’ and similar commands emit terminal hyperlinks
+ * ‘guix build’ now attempts to substitute missing .drv files
+ * ‘guix package’ etc. now lock the profile they operate on
+ * ‘guix pull’ honors /etc/guix/channels.scm when it exists
+ * New ‘guix show’ command, synonymous with ‘guix package --show’
+ * The ‘--manifest’ option can be repeated to combine manifests
+ * Some commands previously lacking ‘--load-path’ now support it
+ * 3514 new packages
+ * 3368 package updates
+- remove patches (merged)
+ * fix-time-duration-issue-part1.patch
+ * fix-time-duration-issue-part2.patch
+
-------------------------------------------------------------------
Wed Jul 31 11:08:14 UTC 2019 - Jonathan Brielmaier <jbrielmaier@suse.de>
diff --git a/guix.spec b/guix.spec
index 1e2d916..72985b0 100644
--- a/guix.spec
+++ b/guix.spec
@@ -1,7 +1,7 @@
#
# spec file for package guix
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,12 +19,12 @@
%define guile guile-2.0.9.tar.xz
%define guix_builder_group guixbuild
Name: guix
-Version: 1.0.1
+Version: 1.1.0
Release: 0
Summary: GNU Package manager
License: GPL-3.0-only
Group: System/Packages
-Url: http://www.gnu.org/software/guix/
+URL: http://www.gnu.org/software/guix/
Source0: https://ftp.gnu.org/gnu/guix/%{name}-%{version}.tar.gz
Source1: https://ftp.gnu.org/gnu/guix/%{name}-%{version}.tar.gz.sig
Source2: %{name}.keyring
@@ -44,10 +44,6 @@ Source12: aarch64-linux-guile-2.0.14.tar.xz
Source13: aarch64-linux-guile-2.0.14.tar.xz.sig
Source20: run_guix_daemon.sh
Source21: run_guix_publish.sh
-# PATCH-FIX-UPSTREAM 88bc3c89bf5145d24c2270d2192b7be547e0024f -- guix fails on downloading
-Patch0: fix-time-duration-issue-part1.patch
-# PATH-FIX-UPSTREAM b6f5339dd0180fe73ab70d9c5b851ca0adc04193 -- guix fails on downloading
-Patch1: fix-time-duration-issue-part2.patch
BuildRequires: gcc-c++
BuildRequires: gnutls-guile
BuildRequires: guile-charting
@@ -65,6 +61,7 @@ BuildRequires: shepherd
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(gnutls)
+BuildRequires: pkgconfig(libgcrypt)
BuildRequires: pkgconfig(sqlite3)
Requires: gnutls-guile
Requires: guile
@@ -75,7 +72,7 @@ Requires: guile-sqlite3
Requires: guile-ssh-devel
Requires: gzip
Requires: libgcrypt-devel
-Requires: libguile-ssh11
+Requires: libguile-ssh12
Requires(pre): %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %{ix86} x86_64 armv7hl aarch64
@@ -87,11 +84,9 @@ As a GNU distribution it contains only free software.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
# install service file to _unitdir
sed -i 's@\$(libdir)/systemd/system@%{_unitdir}@' Makefile.in
-mkdir -p gnu/packages/bootstrap/{i686,x86_64,mips64el,armhf}-linux
+mkdir -p gnu/packages/bootstrap/{i686,x86_64,mips64el,armhf,aarch64}-linux
cp %{SOURCE3} gnu/packages/bootstrap/i686-linux/%{guile}
cp %{SOURCE4} gnu/packages/bootstrap/x86_64-linux/%{guile}
cp %{SOURCE5} gnu/packages/bootstrap/mips64el-linux/%{guile}
@@ -113,8 +108,8 @@ make -j3
rm %{buildroot}%{_infodir}/dir
install -d -m 0755 %{buildroot}/gnu
install -d -m 0755 %{buildroot}/gnu/store
-# only systemd is used, so upstart files are not needed
-rm -rvf %{buildroot}%{_libdir}/upstart
+# only systemd is used, so upstart or sysv init files are not needed
+rm -rvf %{buildroot}%{_libdir}/upstart %{buildroot}%{_sysconfdir}/init.d/guix-daemon
install -m 0755 -t %{buildroot}%{_bindir} %{SOURCE20}
install -m 0755 -t %{buildroot}%{_bindir} %{SOURCE21}
sed -i 's@^ExecStart=.*@ExecStart=/usr/bin/run_guix_daemon.sh@' %{buildroot}%{_unitdir}/guix-daemon.service
@@ -139,8 +134,9 @@ done
%service_add_post guix-daemon.service
%service_add_post guix-publish.service
# Authorize official keys of Guix build farm to enable binary substitutes
-guix archive --authorize < %{_datadir}/guix/hydra.gnu.org.pub
-guix archive --authorize < %{_datadir}/guix/ci.guix.gnu.org.pub
+for key in %{_datadir}/guix/*.pub; do
+ guix archive --authorize < "$key"
+done
%postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/guix.info.gz
@@ -164,7 +160,6 @@ guix archive --authorize < %{_datadir}/guix/ci.guix.gnu.org.pub
%{_infodir}/guix*
%{_infodir}/images
%{_libdir}/guile/*
-%{_libexecdir}/guix
%{_mandir}/man1/guix*
%{_unitdir}/guix*.service
%attr(755,root,root) %dir /gnu