Accepting request 664440 from devel:languages:misc
- update to version 0.16 Will fail to build until all programms requiring guile will be rebuild, due to the update to guile-2.2. OBS-URL: https://build.opensuse.org/request/show/664440 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/guix?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
3cab4c6c14
@ -1,32 +0,0 @@
|
||||
From 8dd0e2f057a63231ffe3f8c41dbf4c7f8b4dbdf6 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Brielmaier <jbrielmaier@suse.de>
|
||||
Date: Tue, 10 Jul 2018 12:16:41 +0200
|
||||
Subject: [PATCH 1/1] gnu: local.mk: Add missing patches.
|
||||
|
||||
---
|
||||
gnu/local.mk | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/gnu/local.mk b/gnu/local.mk
|
||||
index dad664ca1..5b1e634dd 100644
|
||||
--- a/gnu/local.mk
|
||||
+++ b/gnu/local.mk
|
||||
@@ -1018,6 +1018,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/perl-no-sys-dirs.patch \
|
||||
%D%/packages/patches/perl-module-pluggable-search.patch \
|
||||
%D%/packages/patches/perl-reproducible-build-date.patch \
|
||||
+ %D%/packages/patches/perl-text-markdown-discount-unbundle.patch \
|
||||
%D%/packages/patches/perl-www-curl-remove-symbol.patch \
|
||||
%D%/packages/patches/picprog-non-intel-support.patch \
|
||||
%D%/packages/patches/pidgin-add-search-path.patch \
|
||||
@@ -1094,6 +1095,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/quagga-reproducible-build.patch \
|
||||
%D%/packages/patches/quassel-qt-5.11.patch \
|
||||
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \
|
||||
+ %D%/packages/patches/racket-fix-xform-issue.patch \
|
||||
%D%/packages/patches/rapicorn-isnan.patch \
|
||||
%D%/packages/patches/raptor2-heap-overflow.patch \
|
||||
%D%/packages/patches/ratpoison-shell.patch \
|
||||
--
|
||||
2.18.0
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:571572d38d6fe11201546d76697ab92a3becc80b4f8b5f745ae2c1b2f093cb1d
|
||||
size 22704560
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEPORkVYqE/cadtAz7CQsRmT2a67UFAls/NF8ACgkQCQsRmT2a
|
||||
67WXNA//aIopXlLO9OHouthLOSEialZj7HyjdCYKGdZ5MpsJgxEUyER8IW7L6b6d
|
||||
Abldb/7orubGwqJjbYqndK5odxvsI3RyccBu1Mmap6pYX4J3xpBSNeDCmpYZDFY7
|
||||
r4WG4DvcXnP4LevgBrffaEwivIZ0USqkIijH3a09nMMO94Ds/aI65XjOE8SVH2E3
|
||||
34tbP/OMpR3YqUwRXAQOHM0Rv6uLzKLAMyz84Nagm9dqYvFhMhV8BJLurSyGf1od
|
||||
L8qNU1gxjB81+a5hKOaKpTpe0IV4dJ0MuINOIhG7zJwpwOgOanGTXUrJYk9VsPSO
|
||||
YB0yHZoRKNuBAOpiNH48RgDNEcCgEjRfUbcpozkPgBYTj8C6o9ywUPHCa/jFEono
|
||||
4NQVvpmDot3vRu284cE8mlU+UNSB2RTOdOTQXdMuXm/Qc7HJ+MnM3Ts1XNXzL29h
|
||||
lTr4yMLSFveXi9O13mJoHVua3nnPUPduaDzYZw6K08141PpG1z56je88NGbBymb7
|
||||
3U+Yyx9dclLp5XgR8SNI+T2ihj+I2ba94WOHcbE3FNQr9DO62UaEgESoa109N6BD
|
||||
xp++QHjcUuwg+MKqNPKUt3M34guM5BiwUtUcMeJpZ27f/1tXqPmlIzvLFNXBM1Eb
|
||||
GHp3FvSqTJ/0vUJhk8YW2ms9mlUTACr5bLc1xLiNrWww7056+EM=
|
||||
=1MjC
|
||||
-----END PGP SIGNATURE-----
|
||||
3
guix-0.16.0.tar.gz
Normal file
3
guix-0.16.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:58a39c34fcebe621f3b44a6dced34df37b826623ee886e6138473d4b8f9d02d1
|
||||
size 24365691
|
||||
16
guix-0.16.0.tar.gz.sig
Normal file
16
guix-0.16.0.tar.gz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEPORkVYqE/cadtAz7CQsRmT2a67UFAlwJTxUACgkQCQsRmT2a
|
||||
67XNWg//ZVbrIFKA9J9p4FkWmxQOv2FHuyoeClxs0mszRE8/BNigvOS5zBYIMnEU
|
||||
2Oo6xjUGYfd8Qe70gGFgLxoRn24ZT5iczwSBjH9yxn/37nS3UGQ4+z0XoazKl0FS
|
||||
8xgmrAHiQnQvb7d6WjexXoxRjnDMlPkzrGwlVtsm7xZNa5W6ufFYVKhC6KTZeb/i
|
||||
YZHfFiplpiPaqOssFj5PPEUwFTN6u2XRTxvJTfXv8XF3qrWlVi+GSleXm1DIgsHd
|
||||
6nu2bkVMMFhvjhM2Z5gdCxVjo3lAPdK5/CCf3uXKwiiFTlK0UpqIkKDiTMygvBHq
|
||||
T3dIhPYws7K5wi5FBSxJCbdxHy2wZsClEpOa3MgcBmnMzhdqHPz+2mT68W8i36sw
|
||||
vcCv07CQRDz3KjQrC8U8E4O3jIQDptaPjpIMevHDpGDyigPmNiSoTxWsgynRL5q3
|
||||
78LM8hzwnsZ4bu8bUuOM4tlyqqgXfHPklZR2AQeWNSrs9CJ3jdp1iyi63GXR+Q8d
|
||||
3QhAK4rr0jvClcJsb9+AHMVgAcAMRHCfNkCkzD3fwKScHZZJveSWfPdLq6WssnPU
|
||||
qyhWqKNZx7b0ZlUCIZSVAfihdhtBV7G5CQfDmu8926vIbOLYMdJxo/V+1JpEC07y
|
||||
Sv39ppsr5/oL9LSdjhv7D/hRlHY/4TtjGUfwdRty7znhJLSZbOo=
|
||||
=BB/W
|
||||
-----END PGP SIGNATURE-----
|
||||
44
guix.changes
44
guix.changes
@ -1,3 +1,47 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 6 18:08:39 UTC 2018 - jbrielmaier@suse.de
|
||||
|
||||
- update to version 0.16
|
||||
* Default substitute URL changed to https://ci.guix.info
|
||||
* ‘guix pull -l’ lists new and upgraded packages
|
||||
* ‘guix pull’ now supports channels via ~/.config/guix/channels.scm
|
||||
* New ‘--profile’ or ‘-p’ option for ‘guix pull’
|
||||
* ~/.config/guix/current is now a symlink to /var/guix/profiles
|
||||
* New ‘guix describe’ command
|
||||
* ‘guix package’ no longer shows build logs by default
|
||||
* ‘guix’ commands now produce colored output by default
|
||||
* User interface now reports grafts separately
|
||||
* Manifests can now refer to arbitrary Guix commits using “inferiors”
|
||||
* New ‘--with-branch’ and ‘--with-commit’ package transformation options
|
||||
* ‘guix build -f’ now accepts any kind of “file-like object”
|
||||
* Git checkouts may now be fetched from Software Heritage
|
||||
* New ‘guix repl’ command for use by inferiors
|
||||
* New ‘guix processes’ command
|
||||
* ‘guix pack’ now honors ‘--localstatedir’ for all its backends
|
||||
* New ‘opam’ importer for ‘guix import’
|
||||
* ‘guix import pypi’ has a new ‘--recursive’ option
|
||||
* ‘guix import hackage’ has a new ‘--recursive’ option
|
||||
* ‘guix import stackage’ has a new ‘--recursive’ option
|
||||
* The short option for ‘--lts-version’ is now ‘-l’ (used to be ‘-r’).
|
||||
* ‘guix refresh’ now stores upstream keys in ~/.config/guix/upstream
|
||||
* Guix now depends on Guile-Gcrypt
|
||||
* Guix now requires Guile-JSON
|
||||
985 new packages
|
||||
1945 packages updated
|
||||
For more details see: /usr/share/doc/packages/guix/NEWS
|
||||
|
||||
- remove patches no longer needed:
|
||||
* perl-text-markdown-discount-unbundle.patch
|
||||
* racket-fix-xform-issue.patch
|
||||
* 0001-gnu-local.mk-Add-missing-patches.patch
|
||||
- remove dependencies and handling needed for running bootstrap
|
||||
script
|
||||
- add new build and runtime dependency guile-gcrypt, as well as
|
||||
guile-git on runtime
|
||||
- authorize key for now offical build farm ci.guix.info
|
||||
- "guix-authorize" renamed to "authorize" and moved to
|
||||
/usr/lib/guix
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 26 11:09:49 UTC 2018 - jbrielmaier@suse.de
|
||||
|
||||
|
||||
24
guix.spec
24
guix.spec
@ -19,7 +19,7 @@
|
||||
%define guile guile-2.0.9.tar.xz
|
||||
%define guix_builder_group guixbuild
|
||||
Name: guix
|
||||
Version: 0.15.0
|
||||
Version: 0.16.0
|
||||
Release: 0
|
||||
Summary: GNU Package manager
|
||||
License: GPL-3.0-only
|
||||
@ -44,15 +44,11 @@ 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
|
||||
# In the release tarball these two patches missing, leading to errors in guix weather
|
||||
# and guix challenge. Upstream: 57ac5261fec345b16cf80f87aa03212abc2c5a11
|
||||
Source30: perl-text-markdown-discount-unbundle.patch
|
||||
Source31: racket-fix-xform-issue.patch
|
||||
Patch0: 0001-gnu-local.mk-Add-missing-patches.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gnutls-guile
|
||||
BuildRequires: guile-charting
|
||||
BuildRequires: guile-devel >= 2.0
|
||||
BuildRequires: guile-gcrypt
|
||||
BuildRequires: guile-git
|
||||
BuildRequires: guile-json
|
||||
BuildRequires: guile-sqlite3
|
||||
@ -66,12 +62,10 @@ BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: pkgconfig(bzip2)
|
||||
BuildRequires: pkgconfig(gnutls)
|
||||
BuildRequires: pkgconfig(sqlite3)
|
||||
# Needed for creating the Makefile including the two missing patches
|
||||
BuildRequires: automake
|
||||
BuildRequires: help2man
|
||||
BuildRequires: makeinfo
|
||||
Requires: gnutls-guile
|
||||
Requires: guile
|
||||
Requires: guile-gcrypt
|
||||
Requires: guile-git
|
||||
Requires: guile-json
|
||||
Requires: guile-sqlite3
|
||||
Requires: guile-ssh-devel
|
||||
@ -86,9 +80,6 @@ Purely functional package manager and a distribution thereof.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
# Create the Makefile including two missing patches
|
||||
%patch0 -p1
|
||||
./bootstrap
|
||||
# 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
|
||||
@ -97,9 +88,6 @@ cp %{SOURCE4} gnu/packages/bootstrap/x86_64-linux/%{guile}
|
||||
cp %{SOURCE5} gnu/packages/bootstrap/mips64el-linux/%{guile}
|
||||
cp %{SOURCE6} gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz
|
||||
cp %{SOURCE12} gnu/packages/bootstrap/aarch64-linux/guile-2.0.14.tar.xz
|
||||
# copy the patches to correct location
|
||||
cp %{SOURCE30} gnu/packages/patches
|
||||
cp %{SOURCE31} gnu/packages/patches
|
||||
|
||||
%build
|
||||
export GUILE_WARN_DEPRECATED
|
||||
@ -142,8 +130,9 @@ done
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/guix.info.gz
|
||||
%service_add_post guix-daemon.service
|
||||
%service_add_post guix-publish.service
|
||||
# Authorize official key of Guix build farm to enable binary substitutes
|
||||
# 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.info.pub
|
||||
|
||||
%postun
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/guix.info.gz
|
||||
@ -168,7 +157,6 @@ guix archive --authorize < %{_datadir}/guix/hydra.gnu.org.pub
|
||||
%{_infodir}/images
|
||||
%{_libdir}/guile/*
|
||||
%{_libexecdir}/guix
|
||||
%{_libexecdir}/guix-authenticate
|
||||
%{_mandir}/man1/guix*
|
||||
%{_unitdir}/guix*.service
|
||||
%attr(755,root,root) %dir /gnu
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
Description: Use the markdown library provided by the libmarkdown2 package.
|
||||
Author: Alessandro Ghedini <al3xbio@gmail.com>
|
||||
Origin: vendor
|
||||
Forwarded: not-needed
|
||||
Last-Update: 2012-01-01
|
||||
|
||||
--- a/Makefile.PL
|
||||
+++ b/Makefile.PL
|
||||
@@ -57,12 +57,6 @@
|
||||
|
||||
|
||||
|
||||
-sub MY::postamble {
|
||||
- return sprintf('
|
||||
-$(MYEXTLIB):
|
||||
- %s
|
||||
-', qq{( cd $extdir; CC='cc -fPIC' sh configure.sh; make )\n});
|
||||
-}
|
||||
|
||||
WriteMakefile(
|
||||
NAME => 'Text::Markdown::Discount',
|
||||
@@ -71,8 +65,6 @@
|
||||
($] >= 5.005 ?
|
||||
(ABSTRACT_FROM => 'lib/Text/Markdown/Discount.pm',
|
||||
AUTHOR => 'Masayoshi Sekimura <sekimura@cpan.org>') : ()),
|
||||
- LIBS => '-L' . $extdir,
|
||||
- INC => '-I. -I' . $extdir,
|
||||
- MYEXTLIB => $myextlib,
|
||||
- clean => { FILES => $clean_files },
|
||||
+ LIBS => '-lmarkdown',
|
||||
+ INC => '-I.',
|
||||
);
|
||||
@ -1,63 +0,0 @@
|
||||
050cdb59839896b41431791f8ee0ef2564231b8f
|
||||
Author: Matthew Flatt <mflatt@racket-lang.org>
|
||||
AuthorDate: Tue Mar 6 09:05:08 2018 -0700
|
||||
Commit: Matthew Flatt <mflatt@racket-lang.org>
|
||||
CommitDate: Tue Mar 6 09:05:08 2018 -0700
|
||||
|
||||
Parent: efb9a919fc ffi docs: clarification on `unsafe-socket->port`
|
||||
Containing: master
|
||||
Follows: v5.0.1 (21612)
|
||||
|
||||
xform: avoid problems with `__signbitf128`
|
||||
|
||||
Closes #1962 and uses the suggested patch there, among other changes.
|
||||
|
||||
2 files changed, 6 insertions(+), 3 deletions(-)
|
||||
racket/collects/compiler/private/xform.rkt | 2 +-
|
||||
racket/src/racket/src/number.c | 7 +++++--
|
||||
|
||||
diff --git a/racket/collects/compiler/private/xform.rkt b/racket/collects/compiler/private/xform.rkt
|
||||
index 28a425c057..89ae848f9c 100644
|
||||
--- a/collects/compiler/private/xform.rkt
|
||||
+++ b/collects/compiler/private/xform.rkt
|
||||
@@ -904,7 +904,7 @@
|
||||
|
||||
strlen cos cosl sin sinl exp expl pow powl log logl sqrt sqrtl atan2 atan2l frexp
|
||||
isnan isinf fpclass signbit _signbit _fpclass __fpclassify __fpclassifyf __fpclassifyl
|
||||
- _isnan __isfinited __isnanl __isnan __signbit __signbitf __signbitd __signbitl
|
||||
+ _isnan __isfinited __isnanl __isnan __signbit __signbitf __signbitd __signbitl __signbitf128
|
||||
__isinff __isinfl isnanf isinff __isinfd __isnanf __isnand __isinf __isinff128
|
||||
__inline_isnanl __inline_isnan __inline_signbit __inline_signbitf __inline_signbitd __inline_signbitl
|
||||
__builtin_popcount __builtin_clz __builtin_isnan __builtin_isinf __builtin_signbit
|
||||
diff --git a/racket/src/racket/src/number.c b/racket/src/racket/src/number.c
|
||||
index 71f42aaf3c..3bbad3ba83 100644
|
||||
--- a/src/racket/src/number.c
|
||||
+++ b/src/racket/src/number.c
|
||||
@@ -1796,6 +1796,7 @@ double scheme_real_to_double(Scheme_Object *r)
|
||||
}
|
||||
|
||||
XFORM_NONGCING static MZ_INLINE int minus_zero_p(double d)
|
||||
+ XFORM_SKIP_PROC
|
||||
{
|
||||
#ifdef MZ_IS_NEG_ZERO
|
||||
return MZ_IS_NEG_ZERO(d);
|
||||
@@ -1809,7 +1810,9 @@ int scheme_minus_zero_p(double d)
|
||||
return minus_zero_p(d);
|
||||
}
|
||||
|
||||
-static int rational_dbl_p(double f) {
|
||||
+XFORM_NONGCING static int rational_dbl_p(double f)
|
||||
+ XFORM_SKIP_PROC
|
||||
+{
|
||||
return !(MZ_IS_NAN(f)
|
||||
|| MZ_IS_INFINITY(f));
|
||||
}
|
||||
@@ -1955,7 +1958,7 @@ real_p(int argc, Scheme_Object *argv[])
|
||||
return (SCHEME_REALP(o) ? scheme_true : scheme_false);
|
||||
}
|
||||
|
||||
-static int is_rational(const Scheme_Object *o)
|
||||
+XFORM_NONGCING static int is_rational(const Scheme_Object *o)
|
||||
{
|
||||
if (SCHEME_FLOATP(o))
|
||||
return rational_dbl_p(SCHEME_FLOAT_VAL(o));
|
||||
Loading…
Reference in New Issue
Block a user