From 91a4863d9d727754d1743f4c0591c63b950494cf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 3 Dec 2018 20:00:00 +0100 Subject: gnu: Add hnsd. Thank you, Handshake! * gnu/packages/dns.scm (hnsd): New variable. --- gnu/packages/dns.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 55147f829e..c7b630364d 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -58,6 +58,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial)) @@ -727,3 +728,56 @@ The client supports both dynamic and (near) static services, as well as MX record and alternative name management. It caches the address, and only attempts the update when it has changed.") (license license:gpl2+))) + +(define-public hnsd + ;; There have been no releases yet, hence this commit. + (let ((revision "0") + (commit "895d89c25d316d18df9d374fe78aae3902bc89fb")) + (package + (name "hnsd") + (version (git-version "0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/handshake-org/hnsd") + (commit commit))) + (sha256 + (base32 + "0704y73sddn24jga9csw4gxyfb3pnrfnk0vdcph84n1h38490l16")) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete the bundled copy of libuv. + (delete-file-recursively "uv") + (substitute* "configure.ac" + (("AC_CONFIG_SUBDIRS\\(\\[uv\\]\\)") "")) + (substitute* "Makefile.am" + (("SUBDIRS = uv") "\n") + (("\\$\\(top_builddir\\)/uv/libuv.la") "-luv") + + ;; Make sure the 'hnsd' binary is installed and + ;; dynamically-linked. + (("noinst_PROGRAMS") "bin_PROGRAMS") + (("hnsd_LDFLAGS = -static") "")) + + ;; This script tries to chdir to "uv" and doesn't do more + ;; than "autoreconf" so remove it. + (delete-file "autogen.sh") + #t)))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) ;no need for libhsk.a + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (inputs + `(("unbound" ,unbound) + ("libuv" ,libuv))) + (home-page "https://www.handshake.org/") + (synopsis "Resolver daemon for the Handshake naming protocol") + (description + "@command{hnsd} is a @dfn{host name resolver} for the Handshake Naming +System (HNS) peer-to-peer network.") + (license license:expat)))) -- cgit v1.3 From c05c1910dbd630304e06020d27d4b72bb0502088 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 3 Dec 2018 17:29:58 -0500 Subject: gnu: Beets: Fix compatibility with Python 3.7. * gnu/packages/patches/beets-python-3.7-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/music.scm (beets)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/music.scm | 1 + gnu/packages/patches/beets-python-3.7-fix.patch | 57 +++++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 gnu/packages/patches/beets-python-3.7-fix.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 847c9286cc..53a3547559 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -600,6 +600,7 @@ dist_patch_DATA = \ %D%/packages/patches/bash-completion-directories.patch \ %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ + %D%/packages/patches/beets-python-3.7-fix.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blast+-fix-makefile.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index faf5aab09a..cc6d228006 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2692,6 +2692,7 @@ Songs can be searched by artist, name or even by a part of the song text.") (source (origin (method url-fetch) (uri (pypi-uri "beets" version)) + (patches (search-patches "beets-python-3.7-fix.patch")) (sha256 (base32 "0l2vfrknwcsm6bn83m7476qrz45qwgxcb5k0h7kn96kr70irn1v2")))) diff --git a/gnu/packages/patches/beets-python-3.7-fix.patch b/gnu/packages/patches/beets-python-3.7-fix.patch new file mode 100644 index 0000000000..43707cd9d0 --- /dev/null +++ b/gnu/packages/patches/beets-python-3.7-fix.patch @@ -0,0 +1,57 @@ +Fix compatibility issue with Python 3.7: + +https://github.com/beetbox/beets/issues/2978 + +Patch copied from upstream source repository: + +https://github.com/beetbox/beets/commit/15d44f02a391764da1ce1f239caef819f08beed8 + +From 15d44f02a391764da1ce1f239caef819f08beed8 Mon Sep 17 00:00:00 2001 +From: Adrian Sampson +Date: Sun, 22 Jul 2018 12:34:19 -0400 +Subject: [PATCH] Fix Python 3.7 compatibility (#2978) + +--- + beets/autotag/hooks.py | 8 +++++++- + docs/changelog.rst | 2 ++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py +index 3615a9333..1c62a54c5 100644 +--- a/beets/autotag/hooks.py ++++ b/beets/autotag/hooks.py +@@ -31,6 +31,12 @@ + + log = logging.getLogger('beets') + ++# The name of the type for patterns in re changed in Python 3.7. ++try: ++ Pattern = re._pattern_type ++except AttributeError: ++ Pattern = re.Pattern ++ + + # Classes used to represent candidate options. + +@@ -433,7 +439,7 @@ def _eq(self, value1, value2): + be a compiled regular expression, in which case it will be + matched against `value2`. + """ +- if isinstance(value1, re._pattern_type): ++ if isinstance(value1, Pattern): + return bool(value1.match(value2)) + return value1 == value2 + +#diff --git a/docs/changelog.rst b/docs/changelog.rst +#index be6de2904..d487f31f5 100644 +#--- a/docs/changelog.rst +#+++ b/docs/changelog.rst +#@@ -19,6 +19,8 @@ New features: +# +# Fixes: +# +#+* Fix compatibility Python 3.7 and its change to a name in the ``re`` module. +#+ :bug:`2978` +# * R128 normalization tags are now properly deleted from files when the values +# are missing. +# Thanks to :user:`autrimpo`. -- cgit v1.3 From ca45e494047bda287cf3cf82017f7001aec86d99 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 3 Dec 2018 17:43:07 -0500 Subject: gnu: python-unidecode: Update to 1.0.23. * gnu/packages/python.scm (python-unidecode, python2-unidecode): Update to 1.0.23. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d251468673..d0401b7bdd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2100,13 +2100,13 @@ cutting and pasting that code over and over.") (define-public python-unidecode (package (name "python-unidecode") - (version "0.04.21") + (version "1.0.23") (source (origin (method url-fetch) (uri (pypi-uri "Unidecode" version)) (sha256 (base32 - "0lfhp9c5xrbpjvbpr12ji52g1lx04404bzzdg6pvabhzisw6l2i8")))) + "1ysjbr3nqfqj97h8zyj3v9pya413vkv7a1mzml80w37xx15kb1cb")))) (build-system python-build-system) (home-page "https://pypi.python.org/pypi/Unidecode") (synopsis "ASCII transliterations of Unicode text") -- cgit v1.3 From 191c439e79bff677fa5616b6f8675261073ce991 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 3 Dec 2018 17:43:34 -0500 Subject: gnu: Beets: Update to 1.4.7. * gnu/packages/music.scm (beets): Update to 1.4.7. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index cc6d228006..b59f258ae5 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2688,14 +2688,14 @@ Songs can be searched by artist, name or even by a part of the song text.") (define-public beets (package (name "beets") - (version "1.4.6") + (version "1.4.7") (source (origin (method url-fetch) (uri (pypi-uri "beets" version)) (patches (search-patches "beets-python-3.7-fix.patch")) (sha256 (base32 - "0l2vfrknwcsm6bn83m7476qrz45qwgxcb5k0h7kn96kr70irn1v2")))) + "0w3gz69s9gf5ih69d4sddgh7ndj7658m621bp742zldvjakdncrs")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.3 From 9325533bd009070f2f4a98362ce1d3afd9af060c Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 4 Dec 2018 07:08:47 +0300 Subject: services: ddclient: Fix unrecognized keywords. This patch fixes warnings about unrecognized keywords in logs. * gnu/services/dns.scm (serialize-field): Skip some field names. --- gnu/services/dns.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 24ef886682..1ef754b360 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -684,7 +684,8 @@ (string-delete #\? (symbol->string field-name))) (define (serialize-field field-name val) - (format #t "~a=~a\n" (uglify-field-name field-name) val)) + (when (not (member field-name '(group secret-file user))) + (format #t "~a=~a\n" (uglify-field-name field-name) val))) (define (serialize-boolean field-name val) (serialize-field field-name (if val "yes" "no"))) -- cgit v1.3 From 1f51f0d975d95a2ba645193cf43d0a294d952e83 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 4 Dec 2018 10:01:21 +0100 Subject: gnu: dolphin-emu: Update to commit 2c57e70. * gnu/packages/emulators.scm (dolphin-emu): Update to commit 2c57e70. --- gnu/packages/emulators.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 232adfb081..795595e447 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -117,8 +117,8 @@ ;; Building from recent Git because the official 5.0 release no longer builds. (define-public dolphin-emu - (let ((commit "22ddd11573fd8d3e43a879804e7a64e50928435d") - (revision "4")) + (let ((commit "2c57e709d0f9e4010a4415de4192de887e37f187") + (revision "5")) (package (name "dolphin-emu") (version (git-version "5.0" revision commit)) @@ -144,7 +144,7 @@ #t)) (sha256 (base32 - "01l6r8spaslqc73m3y7hfb2jx5a4848vdkman6x6w2arpb8bywzl")))) + "0aszfdfvs7yg4bmrd3qxwsiz7hx3mrj29f4aw86bz7h9j7hkh57f")))) (build-system cmake-build-system) (arguments '(#:tests? #f -- cgit v1.3 From 0bc02becca1b4b0b3eddb7972567a75f0d464b72 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 3 Dec 2018 16:22:43 +0100 Subject: Remove most references to hydra.gnu.org. * Makefile.am (assert-binaries-available): Don't mention hydra.gnu.org in comment. * build-aux/check-available-binaries.scm: Likewise. * build-aux/check-final-inputs-self-contained.scm: Likewise. * doc/guix.texi (SUBSTITUTE-SERVER): New variable. Use it throughout instead of "mirror.hydra.gnu.org". * doc/contributing.texi (Submitting Patches): Likewise. * gnu/services/base.scm (hydra-key-authorization) (guix-activation): Remove mentions of "hydra.gnu.org" in comments and messages. * gnu/system/install.scm (%installation-services): Likewise. * guix/scripts/size.scm (guix-size): Likewise. --- Makefile.am | 2 +- build-aux/check-available-binaries.scm | 4 +- build-aux/check-final-inputs-self-contained.scm | 2 +- doc/contributing.texi | 2 +- doc/guix.texi | 56 +++++++++++++------------ gnu/services/base.scm | 4 +- gnu/system/install.scm | 2 +- guix/scripts/size.scm | 2 +- 8 files changed, 38 insertions(+), 36 deletions(-) (limited to 'gnu') diff --git a/Makefile.am b/Makefile.am index 6803666a57..a7a67e81cf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -763,7 +763,7 @@ assert-no-store-file-names: $(distdir)/ChangeLog exit 1 ; \ fi -# Make sure hydra.gnu.org has the important binaries. +# Make sure important substitutes are available. assert-binaries-available: $(GOBJECTS) $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/check-available-binaries.scm" diff --git a/build-aux/check-available-binaries.scm b/build-aux/check-available-binaries.scm index b832d99935..c80db1a37e 100644 --- a/build-aux/check-available-binaries.scm +++ b/build-aux/check-available-binaries.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . ;;; -;;; Check whether important binaries are available at hydra.gnu.org. +;;; Check whether important binaries are available. ;;; (use-modules (guix store) diff --git a/build-aux/check-final-inputs-self-contained.scm b/build-aux/check-final-inputs-self-contained.scm index 37dc883d3c..c819086508 100644 --- a/build-aux/check-final-inputs-self-contained.scm +++ b/build-aux/check-final-inputs-self-contained.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . ;;; -;;; Check whether important binaries are available at hydra.gnu.org. +;;; Check whether important binaries are available. ;;; (use-modules (guix store) diff --git a/doc/contributing.texi b/doc/contributing.texi index 7417f28d14..c55eb63382 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -443,7 +443,7 @@ as timestamps or randomly-generated output in the build result. Another option is to use @command{guix challenge} (@pxref{Invoking guix challenge}). You may run it once the package has been committed and -built by @code{hydra.gnu.org} to check whether it obtains the same +built by @code{@value{SUBSTITUTE-SERVER}} to check whether it obtains the same result as you did. Better yet: Find another machine that can build it and run @command{guix publish}. Since the remote build machine is likely different from yours, this can catch non-determinism issues diff --git a/doc/guix.texi b/doc/guix.texi index 7158a1d091..3d9b006adc 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -13,6 +13,9 @@ @set OPENPGP-SIGNING-KEY-ID 3CE464558A84FDC69DB40CFB090B11993D9AEBB5 @set KEY-SERVER pool.sks-keyservers.net +@c The official substitute server used by default. +@set SUBSTITUTE-SERVER ci.guix.info + @copying Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* @@ -1274,8 +1277,7 @@ remote procedure call (@pxref{The Store}). @anchor{daemon-substitute-urls} Consider @var{urls} the default whitespace-separated list of substitute source URLs. When this option is omitted, -@indicateurl{https://mirror.hydra.gnu.org https://hydra.gnu.org} is used -(@code{mirror.hydra.gnu.org} is a mirror of @code{hydra.gnu.org}). +@indicateurl{https://@value{SUBSTITUTE-SERVER}} is used. This means that substitutes may be downloaded from @var{urls}, as long as they are signed by a trusted signature (@pxref{Substitutes}). @@ -2321,7 +2323,7 @@ also result from derivation builds, can be available as substitutes. @cindex hydra @cindex build farm -The @code{mirror.hydra.gnu.org} server is a front-end to an official build farm +The @code{@value{SUBSTITUTE-SERVER}} server is a front-end to an official build farm that builds packages from Guix continuously for some architectures, and makes them available as substitutes. This is the default source of substitutes; it can be overridden by passing the @@ -2353,22 +2355,22 @@ other substitute server. @cindex substitutes, authorization thereof @cindex access control list (ACL), for substitutes @cindex ACL (access control list), for substitutes -To allow Guix to download substitutes from @code{hydra.gnu.org} or a +To allow Guix to download substitutes from @code{@value{SUBSTITUTE-SERVER}} or a mirror thereof, you must add its public key to the access control list (ACL) of archive imports, using the @command{guix archive} command (@pxref{Invoking guix -archive}). Doing so implies that you trust @code{hydra.gnu.org} to not +archive}). Doing so implies that you trust @code{@value{SUBSTITUTE-SERVER}} to not be compromised and to serve genuine substitutes. -The public key for @code{hydra.gnu.org} is installed along with Guix, in -@code{@var{prefix}/share/guix/hydra.gnu.org.pub}, where @var{prefix} is +The public key for @code{@value{SUBSTITUTE-SERVER}} is installed along with Guix, in +@code{@var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub}, where @var{prefix} is the installation prefix of Guix. If you installed Guix from source, make sure you checked the GPG signature of @file{guix-@value{VERSION}.tar.gz}, which contains this public key file. Then, you can run something like this: @example -# guix archive --authorize < @var{prefix}/share/guix/hydra.gnu.org.pub +# guix archive --authorize < @var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub @end example @quotation Note @@ -2409,7 +2411,7 @@ $ guix build emacs --dry-run @end example @noindent -This indicates that substitutes from @code{hydra.gnu.org} are usable and +This indicates that substitutes from @code{@value{SUBSTITUTE-SERVER}} are usable and will be downloaded, when possible, for future builds. @cindex substitutes, how to disable @@ -2501,9 +2503,9 @@ by a server. Today, each individual's control over their own computing is at the mercy of institutions, corporations, and groups with enough power and determination to subvert the computing infrastructure and exploit its -weaknesses. While using @code{hydra.gnu.org} substitutes can be +weaknesses. While using @code{@value{SUBSTITUTE-SERVER}} substitutes can be convenient, we encourage users to also build on their own, or even run -their own build farm, such that @code{hydra.gnu.org} is less of an +their own build farm, such that @code{@value{SUBSTITUTE-SERVER}} is less of an interesting target. One way to help is by publishing the software you build using @command{guix publish} so that others have one more choice of server to download substitutes from (@pxref{Invoking guix publish}). @@ -3658,11 +3660,11 @@ Read a single-item archive as served by substitute servers low-level operation needed in only very narrow use cases; see below. For example, the following command extracts the substitute for Emacs -served by @code{hydra.gnu.org} to @file{/tmp/emacs}: +served by @code{@value{SUBSTITUTE-SERVER}} to @file{/tmp/emacs}: @example $ wget -O - \ - https://hydra.gnu.org/nar/@dots{}-emacs-24.5 \ + https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-emacs-24.5 \ | bunzip2 | guix archive -x /tmp/emacs @end example @@ -6683,7 +6685,7 @@ but you are actually on an @code{x86_64} machine: @example $ guix build --log-file gdb -s mips64el-linux -https://hydra.gnu.org/log/@dots{}-gdb-7.10 +https://@value{SUBSTITUTE-SERVER}/log/@dots{}-gdb-7.10 @end example You can freely access a huge library of build logs! @@ -8335,7 +8337,7 @@ When @command{guix publish} runs, it spawns an HTTP server which allows anyone with network access to obtain substitutes from it. This means that any machine running Guix can also act as if it were a build farm, since the HTTP interface is compatible with Hydra, the software behind -the @code{hydra.gnu.org} build farm. +the @code{@value{SUBSTITUTE-SERVER}} build farm. For security, each substitute is signed, allowing recipients to check their authenticity and integrity (@pxref{Substitutes}). Because @@ -8572,20 +8574,20 @@ any given store item. The command output looks like this: @smallexample -$ guix challenge --substitute-urls="https://hydra.gnu.org https://guix.example.org" -updating list of substitutes from 'https://hydra.gnu.org'... 100.0% +$ guix challenge --substitute-urls="https://@value{SUBSTITUTE-SERVER} https://guix.example.org" +updating list of substitutes from 'https://@value{SUBSTITUTE-SERVER}'... 100.0% updating list of substitutes from 'https://guix.example.org'... 100.0% /gnu/store/@dots{}-openssl-1.0.2d contents differ: local hash: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q - https://hydra.gnu.org/nar/@dots{}-openssl-1.0.2d: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q + https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-openssl-1.0.2d: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q https://guix.example.org/nar/@dots{}-openssl-1.0.2d: 1zy4fmaaqcnjrzzajkdn3f5gmjk754b43qkq47llbyak9z0qjyim /gnu/store/@dots{}-git-2.5.0 contents differ: local hash: 00p3bmryhjxrhpn2gxs2fy0a15lnip05l97205pgbk5ra395hyha - https://hydra.gnu.org/nar/@dots{}-git-2.5.0: 069nb85bv4d4a6slrwjdy8v1cn4cwspm3kdbmyb81d6zckj3nq9f + https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-git-2.5.0: 069nb85bv4d4a6slrwjdy8v1cn4cwspm3kdbmyb81d6zckj3nq9f https://guix.example.org/nar/@dots{}-git-2.5.0: 0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73 /gnu/store/@dots{}-pius-2.1.1 contents differ: local hash: 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax - https://hydra.gnu.org/nar/@dots{}-pius-2.1.1: 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax + https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-pius-2.1.1: 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax https://guix.example.org/nar/@dots{}-pius-2.1.1: 1cy25x1a4fzq5rk0pmvc8xhwyffnqz95h2bpvqsz2mpvlbccy0gs @dots{} @@ -8605,7 +8607,7 @@ the servers obtained a result different from the local build. @cindex non-determinism, in package builds As an example, @code{guix.example.org} always gets a different answer. -Conversely, @code{hydra.gnu.org} agrees with local builds, except in the +Conversely, @code{@value{SUBSTITUTE-SERVER}} agrees with local builds, except in the case of Git. This might indicate that the build process of Git is non-deterministic, meaning that its output varies as a function of various things that Guix does not fully control, in spite of building @@ -8619,14 +8621,14 @@ To find out what is wrong with this Git binary, we can do something along these lines (@pxref{Invoking guix archive}): @example -$ wget -q -O - https://hydra.gnu.org/nar/@dots{}-git-2.5.0 \ +$ wget -q -O - https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-git-2.5.0 \ | guix archive -x /tmp/git $ diff -ur --no-dereference /gnu/store/@dots{}-git.2.5.0 /tmp/git @end example This command shows the difference between the files resulting from the local build, and the files resulting from the build on -@code{hydra.gnu.org} (@pxref{Overview, Comparing and Merging Files,, +@code{@value{SUBSTITUTE-SERVER}} (@pxref{Overview, Comparing and Merging Files,, diffutils, Comparing and Merging Files}). The @command{diff} command works great for text files. When binary files differ, a better option is @uref{https://diffoscope.org/, Diffoscope}, a tool that helps @@ -8641,7 +8643,7 @@ In the meantime, @command{guix challenge} is one tool to help address the problem. If you are writing packages for Guix, you are encouraged to check -whether @code{hydra.gnu.org} and other substitute servers obtain the +whether @code{@value{SUBSTITUTE-SERVER}} and other substitute servers obtain the same build result as you did with: @example @@ -11231,14 +11233,14 @@ Number of build user accounts to create. @item @code{authorize-key?} (default: @code{#t}) @cindex substitutes, authorization thereof Whether to authorize the substitute keys listed in -@code{authorized-keys}---by default that of @code{hydra.gnu.org} +@code{authorized-keys}---by default that of @code{@value{SUBSTITUTE-SERVER}} (@pxref{Substitutes}). @vindex %default-authorized-guix-keys @item @code{authorized-keys} (default: @var{%default-authorized-guix-keys}) The list of authorized key files for archive imports, as a list of string-valued gexps (@pxref{Invoking guix archive}). By default, it -contains that of @code{hydra.gnu.org} (@pxref{Substitutes}). +contains that of @code{@value{SUBSTITUTE-SERVER}} (@pxref{Substitutes}). @item @code{use-substitutes?} (default: @code{#t}) Whether to use substitutes. @@ -23740,7 +23742,7 @@ system}. @cindex substituter Users can obtain the new package definition simply by running @command{guix pull} (@pxref{Invoking guix pull}). When -@code{hydra.gnu.org} is done building the package, installing the +@code{@value{SUBSTITUTE-SERVER}} is done building the package, installing the package automatically downloads binaries from there (@pxref{Substitutes}). The only place where human intervention is needed is to review and apply the patch. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 228d3c5926..cee9898d79 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1518,7 +1518,7 @@ public key, with GUIX." (let ((status (cdr (waitpid pid)))) (unless (zero? status) (format (current-error-port) "warning: \ -failed to register hydra.gnu.org public key: ~a~%" status)))))))) +failed to register public key '~a': ~a~%" key status)))))))) (define %default-authorized-guix-keys ;; List of authorized substitute keys. @@ -1630,7 +1630,7 @@ failed to register hydra.gnu.org public key: ~a~%" status)))))))) ;; otherwise call 'chown' here, but the problem is that on a COW overlayfs, ;; chown leads to an entire copy of the tree, which is a bad idea. - ;; Optionally authorize hydra.gnu.org's key. + ;; Optionally authorize substitute server keys. (if authorize-key? #~(begin #$@(map (cut hydra-key-authorization <> guix) keys)) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 45b3a0c839..c345ba0626 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -250,7 +250,7 @@ You have been warned. Thanks for being so brave.\x1b[0m ;; The usual services. (syslog-service) - ;; The build daemon. Register the hydra.gnu.org key as trusted. + ;; The build daemon. Register the official server keys as trusted. ;; This allows the installation process to use substitutes by ;; default. (guix-service (guix-configuration (authorize-key? #t))) diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm index 344be40883..25218a2945 100644 --- a/guix/scripts/size.scm +++ b/guix/scripts/size.scm @@ -297,7 +297,7 @@ Report the size of PACKAGE and its dependencies.\n")) (leave (G_ "missing store item argument\n"))) ((files ..1) (leave-on-EPIPE - ;; Turn off grafts because (1) hydra.gnu.org does not serve grafted + ;; Turn off grafts because (1) substitute servers do not serve grafted ;; packages, and (2) they do not make any difference on the ;; resulting size. (parameterize ((%graft? #f)) -- cgit v1.3 From af5236739e2d73132e7ae4678030f0ae4356729c Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 28 Nov 2018 19:48:19 +0000 Subject: gnu: petsc-openmpi: Configure with support for HYPRE preconditioner. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (petsc-openmpi)[inputs]: Add hypre-openmpi. [arguments]: Add 'with-hypre=1' flag. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f1b5bb0646..f88cede68a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1767,6 +1767,7 @@ scientific applications modeled by partial differential equations.") (name "petsc-openmpi") (inputs `(("hdf5" ,hdf5-parallel-openmpi) + ("hypre" ,hypre-openmpi) ("metis" ,metis) ("mumps" ,mumps-openmpi) ("openmpi" ,openmpi) @@ -1776,7 +1777,8 @@ scientific applications modeled by partial differential equations.") (arguments (substitute-keyword-arguments (package-arguments petsc) ((#:configure-flags cf) - ``("--with-mpiexec=mpirun" + ``("--with-hypre=1" + "--with-mpiexec=mpirun" "--with-metis=1" "--with-mumps=1" "--with-scalapack=1" -- cgit v1.3 From dd6cb4a0afc40f6cab79824e792d8aa630a5bd69 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 28 Nov 2018 19:48:20 +0000 Subject: gnu: fenics: Skip extra demo in 'check' phase. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/simulation.scm (fenics)[arguments]: Add 'curl-curl' demo to list of demos that require meshes supplied by git-lfs. Signed-off-by: Ludovic Courtès --- gnu/packages/simulation.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index c080a16ce7..2132d4acf4 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -648,6 +648,7 @@ user interface to the FEniCS core components and external libraries.") "'lift-drag', \n" "'elastodynamics', \n" "'dg-advection-diffusion', \n" + "'curl-curl', \n" "'contact-vi-tao', \n" "'contact-vi-snes', \n" "'collision-detection', \n" -- cgit v1.3 From 3a1835128db463f7daa190e72ed6e2d3e72675b2 Mon Sep 17 00:00:00 2001 From: Timo Eisenmann Date: Sun, 2 Dec 2018 11:44:37 +0100 Subject: gnu: enlightenment: Use absolute path to 'edje_cc'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/enlightenment.scm (enlightenment)[arguments]: In 'set-system-actions', set absolute file name to 'edje_cc'. Signed-off-by: Ludovic Courtès --- gnu/packages/enlightenment.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 43ac388b25..9989e2f5a8 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -275,7 +275,8 @@ Libraries with some extra bells and whistles.") (let ((xkeyboard (assoc-ref inputs "xkeyboard-config")) (setxkbmap (assoc-ref inputs "setxkbmap")) (utils (assoc-ref inputs "util-linux")) - (libc (assoc-ref inputs "libc"))) + (libc (assoc-ref inputs "libc")) + (efl (assoc-ref inputs "efl"))) ;; We need to patch the path to 'base.lst' to be able ;; to switch the keyboard layout in E. (substitute* (list "src/modules/xkbswitch/e_mod_parse.c" @@ -290,6 +291,9 @@ Libraries with some extra bells and whistles.") "src/modules/conf_intl/e_int_config_intl.c" "src/modules/wizard/page_010.c") (("locale -a") (string-append libc "/bin/locale -a"))) + (substitute* "src/bin/e_import_config_dialog.c" + (("%s/edje_cc -v %s %s %s\", e_prefix_bin_get\\(\\)") + (string-append efl "/bin/edje_cc -v %s %s %s\""))) (substitute* "src/modules/everything/evry_plug_apps.c" (("/usr/bin/") "")) (substitute* "configure" -- cgit v1.3 From f5a15a86b0ff1c358bfca1e89eabc18d2d5e7818 Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Tue, 27 Nov 2018 18:09:25 +0100 Subject: gnu: emacs-irony-mode: Fetch source using git. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-irony-mode)[source]: Rewrite in terms of GIT-FETCH. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 69392e19d8..50705416a0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2822,11 +2822,13 @@ These are distributed in separate files and can be used individually.") (version "1.2.0") (home-page "https://github.com/Sarcasm/irony-mode") (source (origin - (method url-fetch) - (uri (string-append home-page "/archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url (string-append home-page ".git")) + (commit (string-append "v" version)))) (sha256 (base32 - "1f68zi0glkg2aly66s07rx3w0b0hdi1znxan02h6dbabaadylk99")) + "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8")) (file-name (string-append name "-" version ".tar.gz")))) (build-system emacs-build-system) (arguments '()) -- cgit v1.3 From 4ebfe99a3fc24d7139bd53fab6e1529f5a6d7184 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 4 Dec 2018 13:38:16 +0100 Subject: gnu: pari-gp: Update to 2.11.1. * gnu/packages/algebra.scm (pari-gp): Update to 2.11.1. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 7b0e24049f..0f19649917 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -139,7 +139,7 @@ solve the shortest vector problem.") (define-public pari-gp (package (name "pari-gp") - (version "2.11.0") + (version "2.11.1") (source (origin (method url-fetch) (uri (string-append @@ -147,7 +147,7 @@ solve the shortest vector problem.") version ".tar.gz")) (sha256 (base32 - "18f9yj8ffn3dxignbxj1x36771zbxy4js0r18mv6831ymb6cld9q")))) + "1jfax92jpydjd02fwl30r6b8kfzqqd6sm4yx94gidyz9lqjb7a94")))) (build-system gnu-build-system) (native-inputs `(("texlive" ,texlive-tiny))) (inputs `(("gmp" ,gmp) -- cgit v1.3 From 42c3e00c20dbc9fbdd938ddf6d5d88a92d622b77 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 16:20:59 +0100 Subject: gnu: pigx-rnaseq: Update to 0.0.5. * gnu/packages/bioinformatics.scm (pigx-rnaseq): Update to 0.0.5. [inputs]: Replace snakemake-4 with snakemake. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 026527cd36..7c0429a600 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12957,7 +12957,7 @@ once. This package provides tools to perform Drop-seq analyses.") (define-public pigx-rnaseq (package (name "pigx-rnaseq") - (version "0.0.4") + (version "0.0.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_rnaseq/" @@ -12965,7 +12965,7 @@ once. This package provides tools to perform Drop-seq analyses.") "/pigx_rnaseq-" version ".tar.gz")) (sha256 (base32 - "16gla23rmziimqan7w494q0nr7vfbp42zzkrl9fracmr4k7b1kzr")))) + "05gn658zpj9xki5dbs728z9zxq1mcm25hkwr5vzwqxsfi15l5f2l")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f ; not supported @@ -12981,7 +12981,7 @@ once. This package provides tools to perform Drop-seq analyses.") #t))))) (inputs `(("gzip" ,gzip) - ("snakemake" ,snakemake-4) + ("snakemake" ,snakemake) ("fastqc" ,fastqc) ("multiqc" ,multiqc) ("star" ,star) -- cgit v1.3 From 5790d163a4a56b430592cce1e094e9c608a3f6aa Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 28 Nov 2018 22:06:25 +0530 Subject: gnu: dictionaries: Use license prefix. * gnu/packages/dictionaries.scm: Import (guix licenses) with license: prefix. Fix all license fields. --- gnu/packages/dictionaries.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 3d58589e5e..57aac87fcc 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2018 Nicolas Goaziou ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +23,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages dictionaries) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -87,7 +88,7 @@ (description "V.E.R.A. (Virtual Entity of Relevant Acronyms) is a list of computing acronyms distributed as an info document.") - (license fdl1.3+))) + (license license:fdl1.3+))) (define-public gcide (package @@ -125,7 +126,7 @@ acronyms distributed as an info document.") be used via the GNU Dico program or accessed online at http://gcide.gnu.org.ua/") (home-page "http://gcide.gnu.org.ua/") - (license gpl3+))) + (license license:gpl3+))) (define-public diction ;; Not quite a dictionary, not quite a spell checker either… @@ -147,7 +148,7 @@ Diction is used to identify wordy and commonly misused phrases in a body of text. Style instead analyzes surface aspects of a written work, such as sentence length and other readability measures.") (home-page "https://www.gnu.org/software/diction/") - (license gpl3+))) + (license license:gpl3+))) (define-public ding (package @@ -207,7 +208,7 @@ work, such as sentence length and other readability measures.") (description "Ding is a dictionary lookup program for the X window system. It comes with a German-English dictionary with approximately 270,000 entries.") (home-page "http://www-user.tu-chemnitz.de/~fri/ding/") - (license gpl2+))) + (license license:gpl2+))) (define-public grammalecte (package @@ -234,7 +235,7 @@ a dubious expression is wrong, it will keep silent. The package provides the command line interface, along with a server and a Python library.") - (license gpl3+))) + (license license:gpl3+))) (define-public translate-shell (package @@ -283,4 +284,5 @@ and a Python library.") translator powered by Google Translate (default), Bing Translator, Yandex.Translate and Apertium. It gives you easy access to one of these translation engines from your terminal.") - (license public-domain))) + (license license:public-domain))) + -- cgit v1.3 From d2e1d022538f0a9c885ec4b16db95a4791fbb9e2 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 28 Nov 2018 22:13:41 +0530 Subject: gnu: Add lttoolbox. * gnu/packages/dictionaries.scm (lttoolbox): New variable. --- gnu/packages/dictionaries.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 57aac87fcc..6f58eee0ae 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -30,15 +30,18 @@ #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages curl) #:use-module (gnu packages emacs) #:use-module (gnu packages fribidi) #:use-module (gnu packages linux) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) #:use-module (gnu packages texinfo) #:use-module (gnu packages compression) - #:use-module (gnu packages tcl)) + #:use-module (gnu packages tcl) + #:use-module (gnu packages xml)) (define-public vera @@ -286,3 +289,30 @@ Yandex.Translate and Apertium. It gives you easy access to one of these translation engines from your terminal.") (license license:public-domain))) +(define-public lttoolbox + (package + (name "lttoolbox") + (version "3.5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/apertium/lttoolbox/releases/download/v" + version "/lttoolbox-" version ".tar.gz")) + (sha256 + (base32 + "08y6pf1hl7prwygy1g8h6ndqww18pmb9f3r5988q0pcrp8w6xz6b")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (inputs + `(("libxml2" ,libxml2))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://wiki.apertium.org/wiki/Lttoolbox") + (synopsis "Lexical processing toolbox") + (description "Lttoolbox is a toolbox for lexical processing, morphological +analysis and generation of words. Analysis is the process of splitting a +word (e.g. cats) into its lemma \"cat\" and the grammatical information +@code{}. Generation is the opposite process.") + (license (list license:gpl2 ; main license + license:expat)))) ; utf8/* -- cgit v1.3 From 30a1f6e21447ddfadf1d8677eb6dddf458d50d50 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 28 Nov 2018 22:16:51 +0530 Subject: gnu: Add apertium. * gnu/packages/dictionaries.scm (apertium): New variable. --- gnu/packages/dictionaries.scm | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 6f58eee0ae..039ec45965 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -26,6 +26,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system trivial) @@ -34,9 +35,12 @@ #:use-module (gnu packages base) #:use-module (gnu packages curl) #:use-module (gnu packages emacs) + #:use-module (gnu packages flex) #:use-module (gnu packages fribidi) #:use-module (gnu packages linux) + #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages readline) #:use-module (gnu packages texinfo) #:use-module (gnu packages compression) @@ -316,3 +320,58 @@ word (e.g. cats) into its lemma \"cat\" and the grammatical information @code{}. Generation is the opposite process.") (license (list license:gpl2 ; main license license:expat)))) ; utf8/* + +(define-public apertium + (package + (name "apertium") + (version "3.5.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/apertium/apertium/releases/download/v" + version "/apertium-" version ".tar.gz")) + (sha256 + (base32 + "0lrx58ipx2kzh1pd3xm1viz05dqyrq38jbnj9dnk92c9ckkwkp4h")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (inputs + `(("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("lttoolbox" ,lttoolbox) + ("pcre" ,pcre))) + (native-inputs + `(("apertium-get" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apertium/apertium-get") + (commit "692d030e68008fc123089cf2446070fe8c6e3a3b"))) + (sha256 + (base32 + "0kgp68azvds7yjwfz57z8sa5094fyk5yr0qxzblrw7bisrrihnav")))) + ("flex" ,flex) + ("pkg-config" ,pkg-config) + ;; python is only required for running the test suite + ("python-minimal" ,python-minimal))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; If apertium-get does not exist in the source tree, the build tries + ;; to download it using an svn checkout. To avoid this, copy + ;; apertium-get into the source tree. + (add-after 'unpack 'unpack-apertium-get + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "apertium-get") + "apertium/apertium-get") + #t))))) + (home-page "https://www.apertium.org/") + (synopsis "Rule based machine translation system") + (description "Apertium is a rule based machine translation system +featuring a shallow-transfer machine translation engine. The design of the +system makes translations fast (translating tens of thousands of words per +second on ordinary desktop computers) and, in spite of the errors, reasonably +intelligible and easily correctable.") + (license (list license:gpl2 ; main license + license:expat)))) ; utf8/* -- cgit v1.3 From 040ae1881952c90dae9478e5cfff6aad0ce950da Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 Dec 2018 20:29:32 +0100 Subject: tests: Increase root partitions size to 1.2G. The system closure has grown slightly above 1GiB so adjust accordingly. * gnu/tests/install.scm (%simple-installation-script): Increase vdb2 size of 1.2G, (%extlinux-gpt-installation-script); ditto (%simple-installation-script-for-/dev/vda): ditto, (%separate-store-installation-script): ditto for vdb3, (%encrypted-root-installation-script): ditto. --- gnu/tests/install.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 4764ffffde..72e5523942 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -149,7 +149,7 @@ export GUIX_BUILD_OPTIONS=--no-grafts guix build isc-dhcp parted --script /dev/vdb mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1G \\ + mkpart primary ext2 3M 1.2G \\ set 1 boot on \\ set 1 bios_grub on mkfs.ext4 -L my-root /dev/vdb2 @@ -174,7 +174,7 @@ guix --version export GUIX_BUILD_OPTIONS=--no-grafts guix build isc-dhcp parted --script /dev/vdb mklabel gpt \\ - mkpart ext2 1M 1G \\ + mkpart ext2 1M 1.2G \\ set 1 legacy_boot on mkfs.ext4 -L my-root -O '^64bit' /dev/vdb1 mount /dev/vdb1 /mnt @@ -377,7 +377,7 @@ export GUIX_BUILD_OPTIONS=--no-grafts guix build isc-dhcp parted --script /dev/vda mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1G \\ + mkpart primary ext2 3M 1.2G \\ set 1 boot on \\ set 1 bios_grub on mkfs.ext4 -L my-root /dev/vda2 @@ -510,7 +510,7 @@ guix build isc-dhcp parted --script /dev/vdb mklabel gpt \\ mkpart primary ext2 1M 3M \\ mkpart primary ext2 3M 100M \\ - mkpart primary ext2 100M 1G \\ + mkpart primary ext2 100M 1.2G \\ set 1 boot on \\ set 1 bios_grub on mkfs.ext4 -L root-fs /dev/vdb2 @@ -676,7 +676,7 @@ export GUIX_BUILD_OPTIONS=--no-grafts ls -l /run/current-system/gc-roots parted --script /dev/vdb mklabel gpt \\ mkpart primary ext2 1M 3M \\ - mkpart primary ext2 3M 1G \\ + mkpart primary ext2 3M 1.2G \\ set 1 boot on \\ set 1 bios_grub on echo -n thepassphrase | \\ -- cgit v1.3 From 69a64ecd66733e394a3b116b38f67b354dcebcc9 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 4 Dec 2018 19:44:47 +0000 Subject: gnu: go-gopkg.in-tomb.v2: Fix build. Looks like this test isn't compiling with newer versions of go, so fix it to get the package building again. * gnu/packages/golang.scm (go-gopkg.in-tomb.v2)[arguments]: Add new patch-source phase. --- gnu/packages/golang.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 60890bf724..6c970700a5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -632,7 +632,16 @@ way of specifying command line options.") "1sv15sri99szkdz1bkh0ir46w9n8prrwx5hfai13nrhkawfyfy10")))) (build-system go-build-system) (arguments - '(#:import-path "gopkg.in/tomb.v2")) + '(#:import-path "gopkg.in/tomb.v2" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; Add a missing % to fix the compilation of this test + (substitute* "src/gopkg.in/tomb.v2/tomb_test.go" + (("t.Fatalf\\(`Killf\\(\"BO%s") + "t.Fatalf(`Killf(\"BO%%s")) + #t))))) (synopsis "@code{tomb} handles clean goroutine tracking and termination") (description "The @code{tomb} package handles clean goroutine tracking and -- cgit v1.3 From db2db1296b8a31d40b109bf343518b0c893a970b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:08:18 +0100 Subject: gnu: python-django: Update to 1.11.17. * gnu/packages/django.scm (python-django): Update to 1.11.17. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 59bef9a8d1..ea2e65a588 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -37,13 +37,13 @@ (define-public python-django (package (name "python-django") - (version "1.11.15") + (version "1.11.17") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "0h2sl02x2mxr3rl3dy750pzm5kvmx77116fys8rrgw164kc3b0mi")))) + "10xlpm21ll8mgz5py41sz9vrd603qv7an736agbqxkxlyikfx1x7")))) (build-system python-build-system) (arguments '(#:modules ((srfi srfi-1) -- cgit v1.3 From 56302fc1ec36906af4cdd9506cb894d8cd6f6b7e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:13:17 +0100 Subject: gnu: re2: Download sources from git. * gnu/packages/regex.scm (re2)[source]: Change to GIT-FETCH. --- gnu/packages/regex.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index c05d819d65..533fa41ab9 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -23,6 +23,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix utils)) @@ -32,12 +33,12 @@ (version "2018-10-01") (home-page "https://github.com/google/re2") (source (origin - (method url-fetch) - (uri (string-append home-page "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "10fsxsj3yip34hp2zl5rw8h2x2lgnp83fwrh7m0qfd9m99qrf4x3")))) + "086n0ldr2sqvybck9r0vc302yspj0x7nq554siadspfl1in8ysf6")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.3 From 69d30ba280a5d94c23ddceb7214c273ee97eb457 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:14:11 +0100 Subject: gnu: re2: Update to 2018-12-01. * gnu/packages/regex.scm (re2): Update to 2018-12-01. --- gnu/packages/regex.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index 533fa41ab9..08501aef6f 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -30,7 +30,7 @@ (define-public re2 (package (name "re2") - (version "2018-10-01") + (version "2018-12-01") (home-page "https://github.com/google/re2") (source (origin (method git-fetch) @@ -38,7 +38,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "086n0ldr2sqvybck9r0vc302yspj0x7nq554siadspfl1in8ysf6")))) + "181fq0idwzgfmmpyhmqdxi37rbynzgf1b8s99aaka9kqs9ffwj22")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.3 From 44eff75ea3edae22cc258e42549eee4e5f84accb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:38:53 +0100 Subject: gnu: samba: Update to 4.9.3. * gnu/packages/samba.scm (samba): Update to 4.9.3. [inputs]: Add GPGME, JANSSON, LIBARCHIVE and LMDB. --- gnu/packages/samba.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index b927bbbf9b..f1145fdaa1 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -32,11 +32,13 @@ #:use-module (gnu packages acl) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages check) #:use-module (gnu packages crypto) #:use-module (gnu packages cups) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) + #:use-module (gnu packages gnupg) #:use-module (gnu packages tls) #:use-module (gnu packages popt) #:use-module (gnu packages pkg-config) @@ -46,6 +48,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages web) #:use-module (gnu packages xml)) (define-public cifs-utils @@ -147,14 +150,14 @@ anywhere.") (define-public samba (package (name "samba") - (version "4.8.6") + (version "4.9.3") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "15hawqdm37l6lp9k14c634315p77cllsx89bvbw9h38fg1hj3fbk")))) + "1krm47x08c0vcrq12dxs8mbicma1ck2sl1i0hgkvrmwsgrqdi3yg")))) (build-system gnu-build-system) (arguments `(#:phases @@ -199,10 +202,14 @@ anywhere.") `(("acl" ,acl) ("cups" ,cups) ;; ("gamin" ,gamin) + ("gpgme" ,gpgme) ("gnutls" ,gnutls) ("iniparser" ,iniparser) + ("jansson" ,jansson) ("libaio" ,libaio) + ("libarchive" ,libarchive) ("linux-pam" ,linux-pam) + ("lmdb" ,lmdb) ("openldap" ,openldap) ("popt" ,popt) ("readline" ,readline) -- cgit v1.3 From bdf161251aa45882a5919d4814303ca619d47a79 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:21:56 +0100 Subject: gnu: ldb: Update to 1.4.3. * gnu/packages/samba.scm (ldb): Update to 1.4.3. [inputs]: Add LMDB. --- gnu/packages/samba.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index f1145fdaa1..b4a01b1c95 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -345,14 +345,14 @@ many event types, including timers, signals, and the classic file descriptor eve (define-public ldb (package (name "ldb") - (version "1.3.6") + (version "1.4.3") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/ldb/ldb-" version ".tar.gz")) (sha256 (base32 - "16lkz3gyvsm9als1wyimsl573hclr72xy6454mshwjanncs33lji")) + "07vacwr941y2x31yl9knsr2rpffz5pqabvqds6sbyngqxy4r785c")) (modules '((guix build utils))) (snippet '(begin @@ -385,7 +385,8 @@ many event types, including timers, signals, and the classic file descriptor eve `(("talloc" ,talloc) ("tdb" ,tdb))) (inputs - `(("popt" ,popt) + `(("lmdb" ,lmdb) + ("popt" ,popt) ("tevent" ,tevent))) (synopsis "LDAP-like embedded database") (home-page "https://ldb.samba.org/") -- cgit v1.3 From 17074cae32a37886ce0862eb81645dfe98205e29 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 18:14:22 +0100 Subject: gnu: samba.scm: Sort module imports. * gnu/packages/samba.scm (gnu): Sort imports. --- gnu/packages/samba.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index b4a01b1c95..66d0b5a35d 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -39,15 +39,15 @@ #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages gnupg) - #:use-module (gnu packages tls) - #:use-module (gnu packages popt) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages openldap) - #:use-module (gnu packages readline) #:use-module (gnu packages kerberos) #:use-module (gnu packages linux) + #:use-module (gnu packages openldap) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages popt) #:use-module (gnu packages python) + #:use-module (gnu packages readline) + #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml)) -- cgit v1.3 From b4c684cdf389de435a0bd5a05d2772a168bed7fa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Dec 2018 16:28:35 +0100 Subject: gnu: mbedtls-apache: Update to 2.14.1 [fixes CVE-2018-19608]. * gnu/packages/tls.scm (mbedtls-apache): Update to 2.14.1. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 01c68d2e35..d9971441c6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -826,7 +826,7 @@ then ported to the GNU / Linux environment.") (define-public mbedtls-apache (package (name "mbedtls-apache") - (version "2.14.0") + (version "2.14.1") (source (origin (method url-fetch) @@ -836,7 +836,7 @@ then ported to the GNU / Linux environment.") version "-apache.tgz")) (sha256 (base32 - "0bf8mf8w5dyikbwpckcxgdi0l086adk7pailqds10bkzrcg59y42")))) + "07f6xn77w5rd6fhq5s1dmna3czs4chk5j2s6wkj366cvikawp2gi")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.3 From fe5969656adc0c799deaf06d90a9628b78e7b232 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 4 Dec 2018 20:22:27 +0000 Subject: gnu: mongo-tools: Fix build. I guess this broke when upgrading go. I did try upgrading to the later patch and minor releases, but they had similar problems, so lets upgrade separately. * gnu/packages/databases.scm (mongo-tools)[arguments]: Add patch-source phase. --- gnu/packages/databases.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d7b35834fe..0fa6d451ed 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2868,6 +2868,14 @@ transforms idiomatic python function calls to well-formed SQL queries.") (delete-file-recursively "src/github.com/mongodb/mongo-tools/vendor") #t)) + (add-after 'delete-bundled-source-code 'patch-source + (lambda _ + ;; Remove a redundant argument that causes compilation to fail. + (substitute* + "src/github.com/mongodb/mongo-tools/mongorestore/filepath.go" + (("skipping restore of system.profile collection\", db)") + "skipping restore of system.profile collection\")")) + #t)) ;; We don't need to install the source code for end-user applications (delete 'install-source) (replace 'build -- cgit v1.3 From c16c119d0a7894c42bbe816ec381a0f458f26e6a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 Dec 2018 22:55:46 +0100 Subject: gnu: quilt: Use shorter file names for patches. We were reaching the 99-character limit of POSIX tar. * gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch: Rename to... * gnu/packages/patches/quilt-getopt-nondigit-param.patch: ... this. * gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch: Rename to... * gnu/packages/patches/quilt-getopt-second-separator.patch: ... this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/patchutils.scm (quilt)[source](patches): Likewise. --- gnu/local.mk | 4 +- ...pat-getopt-fix-option-with-nondigit-param.patch | 45 ----------------- .../quilt-compat-getopt-fix-second-separator.patch | 58 ---------------------- .../patches/quilt-getopt-nondigit-param.patch | 45 +++++++++++++++++ .../patches/quilt-getopt-second-separator.patch | 58 ++++++++++++++++++++++ gnu/packages/patchutils.scm | 4 +- 6 files changed, 107 insertions(+), 107 deletions(-) delete mode 100644 gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch delete mode 100644 gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch create mode 100644 gnu/packages/patches/quilt-getopt-nondigit-param.patch create mode 100644 gnu/packages/patches/quilt-getopt-second-separator.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 53a3547559..d2407bb80e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1119,8 +1119,8 @@ dist_patch_DATA = \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/quilt-test-fix-regex.patch \ - %D%/packages/patches/quilt-compat-getopt-fix-second-separator.patch \ - %D%/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch \ + %D%/packages/patches/quilt-getopt-nondigit-param.patch \ + %D%/packages/patches/quilt-getopt-second-separator.patch \ %D%/packages/patches/qtwebkit-pbutils-include.patch \ %D%/packages/patches/randomjungle-disable-static-build.patch \ %D%/packages/patches/rapicorn-isnan.patch \ diff --git a/gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch b/gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch deleted file mode 100644 index 6bbec67e75..0000000000 --- a/gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Jean Delvare -Subject: compat/getopt: Allow non-digit parameter embedded in short option - -The compatibility getopt script allows only digit parameters to be -embedded in short options. Util-linux's getopt implementation does -not have such a restriction and allows any parameter to be embedded -in short options. As a consequence, using the compatibility getopt -script would choke for example on "-pab", which is a legal option -of the "quilt refresh" command. - -Remove the limitation on digits so that the compatibility getopt -script allows what util-linux allows. This fixes the second half -of bug #54772: -https://savannah.nongnu.org/bugs/index.php?54772 - -As a side note, this feature of the compatibility script was broken -anyway, as it would output the digits in reverse order. - -Signed-off-by: Jean Delvare ---- - compat/getopt.in | 13 ++++--------- - 1 file changed, 4 insertions(+), 9 deletions(-) - ---- quilt.orig/compat/getopt.in 2018-10-03 16:05:56.818667040 +0200 -+++ quilt/compat/getopt.in 2018-10-03 16:12:17.624841732 +0200 -@@ -108,15 +108,10 @@ foreach my $word (@words) { - if (scalar(@letters) == 0) { - $need_param = $letter; - } else { -- # short options can have numerical args -- # embedded in the short option list: -UO -- die "unexpected character after option $letter" -- if ($letters[$#letters] !~ /[0-9]/); -- my @digits; -- while (scalar(@letters) && ($letters[$#letters] =~ /[0-9]/)) { -- push @digits, pop @letters; -- } -- push @options, quote_word(join('', reverse @digits)); -+ # short options can have args -+ # embedded in the short option list -+ push @options, quote_word(join('', reverse @letters)); -+ @letters = (); - } - } - } diff --git a/gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch b/gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch deleted file mode 100644 index cde2c8d41c..0000000000 --- a/gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Jean Delvare -Subject: compat/getopt: Handle a second separator - -getopt can be passed 2 '--' separators. The first one tells that -getopt options are over and target program options start. The second -one tells that the target program's options are over and following -arguments should be treated as non-options even if they look like -options. - -This second separator was not handled, causing the compatibility -getopt script to treat the following arguments as options, eventually -failing one way or another. - -Properly detect and handle the second separator. This fixes the first -half of bug #54772: -https://savannah.nongnu.org/bugs/index.php?54772 - -Signed-off-by: Jean Delvare ---- - compat/getopt.in | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - ---- quilt.orig/compat/getopt.in 2018-10-03 15:23:21.147620172 +0200 -+++ quilt/compat/getopt.in 2018-10-03 16:05:56.818667040 +0200 -@@ -8,12 +8,12 @@ - - use strict; - --my $opts; -+my $opts = ''; - my @words; - my $found_sep = 0; - - foreach my $arg (@ARGV) { -- if ($arg eq '--') { -+ if (!$found_sep && $arg eq '--') { - $found_sep = 1; - } - else { -@@ -62,10 +62,17 @@ sub quote_word - return "'$word'"; - } - -+# there can be a second separator, to inhibit processing following arguments -+# as options -+$found_sep = 0; - foreach my $word (@words) { -+ if ($word eq '--') { -+ $found_sep = 1; -+ next; -+ } - - # allow '-' to be an option value -- if (!$need_param && $word !~ /^-./) { -+ if ($found_sep || (!$need_param && $word !~ /^-./)) { - push @barewords, quote_word($word); - next; - } diff --git a/gnu/packages/patches/quilt-getopt-nondigit-param.patch b/gnu/packages/patches/quilt-getopt-nondigit-param.patch new file mode 100644 index 0000000000..6bbec67e75 --- /dev/null +++ b/gnu/packages/patches/quilt-getopt-nondigit-param.patch @@ -0,0 +1,45 @@ +From: Jean Delvare +Subject: compat/getopt: Allow non-digit parameter embedded in short option + +The compatibility getopt script allows only digit parameters to be +embedded in short options. Util-linux's getopt implementation does +not have such a restriction and allows any parameter to be embedded +in short options. As a consequence, using the compatibility getopt +script would choke for example on "-pab", which is a legal option +of the "quilt refresh" command. + +Remove the limitation on digits so that the compatibility getopt +script allows what util-linux allows. This fixes the second half +of bug #54772: +https://savannah.nongnu.org/bugs/index.php?54772 + +As a side note, this feature of the compatibility script was broken +anyway, as it would output the digits in reverse order. + +Signed-off-by: Jean Delvare +--- + compat/getopt.in | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +--- quilt.orig/compat/getopt.in 2018-10-03 16:05:56.818667040 +0200 ++++ quilt/compat/getopt.in 2018-10-03 16:12:17.624841732 +0200 +@@ -108,15 +108,10 @@ foreach my $word (@words) { + if (scalar(@letters) == 0) { + $need_param = $letter; + } else { +- # short options can have numerical args +- # embedded in the short option list: -UO +- die "unexpected character after option $letter" +- if ($letters[$#letters] !~ /[0-9]/); +- my @digits; +- while (scalar(@letters) && ($letters[$#letters] =~ /[0-9]/)) { +- push @digits, pop @letters; +- } +- push @options, quote_word(join('', reverse @digits)); ++ # short options can have args ++ # embedded in the short option list ++ push @options, quote_word(join('', reverse @letters)); ++ @letters = (); + } + } + } diff --git a/gnu/packages/patches/quilt-getopt-second-separator.patch b/gnu/packages/patches/quilt-getopt-second-separator.patch new file mode 100644 index 0000000000..cde2c8d41c --- /dev/null +++ b/gnu/packages/patches/quilt-getopt-second-separator.patch @@ -0,0 +1,58 @@ +From: Jean Delvare +Subject: compat/getopt: Handle a second separator + +getopt can be passed 2 '--' separators. The first one tells that +getopt options are over and target program options start. The second +one tells that the target program's options are over and following +arguments should be treated as non-options even if they look like +options. + +This second separator was not handled, causing the compatibility +getopt script to treat the following arguments as options, eventually +failing one way or another. + +Properly detect and handle the second separator. This fixes the first +half of bug #54772: +https://savannah.nongnu.org/bugs/index.php?54772 + +Signed-off-by: Jean Delvare +--- + compat/getopt.in | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +--- quilt.orig/compat/getopt.in 2018-10-03 15:23:21.147620172 +0200 ++++ quilt/compat/getopt.in 2018-10-03 16:05:56.818667040 +0200 +@@ -8,12 +8,12 @@ + + use strict; + +-my $opts; ++my $opts = ''; + my @words; + my $found_sep = 0; + + foreach my $arg (@ARGV) { +- if ($arg eq '--') { ++ if (!$found_sep && $arg eq '--') { + $found_sep = 1; + } + else { +@@ -62,10 +62,17 @@ sub quote_word + return "'$word'"; + } + ++# there can be a second separator, to inhibit processing following arguments ++# as options ++$found_sep = 0; + foreach my $word (@words) { ++ if ($word eq '--') { ++ $found_sep = 1; ++ next; ++ } + + # allow '-' to be an option value +- if (!$need_param && $word !~ /^-./) { ++ if ($found_sep || (!$need_param && $word !~ /^-./)) { + push @barewords, quote_word($word); + next; + } diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fa5ad62e44..b655399345 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -102,8 +102,8 @@ listing the files modified by a patch.") (base32 "06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn")) (patches (search-patches "quilt-test-fix-regex.patch" - "quilt-compat-getopt-fix-second-separator.patch" - "quilt-compat-getopt-fix-option-with-nondigit-param.patch")))) + "quilt-getopt-second-separator.patch" + "quilt-getopt-nondigit-param.patch")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gnu-gettext))) -- cgit v1.3 From b96bd82133420383e58180d725af6c7e178cdc24 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 5 Dec 2018 00:38:44 +0100 Subject: gnu: next-gtk-webkit: Update to 1.1.0. * gnu/packages/web-browsers.scm (next-gtk-webkit): Update to 1.1.0. --- gnu/packages/web-browsers.scm | 73 +++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 38 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 578cfca560..7e1d612402 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -364,45 +364,44 @@ driven and does not detract you from your daily work.") (license license:gpl3+))) (define-public next-gtk-webkit - (let ((commit "b8899341bbdefd0a33412608fbb0b1f92f818c65")) - (package - (name "next-gtk-webkit") - (version (git-version "1.0.0" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://source.atlas.engineer/public/next") - (commit commit))) - (sha256 - (base32 - "12jmf1b9qr85il9h15mb9vpsfh1wzcln9x9xpn4lps0kkccnpkz9")) - (file-name (git-file-name "next" version)))) - (build-system glib-or-gtk-build-system) - (arguments - `(#:tests? #f ; no tests - #:make-flags (list "gtk-webkit" - "CC=gcc" - (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key (make-flags '()) #:allow-other-keys) - (apply invoke "make" "install-gtk-webkit" make-flags)))))) - (inputs - `(("glib-networking" ,glib-networking) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "https://next.atlas.engineer") - (synopsis "Infinitely extensible web-browser (user interface only)") - (description "Next is a keyboard-oriented, extensible web-browser + (package + (name "next-gtk-webkit") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://source.atlas.engineer/public/next") + (commit version))) + (sha256 + (base32 + "00xi01r6gxlrv7xc2dhf4da30y0vng1snbdmc8d829qyn0chl55q")) + (file-name (git-file-name "next" version)))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags (list "gtk-webkit" + "CC=gcc" + (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "make" "install-gtk-webkit" make-flags)))))) + (inputs + `(("glib-networking" ,glib-networking) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("webkitgtk" ,webkitgtk))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://next.atlas.engineer") + (synopsis "Infinitely extensible web-browser (user interface only)") + (description "Next is a keyboard-oriented, extensible web-browser inspired by Emacs and designed for power users. The application has familiar key-bindings, is fully configurable and extensible in Lisp, and has powerful features for productive professionals.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public sbcl-next (package @@ -428,8 +427,6 @@ features for productive professionals.") (define expected-fasl (string-append lib "/lib/sbcl/next--system.fasl")) - (pk actual-fasl) - (pk expected-fasl) (copy-file actual-fasl expected-fasl) #t)) (add-after 'create-symlinks 'build-program -- cgit v1.3 From 89ca445c298980b7462e6bacff4c044e9e570729 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 5 Dec 2018 00:38:58 +0100 Subject: gnu: sbcl-next: Update to 1.1.0. * gnu/packages/web-browsers.scm (sbcl-next): Update to 1.1.0. --- gnu/packages/web-browsers.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 7e1d612402..6caa486b84 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -442,6 +442,9 @@ features for productive professionals.") ;; the illegal version will result in NIL in the .desktop ;; file. (lambda* (#:key outputs #:allow-other-keys) + (with-output-to-file "version" + (lambda _ + (format #t "~a" ,(package-version next-gtk-webkit)))) (invoke "make" "install-assets" (string-append "PREFIX=" (assoc-ref outputs "out")))))))) @@ -453,14 +456,12 @@ features for productive professionals.") ("cl-strings" ,sbcl-cl-strings) ("cl-string-match" ,sbcl-cl-string-match) ("puri" ,sbcl-puri) - ("queues.simple-queue" ,sbcl-queues.simple-queue) ("sqlite" ,sbcl-cl-sqlite) ("parenscript" ,sbcl-parenscript) ("cl-json" ,sbcl-cl-json) ("swank" ,sbcl-slime-swank) ("cl-markup" ,sbcl-cl-markup) ("cl-css" ,sbcl-cl-css) - ("usocket" ,sbcl-usocket) ("bordeaux-threads" ,sbcl-bordeaux-threads) ("s-xml-rpc" ,sbcl-s-xml-rpc) ("unix-opts" ,sbcl-unix-opts))) -- cgit v1.3 From 79a0eabd2a8765c294b3e2decf71a27cd1dd219d Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 1 Dec 2018 23:14:59 +0300 Subject: gnu: Add python-xmltodict. * gnu/packages/xml.scm (python-xmltodict): New variable. --- gnu/packages/xml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 3ac01133e5..fd4c3fea2c 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -39,6 +39,7 @@ (define-module (gnu packages xml) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages gnupg) @@ -2152,3 +2153,24 @@ It converts the procedure call into an XML document, sends it to a remote server using HTTP, and gets back the response as XML. This library provides a modular implementation of XML-RPC for C and C++.") (license (list license:psfl license:expat)))) + +(define-public python-xmltodict + (package + (name "python-xmltodict") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "xmltodict" version)) + (sha256 + (base32 + "1pxh4yjhvmxi1h6f92skv41g4kbsws3ams57150kzn18m907v3cg")))) + (build-system python-build-system) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-nose" ,python-nose))) + (home-page "https://github.com/martinblech/xmltodict") + (synopsis "Work with XML like you are working with JSON") + (description "This package provides a Python library to convert XML to +@code{OrderedDict}.") + (license license:expat))) -- cgit v1.3 From c7c0b3a98b257dacbd731eb35bec2ef5331c698e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 4 Dec 2018 20:19:50 -0500 Subject: gnu: Syncthing: Update to 0.14.53. * gnu/packages/syncthing.scm (syncthing): Update to 0.14.53. [source]: Use bundled libraries. [inputs]: Remove field. [arguments]: Simplify the 'build' phase. --- gnu/packages/syncthing.scm | 65 +++++++++++----------------------------------- 1 file changed, 15 insertions(+), 50 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index c29c88a588..37654f943c 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,7 +30,7 @@ (define-public syncthing (package (name "syncthing") - (version "0.14.52") + (version "0.14.53") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,12 +38,19 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "1hhn72l74vb9l32i1a54ry2l85ji78cq6isd20lxxdk0bjqc4m29")) - (modules '((guix build utils))) - ;; Delete bundled ("vendored") free software source code. - (snippet '(begin - (delete-file-recursively "vendor") - #t)))) + "0cplg4yw2szvfl91504s567n11qnxvfczzxvj9g1rhczgl7z14v5")) + ;; Since the update to Go 1.11, Go programs have been keeping + ;; spurious references to all their dependencies: + ;; . + ;; For Syncthing, this increases the size of the 'out' closure + ;; from 87.6 MiB to 253.5 MiB. So, we use the bundled + ;; dependencies until the bug is resolved. +; (modules '((guix build utils))) +; ;; Delete bundled ("vendored") free software source code. +; (snippet '(begin +; (delete-file-recursively "vendor") +; #t)) + )) (build-system go-build-system) ;; The primary Syncthing executable goes to "out", while the auxiliary ;; server programs and utility tools go to "utils". This reduces the size @@ -63,7 +70,7 @@ #t)) (replace 'build - (lambda* (#:key inputs #:allow-other-keys) + (lambda _ (with-directory-excursion "src/github.com/syncthing/syncthing" (invoke "go" "run" "build.go" "-no-upgrade")))) @@ -107,48 +114,6 @@ (delete-file (string-append out man "/man1/strelaysrv.1")) (delete-file (string-append utils man "/man1/syncthing.1")) #t)))))) - ;; When updating Syncthing, check 'vendor/manifest' in the source - ;; distribution to ensure we are using the correct versions of these - ;; dependencies. - (inputs - `(("go-github-com-audriusbutkevicius-cli" - ,go-github-com-audriusbutkevicius-cli) - ("go-github-com-audriusbutkevicius-go-nat-pmp" - ,go-github-com-audriusbutkevicius-go-nat-pmp) - ("go-github-com-audriusbutkevicius-pfilter" - ,go-github-com-audriusbutkevicius-pfilter) - ("go-github-com-bkaradzic-go-lz4" ,go-github-com-bkaradzic-go-lz4) - ("go-github-com-calmh-du" ,go-github-com-calmh-du) - ("go-github-com-calmh-xdr" ,go-github-com-calmh-xdr) - ("go-github-com-prometheus-union" ,(go-github-com-prometheus-union)) - ("go-github-com-chmduquesne-rollinghash-adler32" - ,go-github-com-chmduquesne-rollinghash-adler32) - ("go-github-com-gobwas-glob" ,go-github-com-gobwas-glob) - ("go-github-com-gogo-protobuf-union" - ,(go-github-com-gogo-protobuf-union)) - ("go-github-com-golang-groupcache-lru" - ,go-github-com-golang-groupcache-lru) - ("go-github-com-jackpal-gateway" ,go-github-com-jackpal-gateway) - ("go-github-com-kballard-go-shellquote" - ,go-github-com-kballard-go-shellquote) - ("go-github-com-lib-pq" ,go-github-com-lib-pq) - ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) - ("go-github-com-oschwald-geoip2-golang" - ,go-github-com-oschwald-geoip2-golang) - ("go-github-com-pkg-errors" ,go-github-com-pkg-errors) - ("go-github-com-rcrowley-go-metrics" ,go-github-com-rcrowley-go-metrics) - ("go-github-com-sasha-s-go-deadlock" ,go-github-com-sasha-s-go-deadlock) - ("go-github-com-syncthing-notify" ,go-github-com-syncthing-notify) - ("go-github-com-syndtr-goleveldb" ,go-github-com-syndtr-goleveldb) - ("go-github-com-thejerf-suture" ,go-github-com-thejerf-suture) - ("go-github-com-vitrun-qart" ,(go-github-com-vitrun-qart-union)) - ("go-golang-org-x-crypto" ,(go-golang-org-x-crypto-union)) - ("go-golang-org-x-net-union" ,(go-golang-org-x-net-union)) - ("go-golang-org-x-text" ,(go-golang-org-x-text-union)) - ("go-golang-org-x-time-rate" ,go-golang-org-x-time-rate) - ("go-gopkg.in-ldap.v2" ,go-gopkg.in-ldap.v2) - ;; For tests - ("go-github-com-d4l3k-messagediff" ,go-github-com-d4l3k-messagediff))) (synopsis "Decentralized continuous file system synchronization") (description "Syncthing is a peer-to-peer file synchronization tool that supports a wide variety of computing platforms. It uses the Block Exchange -- cgit v1.3 From f2bf63d02980884c74c2602c1b9c655f771e6cb8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 4 Dec 2018 20:26:21 -0500 Subject: gnu: go-github-com-syncthing-notify: Update to 0.0.0-3.116c45b. * gnu/packages/syncthing (go-github-com-syncthing-notify): Update to 0.0.0-3.116c45b. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 37654f943c..4bd95f0651 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -906,8 +906,8 @@ using sh's word-splitting rules.") (license expat)))) (define-public go-github-com-syncthing-notify - (let ((commit "b76b45868a77e7800dd06cce61101af9c4274bcc") - (revision "2")) + (let ((commit "116c45bb5ad48777321e4984d1320d56889b6097") + (revision "3")) (package (name "go-github-com-syncthing-notify") (version (git-version "0.0.0" revision commit)) @@ -919,7 +919,7 @@ using sh's word-splitting rules.") (file-name (git-file-name name version)) (sha256 (base32 - "1xxkzaxygxxr51i2kdxsdaqb5i95hqpkw4kcr75wmsp914slw2q9")))) + "14bh95pkhwmnc65bnv08p3y4flj1j7f6xxr2cgmlwrphnlp9yhl9")))) (build-system go-build-system) (arguments '(#:import-path "github.com/syncthing/notify")) -- cgit v1.3 From f224ea365b4dfbd0af075edc0a095b35d183cf82 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 4 Dec 2018 21:04:31 -0500 Subject: gnu: go-github-com-client-golang-prometheus: Update to 0.9.1-0.7e9098b. * gnu/packages/syncthing.scm (go-github-com-client-golang-prometheus): Update to 0.9.1-0.7e9098b. [arguments]: Skip the test suite. --- gnu/packages/syncthing.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 4bd95f0651..619897ab34 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1153,11 +1153,11 @@ server tools for Prometheus metrics.") (license asl2.0)))) (define-public go-github-com-client-golang-prometheus - (let ((commit "180b8fdc22b4ea7750bcb43c925277654a1ea2f3") + (let ((commit "7e9098b20fb8e103a7a5691878272d7e3d703663") (revision "0")) (package (name "go-github-com-prometheus-client-golang-prometheus") - (version (git-version "0.0.0" revision commit)) + (version (git-version "0.9.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1166,11 +1166,12 @@ server tools for Prometheus metrics.") (file-name (git-file-name name version)) (sha256 (base32 - "1kkfx1j9ka18ydsmdi2cdy3hs39c22b39mbc4laykmj2x93lmbdp")))) + "09q8hlvgyn58hn8fmmj535hrwhqc1215czwzf7fhaqpa9zamj4w1")))) (build-system go-build-system) (arguments '(#:import-path "github.com/prometheus/client_golang/prometheus" - #:unpack-path "github.com/prometheus/client_golang")) + #:unpack-path "github.com/prometheus/client_golang" + #:tests? #f)) ; 'TestHandler' test fails in this non-critical dependency (propagated-inputs `(("go-github-com-beorn7-perks-quantile" ,go-github-com-beorn7-perks-quantile) -- cgit v1.3 From 4b193da3f959244112a85f996d630aa1ed6d0902 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Thu, 8 Nov 2018 09:51:05 +0000 Subject: gnu: sbcl-stumpwm: Drop ECL lisp support and rename to 'stumpwm'. StumpWM version 1.0.0 was the last version to support lisps other than SBCL. This patch renames the current version of Stumpwm to simply 'stumpwm' instead of 'sbcl-stumpwm' since it's redundant, and removes the unmaintained 'ecl-stumpwm' package. * gnu/packages/lisp.scm (sbcl-stumpwm): Deprecate in favor of 'stumpwm'. [name]: Rename to 'stumpwm'. [arguments]: Set '#:asd-system-name' to 'stumpwm'. [properties]: Replace ecl-variant with cl-source-variant. (ecl-stumpwm): Remove variable. (cl-stumpwm): Replace 'sbcl-stumpwm' with 'stumpwm' and adapt. (sbcl-stumpwm+slynk): Deprecate in favor of 'stumpwm+slynk'. [name]: Rename to 'stumpwm-with-slynk'. [inherit, inputs, arguments]: Replace 'sbcl-stumpwm' with 'stumpwm'. Signed-off-by: Oleg Pykhalov --- gnu/packages/lisp.scm | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 5e8b6fdd3d..120d0d5e17 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -928,9 +929,9 @@ from other CLXes around the net.") `(("sbcl-cl-ppcre" ,sbcl-cl-ppcre) ("sbcl-cl-unicode" ,sbcl-cl-unicode))))) -(define-public sbcl-stumpwm +(define-public stumpwm (package - (name "sbcl-stumpwm") + (name "stumpwm") (version "18.05") (source (origin (method url-fetch) @@ -946,7 +947,8 @@ from other CLXes around the net.") ("alexandria" ,sbcl-alexandria))) (outputs '("out" "lib")) (arguments - '(#:phases + '(#:asd-system-name "stumpwm" + #:phases (modify-phases %standard-phases (add-after 'create-symlinks 'build-program (lambda* (#:key outputs #:allow-other-keys) @@ -979,17 +981,15 @@ for input. These design decisions reflect the growing popularity of productive, customizable lisp based systems.") (home-page "https://github.com/stumpwm/stumpwm") (license license:gpl2+) - (properties `((ecl-variant . ,(delay ecl-stumpwm)))))) + (properties `((cl-source-variant . ,(delay cl-stumpwm)))))) -(define-public cl-stumpwm - (sbcl-package->cl-source-package sbcl-stumpwm)) +(define-public sbcl-stumpwm + (deprecated-package "sbcl-stumpwm" stumpwm)) -(define-public ecl-stumpwm - (let ((base (sbcl-package->ecl-package sbcl-stumpwm))) - (package - (inherit base) - (outputs '("out")) - (arguments '())))) +(define-public cl-stumpwm + (package + (inherit (sbcl-package->cl-source-package stumpwm)) + (name "cl-stumpwm"))) ;; The slynk that users expect to install includes all of slynk's contrib ;; modules. Therefore, we build the base module and all contribs first; then @@ -1268,16 +1268,16 @@ multiple inspectors with independent history.") paths) #t))))))) -(define-public sbcl-stumpwm+slynk +(define-public stumpwm+slynk (package - (inherit sbcl-stumpwm) - (name "sbcl-stumpwm-with-slynk") + (inherit stumpwm) + (name "stumpwm-with-slynk") (outputs '("out")) (inputs - `(("stumpwm" ,sbcl-stumpwm "lib") + `(("stumpwm" ,stumpwm "lib") ("slynk" ,sbcl-slynk))) (arguments - (substitute-keyword-arguments (package-arguments sbcl-stumpwm) + (substitute-keyword-arguments (package-arguments stumpwm) ((#:phases phases) `(modify-phases ,phases (replace 'build-program @@ -1301,6 +1301,9 @@ multiple inspectors with independent history.") (delete 'cleanup) (delete 'create-symlinks))))))) +(define-public sbcl-stumpwm+slynk + (deprecated-package "sbcl-stumpwm-with-slynk" stumpwm+slynk)) + (define-public sbcl-parse-js (let ((commit "fbadc6029bec7039602abfc06c73bb52970998f6") (revision "1")) -- cgit v1.3 From 3a2627b83cd18ae2a1f60d45cc726e9077b44fbd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 5 Dec 2018 00:10:11 -0500 Subject: gnu: khal: Disable another test. Normally we shouldn't disable tests just because they fail. However, since the recent glibc update, it's not possible to keep using an old khal, because khal requires locales to be set up properly. * gnu/packages/calendar.scm (khal)[arguments]: Disable a failing test. --- gnu/packages/calendar.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 24e19b472c..a5c677bd4d 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -128,7 +128,9 @@ data units.") ;; running in a TTY: ;; https://github.com/pimutils/khal/issues/683 "not test_printics_read_from_stdin " - "and not test_import_from_stdin"))))))) + "and not test_import_from_stdin " + ;; https://github.com/pimutils/khal/issues/825 + "and not test_description_and_location_and_categories"))))))) (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-cov" ,python-pytest-cov) -- cgit v1.3 From aa00797877e972af9ec68194bde23b9e53f56fbb Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 5 Dec 2018 14:55:02 +0100 Subject: gnu: beets: Make it compatible with Python 3.7. * gnu/packages/music.scm (beets)[arguments]<#:phases> [make-python3.7-compatible]: New phase. --- gnu/packages/music.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b59f258ae5..2314fdc442 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2704,6 +2704,12 @@ Songs can be searched by artist, name or even by a part of the song text.") (lambda _ (setenv "HOME" (string-append (getcwd) "/tmp")) #t)) + (add-after 'unpack 'make-python3.7-compatible + (lambda _ + ;; See . + (substitute* "beets/autotag/hooks.py" + (("re\\._pattern_type") "re.Pattern")) + #t)) (replace 'check (lambda _ (invoke "nosetests" "-v")))))) -- cgit v1.3 From 970ebdae8cef6488c196ed899a774cda54da3588 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Dec 2018 16:16:05 +0100 Subject: services: guix-daemon: Fix authorization of multiple keys. Previously, the 'unless (file-exists? "/etc/guix/acl")' guard would mean that only the first key in the list would get registered since were were generating one registration snippet per key. This fixes that. * gnu/services/base.scm (hydra-key-authorization): Change to be a 'for-each' loop iterating on #$KEYS. --- gnu/services/base.scm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index cee9898d79..89e39f7690 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1499,26 +1499,27 @@ starting at FIRST-UID, and under GID." 1+ 1)) -(define (hydra-key-authorization key guix) - "Return a gexp with code to register KEY, a file containing a 'guix archive' -public key, with GUIX." +(define (hydra-key-authorization keys guix) + "Return a gexp with code to register KEYS, a list of files containing 'guix +archive' public keys, with GUIX." #~(unless (file-exists? "/etc/guix/acl") - (let ((pid (primitive-fork))) - (case pid - ((0) - (let* ((key #$key) - (port (open-file key "r0b"))) - (format #t "registering public key '~a'...~%" key) - (close-port (current-input-port)) - (dup port 0) - (execl #$(file-append guix "/bin/guix") - "guix" "archive" "--authorize") - (exit 1))) - (else - (let ((status (cdr (waitpid pid)))) - (unless (zero? status) - (format (current-error-port) "warning: \ -failed to register public key '~a': ~a~%" key status)))))))) + (for-each (lambda (key) + (let ((pid (primitive-fork))) + (case pid + ((0) + (let* ((port (open-file key "r0b"))) + (format #t "registering public key '~a'...~%" key) + (close-port (current-input-port)) + (dup port 0) + (execl #$(file-append guix "/bin/guix") + "guix" "archive" "--authorize") + (primitive-exit 1))) + (else + (let ((status (cdr (waitpid pid)))) + (unless (zero? status) + (format (current-error-port) "warning: \ +failed to register public key '~a': ~a~%" key status))))))) + '(#$@keys)))) (define %default-authorized-guix-keys ;; List of authorized substitute keys. @@ -1632,8 +1633,7 @@ failed to register public key '~a': ~a~%" key status)))))))) ;; Optionally authorize substitute server keys. (if authorize-key? - #~(begin - #$@(map (cut hydra-key-authorization <> guix) keys)) + (hydra-key-authorization keys guix) #~#f)))) (define* (references-file item #:optional (name "references")) -- cgit v1.3 From c845323d4b0a31ce5241a9d98187e1eeed43f71c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Dec 2018 16:30:58 +0100 Subject: gnu: guix: Update to 0.16.0. --- gnu/packages/package-management.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c5ba65a863..fa5e0af262 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -101,9 +101,9 @@ ;; Latest version of Guix, which may or may not correspond to a release. ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. - (let ((version "0.15.0") - (commit "71a78ba65b00ad1f27086a3dcdded7dc4326ade1") - (revision 8)) + (let ((version "0.16.0") + (commit "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c") + (revision 0)) (package (name "guix") @@ -119,7 +119,7 @@ (commit commit))) (sha256 (base32 - "0isagzccfxjqrc38wamknvh0jzv1pjh0wq5baj9jzwl07xkrc0hc")) + "0lb359byzsnjk558xlgdpv8c5pb7n3b6dhm8rw9nfd9b8yzj589g")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.3 From 676c3adc14f63df0f7a549e518ac87481c0f3e37 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Dec 2018 18:30:16 +0100 Subject: gnu: guix: Update to c845323. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index fa5e0af262..aae8c6a989 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -102,8 +102,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.16.0") - (commit "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c") - (revision 0)) + (commit "c845323d4b0a31ce5241a9d98187e1eeed43f71c") + (revision 1)) (package (name "guix") @@ -119,7 +119,7 @@ (commit commit))) (sha256 (base32 - "0lb359byzsnjk558xlgdpv8c5pb7n3b6dhm8rw9nfd9b8yzj589g")) + "0i431d5p9ckr7kxfiwpp94wgjgqn6mgyypf0smw64bk635fn6ycr")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.3 From 8f11439c365831d7766547c21cff61ecd094a791 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 5 Dec 2018 04:33:47 -0500 Subject: gnu: eyeD3: Update to 0.8.8. * gnu/packages/mp3.scm (eyed3): Update to 0.8.8. --- gnu/packages/mp3.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index c9effbafa3..c7736eeb51 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -470,13 +470,13 @@ compression format (.mpc files).") (define-public eyed3 (package (name "eyed3") - (version "0.8.7") + (version "0.8.8") (source (origin (method url-fetch) (uri (pypi-uri "eyeD3" version)) (sha256 (base32 - "1fzqy6hkg73xvpapdjrdzr3r0fsamnplvjfl7dz7rzgzx2r4x4pg")))) + "197lszkyzm377ym5r0ssryfsiz20yjx8y4rii3wc81n92d1qzlaq")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; the required test data contains copyrighted material. -- cgit v1.3 From 7da4dbb3f241d924a3abc8d7906eccb8eb08d32e Mon Sep 17 00:00:00 2001 From: Rene Date: Wed, 5 Dec 2018 10:02:34 +0100 Subject: gnu: pdfgrep: Update to 2.1.2. * gnu/packages/pdf.scm (pdfgrep): Update to 2.1.2. --- gnu/packages/pdf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 65d7b26df3..4170e4a0ae 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Arun Isaac ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2017 Alex Vong -;;; Copyright © 2017 Rene Saavedra +;;; Copyright © 2017, 2018 Rene Saavedra ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -1001,7 +1001,7 @@ PDF. Indeed @command{pdfposter} was inspired by @command{poster}.") (define-public pdfgrep (package (name "pdfgrep") - (version "2.1.1") + (version "2.1.2") (source (origin (method url-fetch) @@ -1009,7 +1009,7 @@ PDF. Indeed @command{pdfposter} was inspired by @command{poster}.") name "-" version ".tar.gz")) (sha256 (base32 - "02qcl5kmr5qzjfc99qpbpfb1890bxlrq3r208gnding51zrmb09c")))) + "1fia10djcxxl7n9jw2prargw4yzbykk6izig2443ycj9syhxrwqf")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.3 From e9201659799d61b3245f2e5c53ad30c3dc522a72 Mon Sep 17 00:00:00 2001 From: Rene Date: Wed, 5 Dec 2018 07:55:24 +0100 Subject: gnu: balsa: Update to 2.5.6. * gnu/packages/mail.scm (balsa): Update to 2.5.6. [source]: Update URI. --- gnu/packages/mail.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e88b315946..261d1f013d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Kyle Meyer ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice -;;; Copyright © 2017 Rene Saavedra +;;; Copyright © 2017, 2018 Rene Saavedra ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Gábor Boskovits @@ -2424,15 +2424,15 @@ tools and applications: (define-public balsa (package (name "balsa") - (version "2.5.3") + (version "2.5.6") (source (origin (method url-fetch) - (uri (string-append "https://pawsa.fedorapeople.org/balsa/balsa-" - version ".tar.bz2")) + (uri (string-append "https://pawsa.fedorapeople.org/balsa/" + name "-" version ".tar.bz2")) (sha256 (base32 - "15jkwp3ylbwd8iha4dr37z1xb6mkk31ym90vv3h2a5xk2rmym5mq")))) + "17k6wcsl8gki7cskr3hhmfj6n54rha8ca3b6fzd8blsl5shsankx")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.3 From 07df80d19569199a6826c1c01d755d7b4aa757c1 Mon Sep 17 00:00:00 2001 From: Rene Date: Wed, 5 Dec 2018 08:16:34 +0100 Subject: gnu: libfilezilla: Update to 0.15.1. * gnu/packages/ftp.scm (libfilezilla): Update to 0.15.1. [inputs]: Add nettle. --- gnu/packages/ftp.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index b9c6d209b8..6c4efa145c 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -170,7 +170,7 @@ as required.") (define-public libfilezilla (package (name "libfilezilla") - (version "0.14.0") + (version "0.15.1") (source (origin (method url-fetch) @@ -178,11 +178,13 @@ as required.") name "/" name "-" version ".tar.bz2")) (sha256 (base32 - "15cfz98asypf9rfybv4c6kx8nk3wak7qlm1azldc0gd1nqm4xqvz")))) + "17zlhw5b1a7jzh50cbpy2is3sps5lnzch5yf9qm7mwrviw9c8j10")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) ("pkg-config" ,pkg-config))) + (inputs + `(("nettle" ,nettle))) (home-page "https://lib.filezilla-project.org") (synopsis "Cross-platform C++ library used by Filezilla client") (description -- cgit v1.3 From e8338e9101e31971f3151c5e4f5ec87bd3b3e195 Mon Sep 17 00:00:00 2001 From: Rene Date: Wed, 5 Dec 2018 08:51:40 +0100 Subject: gnu: filezilla: Update to 3.39.0. * gnu/packages/ftp.scm (filezilla): Update to 3.39.0. --- gnu/packages/ftp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 6c4efa145c..dd8af33972 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -209,14 +209,14 @@ output. (define-public filezilla (package (name "filezilla") - (version "3.37.4") + (version "3.39.0") (source (origin (method url-fetch) (uri (string-append "https://download.filezilla-project.org/client/" "FileZilla_" version "_src.tar.bz2")) (sha256 - (base32 "169wy7ilsh518mcinkjmr6m0kzxbzchmc9mivf5c9b4zp1w4gg3i")))) + (base32 "0ks42q6mi3qx85zpa98izkyficv2bdh3jnvmy97xjnjyfy9mwlgv")))) (build-system gnu-build-system) (arguments ;; Don't let filezilla phone home to check for updates. -- cgit v1.3 From 07315efc657d668527bb62780206f8abd40682fa Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 5 Dec 2018 15:18:09 -0500 Subject: gnu: Syncthing: Update to 0.14.54. * gnu/packages/syncthing.scm (syncthing): Update to 0.14.54. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 619897ab34..5222354e74 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,7 +30,7 @@ (define-public syncthing (package (name "syncthing") - (version "0.14.53") + (version "0.14.54") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +38,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "0cplg4yw2szvfl91504s567n11qnxvfczzxvj9g1rhczgl7z14v5")) + "1pfjckwsrhy8lbmy42fawgh1gcfmjbh3dfxx05w5yjxnpd1g2z6r")) ;; Since the update to Go 1.11, Go programs have been keeping ;; spurious references to all their dependencies: ;; . -- cgit v1.3 From 9718265eecf8e463405954886be71c4dbd52358a Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 7 Nov 2018 19:39:29 +0000 Subject: gnu: mash: Use C++ 14. I'm looking to upgrade capnproto, and mash fails to build with 0.7. Therefore, tweak the compilation to allow it to build with 0.7. The package also builds with the current version of capnproto. I got the idea of changing the c++ version from here [1]. 1: https://github.com/marbl/Mash/issues/98 * gnu/packages/bioinformatics.scm (mash)[arguments]: Add new use-c++14 phase. --- gnu/packages/bioinformatics.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7c0429a600..e17c53675c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4024,6 +4024,14 @@ sequences).") "src/mash/CommandScreen.cpp") (("^#include \"kseq\\.h\"") "#include \"htslib/kseq.h\"")) + #t)) + (add-after 'fix-includes 'use-c++14 + (lambda _ + ;; capnproto 0.7 requires c++14 to build + (substitute* "configure.ac" + (("c\\+\\+11") "c++14")) + (substitute* "Makefile.in" + (("c\\+\\+11") "c++14")) #t))))) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.3 From 9c5f4b82bb0ed6a0447a68f9cb18c4da5f692acf Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 7 Nov 2018 19:41:46 +0000 Subject: gnu: capnproto: Update to 0.7.0. * gnu/packages/serialization.scm (capnproto): Update to 0.7.0. [arguments]: Add new 'use-tmp-for-tempory-files phase. --- gnu/packages/serialization.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 2df0ce1364..2d61f7451b 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -306,7 +306,7 @@ it a convenient format to store user input files.") (define-public capnproto (package (name "capnproto") - (version "0.6.1") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append @@ -314,7 +314,7 @@ it a convenient format to store user input files.") version ".tar.gz")) (sha256 (base32 - "010s9yhq4531wvdfrdf2477zswhck6cjfby79w73rff3v06090l0")))) + "0hfdnhlbskagzgvby8wy6lrxj53zfzpfqimbhga68c0ji2yw1969")))) (build-system gnu-build-system) (arguments `(#:phases @@ -324,6 +324,14 @@ it a convenient format to store user input files.") ;; Workaround for test that tries to resolve port name from ;; /etc/services, which is not present in build environment. (substitute* "src/kj/async-io-test.c++" ((":http") ":80")) + #t)) + (add-before 'check 'use-tmp-for-tempory-files + (lambda _ + ;; Use /tmp for tempory files, as the default /var/tmp directory + ;; doesn't exist. + (substitute* "src/kj/filesystem-disk-test.c++" + (("VAR\\_TMP \"/var/tmp\"") + "VAR_TMP \"/tmp\"")) #t))))) (home-page "https://capnproto.org") (synopsis "Capability-based RPC and serialization system") -- cgit v1.3 From 17cfb7aeffaaba70e67e9afb50d7100614ffca7f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 5 Dec 2018 07:45:47 +0000 Subject: gnu: ruby-json-pure: Fix build. The version of test-unit used is greater than one of the gemspec files was specifying. It was already being changed in two places, so this commit changes the json-java.gemspec file as well. * gnu/packages/ruby.scm (ruby-json-pure)[arguments]: Add new fix-json-java.gemspec phase. --- gnu/packages/ruby.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2fde016851..52832eeeb8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3010,7 +3010,15 @@ a native C extension.") (lambda _ ;; Regenerate gemspec so loosened dependency constraints are ;; propagated. - (invoke "rake" "gemspec")))))) + (invoke "rake" "gemspec"))) + (add-after 'regenerate-gemspec 'fix-json-java.gemspec + (lambda _ + ;; This gemspec doesn't look to be generated by the above + ;; command, so patch it separately. + (substitute* "json-java.gemspec" + (("%q\\.freeze, \\[\"~> 2\\.0\"\\]") + "%q.freeze, [\">= 2.0\"]")) + #t))))) (native-inputs `(("bundler" ,bundler) ("ragel" ,ragel) -- cgit v1.3 From 4a21d1765d8c158b3f1e9851f106cd8120f6caea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 Dec 2018 16:49:22 +0100 Subject: gnu: nginx: Update to 1.14.2. * gnu/packages/web.scm (nginx): Update to 1.14.2. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 750b760362..d7de40cf75 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -196,14 +196,14 @@ Interface} specification.") (name "nginx") ;; Consider updating the nginx-documentation package if the nginx package is ;; updated. - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "19542jxcjf4dvrqvgb5vr36mhbzcjrxc3v0xh451rm60610rf2dz")))) + "15wppq12qmq8acjs35xfj61czhf9cdc0drnl5mm8hcg3aihryb80")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) -- cgit v1.3 From 3d53869e302540cb9a80cdcbbabea2b67200c0c5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Jun 2018 19:51:23 +0200 Subject: gnu: ldb: Fix build on 32-bit systems. * gnu/packages/samba.scm (ldb)[inputs]: Only add LMDB on 64-bit systems. [arguments]: Make #:tests? conditional on LMDB availability. --- gnu/packages/samba.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 66d0b5a35d..fd9bdd9724 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -365,7 +365,10 @@ many event types, including timers, signals, and the classic file descriptor eve #t)))) (build-system gnu-build-system) (arguments - '(#:phases + '(;; LMDB is only supported on 64-bit systems, yet the test suite + ;; requires it. + #:tests? (assoc-ref %build-inputs "lmdb") + #:phases (modify-phases %standard-phases (replace 'configure ;; ldb use a custom configuration script that runs waf. @@ -385,7 +388,9 @@ many event types, including timers, signals, and the classic file descriptor eve `(("talloc" ,talloc) ("tdb" ,tdb))) (inputs - `(("lmdb" ,lmdb) + `(,@(if (target-64bit?) + `(("lmdb" ,lmdb)) + '()) ("popt" ,popt) ("tevent" ,tevent))) (synopsis "LDAP-like embedded database") -- cgit v1.3 From 178be030c0e4fdeac5e1c968b5c99d84bb4691db Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Dec 2018 17:22:24 +0100 Subject: vm: Add padding in the ISO image. Fixes . Thanks to Ricardo Wurmus and Thomas Schmitt for their suggestions! * gnu/build/vm.scm (make-iso9660-image): Pass "-padding 10m" to xorriso. --- gnu/build/vm.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 746808515f..83ad489cc7 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -477,6 +477,11 @@ GRUB configuration and OS-DRV as the stuff in it." "mnt=/tmp/root/mnt" "-path-list" "-" "--" + + ;; XXX: Add padding to avoid I/O errors on i686: + ;; . + "-padding" "10m" + "-volid" (string-upcase volume-id) (if volume-uuid `("-volume_date" "uuid" -- cgit v1.3 From 68464ea259c87cf9e9eec5858f96e0cdf1d4125c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:06:55 -0500 Subject: gnu: sassc: Fix build. * gnu/packages/web.scm (sassc)[arguments]: Delete bootstrap phase; let phase end on boolean. Signed-off-by: Maxim Cournoyer --- gnu/packages/web.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d7de40cf75..caf56e4119 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1281,12 +1281,14 @@ minimum to provide high performance operation.") #:tests? #f #:phases (modify-phases %standard-phases + (delete 'bootstrap) (delete 'configure) (add-after 'unpack 'unpack-libsass-and-set-path (lambda* (#:key inputs #:allow-other-keys) (invoke "tar" "xvf" (assoc-ref inputs "libsass")) (setenv "SASS_LIBSASS_PATH" - (string-append (getcwd) "/libsass-" ,version))))))) + (string-append (getcwd) "/libsass-" ,version)) + #t))))) (inputs `(("libsass" ,libsass))) (synopsis "CSS pre-processor") -- cgit v1.3 From a18f8eaf61dbc359a1ca724c147e4600553247fb Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Wed, 5 Dec 2018 17:44:28 -0500 Subject: gnu: arc-theme: Update to 20181022 and fix build. * gnu/packages/gnome.scm (arc-theme)[version]: Update to 20181022. [source]: Use new fork, change to git-fetch. [inputs]: Remove and move gtk+ to native-inputs. [native-inputs]: Add gtk+, glib:bin, gnome-shell, inkscape, optipng and sassc. [home-page]: Adapt to new fork. [license]: Fix to GPL 3 or later (gpl3+). Signed-off-by: Maxim Cournoyer --- gnu/packages/gnome.scm | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b497b965bc..fe3c8b86ae 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018 Jovany Leandro G.C ;;; Copyright © 2018 Vasile Dumitrascu +;;; Copyright © 2018 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -95,6 +96,7 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages popt) #:use-module (gnu packages ghostscript) + #:use-module (gnu packages inkscape) #:use-module (gnu packages ibus) #:use-module (gnu packages iso-codes) #:use-module (gnu packages libcanberra) @@ -151,6 +153,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization) #:use-module (gnu packages vpn) + #:use-module (gnu packages web) #:use-module (gnu packages xorg) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) @@ -6435,15 +6438,16 @@ functionality and behavior.") (define-public arc-theme (package (name "arc-theme") - (version "20170302") + (version "20181022") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/horst3180/arc-theme" - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/NicoHood/arc-theme.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0igxpngnkf1wpsg872a9jg3c9f5z8afm312yfbillz16mk8w39cw")))) + "08951dk1irfadwpr3p323a4fprmxg53rk2r2niwq3v62ryhi3663")))) (build-system gnu-build-system) (arguments '(#:phases @@ -6454,16 +6458,20 @@ functionality and behavior.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("pkg-config" ,pkg-config))) - (inputs - `(("gtk+" ,gtk+))) + ("glib" ,glib "bin") ; for glib-compile-resources + ("gnome-shell" ,gnome-shell) + ("gtk+" ,gtk+) + ("inkscape" ,inkscape) + ("optipng" ,optipng) + ("pkg-config" ,pkg-config) + ("sassc" ,sassc))) (synopsis "A flat GTK+ theme with transparent elements") (description "Arc is a flat theme with transparent elements for GTK 3, GTK 2, and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc.") (home-page "https://github.com/horst3180/arc-theme") ;; No "or later" language found. - (license license:gpl3))) + (license license:gpl3+))) (define-public faba-icon-theme (package -- cgit v1.3 From f19dfeeb26b38a59f809b3c49c6e232bc64c108c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Dec 2018 19:18:49 +0100 Subject: gnu: efivar: Update to 37. * gnu/packages/linux.scm (efivar): Update to 37. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9d61734f34..11ac9e6e10 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4049,7 +4049,7 @@ under OpenGL graphics workloads.") (define-public efivar (package (name "efivar") - (version "35") + (version "37") (source (origin (method url-fetch) (uri (string-append "https://github.com/rhboot/" name @@ -4057,7 +4057,7 @@ under OpenGL graphics workloads.") "-" version ".tar.bz2")) (sha256 (base32 - "153k2ifyl4giz5fkryxhz8z621diqjy7v25hfga4z94rs32ks0qy")))) + "17vvfivhsrszh7q39b6npjsrhrhsjf1cmmcpp3xrh6wh7ywzwrrw")))) (build-system gnu-build-system) (arguments `(;; Tests require a UEFI system and is not detected in the chroot. -- cgit v1.3 From 1f9b1d3d974c3f77a8fce950bd07c5006595aaa2 Mon Sep 17 00:00:00 2001 From: Stefan Stefanović Date: Sat, 24 Nov 2018 05:20:29 +0100 Subject: gnu: elogind: Use git-fetch. * gnu/packages/freedesktop.scm (elogind)[source]: Use git-fetch. Signed-off-by: Marius Bakke --- gnu/packages/freedesktop.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 293916c4d2..af8297a75f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -229,13 +229,14 @@ the freedesktop.org XDG Base Directory specification.") (name "elogind") (version "232.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/elogind/elogind/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/elogind/elogind") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1qcxian48z2dj5gfmp7brrngdydqf2jm00f4rjr5sy1myh8fy931")) + "06qqs6yfcwg8aiinqqvy5374pys6sspmvsrqz93c724hqq38d93z")) (patches (search-patches "elogind-glibc-2.27.patch")) (modules '((guix build utils))) (snippet -- cgit v1.3 From 4163f2467bce1a6123f0da1c49e88751d93e634b Mon Sep 17 00:00:00 2001 From: Stefan Stefanović Date: Sat, 24 Nov 2018 06:40:39 +0100 Subject: gnu: elogind: Update to 239.2. * gnu/packages/freedesktop.scm (elogind): Update to 239.2. [source](patches): Remove elogind-glibc-2.27.patch. [source](snippet): Remove snippet. [arguments]: <#:tests?>: Enable tests. <#:configure-flags>: Adjust build paths. Disable some tests. <#:make-flags>: Remove argument. <#:phases>[patch-locale-header]: Remove phase. <#:phases>[clean-runpath]: Add phase. <#:phases>[bootstrap]: Remove phase. <#:phases>[fix-pkttyagent-path]: Add phase. <#:phases>[fix-service-file]: Remove phase. <#:phases>[add-libcap-to-search-path]: Remove phase. <#:phases>[remove-uaccess-tag]: Remove phase. <#:phases>[change-pid-file-path]: Add phase. [build-system]: Switch to meson-build-system. [native-inputs]: Sort native-inputs list. Remove gperf package version constraint. Remove: autoconf, automake, libtool, intltool. Add: docbook-xml-4.2. [inputs]: Remove: linux-libre-headers. * gnu/packages/patches/elogind-glibc-2.27.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove patch file. Signed-off-by: Marius Bakke --- gnu/local.mk | 1 - gnu/packages/freedesktop.scm | 126 +++++++++----------------- gnu/packages/patches/elogind-glibc-2.27.patch | 22 ----- 3 files changed, 43 insertions(+), 106 deletions(-) delete mode 100644 gnu/packages/patches/elogind-glibc-2.27.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 53a3547559..a400e6223e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -666,7 +666,6 @@ dist_patch_DATA = \ %D%/packages/patches/dropbear-CVE-2018-15599.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ - %D%/packages/patches/elogind-glibc-2.27.patch \ %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index af8297a75f..ff74c79f90 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Stefan Stefanović ;;; ;;; This file is part of GNU Guix. ;;; @@ -227,7 +228,7 @@ the freedesktop.org XDG Base Directory specification.") (define-public elogind (package (name "elogind") - (version "232.4") + (version "239.2") (source (origin (method git-fetch) (uri (git-reference @@ -236,101 +237,60 @@ the freedesktop.org XDG Base Directory specification.") (file-name (git-file-name name version)) (sha256 (base32 - "06qqs6yfcwg8aiinqqvy5374pys6sspmvsrqz93c724hqq38d93z")) - (patches (search-patches "elogind-glibc-2.27.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (use-modules (guix build utils)) - (substitute* "Makefile.am" - ;; Avoid validation against DTD because the DTDs for - ;; both doctype 4.2 and 4.5 are needed. - (("XSLTPROC_FLAGS = ") "XSLTPROC_FLAGS = --novalid")) - #t)))) - (build-system gnu-build-system) + "17khwbzqmkfd3hcscs51kzdpvq9p2llm08vbpsdhy9yxgwfzlfa6")))) + (build-system meson-build-system) (arguments - `(#:tests? #f ;FIXME: "make check" in the "po" directory fails. - #:configure-flags - (list (string-append "--with-udevrulesdir=" - (assoc-ref %outputs "out") - "/lib/udev/rules.d") - - ;; Let elogind be its own cgroup controller, rather than relying - ;; on systemd or OpenRC. By default, 'configure' makes an - ;; incorrect guess. - "--with-cgroup-controller=elogind" - - (string-append "--with-rootprefix=" - (assoc-ref %outputs "out")) - (string-append "--with-rootlibexecdir=" - (assoc-ref %outputs "out") - "/libexec/elogind") - ;; These are needed to ensure that lto linking works. - "RANLIB=gcc-ranlib" - "AR=gcc-ar" - "NM=gcc-nm") - #:make-flags '("PKTTYAGENT=/run/current-system/profile/bin/pkttyagent") + `(#:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (sysconf (string-append out "/etc")) + (libexec (string-append out "/libexec/elogind")) + (dbuspolicy (string-append out "/etc/dbus-1/system.d")) + (shepherd (assoc-ref %build-inputs "shepherd")) + (halt-path (string-append shepherd "/sbin/halt")) + (kexec-path "") ;not available in Guix yet + (poweroff-path (string-append shepherd "/sbin/shutdown")) + (reboot-path (string-append shepherd "/sbin/reboot"))) + (list + (string-append "-Drootprefix=" out) + (string-append "-Dsysconfdir=" sysconf) + (string-append "-Drootlibexecdir=" libexec) + (string-append "-Ddbuspolicydir=" dbuspolicy) + (string-append "-Dc_link_args=-Wl,-rpath=" libexec) + (string-append "-Dcpp_link_args=-Wl,-rpath=" libexec) + (string-append "-Dhalt-path=" halt-path) + (string-append "-Dkexec-path=" kexec-path) + (string-append "-Dpoweroff-path=" poweroff-path) + (string-append "-Dreboot-path=" reboot-path) + "-Dcgroup-controller=elogind" + ;; Disable some tests. + "-Dtests=false" + "-Dslow-tests=false")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-locale-header + (add-after 'unpack 'fix-pkttyagent-path (lambda _ - ;; Fix compilation with glibc >= 2.26, which removed xlocale.h. - ;; This can be removed for elogind 234. - (substitute* "src/basic/parse-util.c" - (("xlocale\\.h") "locale.h")) + (substitute* "meson.build" + (("join_paths\\(bindir, 'pkttyagent'\\)") + "'\"/run/current-system/profile/bin/pkttyagent\"'")) #t)) - (replace 'bootstrap + (add-after 'unpack 'change-pid-file-path (lambda _ - (invoke "intltoolize" "--force" "--automake") - (invoke "autoreconf" "-vif"))) - (add-before 'build 'fix-service-file - (lambda* (#:key outputs #:allow-other-keys) - ;; Fix the file name of the 'elogind' binary in the D-Bus - ;; '.service' file. - (substitute* "src/login/org.freedesktop.login1.service" - (("^Exec=.*") - (string-append "Exec=" (assoc-ref %outputs "out") - "/libexec/elogind/elogind\n"))) - #t)) - (add-after 'install 'add-libcap-to-search-path - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Add a missing '-L' for libcap in libelogind.la. See - ;; . - (let ((libcap (assoc-ref inputs "libcap")) - (out (assoc-ref outputs "out"))) - (substitute* (string-append out "/lib/libelogind.la") - (("-lcap") - (string-append "-L" libcap "/lib -lcap"))) - #t))) - (add-after 'unpack 'remove-uaccess-tag - (lambda _ - ;; systemd supports a "uaccess" built-in tag, but eudev currently - ;; doesn't. This leads to eudev warnings that we'd rather not - ;; see, so remove the reference to "uaccess." - (substitute* "src/login/73-seat-late.rules.in" - (("^TAG==\"uaccess\".*" line) - (string-append "# " line "\n"))) + (substitute* "src/login/elogind.c" + (("\"/run/elogind.pid\"") "\"/run/systemd/elogind.pid\"")) #t))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("intltool" ,intltool) - ("gettext" ,gettext-minimal) - ("python" ,python) + `(("docbook-xml" ,docbook-xml) + ("docbook-xml-4.2" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) - ("docbook-xml" ,docbook-xml) - ("xsltproc" ,libxslt) - ("m4" ,m4) + ("gettext" ,gettext-minimal) + ("gperf" ,gperf) ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("m4" ,m4) ("pkg-config" ,pkg-config) - - ;; Use gperf 3.0 to work around - ;; . - ("gperf" ,gperf-3.0))) + ("python" ,python) + ("xsltproc" ,libxslt))) (inputs `(("linux-pam" ,linux-pam) - ("linux-libre-headers" ,linux-libre-headers) ("libcap" ,libcap) ("shepherd" ,shepherd) ;for 'halt' and 'reboot', invoked ;when pressing the power button diff --git a/gnu/packages/patches/elogind-glibc-2.27.patch b/gnu/packages/patches/elogind-glibc-2.27.patch deleted file mode 100644 index 4ade587b5e..0000000000 --- a/gnu/packages/patches/elogind-glibc-2.27.patch +++ /dev/null @@ -1,22 +0,0 @@ -Look for memfd_create in sys/mman.h instead of linux/memfd.h. -Needed to build with glibc-2.27. - ---- a/configure.ac 1969-12-31 19:00:00.000000000 -0500 -+++ b/configure.ac 2018-03-27 23:54:15.414589005 -0400 -@@ -360,7 +360,7 @@ - # ------------------------------------------------------------------------------ - - AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])]) --AC_CHECK_HEADERS([linux/memfd.h], [], []) -+AC_CHECK_HEADERS([sys/mman.h], [], []) - - AC_CHECK_HEADERS([printf.h], [have_printf_h=yes], [have_printf_h=no]) - AS_IF([test x$have_printf_h = xyes], [ -@@ -395,6 +395,7 @@ - [], [], [[ - #include - #include -+#include - #include - #include - #include -- cgit v1.3 From d553ee80828e4b4eb7be59f5278e5d1696b935a0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Dec 2018 21:18:03 +0100 Subject: tests: elogind: Adjust to elogind output change. This is a follow-up to commit 4163f2467bce1a6123f0da1c49e88751d93e634b. * gnu/tests/desktop.scm (run-elogind-test): s|/dev/tty1/tty1. --- gnu/tests/desktop.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests/desktop.scm b/gnu/tests/desktop.scm index be64c4e7e5..6aa22fd49b 100644 --- a/gnu/tests/desktop.scm +++ b/gnu/tests/desktop.scm @@ -50,7 +50,7 @@ ;; Log in as root on tty1, and check what 'loginctl' returns. (test-equal "login on tty1" - '(("c1" "0" "root" "seat0" "/dev/tty1") ;session + '(("c1" "0" "root" "seat0" "tty1") ;session ("seat0") ;seat ("0" "root")) ;user -- cgit v1.3 From e6c28113e6d74c713f8d77bd3d8a543e6871a413 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 6 Dec 2018 15:12:51 -0500 Subject: gnu: QEMU: Fix CVE-2018-16847 and CVE-2018-16867. * gnu/packages/patches/qemu-CVE-2018-16847.patch, gnu/packages/patches/qemu-CVE-2018-16867.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/virtualization.scm (qemu)[source]: Use them. --- gnu/local.mk | 2 + gnu/packages/patches/qemu-CVE-2018-16847.patch | 158 +++++++++++++++++++++++++ gnu/packages/patches/qemu-CVE-2018-16867.patch | 49 ++++++++ gnu/packages/virtualization.scm | 2 + 4 files changed, 211 insertions(+) create mode 100644 gnu/packages/patches/qemu-CVE-2018-16847.patch create mode 100644 gnu/packages/patches/qemu-CVE-2018-16867.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a400e6223e..a35e5ae7e3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1111,6 +1111,8 @@ dist_patch_DATA = \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ + %D%/packages/patches/qemu-CVE-2018-16847.patch \ + %D%/packages/patches/qemu-CVE-2018-16867.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ diff --git a/gnu/packages/patches/qemu-CVE-2018-16847.patch b/gnu/packages/patches/qemu-CVE-2018-16847.patch new file mode 100644 index 0000000000..c76bdf764a --- /dev/null +++ b/gnu/packages/patches/qemu-CVE-2018-16847.patch @@ -0,0 +1,158 @@ +Fix CVE-2018-16847: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-16847 + +Patch copied from upstream source repository: + +https://git.qemu.org/?p=qemu.git;a=commitdiff;h=87ad860c622cc8f8916b5232bd8728c08f938fce + +From 87ad860c622cc8f8916b5232bd8728c08f938fce Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 20 Nov 2018 19:41:48 +0100 +Subject: [PATCH] nvme: fix out-of-bounds access to the CMB +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Because the CMB BAR has a min_access_size of 2, if you read the last +byte it will try to memcpy *2* bytes from n->cmbuf, causing an off-by-one +error. This is CVE-2018-16847. + +Another way to fix this might be to register the CMB as a RAM memory +region, which would also be more efficient. However, that might be a +change for big-endian machines; I didn't think this through and I don't +know how real hardware works. Add a basic testcase for the CMB in case +somebody does this change later on. + +Cc: Keith Busch +Cc: qemu-block@nongnu.org +Reported-by: Li Qiang +Reviewed-by: Li Qiang +Tested-by: Li Qiang +Signed-off-by: Paolo Bonzini +Reviewed-by: Philippe Mathieu-Daudé +Tested-by: Philippe Mathieu-Daudé +Signed-off-by: Kevin Wolf +--- + hw/block/nvme.c | 2 +- + tests/Makefile.include | 2 +- + tests/nvme-test.c | 68 +++++++++++++++++++++++++++++++++++------- + 3 files changed, 60 insertions(+), 12 deletions(-) + +diff --git a/hw/block/nvme.c b/hw/block/nvme.c +index 28d284346dd..8c35cab2b43 100644 +--- a/hw/block/nvme.c ++++ b/hw/block/nvme.c +@@ -1201,7 +1201,7 @@ static const MemoryRegionOps nvme_cmb_ops = { + .write = nvme_cmb_write, + .endianness = DEVICE_LITTLE_ENDIAN, + .impl = { +- .min_access_size = 2, ++ .min_access_size = 1, + .max_access_size = 8, + }, + }; +diff --git a/tests/Makefile.include b/tests/Makefile.include +index 613242bc6ef..fb0b449c02a 100644 +--- a/tests/Makefile.include ++++ b/tests/Makefile.include +@@ -730,7 +730,7 @@ tests/test-hmp$(EXESUF): tests/test-hmp.o + tests/machine-none-test$(EXESUF): tests/machine-none-test.o + tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-virtio-obj-y) + tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y) +-tests/nvme-test$(EXESUF): tests/nvme-test.o ++tests/nvme-test$(EXESUF): tests/nvme-test.o $(libqos-pc-obj-y) + tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o + tests/i82801b11-test$(EXESUF): tests/i82801b11-test.o + tests/ac97-test$(EXESUF): tests/ac97-test.o +diff --git a/tests/nvme-test.c b/tests/nvme-test.c +index 7674a446e4f..2700ba838aa 100644 +--- a/tests/nvme-test.c ++++ b/tests/nvme-test.c +@@ -8,25 +8,73 @@ + */ + + #include "qemu/osdep.h" ++#include "qemu/units.h" + #include "libqtest.h" ++#include "libqos/libqos-pc.h" ++ ++static QOSState *qnvme_start(const char *extra_opts) ++{ ++ QOSState *qs; ++ const char *arch = qtest_get_arch(); ++ const char *cmd = "-drive id=drv0,if=none,file=null-co://,format=raw " ++ "-device nvme,addr=0x4.0,serial=foo,drive=drv0 %s"; ++ ++ if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { ++ qs = qtest_pc_boot(cmd, extra_opts ? : ""); ++ global_qtest = qs->qts; ++ return qs; ++ } ++ ++ g_printerr("nvme tests are only available on x86\n"); ++ exit(EXIT_FAILURE); ++} ++ ++static void qnvme_stop(QOSState *qs) ++{ ++ qtest_shutdown(qs); ++} + +-/* Tests only initialization so far. TODO: Replace with functional tests */ + static void nop(void) + { ++ QOSState *qs; ++ ++ qs = qnvme_start(NULL); ++ qnvme_stop(qs); + } + +-int main(int argc, char **argv) ++static void nvmetest_cmb_test(void) + { +- int ret; ++ const int cmb_bar_size = 2 * MiB; ++ QOSState *qs; ++ QPCIDevice *pdev; ++ QPCIBar bar; + +- g_test_init(&argc, &argv, NULL); +- qtest_add_func("/nvme/nop", nop); ++ qs = qnvme_start("-global nvme.cmb_size_mb=2"); ++ pdev = qpci_device_find(qs->pcibus, QPCI_DEVFN(4,0)); ++ g_assert(pdev != NULL); ++ ++ qpci_device_enable(pdev); ++ bar = qpci_iomap(pdev, 2, NULL); ++ ++ qpci_io_writel(pdev, bar, 0, 0xccbbaa99); ++ g_assert_cmpint(qpci_io_readb(pdev, bar, 0), ==, 0x99); ++ g_assert_cmpint(qpci_io_readw(pdev, bar, 0), ==, 0xaa99); ++ ++ /* Test partially out-of-bounds accesses. */ ++ qpci_io_writel(pdev, bar, cmb_bar_size - 1, 0x44332211); ++ g_assert_cmpint(qpci_io_readb(pdev, bar, cmb_bar_size - 1), ==, 0x11); ++ g_assert_cmpint(qpci_io_readw(pdev, bar, cmb_bar_size - 1), !=, 0x2211); ++ g_assert_cmpint(qpci_io_readl(pdev, bar, cmb_bar_size - 1), !=, 0x44332211); ++ g_free(pdev); + +- qtest_start("-drive id=drv0,if=none,file=null-co://,format=raw " +- "-device nvme,drive=drv0,serial=foo"); +- ret = g_test_run(); ++ qnvme_stop(qs); ++} + +- qtest_end(); ++int main(int argc, char **argv) ++{ ++ g_test_init(&argc, &argv, NULL); ++ qtest_add_func("/nvme/nop", nop); ++ qtest_add_func("/nvme/cmb_test", nvmetest_cmb_test); + +- return ret; ++ return g_test_run(); + } +-- +2.19.2 + diff --git a/gnu/packages/patches/qemu-CVE-2018-16867.patch b/gnu/packages/patches/qemu-CVE-2018-16867.patch new file mode 100644 index 0000000000..1403d8e0f8 --- /dev/null +++ b/gnu/packages/patches/qemu-CVE-2018-16867.patch @@ -0,0 +1,49 @@ +Fix CVE-2018-16867: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-16867 +https://seclists.org/oss-sec/2018/q4/202 + +Patch copied from upstream source repository: + +https://git.qemu.org/?p=qemu.git;a=commitdiff;h=c52d46e041b42bb1ee6f692e00a0abe37a9659f6 + +From c52d46e041b42bb1ee6f692e00a0abe37a9659f6 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Mon, 3 Dec 2018 11:10:45 +0100 +Subject: [PATCH] usb-mtp: outlaw slashes in filenames +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Slash is unix directory separator, so they are not allowed in filenames. +Note this also stops the classic escape via "../". + +Fixes: CVE-2018-16867 +Reported-by: Michael Hanselmann +Signed-off-by: Gerd Hoffmann +Reviewed-by: Philippe Mathieu-Daudé +Message-id: 20181203101045.27976-3-kraxel@redhat.com +--- + hw/usb/dev-mtp.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c +index 0f6a9702ef1..100b7171f4e 100644 +--- a/hw/usb/dev-mtp.c ++++ b/hw/usb/dev-mtp.c +@@ -1719,6 +1719,12 @@ static void usb_mtp_write_metadata(MTPState *s) + + filename = utf16_to_str(dataset->length, dataset->filename); + ++ if (strchr(filename, '/')) { ++ usb_mtp_queue_result(s, RES_PARAMETER_NOT_SUPPORTED, d->trans, ++ 0, 0, 0, 0); ++ return; ++ } ++ + o = usb_mtp_object_lookup_name(p, filename, dataset->length); + if (o != NULL) { + next_handle = o->handle; +-- +2.19.2 + diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 2f8e541d40..0502bb38c4 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -100,6 +100,8 @@ (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) + (patches (search-patches "qemu-CVE-2018-16847.patch" + "qemu-CVE-2018-16867.patch")) (sha256 (base32 "04sp3f1gp4bdb913jf7fw761njaqp2l32wgipp1sapmxx17zcyld")))) -- cgit v1.3 From 1ecd6624ab304fa50b9cd5ce33b8168e9c556ec5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 6 Dec 2018 17:15:37 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.143. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.143. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 11ac9e6e10..cfd8db8a4c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -433,8 +433,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.142" - "0a7c41m41p83byn68cfixq460sy73ahwcx9y3xm6cv05grqza8zh" + (make-linux-libre "4.9.143" + "0vg6hs7vc09riyki8lyy73p3ghl6k9q4xfv7dals4s9q61i6b6d6" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.3 From 8b041fd21d18267e1a35fb6e6574e21e426c8b1b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 6 Dec 2018 17:16:27 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.86. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.86. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cfd8db8a4c..20e17eea5b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -423,8 +423,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.19-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.85") -(define %linux-libre-4.14-hash "1jh11y6jakkp3xlq9jbf2myfjzbccjx1iyhd6ny7r9cjkv6r5i5i") +(define %linux-libre-4.14-version "4.14.86") +(define %linux-libre-4.14-hash "1w98drq4ns2awwrbbkd6vy9fh219w8bfjfni5zndfycs5yh5hg65") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.3 From 69f867b18f42c5a5de26fa55acbe1091635073d7 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 6 Dec 2018 17:17:23 -0500 Subject: gnu: linux-libre: Update to 4.19.7. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.19.7. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 20e17eea5b..12c0033196 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -400,8 +400,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.19.6") -(define %linux-libre-hash "1ybi878li06algbv2pdwn81jlh038pfvzz3axn1bzic9p4c9rjhf") +(define %linux-libre-version "4.19.7") +(define %linux-libre-hash "1fj038hz6b7g9gdiw9kggydryf8dvrdsfn81snns9bn5b01yp67n") (define %linux-libre-4.19-patches (list %boot-logo-patch -- cgit v1.3 From 5118e26f83cc2b4ec835df56bee2a4003c1325b9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Dec 2018 00:06:51 +0100 Subject: gnu: guix-daemon: Add dependency on Guile-JSON. Fixes a bug introduced in 6776af04d4b65c5a9a07784307a6abe395b6f480, where the configure phase of 'guix-daemon' would abort due to the lack of Guile-JSON. * gnu/packages/package-management.scm (guix-daemon)[inputs]: Add GUILE-JSON. --- gnu/packages/package-management.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index aae8c6a989..588f8bbcef 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -316,6 +316,7 @@ the Nix package manager.") (inputs `(("gnutls" ,gnutls) ("guile-git" ,guile-git) + ("guile-json" ,guile-json) ("guile-gcrypt" ,guile-gcrypt) ,@(fold alist-delete (package-inputs guix) '("boot-guile" "boot-guile/i686" "util-linux")))) -- cgit v1.3 From 705ea5bff6a2803e8ec24652090e78b3a6f2babc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 7 Dec 2018 13:43:43 +0100 Subject: gnu: Add r-fmsb. * gnu/packages/cran.scm (r-fmsb): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f08a204fb8..423bb5b54f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7754,3 +7754,24 @@ circular variables).") "This package provides tools to fit and compare Ornstein-Uhlenbeck models for evolution along a phylogenetic tree.") (license license:gpl2+))) + +(define-public r-fmsb + (package + (name "r-fmsb") + (version "0.6.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "fmsb" version)) + (sha256 + (base32 + "1n29bnyp20pvpk2lsa9fblsj5w7amp14snc74pk5w3yr5y6rj0s5")))) + (build-system r-build-system) + (home-page "http://minato.sip21c.org/msb/") + (synopsis "Functions for medical statistics book with demographic data") + (description + "This package provides several utility functions for the book entitled +\"Practices of Medical and Health Data Analysis using R\" (Pearson Education +Japan, 2007) with Japanese demographic data and some demographic analysis +related functions.") + (license license:gpl2+))) -- cgit v1.3 From 814652b41f0da9e84f9f526e2a2e2c5ebfd66970 Mon Sep 17 00:00:00 2001 From: Diego Nicola Barbato Date: Fri, 7 Dec 2018 11:47:28 +0100 Subject: gnu: emacs-exwm: Update to 0.21. * gnu/packages/emacs.scm (emacs-exwm): Update to 0.21. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 50705416a0..d8a9ffeaed 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6787,7 +6787,7 @@ It should enable you to implement low-level X11 applications.") (define-public emacs-exwm (package (name "emacs-exwm") - (version "0.20") + (version "0.21") (synopsis "Emacs X window manager") (source (origin (method url-fetch) @@ -6795,7 +6795,7 @@ It should enable you to implement low-level X11 applications.") version ".tar")) (sha256 (base32 - "0nhhzbkm0mkj7sd1dy2c19cmn56gyaj9nl8kgy86h4fp63hjaz04")))) + "07ng1pgsnc3isfsyzh2gfc7391p9il8lb5xqf1z6yqn20w7k6xzj")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xelb" ,emacs-xelb))) -- cgit v1.3 From 6eac835f178c0c78637b0db8a4585a617b2f7622 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Dec 2018 14:16:07 +0100 Subject: maint: update-guix-package: Really register GC roots. Previously we'd pass a relative file name to 'add-indirect-root', which the daemon would interpret as relative to "/". Consequently, checkouts were not protected from GC. * build-aux/update-guix-package.scm (main): Pass an absolute file name to 'add-indirect-root'. --- build-aux/update-guix-package.scm | 5 +++-- gnu/packages/package-management.scm | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/build-aux/update-guix-package.scm b/build-aux/update-guix-package.scm index 9598872dfd..83f6eca6bb 100644 --- a/build-aux/update-guix-package.scm +++ b/build-aux/update-guix-package.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2017, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -133,7 +133,8 @@ COMMIT." ;; Add an indirect GC root for SOURCE in the current directory. (false-if-exception (delete-file root)) (symlink source root) - (add-indirect-root store root) + (add-indirect-root store + (string-append (getcwd) "/" root)) (format #t "source code for commit ~a: ~a (GC root: ~a)~%" commit source root))))) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 588f8bbcef..4dd025786b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -102,8 +102,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.16.0") - (commit "c845323d4b0a31ce5241a9d98187e1eeed43f71c") - (revision 1)) + (commit "5227d938e2b7bda22e2a7aa733e1e09a6c726f18") + (revision 2)) (package (name "guix") @@ -119,7 +119,7 @@ (commit commit))) (sha256 (base32 - "0i431d5p9ckr7kxfiwpp94wgjgqn6mgyypf0smw64bk635fn6ycr")) + "0v1a99k0qpxa5ksgqqwydd1nb00hkd71fj7374rqhklvk0a2cdz9")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.3 From 23a1f738b1ef83c3dcb329e1c68617b0452e6a07 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 7 Dec 2018 15:36:54 +0100 Subject: gnu: guix: Update to 6ddc63e599a26c. This fixes a problem introduced with commit 6eac835f178c0c78637b0db8a4585a617b2f7622. Reported on the #guix IRC channel by tune. * gnu/packages/package-management.scm (guix): Update to 6ddc63e599a26c. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 4dd025786b..ae8612491f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -102,8 +102,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.16.0") - (commit "5227d938e2b7bda22e2a7aa733e1e09a6c726f18") - (revision 2)) + (commit "6ddc63e599a26c302f74d0622f67cfd987f0dc5f") + (revision 3)) (package (name "guix") @@ -119,7 +119,7 @@ (commit commit))) (sha256 (base32 - "0v1a99k0qpxa5ksgqqwydd1nb00hkd71fj7374rqhklvk0a2cdz9")) + "0vzxrsfbr4phhy60m7pc6klb61whqc404c3x76ydj70xvi1xa0wz")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.3 From b9103c827c605dee32baf62816a0429543b3e451 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 5 Dec 2018 01:28:00 -0500 Subject: gnu: Add a C++14 variant of Boost for packages that need it. Fixes and . * gnu/packages/boost.scm (boost-cxx14): New variable. * gnu/packages/compression.scm (innoextract)[inputs]: Use it. * gnu/packages/mpd.scm (ncmpcpp)[inputs]: Use it. --- gnu/packages/boost.scm | 10 ++++++++++ gnu/packages/compression.scm | 2 +- gnu/packages/mpd.scm | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index b772781f56..f9108b3ad6 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -122,6 +122,16 @@ across a broad spectrum of applications.") (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt" "Some components have other similar licences.")))) +;; Some programs need Boost to be built with C++14 support. +(define-public boost-cxx14 + (package (inherit boost) + (arguments + (substitute-keyword-arguments (package-arguments boost) + ((#:make-flags flags) + `(append ,flags + '("cxxflags=-std=c++14"))))) + (properties '((hidden? . #t))))) + (define-public boost-for-mysql ;; Older version for MySQL 5.7.23. (package diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 32b92a976c..e8a50c676c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2263,7 +2263,7 @@ single-member files which can't be decompressed in parallel.") (build-system cmake-build-system) (arguments `(#:tests? #f)) ;; No tests available. - (inputs `(("boost" ,boost) + (inputs `(("boost" ,boost-cxx14) ("libiconv" ,libiconv) ("xz" ,xz))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index fe8610ab94..0a81a3b8b8 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -244,7 +244,7 @@ terminal using ncurses.") "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5")))) (build-system gnu-build-system) (inputs `(("libmpdclient" ,libmpdclient) - ("boost" ,boost) + ("boost" ,boost-cxx14) ("readline" ,readline) ("ncurses" ,ncurses) ("taglib" ,taglib) -- cgit v1.3 From 46c8cea27b6f81f61c14579ad606004d98d3ac55 Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Fri, 30 Nov 2018 23:25:37 +0530 Subject: gnu: qjackctl: Update 0.5.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (qjackctl): Update to 0.5.5. Signed-off-by: 宋文武 --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index a65cfa238e..66bc7e7f53 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2118,14 +2118,14 @@ and ALSA.") (define-public qjackctl (package (name "qjackctl") - (version "0.5.4") + (version "0.5.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" version "/qjackctl-" version ".tar.gz")) (sha256 (base32 - "0qr71nb93gkz5q53nfcl5g168z173wc6s8w1yjs3rfn3m4hg0bcq")))) + "1rzzqa39a6llr52vjkjr0a86nc776kmr5xs52qqga8ms9697psz5")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no check target -- cgit v1.3 From f9dcf79f4752708554a452aa80a0987ab0e31754 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Dec 2018 09:06:22 +0100 Subject: gnu: ingen: Fix build. Fixes . * gnu/packages/music.scm (ingen)[arguments]: Use python-2. --- gnu/packages/music.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2314fdc442..eafc38796e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3305,7 +3305,8 @@ plugins, a switch trigger, a toggle switch, and a peakmeter.") "1wg47vjw9djn99gbnsl2bcwj4xhdid61m4wrbn2nlp797flj91ic")))) (build-system waf-build-system) (arguments - `(#:tests? #f ; no "check" target + `(#:python ,python-2 + #:tests? #f ; no "check" target #:configure-flags (list "--no-webkit") #:phases (modify-phases %standard-phases -- cgit v1.3 From ec60c3a58137ddb3c135999c3e7ccb90d51e3185 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 2 Dec 2018 13:31:41 +1100 Subject: gnu: calibre: Update to 3.35.0. * gnu/packages/ebooks.scm: (calibre): Update to 3.35.0. Signed-off-by: Andreas Enge --- gnu/packages/ebook.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index a78e3e871f..e750c6cac8 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -75,7 +75,7 @@ (define-public calibre (package (name "calibre") - (version "3.28.0") + (version "3.35.0") (source (origin (method url-fetch) @@ -84,7 +84,7 @@ version ".tar.xz")) (sha256 (base32 - "0b3vv03c6m6972sk8zj3zc5sq6b9837irnfgjlqhv9z5i75m0414")) + "1gd15wjz4fhcra6d44xiy3hwbyk0miwb66a1pq5yldyy0hlb271z")) ;; Remove non-free or doubtful code, see ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html (modules '((guix build utils))) -- cgit v1.3 From 5537603fbf43525ab6a5ba9a4e911ae3ad9f712a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 1 Dec 2018 23:15:14 -0500 Subject: gnu: Rename "octave" to "octave-cli". * gnu/packages/maths.scm (octave): Rename to... (octave-cli): ...this. [name]: Change to "octave-cli". (qtoctave): Inherit from octave-cli. (flann)[inputs]: Adjust accordingly. * gnu/packages/engineering.scm (qucs)[inputs]: Likewise. (qucs-s)[inputs]: Likewise. * gnu/packages/machine-learning.scm (shogun)[inputs]: Likewise. --- gnu/packages/engineering.scm | 4 ++-- gnu/packages/machine-learning.scm | 2 +- gnu/packages/maths.scm | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 8ef9a5c277..308501f882 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1709,7 +1709,7 @@ parallel computing platforms. It also supports serial execution.") ("gcc-toolchain" ,gcc-toolchain) ("iverilog" ,iverilog) ("libtool" ,libtool) - ("octave" ,octave) + ("octave" ,octave-cli) ("qt4" ,qt-4) ("sed" ,sed))) (home-page "http://qucs.sourceforge.net/") @@ -1839,7 +1839,7 @@ simulations are also supported.") ("libtool" ,libtool) ("mpi" ,openmpi) ("ngspice" ,ngspice) - ("octave" ,octave) + ("octave" ,octave-cli) ("qt4" ,qt-4) ("qucs" ,qucs) ("sed" ,sed) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 3f525e39a5..084e62cca4 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -495,7 +495,7 @@ sample proximities between pairs of cases.") `(("python" ,python) ("numpy" ,python-numpy) ("r-minimal" ,r-minimal) - ("octave" ,octave) + ("octave" ,octave-cli) ("swig" ,swig) ("eigen" ,eigen) ("hdf5" ,hdf5) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f88cede68a..e2f3e662c7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1413,9 +1413,9 @@ can solve two kinds of problems: ;; For a fully featured Octave, users are strongly recommended also to install ;; the following packages: less, ghostscript, gnuplot. -(define-public octave +(define-public octave-cli (package - (name "octave") + (name "octave-cli") (version "4.4.1") (source (origin @@ -1498,20 +1498,20 @@ script files.") (license license:gpl3+))) (define-public qtoctave - (package (inherit octave) + (package (inherit octave-cli) (name "qtoctave") (source (origin - (inherit (package-source octave)))) + (inherit (package-source octave-cli)))) (inputs `(("qscintilla" ,qscintilla) ("qt" ,qtbase) - ,@(package-inputs octave))) + ,@(package-inputs octave-cli))) (native-inputs `(("qttools" , qttools) ;for lrelease ("texlive" ,texlive) ;for texi2dvi - ,@(package-native-inputs octave))) + ,@(package-native-inputs octave-cli))) (arguments - (substitute-keyword-arguments (package-arguments octave) + (substitute-keyword-arguments (package-arguments octave-cli) ((#:phases phases) `(modify-phases ,phases (add-before 'configure 'patch-qscintilla-library-name @@ -3580,7 +3580,7 @@ in finite element programs.") `(("unzip" ,unzip))) (inputs `(("hdf5" ,hdf5) - ("octave" ,octave) + ("octave" ,octave-cli) ("python" ,python-2) ; print syntax ;; ("python2-numpy" ,python2-numpy) ; only required for the tests ("zlib" ,zlib))) -- cgit v1.3 From e0ae7e73746e99dc0fdd1f86e6d0299827cf9d98 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 1 Dec 2018 23:37:50 -0500 Subject: gnu: Rename "qtoctave" to "octave". * gnu/packages/maths.scm (qtoctave): Define in terms of 'deprectated-package'. (octave): New variable, formerly known as "qtoctave". --- gnu/packages/maths.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e2f3e662c7..e088869682 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1497,9 +1497,9 @@ Work may be performed both at the interactive command-line as well as via script files.") (license license:gpl3+))) -(define-public qtoctave +(define-public octave (package (inherit octave-cli) - (name "qtoctave") + (name "octave") (source (origin (inherit (package-source octave-cli)))) (inputs @@ -1525,6 +1525,9 @@ script files.") "qscintilla2_qt5")) #t)))))))) +(define-public qtoctave + (deprecated-package "qtoctave" octave)) + (define-public opencascade-oce (package (name "opencascade-oce") -- cgit v1.3 From 91206dffb901ab4d881b6e16cdfbcfd9ba32f357 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Dec 2018 19:53:30 +0100 Subject: gnu: elogind: Update to 239.3. * gnu/packages/freedesktop.scm (elogind): Update to 239.3. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ff74c79f90..8982c0ec35 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -228,7 +228,7 @@ the freedesktop.org XDG Base Directory specification.") (define-public elogind (package (name "elogind") - (version "239.2") + (version "239.3") (source (origin (method git-fetch) (uri (git-reference @@ -237,7 +237,7 @@ the freedesktop.org XDG Base Directory specification.") (file-name (git-file-name name version)) (sha256 (base32 - "17khwbzqmkfd3hcscs51kzdpvq9p2llm08vbpsdhy9yxgwfzlfa6")))) + "1gipnbnlz5k3gxv33wyhi2zd94hlfa9lm360p8z6w5i9s8dzhf52")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.3 From 8d65ae44ac9492b17266aa1bbe04d562e904946a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Dec 2018 00:43:36 +0100 Subject: gnu: GCC@6: Update to 6.5.0. * gnu/packages/patches/gcc-libsanitizer-fix.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/gcc.scm (gcc-6): Update to 6.5.0. [source](patches): Drop obsolete patches. [source](snippet): Remove. --- gnu/local.mk | 1 - gnu/packages/gcc.scm | 24 +---- gnu/packages/patches/gcc-libsanitizer-fix.patch | 113 ------------------------ 3 files changed, 4 insertions(+), 134 deletions(-) delete mode 100644 gnu/packages/patches/gcc-libsanitizer-fix.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 52451b8c38..ae3aee7c21 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -715,7 +715,6 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \ %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch \ %D%/packages/patches/gcc-4.9-libsanitizer-ustat.patch \ - %D%/packages/patches/gcc-libsanitizer-fix.patch \ %D%/packages/patches/gcc-libsanitizer-ustat.patch \ %D%/packages/patches/gcc-libvtv-runpath.patch \ %D%/packages/patches/gcc-strmov-store-file-names.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 8207104174..fb06b53474 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -461,34 +461,18 @@ Go. It also includes runtime support libraries for these languages.") (define-public gcc-6 (package (inherit gcc-5) - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "1m0lr7938lw5d773dkvwld90hjlcq2282517d1gwvrfzmwgg42w5")) - (patches (search-patches "gcc-libsanitizer-fix.patch" - "gcc-libsanitizer-ustat.patch" - "gcc-strmov-store-file-names.patch" + "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby")) + (patches (search-patches "gcc-strmov-store-file-names.patch" "gcc-6-source-date-epoch-1.patch" "gcc-6-source-date-epoch-2.patch" - "gcc-5.0-libvtv-runpath.patch")) - (modules '((guix build utils))) - ;; This is required for building with glibc-2.26. - ;; This can be removed when gcc-6.5.0 is released. - ;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712 - (snippet - '(begin - (for-each - (lambda (dir) - (substitute* (string-append "libgcc/config/" - dir "/linux-unwind.h") - (("struct ucontext") "ucontext_t"))) - '("aarch64" "alpha" "bfin" "i386" "m68k" "nios2" - "pa" "sh" "tilepro" "xtensa")) - #t)))) + "gcc-5.0-libvtv-runpath.patch")))) (inputs `(("isl" ,isl) ,@(package-inputs gcc-4.7))) diff --git a/gnu/packages/patches/gcc-libsanitizer-fix.patch b/gnu/packages/patches/gcc-libsanitizer-fix.patch deleted file mode 100644 index 67aa44bed4..0000000000 --- a/gnu/packages/patches/gcc-libsanitizer-fix.patch +++ /dev/null @@ -1,113 +0,0 @@ -https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=8937b94d1a643fd9760714642296d034a45254a8 -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81066 - -This patch can be removed when gcc-6.5.0 is released - -From 8937b94d1a643fd9760714642296d034a45254a8 Mon Sep 17 00:00:00 2001 -From: doko -Date: Thu, 7 Sep 2017 07:15:24 +0000 -Subject: [PATCH] 2017-09-07 Matthias Klose - - Backported from mainline - 2017-07-14 Jakub Jelinek - - PR sanitizer/81066 - * sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969. - * sanitizer_common/sanitizer_linux.cc: Likewise. - * sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise. - * tsan/tsan_platform_linux.cc: Likewise. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@251828 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - libsanitizer/ChangeLog | 11 +++++++++++ - libsanitizer/sanitizer_common/sanitizer_linux.cc | 3 +-- - libsanitizer/sanitizer_common/sanitizer_linux.h | 4 +--- - .../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +- - libsanitizer/tsan/tsan_platform_linux.cc | 2 +- - 5 files changed, 15 insertions(+), 7 deletions(-) - -diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog -index 252cd09..d988b28 100644 ---- a/libsanitizer/ChangeLog -+++ b/libsanitizer/ChangeLog -@@ -1,3 +1,14 @@ -+2017-09-07 Matthias Klose -+ -+ Backported from mainline -+ 2017-07-14 Jakub Jelinek -+ -+ PR sanitizer/81066 -+ * sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969. -+ * sanitizer_common/sanitizer_linux.cc: Likewise. -+ * sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise. -+ * tsan/tsan_platform_linux.cc: Likewise. -+ - 2017-07-04 Release Manager - - * GCC 6.4.0 released. -diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc -index 2cefa20..223d9c6 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_linux.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc -@@ -546,8 +546,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { - } - #endif - --uptr internal_sigaltstack(const struct sigaltstack *ss, -- struct sigaltstack *oss) { -+uptr internal_sigaltstack(const void *ss, void *oss) { - return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss); - } - -diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h -index 4497702..1594058 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_linux.h -+++ b/libsanitizer/sanitizer_common/sanitizer_linux.h -@@ -19,7 +19,6 @@ - #include "sanitizer_platform_limits_posix.h" - - struct link_map; // Opaque type returned by dlopen(). --struct sigaltstack; - - namespace __sanitizer { - // Dirent structure for getdents(). Note that this structure is different from -@@ -28,8 +27,7 @@ struct linux_dirent; - - // Syscall wrappers. - uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); --uptr internal_sigaltstack(const struct sigaltstack* ss, -- struct sigaltstack* oss); -+uptr internal_sigaltstack(const void* ss, void* oss); - uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set, - __sanitizer_sigset_t *oldset); - void internal_sigfillset(__sanitizer_sigset_t *set); -diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -index c919e4f..014162af 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -@@ -267,7 +267,7 @@ static int TracerThread(void* argument) { - - // Alternate stack for signal handling. - InternalScopedBuffer handler_stack_memory(kHandlerStackSize); -- struct sigaltstack handler_stack; -+ stack_t handler_stack; - internal_memset(&handler_stack, 0, sizeof(handler_stack)); - handler_stack.ss_sp = handler_stack_memory.data(); - handler_stack.ss_size = kHandlerStackSize; -diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc -index 09cec5f..908f4fe 100644 ---- a/libsanitizer/tsan/tsan_platform_linux.cc -+++ b/libsanitizer/tsan/tsan_platform_linux.cc -@@ -291,7 +291,7 @@ bool IsGlobalVar(uptr addr) { - int ExtractResolvFDs(void *state, int *fds, int nfd) { - #if SANITIZER_LINUX - int cnt = 0; -- __res_state *statp = (__res_state*)state; -+ struct __res_state *statp = (struct __res_state*)state; - for (int i = 0; i < MAXNS && cnt < nfd; i++) { - if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) - fds[cnt++] = statp->_u._ext.nssocks[i]; --- -2.9.3 - -- cgit v1.3 From 7570ec5aa96d459aa41ddfaf459a883be89848d4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Dec 2018 00:44:44 +0100 Subject: gnu: GCC@7: Update to 7.4.0. * gnu/packages/gcc.scm (gcc-7): Update to 7.4.0. [source](patches): Drop 'gcc-libsanitizer-ustat.patch'. * gnu/packages/storage.scm (ceph)[inputs]: Change from BOOST to BOOST-CXX14, as GCC 7.4.0 triggers . --- gnu/packages/gcc.scm | 5 ++--- gnu/packages/storage.scm | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index fb06b53474..1f1e80dde8 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -490,16 +490,15 @@ Go. It also includes runtime support libraries for these languages.") (define-public gcc-7 (package (inherit gcc-6) - (version "7.3.0") + (version "7.4.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43")) + "0lgy170b0pp60j9cczqkmaqyjjb584vfamj4c30swd7k0j6y5pgd")) (patches (search-patches "gcc-strmov-store-file-names.patch" - "gcc-libsanitizer-ustat.patch" "gcc-5.0-libvtv-runpath.patch")))) (description "GCC is the GNU Compiler Collection. It provides compiler front-ends diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 5051ccd986..4eae37815e 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -321,7 +321,7 @@ ("python2-testtools" ,python2-testtools) ("python2-tox" ,python2-tox))) (inputs - `(("boost" ,boost) + `(("boost" ,boost-cxx14) ("curl" ,curl) ("cryptsetup" ,cryptsetup) ("expat" ,expat) -- cgit v1.3 From 6fac106491e777b997e05b215fecba11808435f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Dec 2018 01:16:34 +0100 Subject: gnu: feh: Update to 3.1.1. * gnu/packages/image-viewers.scm (feh): Update to 3.1.1. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 8e70f1fdfc..62f6674691 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -61,7 +61,7 @@ (define-public feh (package (name "feh") - (version "3.1") + (version "3.1.1") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -69,7 +69,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "01rrl009m1kxwvqqr98y4wk8m1al18fkxwv8cds2k7n4qiv6xdb7")))) + "1sy8z6rv5sy1bhk3846hgfdy96wdi874yr2fnxfprks46qp29l31")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.3 From 8a831c6f0699953a878dae07250c17a34a6025bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Dec 2018 02:02:51 +0100 Subject: gnu: Remove more GCC ICE workarounds. These were fixed with . * gnu/packages/glib.scm (python-pygobject, python2-pygobject)[native-inputs]: Remove GCC-7. * gnu/packages/gnome.scm (gjs)[native-inputs]: Likewise. [arguments]: Remove related phase. --- gnu/packages/glib.scm | 13 ++----------- gnu/packages/gnome.scm | 14 +------------- 2 files changed, 3 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 491f688c8e..cd9b48caff 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -36,7 +36,6 @@ #:use-module (gnu packages enlightenment) #:use-module (gnu packages file) #:use-module (gnu packages flex) - #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gperf) @@ -621,11 +620,7 @@ useful for C++.") (delete-file "tests/test_ossig.py") #t))))) (native-inputs - `(;; Use gcc-7 to work around an internal compiler error that happens - ;; when using gcc-5.5.0. FIXME: Try removing this when the default - ;; compiler is no longer gcc-5.5.0. - ("gcc" ,gcc-7) - ("which" ,which) + `(("which" ,which) ;for tests: dbus-run-session and glib-compile-schemas ("dbus" ,dbus) ("glib-bin" ,glib "bin") @@ -656,11 +651,7 @@ useful for C++.") ("python-pycairo" ,python2-pycairo) ("gobject-introspection" ,gobject-introspection))) (native-inputs - `(;; Use gcc-7 to work around an internal compiler error that happens - ;; when using gcc-5.5.0. FIXME: Try removing this when the default - ;; compiler is no longer gcc-5.5.0. - ("gcc" ,gcc-7) - ("which" ,which) + `(("which" ,which) ;for tests: dbus-run-session and glib-compile-schemas ("dbus" ,dbus) ("glib-bin" ,glib "bin") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fe3c8b86ae..415398eeee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4633,14 +4633,6 @@ configuration program to choose applications starting on login.") (arguments '(#:phases (modify-phases %standard-phases - (add-after 'set-paths 'work-around-gcc-7-include-path-issue - ;; FIXME: Work around a problem with gcc-7 includes (see - ;; ). Note that we use gcc-7 - ;; to work around an internal compiler error in gcc-5. - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) (add-before 'check 'pre-check (lambda _ @@ -4658,11 +4650,7 @@ configuration program to choose applications starting on login.") ((".*expect\\(datestr\\).*") "")) #t))))) (native-inputs - `(("gcc" ,gcc-7) ; FIXME: Work around an internal compiler error in - ; gcc-5. Try removing this when our default compiler is - ; no longer gcc-5.5.0, and also remove the - ; 'work-around-gcc-7-include-path-issue' phase above. - ("glib:bin" ,glib "bin") ; for glib-compile-resources + `(("glib:bin" ,glib "bin") ; for glib-compile-resources ("pkg-config" ,pkg-config) ("xmllint" ,libxml2) ;; For testing -- cgit v1.3 From 08861d259b453442c38fe93477bc62d2080b1442 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Dec 2018 19:06:31 +0100 Subject: gnu: python-pyaml: Update to 18.11.0. * gnu/packages/python.scm (python-pyaml): Update to 18.11.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d0401b7bdd..9472a441ef 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9759,13 +9759,13 @@ addresses, and phone numbers.") (define-public python-pyaml (package (name "python-pyaml") - (version "17.7.2") + (version "18.11.0") (source (origin (method url-fetch) (uri (pypi-uri "pyaml" version)) (sha256 (base32 - "132grrw0ajq4nrappi3ldbkb952k7yn9b6c7csi2rmvzm1g6ppp2")))) + "0fi604ix8lbpj1266q7js6szm771saprdzzcdwmj43wy83694qmr")))) (build-system python-build-system) (native-inputs `(("python-unidecode" ,python-unidecode))) -- cgit v1.3 From 4ad62876cb85ebab8e8607afb5e90844acbcfafd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Dec 2018 22:47:41 +0200 Subject: gnu: quassel: Update to 0.13.0. * gnu/packages/irc.scm (quassel): Update to 0.13.0. [arguments]: Update configure flags. [inputs]: Add qtmultimedia. --- gnu/packages/irc.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 4f4e494ee5..9ca26d909c 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -65,7 +65,7 @@ (define-public quassel (package (name "quassel") - (version "0.12.5") + (version "0.13.0") (source (origin (method url-fetch) @@ -73,7 +73,7 @@ version ".tar.bz2")) (sha256 (base32 - "1qkl3sb4ijx4k17m0c42j2p5bc4jymypwhmplm942rbrzm6mg50q")) + "0xp9mppxl63qzgsdyprmblvfrj0bb9z57kfc088gvcavvq1210nr")) (modules '((guix build utils))) ;; We don't want to install the bundled scripts. (snippet @@ -86,13 +86,13 @@ (arguments ;; The three binaries are not mutually exlusive, and are all built ;; by default. - '(#:configure-flags '(;;"-DWANT_QTCLIENT=OFF" ; 5.2 MiB - ;;"-DWANT_CORE=OFF" ; 2.4 MiB - ;;"-DWANT_MONO=OFF" ; 6.4 MiB - "-DUSE_QT5=ON" ; default is qt4 + '(#:configure-flags '(;;"-DWANT_QTCLIENT=OFF" ; 6.1 MiB + ;;"-DWANT_CORE=OFF" ; 3.0 MiB + ;;"-DWANT_MONO=OFF" ; 7.6 MiB "-DWITH_KDE=OFF" ; no to kde integration ... - "-DWITH_OXYGEN=ON" ; therefore we install bundled icons - "-DWITH_WEBKIT=OFF") ; we don't depend on qtwebkit + "-DWITH_BUNDLED_ICONS=ON" ; so we install bundled icons + "-DWITH_OXYGEN_ICONS=ON" ; also the oxygen ones + "-DWITH_WEBENGINE=OFF") ; we don't depend on qtwebengine #:tests? #f)) ; no test target (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -101,6 +101,7 @@ (inputs `(("qca" ,qca) ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) ("qtscript" ,qtscript) ("snorenotify" ,snorenotify) ("zlib" ,zlib))) -- cgit v1.3 From b52bcb24c68777ad9fd6f9f2c006b691b3ca9089 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 8 Dec 2018 23:07:47 +0200 Subject: gnu: quassel: Patch reference to inxi. * gnu/packages/irc.scm (quassel)[arguments]: Patch the reference to 'inxi' in the source. [inputs]: Add inxi-minimal. --- gnu/packages/irc.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 9ca26d909c..ba31d36b9e 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -30,6 +30,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages aspell) #:use-module (gnu packages autogen) #:use-module (gnu packages autotools) @@ -93,13 +94,22 @@ "-DWITH_BUNDLED_ICONS=ON" ; so we install bundled icons "-DWITH_OXYGEN_ICONS=ON" ; also the oxygen ones "-DWITH_WEBENGINE=OFF") ; we don't depend on qtwebengine + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-inxi-reference + (lambda* (#:key inputs #:allow-other-keys) + (let ((inxi (string-append (assoc-ref inputs "inxi") "/bin/inxi"))) + (substitute* "src/common/aliasmanager.cpp" + ((" inxi ") (string-append " " inxi " "))) + #t)))) #:tests? #f)) ; no test target (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs - `(("qca" ,qca) + `(("inxi" ,inxi-minimal) + ("qca" ,qca) ("qtbase" ,qtbase) ("qtmultimedia" ,qtmultimedia) ("qtscript" ,qtscript) -- cgit v1.3 From 5763243c4f5186e9da58ef79dc9c8b589e125d2d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Dec 2018 22:48:13 +0100 Subject: gnu: qsynth: Update to 0.5.4. * gnu/packages/audio.scm (qsynth): Update to 0.5.4. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 66bc7e7f53..cb91de49cd 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2855,7 +2855,7 @@ interface.") (define-public qsynth (package (name "qsynth") - (version "0.5.3") + (version "0.5.4") (source (origin (method url-fetch) @@ -2863,7 +2863,7 @@ interface.") "/qsynth-" version ".tar.gz")) (sha256 (base32 - "1jghczmmva7cyavg1q0j8nr3hmjpzzglzi5ckg92ax4ji8gpks9c")))) + "0kpq5fxr96wnii18ax780w1ivq8ksk892ac0bprn92iz0asfysrd")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" phase -- cgit v1.3 From d871e29ada230093588b7894b76aa71fb7990c60 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Dec 2018 22:52:28 +0100 Subject: gnu: supercollider: Fix build. Fixes . * gnu/packages/audio.scm (supercollider)[arguments]: Add phase to fix build with Boost 1.68. [inputs]: Replace boost with boost-cxx14. --- gnu/packages/audio.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index cb91de49cd..345140aba1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2202,6 +2202,12 @@ background file post-processing.") (ice-9 ftw)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-build-with-boost-1.68 + (lambda _ + (substitute* "server/supernova/utilities/time_tag.hpp" + (("(time_duration offset = .+ microseconds\\().*" _ m) + (string-append m "static_cast(get_nanoseconds()/1000));\n"))) + #t)) (add-after 'unpack 'rm-bundled-libs (lambda _ ;; The build system doesn't allow us to unbundle the following @@ -2266,7 +2272,7 @@ external_libraries/yaml-cpp/include)")) ("eudev" ,eudev) ;for user interactions with devices ("avahi" ,avahi) ;zeroconf service discovery support ("icu4c" ,icu4c) - ("boost" ,boost) + ("boost" ,boost-cxx14) ("boost-sync" ,boost-sync) ("yaml-cpp" ,yaml-cpp))) (home-page "https://github.com/supercollider/supercollider") -- cgit v1.3 From cbe23db2d7dd30cb917b0981b7c9921ff32be0bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Dec 2018 22:54:15 +0100 Subject: gnu: qtractor: Update to 0.9.3. * gnu/packages/music.scm (qtractor): Update to 0.9.3. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index eafc38796e..37fcf019bc 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2247,14 +2247,14 @@ from the command line.") (define-public qtractor (package (name "qtractor") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) (uri (string-append "http://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "1j3rpvdkw9rw48j4zyfn6rprp01csy4rl6zckcjyx0vh7vaycchr")))) + "1010gvkzdzdk39g1g6wx2j19ls0kdl6l9q51xzk2qik7h2fwxl71")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target -- cgit v1.3 From 0fd9671bcca297ee74bdee85db928c343dcef662 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Dec 2018 22:55:48 +0100 Subject: gnu: patchage: Fix build. Fixes . * gnu/packages/audio.scm (patchage)[arguments]: Use Python 2. --- gnu/packages/audio.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 345140aba1..678bbcf55f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2097,7 +2097,9 @@ buffers, and audio capture.") (base32 "1agdpwwi42176l4mxj0c4fsvdiv1ig56bfnnx0msckxmy57df8bb")))) (build-system waf-build-system) - (arguments `(#:tests? #f)) ; no check target + (arguments + `(#:tests? #f ; no check target + #:python ,python-2)) (inputs `(("alsa-lib" ,alsa-lib) ("boost" ,boost) -- cgit v1.3 From cec0c4e29c6efb337ae65d9c533cdbb2bf724430 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Dec 2018 23:06:46 +0100 Subject: gnu: libgphoto2: Update to 2.5.21. * gnu/packages/photo.scm (libgphoto2): Update to 2.5.21. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 1b1458a285..9410d1761d 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -131,14 +131,14 @@ data as produced by digital cameras.") (define-public libgphoto2 (package (name "libgphoto2") - (version "2.5.20") + (version "2.5.21") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/libgphoto/" version "/libgphoto2-" version ".tar.bz2")) (sha256 (base32 - "03wbwsb4v7yay8g5ni7pzmkbrh7qnqx977bddjpxsp9f1qag03z1")))) + "1ccb8idjkv19p9zxg6hh8y6vbgs8flpnh550lq6a8cmga8d2nmy5")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.3