From 568f977f9c4c2edd0f29b7627b315b716eda9c15 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 3 Apr 2017 00:50:57 +0530 Subject: [PATCH 001/301] gnu: emacs-elfeed: Enable tests. * gnu/packages/emacs.scm (emacs-elfeed)[arguments]: Add a 'check' phase. Signed-off-by: Kei Kebreau --- gnu/packages/emacs.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d1267d4f46..3db31f207b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3100,6 +3100,12 @@ (define-public emacs-elfeed (base32 "145glas04zd0s2rmnif46vhyijs4z03v871gfp1dcrwxvvvns8ap")))) (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'check + (lambda _ + (zero? (system* "make" "test"))))))) (home-page "https://github.com/skeeto/elfeed") (synopsis "Atom/RSS feed reader for Emacs") (description From 9a49129651f4c53f42b31a2c44e4f299eb82708b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 2 Apr 2017 11:36:47 -0400 Subject: [PATCH 002/301] gnu: audacity: Update to 2.1.3. * gnu/packages/audacity.scm (audacity): Update to 2.1.3. [source]: Fetch gzipped tar archive instead of a zip archive; remove unnecessary patch. [native-inputs]: Add autoconf, automake and libtool. [arguments]: Add autoreconf phase to detect system libraries. * gnu/packages/patches/audacity-fix-ffmpeg-binding.patch: Delete patch. * gnu/local.mk: Remove reference to removed patch. --- gnu/local.mk | 1 - gnu/packages/audacity.scm | 19 ++++++++--- .../patches/audacity-fix-ffmpeg-binding.patch | 32 ------------------- 3 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/audacity-fix-ffmpeg-binding.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9035753673..5da3590375 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -495,7 +495,6 @@ dist_patch_DATA = \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ - %D%/packages/patches/audacity-fix-ffmpeg-binding.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ %D%/packages/patches/automake-regexp-syntax.patch \ %D%/packages/patches/automake-test-gzip-warning.patch \ diff --git a/gnu/packages/audacity.scm b/gnu/packages/audacity.scm index a70d0e3a69..1ef5048f9e 100644 --- a/gnu/packages/audacity.scm +++ b/gnu/packages/audacity.scm @@ -23,6 +23,7 @@ (define-module (gnu packages audacity) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages gettext) #:use-module (gnu packages gtk) @@ -39,15 +40,14 @@ (define-module (gnu packages audacity) (define-public audacity (package (name "audacity") - (version "2.1.2") + (version "2.1.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/audacity/audacity/archive" - "/Audacity-" version ".zip")) + "/Audacity-" version ".tar.gz")) (sha256 - (base32 "1642i9d5cdmqzj6r0qdl2ldnqsvpb08znnczncysi72x6zpvb5qq")) - (patches (search-patches "audacity-fix-ffmpeg-binding.patch")))) + (base32 "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b")))) (build-system gnu-build-system) (inputs ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree @@ -73,7 +73,10 @@ (define-public audacity ("lilv" ,lilv) ("portaudio" ,portaudio))) (native-inputs - `(("gettext" ,gettext-minimal) ;for msgfmt + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) ;for msgfmt + ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("python" ,python-2) ("which" ,which))) @@ -90,6 +93,12 @@ (define-public audacity (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz") (string-append "LIBMAD_CFLAGS=-I" libmad "/include") (string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad"))) + #:phases + (modify-phases %standard-phases + ;; FFmpeg is only detected if autoreconf runs. + (add-before 'configure 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))) ;; The test suite is not "well exercised" according to the developers, ;; and fails with various errors. See ;; . diff --git a/gnu/packages/patches/audacity-fix-ffmpeg-binding.patch b/gnu/packages/patches/audacity-fix-ffmpeg-binding.patch deleted file mode 100644 index d6d65338d9..0000000000 --- a/gnu/packages/patches/audacity-fix-ffmpeg-binding.patch +++ /dev/null @@ -1,32 +0,0 @@ -This resolves some "declaration of C function conflicts with previous -declaration" errors during compilation. - ---- a/src/FFmpeg.h 2015-02-21 00:33:33.853857529 +0100 -+++ b/src/FFmpeg.h 2015-02-21 00:35:09.626497205 +0100 -@@ -688,7 +688,7 @@ - FFMPEG_FUNCTION_WITH_RETURN( - AVOutputFormat*, - av_oformat_next, -- (AVOutputFormat *f), -+ (const AVOutputFormat *f), - (f) - ); - FFMPEG_FUNCTION_WITH_RETURN( -@@ -755,7 +755,7 @@ - FFMPEG_FUNCTION_WITH_RETURN( - int, - av_fifo_size, -- (AVFifoBuffer *f), -+ (const AVFifoBuffer *f), - (f) - ); - FFMPEG_FUNCTION_WITH_RETURN( -@@ -801,7 +801,7 @@ - FFMPEG_FUNCTION_WITH_RETURN( - AVDictionaryEntry *, - av_dict_get, -- (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), -+ (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), - (m, key, prev, flags) - ); - FFMPEG_FUNCTION_WITH_RETURN( From cd158a2b775b1d9b281fc48af537d615d2492e56 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 17 Mar 2017 10:24:39 +0100 Subject: [PATCH 003/301] gnu: python-cython: Update to 0.25.2. * gnu/packages/python.scm (python-cython, python2-cython): Update to 0.25.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9863d1cf6b..407629e06a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3401,14 +3401,14 @@ (define-public python2-rq (define-public python-cython (package (name "python-cython") - (version "0.24.1") + (version "0.25.2") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 (base32 - "1fg7fmpvfcq9md4ncyqnnylyjy4z3ksdrshzis95g1sh03d8z044")))) + "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so From 26bad5d7eb00971a8bfcdb5556b106a601957de4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Apr 2017 17:43:46 +0200 Subject: [PATCH 004/301] gnu: nss, nss-certs: Update to 3.30. * gnu/packages/gnuzilla.scm (nss): Update to 3.30. * gnu/packages/certs.scm (nss-certs): Update to 3.30. * gnu/packages/patches/nss-increase-test-timeout.patch: Adjust patch context. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/gnuzilla.scm | 4 ++-- gnu/packages/patches/nss-increase-test-timeout.patch | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 7f5c5b793f..4b43348a50 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -74,7 +74,7 @@ (define certdata2pem (define-public nss-certs (package (name "nss-certs") - (version "3.29.3") + (version "3.30") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -85,7 +85,7 @@ (define-public nss-certs "nss-" version ".tar.gz"))) (sha256 (base32 - "1sz1r2iml9bhd4iqiqz75gii855a25895vpy9scjky0y4lqwrp9m")))) + "1agkkwb51si4raw46p44vl3d0l7wzvdjcblpcdjjz6aymq6h1h58")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 9cf64f82c4..76a65f09e6 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -193,7 +193,7 @@ (define-public nspr (define-public nss (package (name "nss") - (version "3.29.3") + (version "3.30") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -204,7 +204,7 @@ (define-public nss "nss-" version ".tar.gz"))) (sha256 (base32 - "1sz1r2iml9bhd4iqiqz75gii855a25895vpy9scjky0y4lqwrp9m")) + "1agkkwb51si4raw46p44vl3d0l7wzvdjcblpcdjjz6aymq6h1h58")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) diff --git a/gnu/packages/patches/nss-increase-test-timeout.patch b/gnu/packages/patches/nss-increase-test-timeout.patch index c6aac6ac00..1e24940322 100644 --- a/gnu/packages/patches/nss-increase-test-timeout.patch +++ b/gnu/packages/patches/nss-increase-test-timeout.patch @@ -14,12 +14,12 @@ Increase timeouts to increase chances of a successful build. } void TlsConnectTestBase::EnableExtendedMasterSecret() { -@@ -387,7 +387,7 @@ - } else { - fail_agent = server_; +@@ -385,7 +385,7 @@ + if (failing_side == TlsAgent::CLIENT) { + failing_agent = client_; } -- ASSERT_TRUE_WAIT(fail_agent->state() == TlsAgent::STATE_ERROR, 5000); -+ ASSERT_TRUE_WAIT(fail_agent->state() == TlsAgent::STATE_ERROR, 25000); +- ASSERT_TRUE_WAIT(failing_agent->state() == TlsAgent::STATE_ERROR, 5000); ++ ASSERT_TRUE_WAIT(failing_agent->state() == TlsAgent::STATE_ERROR, 25000); } void TlsConnectTestBase::ConfigureVersion(uint16_t version) { From 350a30845c46df55aa0338d0f2fe755275e28fa1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Apr 2017 18:18:39 +0200 Subject: [PATCH 005/301] gnu: python-pexpect: Use python-pytest@3.0. * gnu/packages/python.scm (python-pexpect, python2-pexpect)[native-inputs]: Change PYTHON-PYTEST to PYTHON-PYTEST-3.0. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 407629e06a..f3f3a1cbca 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4905,7 +4905,7 @@ (define-public python-pexpect (replace 'check (lambda _ (zero? (system* "nosetests" "-v"))))))) (native-inputs `(("python-nose" ,python-nose) - ("python-pytest" ,python-pytest) + ("python-pytest" ,python-pytest-3.0) ("man-db" ,man-db) ("which" ,which))) (propagated-inputs From b4dcfce51bb3e06710e06881e23493fde3c4763c Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Thu, 30 Mar 2017 17:47:00 +0200 Subject: [PATCH 006/301] gnu: Add cifs-utils. * gnu/packages/samba.scm (cifs-utils): New variable. --- gnu/packages/samba.scm | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 3b2a6868d8..8c13222fe3 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira +;;; Copyright © 2017 Thomas Danckaert ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,8 @@ (define-module (gnu packages samba) #:use-module (guix licenses) #:use-module (gnu packages acl) #:use-module (gnu packages admin) + #:use-module (gnu packages autotools) + #:use-module (gnu packages crypto) #:use-module (gnu packages cups) #:use-module (gnu packages databases) #:use-module (gnu packages tls) @@ -33,10 +36,54 @@ (define-module (gnu packages samba) #: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 perl) #:use-module (gnu packages python)) +(define-public cifs-utils + (package + (name "cifs-utils") + (version "6.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.samba.org/pub/linux-cifs/" + name "/" name "-" version ".tar.bz2")) + (sha256 (base32 + "1ayghnkryy1n1zm5dyvyyr7n3807nsm6glfcbbki5c2a8w91dwmj")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("keytuils" ,keyutils) + ("linux-pam" ,linux-pam) + ("libcap-ng" ,libcap-ng) + ("mit-krb5" ,mit-krb5) + ("samba" ,samba) + ("talloc" ,talloc))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; The 6.7 tarball is missing ‘install.sh’. Create it. + (add-before 'configure 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-i")))) + (add-before 'configure 'set-root-sbin + (lambda _ ; Don't try to install in "/sbin". + (setenv "ROOTSBINDIR" + (string-append (assoc-ref %outputs "out") "/sbin")) + #t))))) + (synopsis "User-space utilities for Linux CIFS (Samba) mounts") + (description "@code{cifs-utils} is a set of user-space utilities for +mounting and managing @dfn{Common Internet File System} (CIFS) shares using +the Linux kernel CIFS client.") + (home-page "https://wiki.samba.org/index.php/LinuxCIFS_utils") + ;; cifs-utils is licensed as GPL3 or later, but 3 files contain LGPL code. + (license gpl3+))) + (define-public iniparser (package (name "iniparser") From b98d4ec0aaab744ad3452cc57f9598db58a0e352 Mon Sep 17 00:00:00 2001 From: Muriithi Frederick Muriuki Date: Sat, 1 Apr 2017 15:56:23 +0300 Subject: [PATCH 007/301] gnu: Add python-mando-0.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-mando-0.3.1): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f3f3a1cbca..e9ccc7db28 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13947,3 +13947,20 @@ (define-public python-mando (define-public python2-mando (package-with-python2 python-mando)) + +(define-public python-mando-0.3.1 + ;; python-radon (version 1.5.0) has a requirement + ;; for mando<0.4,>=0.3 + (package + (inherit python-mando) + (name "python-mando") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/rubik/mando/archive/v" + version + ".tar.gz")) + (sha256 + (base32 + "17jlkdpqw22z1nyml5ybslilqkzmnk0dxxjml8bfghav1l5hbwd2")))))) From 3e43166ffc11fb117c55da594e57866a75625900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 3 Apr 2017 23:52:19 +0200 Subject: [PATCH 008/301] gexp: 'lower-object' raises an exception when passed an invalid object. * guix/gexp.scm (&gexp-error, &gexp-input-error): New error conditions. (lower-object): Raise &gexp-input-error when 'lookup-compiler' returns #f. * tests/gexp.scm ("lower-object & gexp-input-error?"): New test. * guix/ui.scm (call-with-error-handling): Add case for 'gexp-input-error?'. --- guix/gexp.scm | 25 ++++++++++++++++++++++--- guix/ui.scm | 5 +++++ tests/gexp.scm | 7 +++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 1b8e43e994..80d8f735b3 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -26,6 +26,8 @@ (define-module (guix gexp) #:use-module (srfi srfi-9) #:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:use-module (ice-9 match) #:export (gexp gexp? @@ -84,7 +86,13 @@ (define-module (guix gexp) gexp-compiler? lower-object - lower-inputs)) + lower-inputs + + &gexp-error + gexp-error? + &gexp-input-error + gexp-input-error? + gexp-error-invalid-input)) ;;; Commentary: ;;; @@ -140,6 +148,14 @@ (define-record-type (lower gexp-compiler-lower) (expand gexp-compiler-expand)) ;#f | DRV -> sexp +(define-condition-type &gexp-error &error + gexp-error?) + +(define-condition-type &gexp-input-error &gexp-error + gexp-input-error? + (input gexp-error-invalid-input)) + + (define %gexp-compilers ;; 'eq?' mapping of record type descriptor to . (make-hash-table 20)) @@ -177,8 +193,11 @@ (define* (lower-object obj corresponding to OBJ for SYSTEM, cross-compiling for TARGET if TARGET is true. OBJ must be an object that has an associated gexp compiler, such as a ." - (let ((lower (lookup-compiler obj))) - (lower obj system target))) + (match (lookup-compiler obj) + (#f + (raise (condition (&gexp-input-error (input obj))))) + (lower + (lower obj system target)))) (define-syntax define-gexp-compiler (syntax-rules (=> compiler expander) diff --git a/guix/ui.scm b/guix/ui.scm index 345bf490b2..b3c94795fe 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -26,6 +26,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix ui) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix store) #:use-module (guix config) @@ -448,6 +449,10 @@ (define (port-filename* port) (location->string loc) (package-full-name package) (build-system-name system)))) + ((gexp-input-error? c) + (let ((input (package-error-invalid-input c))) + (leave (_ "~s: invalid G-expression input~%") + (gexp-error-invalid-input c)))) ((profile-not-found-error? c) (leave (_ "profile '~a' does not exist~%") (profile-error-profile c))) diff --git a/tests/gexp.scm b/tests/gexp.scm index b3f7323984..41a53ae5a4 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -946,6 +946,13 @@ (define shebang (string=? (readlink (string-append comp "/text")) text))))))) +(test-assert "lower-object & gexp-input-error?" + (guard (c ((gexp-input-error? c) + (gexp-error-invalid-input c))) + (run-with-store %store + (lower-object (current-module)) + #:guile-for-build (%guile-for-build)))) + (test-assert "printer" (string-match "^#$" From 76c486196f299716be33df86d06b3ce2b79dd77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 4 Apr 2017 00:00:41 +0200 Subject: [PATCH 009/301] packages: Catch invalid input errors for structs. Reported by Thomas Sigurdsen at . * guix/packages.scm (expand-input): Add 'guard' form around call to 'package-source-derivation'. * tests/packages.scm (dummy): New test. --- guix/packages.scm | 12 ++++++++++-- tests/packages.scm | 8 ++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 61171b8342..b68b3de6d2 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -31,7 +31,6 @@ (define-module (guix packages) #:use-module (guix memoization) #:use-module (guix build-system) #:use-module (guix search-paths) - #:use-module (guix gexp) #:use-module (guix sets) #:use-module (ice-9 match) #:use-module (ice-9 vlist) @@ -846,7 +845,16 @@ (define derivation ;; source. (list name (intern file))) (((? string? name) (? struct? source)) - (list name (package-source-derivation store source system))) + ;; 'package-source-derivation' calls 'lower-object', which can throw + ;; '&gexp-input-error'. However '&gexp-input-error' lacks source + ;; location info, so we catch and rethrow here (XXX: not optimal + ;; performance-wise). + (guard (c ((gexp-input-error? c) + (raise (condition + (&package-input-error + (package package) + (input (gexp-error-invalid-input c))))))) + (list name (package-source-derivation store source system)))) (x (raise (condition (&package-input-error (package package) diff --git a/tests/packages.scm b/tests/packages.scm index aa29758830..51dc1ba2b0 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -470,6 +470,14 @@ (define read-at (package-derivation %store p) #f))) +(let ((dummy (dummy-package "foo" (inputs `(("x" ,(current-module))))))) + (test-equal "&package-input-error" + (list dummy (current-module)) + (guard (c ((package-input-error? c) + (list (package-error-package c) + (package-error-invalid-input c)))) + (package-derivation %store dummy)))) + (test-assert "reference to non-existent output" ;; See . (parameterize ((%graft? #f)) From f73bb91ebe8d78f54bb90d2168b353a4f5210f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 4 Apr 2017 00:06:37 +0200 Subject: [PATCH 010/301] tests: Adjust search-paths test following the introduction of aarch64. Fixes a regression introduced in 3b88f3767d9f3ad2cc64173525cd53d429bfe7e7. * tests/search-paths.scm ("evaluate-search-paths, separator is #f"): Change the expected result to "aarch64-linux". --- tests/search-paths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/search-paths.scm b/tests/search-paths.scm index 2a4c18dd76..8dad424415 100644 --- a/tests/search-paths.scm +++ b/tests/search-paths.scm @@ -29,7 +29,7 @@ (define %top-srcdir (test-equal "evaluate-search-paths, separator is #f" (string-append %top-srcdir - "/gnu/packages/bootstrap/armhf-linux") + "/gnu/packages/bootstrap/aarch64-linux") ;; The following search path spec should evaluate to a single item: the ;; first directory that matches the "-linux$" pattern in From 4d40c6aab0ebabf75845b3d4c7eecdf81adae10f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 1 Apr 2017 17:01:44 +0200 Subject: [PATCH 011/301] gnu: perl-dbd-pg: Update to 3.5.3. * gnu/packages/databases.scm (perl-dbd-pg): Update to 3.5.3. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 675619d6ab..9b1de85256 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -960,7 +960,7 @@ (define-public perl-dbix-class-schema-loader (define-public perl-dbd-pg (package (name "perl-dbd-pg") - (version "3.5.1") + (version "3.5.3") (source (origin (method url-fetch) @@ -968,7 +968,7 @@ (define-public perl-dbd-pg "DBD-Pg-" version ".tar.gz")) (sha256 (base32 - "0z0kf1kjgbi5f6nr63i2fnrx7629d9lvxg1q8sficwb3zdf1ggzx")))) + "03m9w1cd0yyrbqwkwcl92j1cpmasmm69f3hwvcrlfsi5fnwsk63y")))) (build-system perl-build-system) (native-inputs `(("perl-dbi" ,perl-dbi))) From 2273b7515441d296315a7c03b1439bc1384779b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 1 Apr 2017 17:02:25 +0200 Subject: [PATCH 012/301] gnu: perl-dbd-sqlite: Update to 1.54. * gnu/packages/databases.scm (perl-dbd-sqlite): Update to 1.54. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9b1de85256..3182ddcf26 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1008,7 +1008,7 @@ (define-public perl-dbd-mysql (define-public perl-dbd-sqlite (package (name "perl-dbd-sqlite") - (version "1.52") + (version "1.54") (source (origin (method url-fetch) (uri (string-append @@ -1016,7 +1016,7 @@ (define-public perl-dbd-sqlite version ".tar.gz")) (sha256 (base32 - "0kimb2qr1rh07yylbbfybwcizpmy61ck667amypn4clmkfg0knm6")))) + "0sbj9lx9syzpknvjv8cz9jndg32qz775vy2prgq305npv3dsca9r")))) (build-system perl-build-system) (inputs `(("sqlite" ,sqlite))) (propagated-inputs `(("perl-dbi" ,perl-dbi))) From dd0cfb37da28d8b000b7a92158b8a5e79fa89944 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 1 Apr 2017 17:03:01 +0200 Subject: [PATCH 013/301] gnu: perl-db-file: Update to 1.840. * gnu/packages/databases.scm (perl-db-file): Update to 1.840. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 3182ddcf26..db15a5afa5 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1280,7 +1280,7 @@ (define-public wiredtiger (define-public perl-db-file (package (name "perl-db-file") - (version "1.838") + (version "1.840") (source (origin (method url-fetch) @@ -1290,7 +1290,7 @@ (define-public perl-db-file ".tar.gz")) (sha256 (base32 - "0yp5d5zr8dk9g6xdh7ygi5bq63q7nxvhd58dk2i3ki4nb7yv2yh9")))) + "1i5jz85z4hpx15lw6ix27pyvrf0ziyh4z33lii4d3wnhz83lg1mp")))) (build-system perl-build-system) (inputs `(("bdb" ,bdb))) (native-inputs `(("perl-test-pod" ,perl-test-pod))) From 84f06e540c4fbaf048e2212396ac780d9f78e314 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Apr 2017 19:57:12 +0200 Subject: [PATCH 014/301] gnu: perl-lingua-en-findnumber: Update to 1.32. * gnu/packages/language.scm (perl-lingua-en-findnumber): Update to 1.32. --- gnu/packages/language.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 6c837948c0..1321cf4fa0 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -28,7 +28,7 @@ (define-module (gnu packages language) (define-public perl-lingua-en-findnumber (package (name "perl-lingua-en-findnumber") - (version "1.30") + (version "1.32") (source (origin (method url-fetch) @@ -36,7 +36,7 @@ (define-public perl-lingua-en-findnumber "Lingua-EN-FindNumber-" version ".tar.gz")) (sha256 (base32 - "0g5h6bwwggizwh3dd3xyx92537s4qy8nspshp1lrm9qlxh3prc28")))) + "015ximzdp42v824llwlg2pd77vd0d172lb4xs55q9f9zhqf6s5qx")))) (build-system perl-build-system) (propagated-inputs `(("perl-lingua-en-words2nums" ,perl-lingua-en-words2nums))) From 3581c3571ac70734bbd6fe9596cbac9eb57e68ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Apr 2017 19:58:01 +0200 Subject: [PATCH 015/301] gnu: perl-lingua-en-inflect: Update to 1.901. * gnu/packages/language.scm (perl-lingua-en-inflect): Update to 1.901. --- gnu/packages/language.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 1321cf4fa0..f20a0d0d29 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -50,7 +50,7 @@ (define-public perl-lingua-en-findnumber (define-public perl-lingua-en-inflect (package (name "perl-lingua-en-inflect") - (version "1.895") + (version "1.901") (source (origin (method url-fetch) @@ -58,7 +58,7 @@ (define-public perl-lingua-en-inflect "Lingua-EN-Inflect-" version ".tar.gz")) (sha256 (base32 - "0drzg9a2dkjxgf00n6jg0jzhd8972bh3j4wdnmdxpqi3zmfqhwcy")))) + "0mcwlgf6hkh4zm3s1x899f25xj4hyzrc2vssiwfxysqja36yf5ys")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Lingua-EN-Inflect") From e2fb341f8fd29a051523c5362967c925f869ce85 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Apr 2017 19:58:50 +0200 Subject: [PATCH 016/301] gnu: perl-lingua-en-inflect-number: Update to 1.12. * gnu/packages/language.scm (perl-lingua-en-inflect-number): Update to 1.12. --- gnu/packages/language.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index f20a0d0d29..11f57090c0 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -73,7 +73,7 @@ (define-public perl-lingua-en-inflect (define-public perl-lingua-en-inflect-number (package (name "perl-lingua-en-inflect-number") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) @@ -81,7 +81,7 @@ (define-public perl-lingua-en-inflect-number "Lingua-EN-Inflect-Number-" version ".tar.gz")) (sha256 (base32 - "0rvgrff96ja7fqr79dszmiyv2wz4izw82znah0mx9szkir657gfz")))) + "1gxccynkaqav43ww43jp4rzkyr36x97jd03yb5f6yx0jhn1k7yv6")))) (build-system perl-build-system) (propagated-inputs `(("perl-lingua-en-inflect" ,perl-lingua-en-inflect))) From 5b5b4edfcc4441db6b97d11dbec3533fee2b825e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Apr 2017 19:59:31 +0200 Subject: [PATCH 017/301] gnu: perl-lingua-en-number-isordinal: Update to 0.05. * gnu/packages/language.scm (perl-lingua-en-number-isordinal): Update to 0.05. --- gnu/packages/language.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 11f57090c0..9ee24b6195 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -122,7 +122,7 @@ (define-public perl-lingua-en-inflect-phrase (define-public perl-lingua-en-number-isordinal (package (name "perl-lingua-en-number-isordinal") - (version "0.04") + (version "0.05") (source (origin (method url-fetch) @@ -130,7 +130,7 @@ (define-public perl-lingua-en-number-isordinal "Lingua-EN-Number-IsOrdinal-" version ".tar.gz")) (sha256 (base32 - "1321fm4pyqcamffd0qsjm1gb07ijqndlb29qkcqf22kaibngfm4i")))) + "1mhqjvh2ad30gjab5b3a6mbr4aysyrscp4wp42yy5x6001a6km98")))) (build-system perl-build-system) (native-inputs `(("perl-try-tiny" ,perl-try-tiny) From 153ea992e8489384e723db10617107016835cc03 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Apr 2017 20:00:07 +0200 Subject: [PATCH 018/301] gnu: perl-lingua-en-tagger: Update to 0.28. * gnu/packages/language.scm (perl-lingua-en-tagger): Update to 0.28. --- gnu/packages/language.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 9ee24b6195..e7b42290fc 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -146,7 +146,7 @@ (define-public perl-lingua-en-number-isordinal (define-public perl-lingua-en-tagger (package (name "perl-lingua-en-tagger") - (version "0.24") + (version "0.28") (source (origin (method url-fetch) @@ -154,7 +154,7 @@ (define-public perl-lingua-en-tagger "Lingua-EN-Tagger-" version ".tar.gz")) (sha256 (base32 - "0qksqh1zi8fz76a29s2ll4g6yr8y6agmzgq7ngccvgj3gza5q241")))) + "1rm223d871s150dgnhbar71w56bim950cp45f0904w6px5fifcqa")))) (build-system perl-build-system) (propagated-inputs `(("perl-memoize-expirelru" ,perl-memoize-expirelru) From e26f2c67d6bc45874b26b70908f728aec2325d0e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Apr 2017 20:01:29 +0200 Subject: [PATCH 019/301] gnu: perl-email-mime: Update to 1.940. * gnu/packages/mail.scm (perl-email-mime): Update to 1.940. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 5826c42843..4feeb310e3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1335,7 +1335,7 @@ (define-public perl-email-messageid (define-public perl-email-mime (package (name "perl-email-mime") - (version "1.937") + (version "1.940") (source (origin (method url-fetch) @@ -1343,7 +1343,7 @@ (define-public perl-email-mime "Email-MIME-" version ".tar.gz")) (sha256 (base32 - "0s50i3nxi9dr81p4rn017nrarc40yrwz0qcw34q8k3pvdf46fr9n")))) + "0pnxbr16cn5qy96xqhp9zmd94ashc9ivqh10qbgbc3f637a0mfir")))) (build-system perl-build-system) (propagated-inputs `(("perl-email-address" ,perl-email-address) From f751b7596d3cc191a56fc9c786617f89e6194cb2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Apr 2017 20:02:52 +0200 Subject: [PATCH 020/301] gnu: perl-email-simple: Update to 2.213. * gnu/packages/mail.scm (perl-email-simple): Update to 2.213. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4feeb310e3..65fa9df544 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1436,7 +1436,7 @@ (define-public perl-email-sender (define-public perl-email-simple (package (name "perl-email-simple") - (version "2.211") + (version "2.213") (source (origin (method url-fetch) @@ -1444,7 +1444,7 @@ (define-public perl-email-simple "Email-Simple-" version ".tar.gz")) (sha256 (base32 - "1if4a2wh4iwlcycqrd2fhkx04ngmd75q444gh43w0r9p15ym5f8w")))) + "1ibwsng63gvqqc6r2135mjwfdzazxkb1x8q7f87wqcbjcjfpmffd")))) (build-system perl-build-system) (propagated-inputs `(("perl-email-date-format" ,perl-email-date-format))) From f49ced682736b4ac27a2f01c9ae80bebc050fbf9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 3 Apr 2017 04:24:04 +0200 Subject: [PATCH 021/301] gnu: youtube-dl: Update to 2017.04.03. * gnu/packages/video.scm (youtube-dl): Update to 2017.04.03. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b29f6cc9f4..4f005f5940 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -984,7 +984,7 @@ (define-public libvpx (define-public youtube-dl (package (name "youtube-dl") - (version "2017.03.26") + (version "2017.04.03") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -992,7 +992,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "00ysv18p4rqg7sswbpjpmmvaih6nm135bpllqdlj4ns8kjqmh59j")))) + "1zfhq20i7xz0djfps39k3yrpdl8ni2yqh43211ma5m40ms78j4yk")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion From 6c17422eace097aceac4b5994f0343bcbed6e3ab Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 3 Apr 2017 23:15:29 -0400 Subject: [PATCH 022/301] utils: Fix handling of shell arguments for xz compression. Fixes test failures related to xz compression in tests/utils.scm. This is a followup to commit 63102406f22412bb922de5549deb89d3594a38c0. * guix/utils.scm (decompressed-port, compressed-port, compressed-output-port): Split each shell argument into its own list element. --- guix/utils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/utils.scm b/guix/utils.scm index fb962df8ba..3fefa49607 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -155,7 +155,7 @@ (define (decompressed-port compression input) (match compression ((or #f 'none) (values input '())) ('bzip2 (filtered-port `(,%bzip2 "-dc") input)) - ('xz (filtered-port `(,%xz "-dc -T0") input)) + ('xz (filtered-port `(,%xz "-dc" "-T0") input)) ('gzip (filtered-port `(,%gzip "-dc") input)) (else (error "unsupported compression scheme" compression)))) @@ -165,7 +165,7 @@ (define (compressed-port compression input) (match compression ((or #f 'none) (values input '())) ('bzip2 (filtered-port `(,%bzip2 "-c") input)) - ('xz (filtered-port `(,%xz "-c -T0") input)) + ('xz (filtered-port `(,%xz "-c" "-T0") input)) ('gzip (filtered-port `(,%gzip "-c") input)) (else (error "unsupported compression scheme" compression)))) @@ -222,7 +222,7 @@ (define* (compressed-output-port compression output (match compression ((or #f 'none) (values output '())) ('bzip2 (filtered-output-port `(,%bzip2 "-c" ,@options) output)) - ('xz (filtered-output-port `(,%xz "-c -T0" ,@options) output)) + ('xz (filtered-output-port `(,%xz "-c" "-T0" ,@options) output)) ('gzip (filtered-output-port `(,%gzip "-c" ,@options) output)) (else (error "unsupported compression scheme" compression)))) From b7506f74dffd86b93a07ef2c6dfc6517897afea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 4 Apr 2017 13:44:23 +0200 Subject: [PATCH 023/301] gnu: glog: Fix name demangling for GCC 5. * gnu/packages/patches/glog-gcc-5-demangling.patch: New file. * gnu/packages/logging.scm (glog)[sources]: Add it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/logging.scm | 6 +- .../patches/glog-gcc-5-demangling.patch | 64 +++++++++++++++++++ 3 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/glog-gcc-5-demangling.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5da3590375..15087b1183 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -608,6 +608,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-locales.patch \ %D%/packages/patches/glibc-o-largefile.patch \ %D%/packages/patches/glibc-versioned-locpath.patch \ + %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index c40d6ebbaf..d28094c3a8 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ricardo Wurmus -;;; Copyright © 2016 Ludovic Courtès +;;; Copyright © 2016, 2017 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +24,7 @@ (define-module (gnu packages logging) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages perl) #:use-module (gnu packages autotools)) @@ -62,7 +63,8 @@ (define-public glog (sha256 (base32 "0ym5g15m7c8kjfr2c3zq6bz08ghin2d1r1nb6v2vnkfh1vn945x1")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (string-append name "-" version "-checkout")) + (patches (search-patches "glog-gcc-5-demangling.patch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;for tests diff --git a/gnu/packages/patches/glog-gcc-5-demangling.patch b/gnu/packages/patches/glog-gcc-5-demangling.patch new file mode 100644 index 0000000000..7f3f42ceca --- /dev/null +++ b/gnu/packages/patches/glog-gcc-5-demangling.patch @@ -0,0 +1,64 @@ +Fix symbol demangling for GCC 5, as reported at: + + https://github.com/google/glog/issues/14 + +Patch from: + + https://github.com/google/glog/pull/50 + +From b1639e3014996fbc7635870e013559c54e7e3b2f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?David=20Mart=C3=ADnez=20Moreno?= +Date: Thu, 13 Aug 2015 09:31:26 -0700 +Subject: [PATCH] Fix ABI demangling for the GCC 5.x case. + +When glog is compiled with gcc-5.2 in cxx11 ABI mode, it barfs about unmangled symbols. This patches it getting inspiration from binutils and demangle.cc itself, although it may be totally wrong or maybe have to use ParseAbiTag in more places. I haven't read the spec for the symbols, though. + +This patch makes the demangle unit test pass correctly. +--- + src/demangle.cc | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/src/demangle.cc b/src/demangle.cc +index e858181..0f0c831 100644 +--- a/src/demangle.cc ++++ b/src/demangle.cc +@@ -439,6 +439,7 @@ static bool ParseExprPrimary(State *state); + static bool ParseLocalName(State *state); + static bool ParseDiscriminator(State *state); + static bool ParseSubstitution(State *state); ++static bool ParseAbiTag(State *state); + + // Implementation note: the following code is a straightforward + // translation of the Itanium C++ ABI defined in BNF with a couple of +@@ -567,6 +568,8 @@ static bool ParseNestedName(State *state) { + static bool ParsePrefix(State *state) { + bool has_something = false; + while (true) { ++ if (ParseAbiTag(state)) ++ continue; + MaybeAppendSeparator(state); + if (ParseTemplateParam(state) || + ParseSubstitution(state) || +@@ -585,6 +588,22 @@ static bool ParsePrefix(State *state) { + return true; + } + ++// ::= B ++static bool ParseAbiTag(State *state) { ++ State copy = *state; ++ ++ Append(state, "[", 1); ++ if (ParseOneCharToken(state, 'B') && ++ ParseSourceName(state)) ++ { ++ Append(state, "]", 1); ++ return true; ++ } ++ ++ *state = copy; ++ return false; ++} ++ + // ::= + // ::= + // ::= From 0d78e3774616d71c6929c48ce0253088d201957c Mon Sep 17 00:00:00 2001 From: Mark Meyer Date: Mon, 3 Apr 2017 19:58:49 +0200 Subject: [PATCH 024/301] gnu: Add qjackctl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (qjackctl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/audio.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 86a149b1d3..d9fdd6c6b3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1792,6 +1792,36 @@ (define-public patchage and ALSA.") (license license:gpl3+))) +(define-public qjackctl + (package + (name "qjackctl") + (version "0.4.4") + (source (origin + (method url-fetch) + (uri + (string-append + "https://downloads.sourceforge.net/project/qjackctl/qjackctl/" + version "/qjackctl-" version ".tar.gz")) + (sha256 + (base32 + "19bbljb3iz5ss4s5fmra1dxabg2fnp61sa51d63zsm56xkvv47ak")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f)) ; no check target + + (inputs + `(("jack-2" ,jack-2) + ("qt" ,qt))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (home-page "https://qjackctl.sourceforge.io/") + (synopsis "Jack server control application") + (description "Control a Jack server. Allows you to plug various sources +into various outputs and to start, stop and configure jackd") + (license license:gpl2+))) + + (define-public raul (package (name "raul") From 6beaa5a02a516c061c2ff86ce4beb43374015194 Mon Sep 17 00:00:00 2001 From: Mark Meyer Date: Mon, 3 Apr 2017 21:29:25 +0200 Subject: [PATCH 025/301] gnu: moc: Add Ogg Vorbis support. * gnu/packages/music.scm (moc)[inputs]: Add libogg and libvorbis. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/music.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6f42160f77..1fe5cef41d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2261,6 +2261,8 @@ (define-public moc ("libmodplug" ,libmodplug) ("libmpcdec" ,libmpcdec) ("libmad" ,libmad) + ("libogg" ,libogg) + ("libvorbis" ,libvorbis) ("ncurses" ,ncurses) ("openssl" ,openssl) ("sasl" ,cyrus-sasl) From a3dea99107e20e3e50e9b766850254c87accde49 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Apr 2017 17:35:35 +0200 Subject: [PATCH 026/301] gnu: python2-cython: Fix build on 32-bit platforms. * gnu/packages/python.scm (python-cython, python2-cython)[source]: Add patch. * gnu/packages/patches/python-cython-fix-tests-32bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + .../python-cython-fix-tests-32bit.patch | 27 +++++++++++++++++++ gnu/packages/python.scm | 1 + 3 files changed, 29 insertions(+) create mode 100644 gnu/packages/patches/python-cython-fix-tests-32bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 15087b1183..425c233979 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -878,6 +878,7 @@ dist_patch_DATA = \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ %D%/packages/patches/python-statsmodels-fix-tests.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ + %D%/packages/patches/python-cython-fix-tests-32bit.patch \ %D%/packages/patches/python-fake-factory-fix-build-32bit.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ %D%/packages/patches/python-pandas-skip-failing-tests.patch \ diff --git a/gnu/packages/patches/python-cython-fix-tests-32bit.patch b/gnu/packages/patches/python-cython-fix-tests-32bit.patch new file mode 100644 index 0000000000..7ccc11dd4c --- /dev/null +++ b/gnu/packages/patches/python-cython-fix-tests-32bit.patch @@ -0,0 +1,27 @@ +This fixes a test failure on 32-bit platforms. + +Upstream bug URL: https://github.com/cython/cython/issues/1548 + +Patch copied from upstream source repository: + +https://github.com/cython/cython/commit/d92a718a26c9354fbf35f31a17de5c069865a447 + +From d92a718a26c9354fbf35f31a17de5c069865a447 Mon Sep 17 00:00:00 2001 +From: Robert Bradshaw +Date: Tue, 24 Jan 2017 16:57:00 -0800 +Subject: [PATCH] Normalize possible L suffix. + +--- + tests/run/cpdef_enums.pyx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/run/cpdef_enums.pyx b/tests/run/cpdef_enums.pyx +index 167c762..c264ec5 100644 +--- a/tests/run/cpdef_enums.pyx ++++ b/tests/run/cpdef_enums.pyx +@@ -93,4 +93,4 @@ def verify_resolution_GH1533(): + 3 + """ + THREE = 100 +- return PyxEnum.THREE ++ return int(PyxEnum.THREE) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e9ccc7db28..0746af24a1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3406,6 +3406,7 @@ (define-public python-cython (origin (method url-fetch) (uri (pypi-uri "Cython" version)) + (patches (search-patches "python-cython-fix-tests-32bit.patch")) (sha256 (base32 "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi")))) From 4dc12417d2f982016832726b3e644eb3adb43262 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Apr 2017 17:44:57 +0200 Subject: [PATCH 027/301] gnu: gnupg: Update to 2.1.20. * gnu/packages/gnupg.scm (gnupg): Update to 2.1.20. [source]: Remove patch. * gnu/packages/patches/gnupg-2.1-fix-Y2038-test-failure.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnupg.scm | 5 +- .../gnupg-2.1-fix-Y2038-test-failure.patch | 67 ------------------- 3 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 gnu/packages/patches/gnupg-2.1-fix-Y2038-test-failure.patch diff --git a/gnu/local.mk b/gnu/local.mk index 425c233979..969bcefeb1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -613,7 +613,6 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ %D%/packages/patches/gnucash-price-quotes-perl.patch \ - %D%/packages/patches/gnupg-2.1-fix-Y2038-test-failure.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 532dbf88f7..0c20f9ae54 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -217,15 +217,14 @@ (define-public npth (define-public gnupg (package (name "gnupg") - (version "2.1.19") + (version "2.1.20") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) - (patches (search-patches "gnupg-2.1-fix-Y2038-test-failure.patch")) (sha256 (base32 - "1w4vccmb5l50lm4yrz9vkdj7whbfvzx543r55362kkj1aqgyvk26")))) + "03cnd6gz8f4lf69inskssw57idrswcdimhccdyglmrlv6rlrmkr4")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/gnupg-2.1-fix-Y2038-test-failure.patch b/gnu/packages/patches/gnupg-2.1-fix-Y2038-test-failure.patch deleted file mode 100644 index b3a198c499..0000000000 --- a/gnu/packages/patches/gnupg-2.1-fix-Y2038-test-failure.patch +++ /dev/null @@ -1,67 +0,0 @@ -Fix a Y2038 test failure on systems where time_t is a signed 32-bit value: - -https://bugs.gnupg.org/gnupg/issue2988 - -Patch copied from upstream source repository: - -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=de3838372ae3cdecbd83eea2c53c8e2656d93052 - -From de3838372ae3cdecbd83eea2c53c8e2656d93052 Mon Sep 17 00:00:00 2001 -From: Justus Winter -Date: Tue, 7 Mar 2017 12:18:59 +0100 -Subject: [PATCH] tests: Avoid overflowing signed 32 bit time_t. - -* tests/openpgp/quick-key-manipulation.scm: Use expiration times in -the year 2038 instead of 2105 to avoid overflowing 32 bit time_t. -time_t is used internally to parse the expiraton time from the iso -timestamp. - -GnuPG-bug-id: 2988 -Signed-off-by: Justus Winter ---- - tests/openpgp/quick-key-manipulation.scm | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/tests/openpgp/quick-key-manipulation.scm b/tests/openpgp/quick-key-manipulation.scm -index 10f0bfe21..08ef62613 100755 ---- a/tests/openpgp/quick-key-manipulation.scm -+++ b/tests/openpgp/quick-key-manipulation.scm -@@ -125,8 +125,13 @@ - (default default never) - (rsa "sign auth encr" "seconds=600") ;; GPGME uses this - (rsa "auth,encr" "2") ;; "without a letter, days is assumed" -- (rsa "sign" "2105-01-01") ;; "last year GnuPG can represent is 2105" -- (rsa "sign" "21050101T115500") ;; "last year GnuPG can represent is 2105" -+ ;; Sadly, the timestamp is truncated by the use of time_t on -+ ;; systems where time_t is a signed 32 bit value. -+ (rsa "sign" "2038-01-01") ;; unix millennium -+ (rsa "sign" "20380101T115500") ;; unix millennium -+ ;; Once fixed, we can use later timestamps: -+ ;; (rsa "sign" "2105-01-01") ;; "last year GnuPG can represent is 2105" -+ ;; (rsa "sign" "21050101T115500") ;; "last year GnuPG can represent is 2105" - (rsa sign "2d") - (rsa1024 sign "2w") - (rsa2048 encr "2m") -@@ -157,7 +162,8 @@ - (lambda (subkey) - (assert (= 1 (:alg subkey))) - (assert (string-contains? (:cap subkey) "s")) -- (assert (time-matches? 4260207600 ;; 2105-01-01 -+ (assert (time-matches? 2145916800 ;; 2038-01-01 -+ ;; 4260207600 ;; 2105-01-01 - (string->number (:expire subkey)) - ;; This is off by 12h, but I guess it just - ;; choses the middle of the day. -@@ -165,7 +171,8 @@ - (lambda (subkey) - (assert (= 1 (:alg subkey))) - (assert (string-contains? (:cap subkey) "s")) -- (assert (time-matches? 4260254100 ;; UTC 2105-01-01 11:55:00 -+ (assert (time-matches? 2145959700 ;; UTC 2038-01-01 11:55:00 -+ ;; 4260254100 ;; UTC 2105-01-01 11:55:00 - (string->number (:expire subkey)) - (minutes->seconds 5)))) - (lambda (subkey) --- -2.12.0 - From dcc9b6abc7fa1613a1ec922a1f8fe3a12ba74b58 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Apr 2017 18:00:12 +0200 Subject: [PATCH 028/301] gnu: python-django: Update to 1.10.7 [fixes CVE-2017-7233 and CVE-2017-7234]. * gnu/packages/django.scm (python-django, python2-django): Update to 1.10.7. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 185fbf8e62..92109b9082 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -29,13 +29,13 @@ (define-module (gnu packages django) (define-public python-django (package (name "python-django") - (version "1.10.5") + (version "1.10.7") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "12szjsmnfhh2yr54sfynyjr8vl0q9gb6qak3ayqcifcinrs97f0d")))) + "1f5hnn2dzfr5szk4yc47bs4kk2nmrayjcvgpqi2s4l13pjfpfgar")))) (build-system python-build-system) (arguments '(#:phases From 33b2520175feec6d9bea8f3b1063ac440f2aafbf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Apr 2017 18:30:52 +0200 Subject: [PATCH 029/301] gnu: python-django: Specify CPE name. * gnu/packages/django.scm (python-django, python2-django)[properties]: Add "cpe-name". --- gnu/packages/django.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 92109b9082..805dca6c9e 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -80,7 +80,8 @@ (define-public python-django any Web site. Django focuses on automating as much as possible and adhering to the @dfn{don't repeat yourself} (DRY) principle.") (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-django)))))) + (properties `((python2-variant . ,(delay python2-django)) + (cpe-name . "django"))))) (define-public python2-django (let ((base (package-with-python2 (strip-python2-variant python-django)))) From cca906754d082d6d847e056e9107900aa52880e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Tue, 4 Apr 2017 15:27:44 +0200 Subject: [PATCH 030/301] gnu: icecat: Re-enable parallel build. * gnu/packages/gnuzilla.scm (icecat)[arguments]: Re-enable parallel build. --- gnu/packages/gnuzilla.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 76a65f09e6..46c07a83f4 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -472,7 +472,6 @@ (define-public icecat (arguments `(#:tests? #f ; no check target #:out-of-source? #t ; must be built outside of the source directory - #:parallel-build? #f ;; XXX: There are RUNPATH issues such as ;; $prefix/lib/icecat-31.6.0/plugin-container NEEDing libmozalloc.so, From 8db947169fde2a5c8526c9c91ae82b7cd92a5331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Tue, 4 Apr 2017 15:05:49 +0200 Subject: [PATCH 031/301] gnu: icecat: Use bundled ICU to avoid crashes. * gnu/packages/gnuzilla.scm (icecat)[arguments] <#:configure-flags>: Temporarily comment out "--with-system-icu". --- gnu/packages/gnuzilla.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 46c07a83f4..74063cfb74 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Alex Griffin +;;; Copyright © 2017 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -508,7 +509,11 @@ (define-public icecat "--with-system-jpeg" ; must be libjpeg-turbo "--with-system-libevent" "--with-system-libvpx" - "--with-system-icu" + + ;; FIXME: It is preferable to build with system + ;; libraries, but this fixes crashes. + ;; "--with-system-icu" + "--with-system-nspr" "--with-system-nss" "--enable-system-pixman" From 1c6b2d3f980bf8cc39ec703fb1a45f2b42ac135c Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Mon, 3 Apr 2017 23:47:22 -0700 Subject: [PATCH 032/301] build: Export register-root procedure. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/scripts/build.scm: Export register-root procedure. Signed-off-by: Ludovic Courtès --- guix/scripts/build.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 68402fda18..ba47b1232d 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -51,7 +51,8 @@ (define-module (guix scripts build) options->transformation show-transformation-options-help - guix-build)) + guix-build + register-root)) (define %default-log-urls ;; Default base URLs for build logs. From f84011d04a159d0a4acc8af0c0bf673ba09407c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 4 Apr 2017 23:44:59 +0200 Subject: [PATCH 033/301] services: cuirass: Wait for networking. * gnu/services/cuirass.scm (cuirass-shepherd-service): Add 'networking' to 'requirements'. --- gnu/services/cuirass.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 237f71a09b..6beabc4b3b 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -87,7 +87,7 @@ (define (cuirass-shepherd-service config) (list (shepherd-service (documentation "Run Cuirass.") (provision '(cuirass)) - (requirement '(guix-daemon)) + (requirement '(guix-daemon networking)) (start #~(make-forkexec-constructor (list (string-append #$cuirass "/bin/cuirass") "--cache-directory" #$cache-directory From 01fe019166fe8a925b3bf3b489792b52b1b6ca7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Apr 2017 00:44:45 +0200 Subject: [PATCH 034/301] gnu: openexr: Add IlmBase include sub-directory to 'OpenEXR.pc'. * gnu/packages/graphics.scm (openexr)[arguments]: Add 'set-ilmbase-directory-in-pc-file' phase. --- gnu/packages/graphics.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index a502f246ff..79c7772af9 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Ricardo Wurmus @@ -256,6 +256,20 @@ (define-public openexr (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'set-ilmbase-directory-in-pc-file + (lambda* (#:key inputs #:allow-other-keys) + ;; Add '-I ILMBASE/include/OpenEXR' to 'OpenEXR.pc' since some of + ;; the headers of OpenEXR expect IlmBase headers to live in the + ;; same directory. Unfortunately this doesn't help much because + ;; 'FindOpenEXR.cmake' doesn't read 'OpenEXR.pc'... + (let ((ilmbase (assoc-ref inputs "ilmbase"))) + (substitute* "OpenEXR.pc.in" + (("^Cflags: (.*)$" _ cflags) + (string-append "Cflags: " + " -I" ilmbase "/include" + " -I" ilmbase "/include/OpenEXR " + cflags "\n"))) + #t))) (add-after 'unpack 'disable-broken-test ;; This test fails on i686. Upstream developers suggest that ;; this test is broken on i686 and can be safely disabled: From 5894b60491d76c3d8208d64c445684d5d8b1d756 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 5 Apr 2017 01:01:00 +0200 Subject: [PATCH 035/301] gnu: algebra: Re-order imports. * gnu/packages/algebra.scm: Order imports alphabetically. --- gnu/packages/algebra.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 98bb2aeb71..d7f3203d23 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -25,26 +25,26 @@ (define-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) + #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages gl) #:use-module (gnu packages graphviz) #:use-module (gnu packages image) - #:use-module (gnu packages multiprecision) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) + #:use-module (gnu packages multiprecision) #:use-module (gnu packages perl) - #:use-module (gnu packages readline) - #:use-module (gnu packages flex) #:use-module (gnu packages python) + #:use-module (gnu packages readline) #:use-module (gnu packages shells) #:use-module (gnu packages tex) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) #:use-module (guix utils)) From f0bacad682734371fc5b5ed732625ae2c629973b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 5 Apr 2017 03:10:24 +0200 Subject: [PATCH 036/301] gnu: bc: Actually use readline. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/algebra.scm (bc)[arguments]: Add ‘--with-readline’ to #:configure-flags. --- gnu/packages/algebra.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index d7f3203d23..ab73a6e2e5 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -494,7 +495,9 @@ (define-public bc ;; PREFIX/share/{man,info}. (string-append "--mandir=" out "/share/man") (string-append "--infodir=" out "/share/info"))))) - %standard-phases))) + %standard-phases) + #:configure-flags + (list "--with-readline"))) (home-page "https://www.gnu.org/software/bc/") (synopsis "Arbitrary precision numeric processing language") (description From dfee7daedb760f1b1d7506829ca31633f4173356 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 5 Apr 2017 01:14:44 +0200 Subject: [PATCH 037/301] gnu: bc: Update to 1.07. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/algebra.scm (bc): Update to 1.07. [native-inputs]: Add ed and texinfo. [arguments]: Use default ‘configure’ phase. --- gnu/packages/algebra.scm | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index ab73a6e2e5..96720bd593 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -26,6 +26,7 @@ (define-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) + #:use-module (gnu packages ed) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages gl) @@ -39,6 +40,7 @@ (define-module (gnu packages algebra) #:use-module (gnu packages readline) #:use-module (gnu packages shells) #:use-module (gnu packages tex) + #:use-module (gnu packages texinfo) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) @@ -468,35 +470,22 @@ (define-public gmp-ecm (define-public bc (package (name "bc") - (version "1.06") + (version "1.07") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz")) (sha256 (base32 - "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf")))) + "1b852b39y43zrbya7d8civ7vmdbfap5v1ivc70ypr3bj7b1izksm")))) (build-system gnu-build-system) - (inputs `(("readline" ,readline))) - (native-inputs `(("flex" ,flex))) + (inputs + `(("readline" ,readline))) + (native-inputs + `(("ed" ,ed) + ("flex" ,flex) + ("texinfo" ,texinfo))) (arguments - '(#:phases - (alist-replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - ;; This old `configure' script doesn't support - ;; variables passed as arguments. - (let ((out (assoc-ref outputs "out"))) - (setenv "CONFIG_SHELL" (which "bash")) - (zero? - (system* - "./configure" - (string-append "--prefix=" out) - ;; By default, man and info pages are put in - ;; PREFIX/{man,info}, but we want them in - ;; PREFIX/share/{man,info}. - (string-append "--mandir=" out "/share/man") - (string-append "--infodir=" out "/share/info"))))) - %standard-phases) - #:configure-flags + '(#:configure-flags (list "--with-readline"))) (home-page "https://www.gnu.org/software/bc/") (synopsis "Arbitrary precision numeric processing language") From 52b2d666ca853f36068d5924b4a516af9f9c6d14 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Mon, 3 Apr 2017 15:18:31 +0200 Subject: [PATCH 038/301] gnu: kdevelop: Update to 5.1.0. * gnu/packages/kde.scm (kdevelop, kdevplatform): Update to 5.1.0. --- gnu/packages/kde.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 03cfd0ee7b..9d8507030b 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -39,7 +39,7 @@ (define-module (gnu packages kde) (define-public kdevelop (package (name "kdevelop") - (version "5.0.4") + (version "5.1.0") (source (origin (method url-fetch) @@ -48,7 +48,7 @@ (define-public kdevelop version ".tar.xz")) (sha256 (base32 - "0max4g1i8xf5g7a8zm60qkr2j8w5bsqzxz914z43fj5ipnr4448r")))) + "1s4cbkx2a0p73b52yxmf5dhv08xk9pxgrkjsnbzy76ssfr545g60")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -148,7 +148,7 @@ (define-public kdevelop-pg-qt (define-public kdevplatform (package (name "kdevplatform") - (version "5.0.4") + (version "5.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/kdevelop" @@ -156,7 +156,7 @@ (define-public kdevplatform version ".tar.xz")) (sha256 (base32 - "0wfl5azblnpmc7hydfvm7450343m1v7cr2g9gw0qs1432gbzraq1")))) + "1nxf66vk6p7lmckdsha9fpq3zchwbg79qhy49f4hndlxgj03p7zh")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) From b23c1a71be7265df8aa0b2b1bc43bcbd5a5e32ea Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 4 Apr 2017 21:51:15 -0400 Subject: [PATCH 039/301] download: Update the GnuPG mirror list. * guix/download.scm (%mirrors) : Use HTTP for TU Wien mirror. --- guix/download.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/download.scm b/guix/download.scm index 3f9263d757..181bf45813 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -66,7 +66,7 @@ (define %mirrors "ftp://gcc.gnu.org/pub/gcc/" ,@(map (cut string-append <> "/gcc") gnu-mirrors)) (gnupg - "ftp://gd.tuwien.ac.at/privacy/gnupg/" + "http://gd.tuwien.ac.at/privacy/gnupg/" "ftp://mirrors.dotsrc.org/gcrypt/" "ftp://mirror.cict.fr/gnupg/" "http://artfiles.org/gnupg.org" From fc5b12879f0cb15afd2357556f495c94d3ab7cb9 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Wed, 5 Apr 2017 21:03:12 +1000 Subject: [PATCH 040/301] gnu: diamond: Update to 0.8.37. * gnu/packages/bioinformatics.scm (diamond): Update to 0.8.37. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6ec378c0d9..9244ae327c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2084,7 +2084,7 @@ (define-public deeptools (define-public diamond (package (name "diamond") - (version "0.8.36") + (version "0.8.37") (source (origin (method url-fetch) (uri (string-append @@ -2093,7 +2093,7 @@ (define-public diamond (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "092smzzjcg51n3x4h84k52ijpz9m40ri838j9k2i463ribc3c8rh")))) + "1zn7q8m41ayfnjvf9snrsnq00mm68alf9rhdadx5q1sk23lyvp2l")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no "check" target From beebe43176b6e63f35932f280f43969c46d951d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Apr 2017 17:48:26 +0200 Subject: [PATCH 041/301] gnu: sra-tools: Use "modify-phases" syntax. * gnu/packages/bioinformatics.scm (sra-tools)[arguments]: Use "modify-phases" syntax. --- gnu/packages/bioinformatics.scm | 83 ++++++++++++++++----------------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9244ae327c..6a04e69be3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4790,50 +4790,49 @@ (define-public sra-tools "/lib64" "/lib32"))) #:phases - (alist-replace - 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; The build system expects a directory containing the sources and - ;; raw build output of ncbi-vdb, including files that are not - ;; installed. Since we are building against an installed version of - ;; ncbi-vdb, the following modifications are needed. - (substitute* "setup/konfigure.perl" - ;; Make the configure script look for the "ilib" directory of - ;; "ncbi-vdb" without first checking for the existence of a - ;; matching library in its "lib" directory. - (("^ my \\$f = File::Spec->catdir\\(\\$libdir, \\$lib\\);") - "my $f = File::Spec->catdir($ilibdir, $ilib);") - ;; Look for interface libraries in ncbi-vdb's "ilib" directory. - (("my \\$ilibdir = File::Spec->catdir\\(\\$builddir, 'ilib'\\);") - "my $ilibdir = File::Spec->catdir($dir, 'ilib');")) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; The build system expects a directory containing the sources and + ;; raw build output of ncbi-vdb, including files that are not + ;; installed. Since we are building against an installed version of + ;; ncbi-vdb, the following modifications are needed. + (substitute* "setup/konfigure.perl" + ;; Make the configure script look for the "ilib" directory of + ;; "ncbi-vdb" without first checking for the existence of a + ;; matching library in its "lib" directory. + (("^ my \\$f = File::Spec->catdir\\(\\$libdir, \\$lib\\);") + "my $f = File::Spec->catdir($ilibdir, $ilib);") + ;; Look for interface libraries in ncbi-vdb's "ilib" directory. + (("my \\$ilibdir = File::Spec->catdir\\(\\$builddir, 'ilib'\\);") + "my $ilibdir = File::Spec->catdir($dir, 'ilib');")) - ;; Dynamic linking - (substitute* "tools/copycat/Makefile" - (("smagic-static") "lmagic")) + ;; Dynamic linking + (substitute* "tools/copycat/Makefile" + (("smagic-static") "lmagic")) - ;; The 'configure' script doesn't recognize things like - ;; '--enable-fast-install'. - (zero? (system* - "./configure" - (string-append "--build-prefix=" (getcwd) "/build") - (string-append "--prefix=" (assoc-ref outputs "out")) - (string-append "--debug") - (string-append "--with-fuse-prefix=" - (assoc-ref inputs "fuse")) - (string-append "--with-magic-prefix=" - (assoc-ref inputs "libmagic")) - ;; TODO: building with libxml2 fails with linker errors - ;; (string-append "--with-xml2-prefix=" - ;; (assoc-ref inputs "libxml2")) - (string-append "--with-ncbi-vdb-sources=" - (assoc-ref inputs "ncbi-vdb")) - (string-append "--with-ncbi-vdb-build=" - (assoc-ref inputs "ncbi-vdb")) - (string-append "--with-ngs-sdk-prefix=" - (assoc-ref inputs "ngs-sdk")) - (string-append "--with-hdf5-prefix=" - (assoc-ref inputs "hdf5"))))) - %standard-phases))) + ;; The 'configure' script doesn't recognize things like + ;; '--enable-fast-install'. + (zero? (system* + "./configure" + (string-append "--build-prefix=" (getcwd) "/build") + (string-append "--prefix=" (assoc-ref outputs "out")) + (string-append "--debug") + (string-append "--with-fuse-prefix=" + (assoc-ref inputs "fuse")) + (string-append "--with-magic-prefix=" + (assoc-ref inputs "libmagic")) + ;; TODO: building with libxml2 fails with linker errors + ;; (string-append "--with-xml2-prefix=" + ;; (assoc-ref inputs "libxml2")) + (string-append "--with-ncbi-vdb-sources=" + (assoc-ref inputs "ncbi-vdb")) + (string-append "--with-ncbi-vdb-build=" + (assoc-ref inputs "ncbi-vdb")) + (string-append "--with-ngs-sdk-prefix=" + (assoc-ref inputs "ngs-sdk")) + (string-append "--with-hdf5-prefix=" + (assoc-ref inputs "hdf5"))))))))) (native-inputs `(("perl" ,perl))) (inputs `(("ngs-sdk" ,ngs-sdk) From 1108a920bd09a8a81e5953ede65f3123bc35ad92 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Apr 2017 17:57:23 +0200 Subject: [PATCH 042/301] gnu: sra-tools: Fix glibc naming conflict. * gnu/packages/bioinformatics.scm (sra-tools)[arguments]: Add build phase "patch-away-glibc-conflict" to fix a definition conflict with glibc 2.25. --- gnu/packages/bioinformatics.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6a04e69be3..c8219cc2cc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4832,7 +4832,19 @@ (define-public sra-tools (string-append "--with-ngs-sdk-prefix=" (assoc-ref inputs "ngs-sdk")) (string-append "--with-hdf5-prefix=" - (assoc-ref inputs "hdf5"))))))))) + (assoc-ref inputs "hdf5")))))) + ;; This version of sra-tools fails to build with glibc because of a + ;; naming conflict. glibc-2.25/include/bits/mathcalls.h already + ;; contains a definition of "canonicalize", so we rename it. + ;; + ;; See upstream bug report: + ;; https://github.com/ncbi/sra-tools/issues/67 + (add-after 'unpack 'patch-away-glibc-conflict + (lambda _ + (substitute* "tools/bam-loader/bam.c" + (("canonicalize\\(" line) + (string-append "sra_tools_" line))) + #t))))) (native-inputs `(("perl" ,perl))) (inputs `(("ngs-sdk" ,ngs-sdk) From 5ae63362ae919caaf722bd4b0199e1c14c994aa5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Oct 2016 09:47:40 +0200 Subject: [PATCH 043/301] import cran: Distinguish Bioconductor data packages. * guix/import/cran.scm (bioconductor-package?): Exclude Bioconductor data packages. (bioconductor-data-package?): New procedure. --- guix/import/cran.scm | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index a5f91fe8d2..4d36882cf5 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -424,13 +424,30 @@ (define (cran-package? package) (define (bioconductor-package? package) "Return true if PACKAGE is an R package from Bioconductor." - (and (string-prefix? "r-" (package-name package)) - (match (and=> (package-source package) origin-uri) - ((? string? uri) - (string-prefix? "http://bioconductor.org" uri)) - ((? list? uris) - (any (cut string-prefix? "http://bioconductor.org" <>) uris)) - (_ #f)))) + (let ((predicate (lambda (uri) + (and (string-prefix? "http://bioconductor.org" uri) + ;; Data packages are not listed in SVN + (not (string-contains uri "/data/annotation/")))))) + (and (string-prefix? "r-" (package-name package)) + (match (and=> (package-source package) origin-uri) + ((? string? uri) + (predicate uri)) + ((? list? uris) + (any predicate uris)) + (_ #f))))) + +(define (bioconductor-data-package? package) + "Return true if PACKAGE is an R data package from Bioconductor." + (let ((predicate (lambda (uri) + (and (string-prefix? "http://bioconductor.org" uri) + (string-contains uri "/data/annotation/"))))) + (and (string-prefix? "r-" (package-name package)) + (match (and=> (package-source package) origin-uri) + ((? string? uri) + (predicate uri)) + ((? list? uris) + (any predicate uris)) + (_ #f))))) (define %cran-updater (upstream-updater From cd381c317b03d7ff4936e0006c277e7126500602 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 4 Apr 2017 16:08:15 -0400 Subject: [PATCH 044/301] gnu: Move audacity to audio.scm. * gnu/packages/audacity.scm: Remove file and move audacity... * gnu/packages/audio.scm: ...here. * gnu/local.mk: Remove reference to removed file. --- gnu/local.mk | 1 - gnu/packages/audacity.scm | 112 -------------------------------------- gnu/packages/audio.scm | 75 +++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 113 deletions(-) delete mode 100644 gnu/packages/audacity.scm diff --git a/gnu/local.mk b/gnu/local.mk index 969bcefeb1..f54ab2a455 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -53,7 +53,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/assembly.scm \ %D%/packages/astronomy.scm \ %D%/packages/attr.scm \ - %D%/packages/audacity.scm \ %D%/packages/audio.scm \ %D%/packages/augeas.scm \ %D%/packages/autogen.scm \ diff --git a/gnu/packages/audacity.scm b/gnu/packages/audacity.scm deleted file mode 100644 index 1ef5048f9e..0000000000 --- a/gnu/packages/audacity.scm +++ /dev/null @@ -1,112 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages audacity) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build-system gnu) - #:use-module (gnu packages) - #:use-module (gnu packages audio) - #:use-module (gnu packages autotools) - #:use-module (gnu packages base) - #:use-module (gnu packages gettext) - #:use-module (gnu packages gtk) - #:use-module (gnu packages linux) - #:use-module (gnu packages mp3) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages pulseaudio) - #:use-module (gnu packages python) - #:use-module (gnu packages xiph) - #:use-module (gnu packages xml) - #:use-module (gnu packages video) - #:use-module (gnu packages wxwidgets)) - -(define-public audacity - (package - (name "audacity") - (version "2.1.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/audacity/audacity/archive" - "/Audacity-" version ".tar.gz")) - (sha256 - (base32 "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b")))) - (build-system gnu-build-system) - (inputs - ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree - ;; versions shipping with Audacity are used for now. - `(("wxwidgets" ,wxwidgets-gtk2) - ("gtk" ,gtk+-2) - ("alsa-lib" ,alsa-lib) - ("jack" ,jack-1) - ("expat" ,expat) - ("ffmpeg" ,ffmpeg) - ("lame" ,lame) - ("flac" ,flac) - ("libid3tag" ,libid3tag) - ("libmad" ,libmad) - ("libsbsms" ,libsbsms) - ("libsndfile" ,libsndfile) - ("soundtouch" ,soundtouch) - ("soxr" ,soxr) ;replaces libsamplerate - ("twolame" ,twolame) - ("vamp" ,vamp) - ("libvorbis" ,libvorbis) - ("lv2" ,lv2) - ("lilv" ,lilv) - ("portaudio" ,portaudio))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("gettext" ,gettext-minimal) ;for msgfmt - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("python" ,python-2) - ("which" ,which))) - (arguments - '(#:configure-flags - (let ((libid3tag (assoc-ref %build-inputs "libid3tag")) - (libmad (assoc-ref %build-inputs "libmad"))) - (list - ;; Loading FFmpeg dynamically is problematic. - "--disable-dynamic-loading" - ;; libid3tag and libmad provide no .pc files, so pkg-config fails to - ;; find them. Force their inclusion. - (string-append "ID3TAG_CFLAGS=-I" libid3tag "/include") - (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz") - (string-append "LIBMAD_CFLAGS=-I" libmad "/include") - (string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad"))) - #:phases - (modify-phases %standard-phases - ;; FFmpeg is only detected if autoreconf runs. - (add-before 'configure 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))) - ;; The test suite is not "well exercised" according to the developers, - ;; and fails with various errors. See - ;; . - #:tests? #f)) - (home-page "http://audacity.sourceforge.net/") - (synopsis "Software for recording and editing sounds") - (description - "Audacity is a multi-track audio editor designed for recording, playing -and editing digital audio. It features digital effects and spectrum analysis -tools.") - (license license:gpl2+))) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d9fdd6c6b3..9dc6797343 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -75,6 +75,7 @@ (define-module (gnu packages audio) #:use-module (gnu packages video) #:use-module (gnu packages vim) ;xxd #:use-module (gnu packages webkit) + #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -269,6 +270,80 @@ (define-public ardour engineers, musicians, soundtrack editors and composers.") (license license:gpl2+))) +(define-public audacity + (package + (name "audacity") + (version "2.1.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/audacity/audacity/archive" + "/Audacity-" version ".tar.gz")) + (sha256 + (base32 "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b")))) + (build-system gnu-build-system) + (inputs + ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree + ;; versions shipping with Audacity are used for now. + `(("wxwidgets" ,wxwidgets-gtk2) + ("gtk" ,gtk+-2) + ("alsa-lib" ,alsa-lib) + ("jack" ,jack-1) + ("expat" ,expat) + ("ffmpeg" ,ffmpeg) + ("lame" ,lame) + ("flac" ,flac) + ("libid3tag" ,libid3tag) + ("libmad" ,libmad) + ("libsbsms" ,libsbsms) + ("libsndfile" ,libsndfile) + ("soundtouch" ,soundtouch) + ("soxr" ,soxr) ;replaces libsamplerate + ("twolame" ,twolame) + ("vamp" ,vamp) + ("libvorbis" ,libvorbis) + ("lv2" ,lv2) + ("lilv" ,lilv) + ("portaudio" ,portaudio))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) ;for msgfmt + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("python" ,python-2) + ("which" ,which))) + (arguments + '(#:configure-flags + (let ((libid3tag (assoc-ref %build-inputs "libid3tag")) + (libmad (assoc-ref %build-inputs "libmad"))) + (list + ;; Loading FFmpeg dynamically is problematic. + "--disable-dynamic-loading" + ;; libid3tag and libmad provide no .pc files, so pkg-config fails to + ;; find them. Force their inclusion. + (string-append "ID3TAG_CFLAGS=-I" libid3tag "/include") + (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz") + (string-append "LIBMAD_CFLAGS=-I" libmad "/include") + (string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad"))) + #:phases + (modify-phases %standard-phases + ;; FFmpeg is only detected if autoreconf runs. + (add-before 'configure 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))) + ;; The test suite is not "well exercised" according to the developers, + ;; and fails with various errors. See + ;; . + #:tests? #f)) + (home-page "http://audacity.sourceforge.net/") + (synopsis "Software for recording and editing sounds") + (description + "Audacity is a multi-track audio editor designed for recording, playing +and editing digital audio. It features digital effects and spectrum analysis +tools.") + (license license:gpl2+))) + (define-public azr3 (package (name "azr3") From b28187cd0ca75a17a12dce9bfb5855d8fbf61eb3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 5 Apr 2017 21:23:41 +0200 Subject: [PATCH 045/301] Revert "gnu: bc: Update to 1.07." This reverts commit dfee7daedb760f1b1d7506829ca31633f4173356. It causes the linux-libre@4.9 build to hang (command-line usage works fine). --- gnu/packages/algebra.scm | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 96720bd593..ab73a6e2e5 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -26,7 +26,6 @@ (define-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) - #:use-module (gnu packages ed) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages gl) @@ -40,7 +39,6 @@ (define-module (gnu packages algebra) #:use-module (gnu packages readline) #:use-module (gnu packages shells) #:use-module (gnu packages tex) - #:use-module (gnu packages texinfo) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) @@ -470,22 +468,35 @@ (define-public gmp-ecm (define-public bc (package (name "bc") - (version "1.07") + (version "1.06") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz")) (sha256 (base32 - "1b852b39y43zrbya7d8civ7vmdbfap5v1ivc70ypr3bj7b1izksm")))) + "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf")))) (build-system gnu-build-system) - (inputs - `(("readline" ,readline))) - (native-inputs - `(("ed" ,ed) - ("flex" ,flex) - ("texinfo" ,texinfo))) + (inputs `(("readline" ,readline))) + (native-inputs `(("flex" ,flex))) (arguments - '(#:configure-flags + '(#:phases + (alist-replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; This old `configure' script doesn't support + ;; variables passed as arguments. + (let ((out (assoc-ref outputs "out"))) + (setenv "CONFIG_SHELL" (which "bash")) + (zero? + (system* + "./configure" + (string-append "--prefix=" out) + ;; By default, man and info pages are put in + ;; PREFIX/{man,info}, but we want them in + ;; PREFIX/share/{man,info}. + (string-append "--mandir=" out "/share/man") + (string-append "--infodir=" out "/share/info"))))) + %standard-phases) + #:configure-flags (list "--with-readline"))) (home-page "https://www.gnu.org/software/bc/") (synopsis "Arbitrary precision numeric processing language") From 79f912c7106131f4179c727583d33500271361cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Apr 2017 09:40:08 +0200 Subject: [PATCH 046/301] Revert "gnu: openexr: Add IlmBase include sub-directory to 'OpenEXR.pc'." This reverts commit 01fe019166fe8a925b3bf3b489792b52b1b6ca7a, which was unneeded because IlmBase is already listed as 'Requires' in 'OpenEXR.pc'. --- gnu/packages/graphics.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 79c7772af9..a502f246ff 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Ricardo Wurmus @@ -256,20 +256,6 @@ (define-public openexr (arguments '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'set-ilmbase-directory-in-pc-file - (lambda* (#:key inputs #:allow-other-keys) - ;; Add '-I ILMBASE/include/OpenEXR' to 'OpenEXR.pc' since some of - ;; the headers of OpenEXR expect IlmBase headers to live in the - ;; same directory. Unfortunately this doesn't help much because - ;; 'FindOpenEXR.cmake' doesn't read 'OpenEXR.pc'... - (let ((ilmbase (assoc-ref inputs "ilmbase"))) - (substitute* "OpenEXR.pc.in" - (("^Cflags: (.*)$" _ cflags) - (string-append "Cflags: " - " -I" ilmbase "/include" - " -I" ilmbase "/include/OpenEXR " - cflags "\n"))) - #t))) (add-after 'unpack 'disable-broken-test ;; This test fails on i686. Upstream developers suggest that ;; this test is broken on i686 and can be safely disabled: From f37f2b83fa95c1fe2bf01c4b8072cfc23d4c67ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Apr 2017 15:19:15 +0200 Subject: [PATCH 047/301] packages: Add 'package-mapping' and base 'package-input-rewriting' on it. * guix/packages.scm (package-mapping): New procedure. (package-input-rewriting): Rewrite in terms of 'package-mapping'. * tests/packages.scm ("package-mapping"): New test. * doc/guix.texi (Defining Packages): Document it. --- doc/guix.texi | 10 +++++++++ guix/packages.scm | 56 ++++++++++++++++++++++++++++++---------------- tests/packages.scm | 27 ++++++++++++++++++++++ 3 files changed, 74 insertions(+), 19 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index aa779e38e2..b2498d039e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2946,6 +2946,16 @@ with @var{libressl}. Then we use it to define a @dfn{variant} of the This is exactly what the @option{--with-input} command-line option does (@pxref{Package Transformation Options, @option{--with-input}}). +A more generic procedure to rewrite a package dependency graph is +@code{package-mapping}: it supports arbitrary changes to nodes in the +graph. + +@deffn {Scheme Procedure} package-mapping @var{proc} [@var{cut?}] +Return a procedure that, given a package, applies @var{proc} to all the packages +depended on and returns the resulting package. The procedure stops recursion +when @var{cut?} returns true for a given package. +@end deffn + @menu * package Reference :: The package data type. * origin Reference:: The origin data type. diff --git a/guix/packages.scm b/guix/packages.scm index b68b3de6d2..44f2c32fb7 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -98,6 +98,7 @@ (define-module (guix packages) package-transitive-propagated-inputs package-transitive-native-search-paths package-transitive-supported-systems + package-mapping package-input-rewriting package-source-derivation package-derivation @@ -741,6 +742,35 @@ (define (bag-transitive-target-inputs bag) "Return the \"target inputs\" of BAG, recursively." (transitive-inputs (bag-target-inputs bag))) +(define* (package-mapping proc #:optional (cut? (const #f))) + "Return a procedure that, given a package, applies PROC to all the packages +depended on and returns the resulting package. The procedure stops recursion +when CUT? returns true for a given package." + (define (rewrite input) + (match input + ((label (? package? package) outputs ...) + (let ((proc (if (cut? package) proc replace))) + (cons* label (proc package) outputs))) + (_ + input))) + + (define replace + (mlambdaq (p) + ;; Return a variant of P with PROC applied to P and its explicit + ;; dependencies, recursively. Memoize the transformations. Failing to + ;; do that, we would build a huge object graph with lots of duplicates, + ;; which in turns prevents us from benefiting from memoization in + ;; 'package-derivation'. + (let ((p (proc p))) + (package + (inherit p) + (location (package-location p)) + (inputs (map rewrite (package-inputs p))) + (native-inputs (map rewrite (package-native-inputs p))) + (propagated-inputs (map rewrite (package-propagated-inputs p))))))) + + replace) + (define* (package-input-rewriting replacements #:optional (rewrite-name identity)) "Return a procedure that, when passed a package, replaces its direct and @@ -750,26 +780,14 @@ (define* (package-input-rewriting replacements Optionally, REWRITE-NAME is a one-argument procedure that takes the name of a package and returns its new name after rewrite." - (define (rewrite input) - (match input - ((label (? package? package) outputs ...) - (match (assq-ref replacements package) - (#f (cons* label (replace package) outputs)) - (new (cons* label new outputs)))) - (_ - input))) + (define (rewrite p) + (match (assq-ref replacements p) + (#f (package + (inherit p) + (name (rewrite-name (package-name p))))) + (new new))) - (define replace - (mlambdaq (p) - ;; Return a variant of P with its inputs rewritten. - (package - (inherit p) - (name (rewrite-name (package-name p))) - (inputs (map rewrite (package-inputs p))) - (native-inputs (map rewrite (package-native-inputs p))) - (propagated-inputs (map rewrite (package-propagated-inputs p)))))) - - replace) + (package-mapping rewrite (cut assq <> replacements))) ;;; diff --git a/tests/packages.scm b/tests/packages.scm index 51dc1ba2b0..930374dabf 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -886,6 +886,33 @@ (define read-at (and (build-derivations %store (list drv)) (file-exists? (string-append out "/bin/make"))))))) +(test-equal "package-mapping" + 42 + (let* ((dep (dummy-package "chbouib" + (native-inputs `(("x" ,grep))))) + (p0 (dummy-package "example" + (inputs `(("foo" ,coreutils) + ("bar" ,grep) + ("baz" ,dep))))) + (transform (lambda (p) + (package (inherit p) (source 42)))) + (rewrite (package-mapping transform)) + (p1 (rewrite p0))) + (and (eq? p1 (rewrite p0)) + (eqv? 42 (package-source p1)) + (match (package-inputs p1) + ((("foo" dep1) ("bar" dep2) ("baz" dep3)) + (and (eq? dep1 (rewrite coreutils)) ;memoization + (eq? dep2 (rewrite grep)) + (eq? dep3 (rewrite dep)) + (eqv? 42 + (package-source dep1) (package-source dep2) + (package-source dep3)) + (match (package-native-inputs dep3) + ((("x" dep)) + (and (eq? dep (rewrite grep)) + (package-source dep)))))))))) + (test-assert "package-input-rewriting" (let* ((dep (dummy-package "chbouib" (native-inputs `(("x" ,grep))))) From 1618006d0bc9bfdc63f4d199fd980f29ecc78ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Apr 2017 21:32:13 +0200 Subject: [PATCH 048/301] build-system/python: 'package-with-explicit-python' uses 'package-mapping'. * guix/build-system/python.scm (package-with-explicit-python) [package-variant, cut?]: New procedures. [transform]: Remove 'mlambdaq' form and input tuple handling. Use 'package-mapping'. --- guix/build-system/python.scm | 79 ++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 45 deletions(-) diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index 17173f121e..ffed837313 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -83,54 +83,43 @@ (define* (package-with-explicit-python python old-prefix new-prefix of packages. The property value must be the promise of a package. This is a convenient way for package writers to force the transformation to use pre-defined variants." - (define transform - ;; Memoize the transformations. Failing to do that, we would build a huge - ;; object graph with lots of duplicates, which in turns prevents us from - ;; benefiting from memoization in 'package-derivation'. - (mlambdaq (p) - (let* ((rewrite-if-package - (lambda (content) - ;; CONTENT may be a file name, in which case it is returned, - ;; or a package, which is rewritten with the new PYTHON and - ;; NEW-PREFIX. - (if (package? content) - (transform content) - content))) - (rewrite - (match-lambda - ((name content . rest) - (append (list name (rewrite-if-package content)) rest))))) + (define package-variant + (if variant-property + (lambda (package) + (assq-ref (package-properties package) + variant-property)) + (const #f))) - (cond - ;; If VARIANT-PROPERTY is present, use that. - ((and variant-property - (assoc-ref (package-properties p) variant-property)) - => force) + (define (transform p) + (cond + ;; If VARIANT-PROPERTY is present, use that. + ((package-variant p) + => force) - ;; Otherwise build the new package object graph. - ((eq? (package-build-system p) python-build-system) - (package - (inherit p) - (location (package-location p)) - (name (let ((name (package-name p))) - (string-append new-prefix - (if (string-prefix? old-prefix name) - (substring name - (string-length old-prefix)) - name)))) - (arguments - (let ((python (if (promise? python) - (force python) - python))) - (ensure-keyword-arguments (package-arguments p) - `(#:python ,python)))) - (inputs (map rewrite (package-inputs p))) - (propagated-inputs (map rewrite (package-propagated-inputs p))) - (native-inputs (map rewrite (package-native-inputs p))))) - (else - p))))) + ;; Otherwise build the new package object graph. + ((eq? (package-build-system p) python-build-system) + (package + (inherit p) + (location (package-location p)) + (name (let ((name (package-name p))) + (string-append new-prefix + (if (string-prefix? old-prefix name) + (substring name + (string-length old-prefix)) + name)))) + (arguments + (let ((python (if (promise? python) + (force python) + python))) + (ensure-keyword-arguments (package-arguments p) + `(#:python ,python)))))) + (else p))) - transform) + (define (cut? p) + (or (not (eq? (package-build-system p) python-build-system)) + (package-variant p))) + + (package-mapping transform cut?)) (define package-with-python2 ;; Note: delay call to 'default-python2' until after the 'arguments' field From a0b87ef8ec7735aa42cf35d380e9cff04f3236f3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 5 Apr 2017 01:09:22 -0700 Subject: [PATCH 049/301] profiles: Generate database file for man pages. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The mandb database file (index.db) is used by the "apropos" (whatis) or "man -k" commands. This change introduces a profile hook to generate such database file. * guix/profiles.scm (manual-database): New procedure. (%default-profile-hooks): Add it. Co-authored-by: Ludovic Courtès --- guix/profiles.scm | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/guix/profiles.scm b/guix/profiles.scm index 795c9447fe..eb172ef450 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Huang Ying +;;; Copyright © 2017 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -946,10 +947,88 @@ (define build #:local-build? #t #:substitutable? #f)) +(define (manual-database manifest) + "Return a derivation that builds the manual page database (\"mandb\") for +the entries in MANIFEST." + (define man-db ;lazy reference + (module-ref (resolve-interface '(gnu packages man)) 'man-db)) + + (define build + #~(begin + (use-modules (guix build utils) + (srfi srfi-1) + (srfi srfi-26)) + + (define entries + (filter-map (lambda (directory) + (let ((man (string-append directory "/share/man"))) + (and (directory-exists? man) + man))) + '#$(manifest-inputs manifest))) + + (define manpages-collection-dir + (string-append (getenv "PWD") "/manpages-collection")) + + (define man-directory + (string-append #$output "/share/man")) + + (define (get-manpage-tail-path manpage-path) + (let ((index (string-contains manpage-path "/share/man/"))) + (unless index + (error "Manual path doesn't contain \"/share/man/\":" + manpage-path)) + (string-drop manpage-path (+ index (string-length "/share/man/"))))) + + (define (populate-manpages-collection-dir entries) + (let ((manpages (append-map (cut find-files <> #:stat stat) entries))) + (for-each (lambda (manpage) + (let* ((dest-file (string-append + manpages-collection-dir "/" + (get-manpage-tail-path manpage)))) + (mkdir-p (dirname dest-file)) + (catch 'system-error + (lambda () + (symlink manpage dest-file)) + (lambda args + ;; Different packages may contain the same + ;; manpage. Simply ignore the symlink error. + #t)))) + manpages))) + + (mkdir-p manpages-collection-dir) + (populate-manpages-collection-dir entries) + + ;; Create a mandb config file which contains a custom made + ;; manpath. The associated catpath is the location where the database + ;; gets generated. + (copy-file #+(file-append man-db "/etc/man_db.conf") + "man_db.conf") + (substitute* "man_db.conf" + (("MANDB_MAP /usr/man /var/cache/man/fsstnd") + (string-append "MANDB_MAP " manpages-collection-dir " " + man-directory))) + + (mkdir-p man-directory) + (setenv "MANPATH" (string-join entries ":")) + + (format #t "creating manual page database for ~a packages...~%" + (length entries)) + (force-output) + + (zero? (system* #+(file-append man-db "/bin/mandb") + "--quiet" "--create" + "-C" "man_db.conf")))) + + (gexp->derivation "manual-database" build + #:modules '((guix build utils) + (srfi srfi-26)) + #:local-build? #t)) + (define %default-profile-hooks ;; This is the list of derivation-returning procedures that are called by ;; default when making a non-empty profile. (list info-dir-file + manual-database fonts-dir-file ghc-package-cache-file ca-certificate-bundle From 31f1f593fb835978085566e50d3d8c576d55fe99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Apr 2017 22:44:27 +0200 Subject: [PATCH 050/301] doc: Add "Documentation" section. * doc/guix.texi (Documentation): New node. --- doc/guix.texi | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index b2498d039e..c29af46ff1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -165,6 +165,7 @@ GNU Distribution * System Installation:: Installing the whole operating system. * System Configuration:: Configuring the operating system. +* Documentation:: Browsing software user manuals. * Installing Debugging Files:: Feeding the debugger. * Security Updates:: Deploying security fixes quickly. * Package Modules:: Packages from the programmer's viewpoint. @@ -6907,6 +6908,7 @@ For information on porting to other architectures or kernels, @menu * System Installation:: Installing the whole operating system. * System Configuration:: Configuring the operating system. +* Documentation:: Browsing software user manuals. * Installing Debugging Files:: Feeding the debugger. * Security Updates:: Deploying security fixes quickly. * Package Modules:: Packages from the programmer's viewpoint. @@ -15905,6 +15907,70 @@ This service represents PID@tie{}1. @end defvr +@node Documentation +@section Documentation + +@cindex documentation, searching for +@cindex searching for documentation +@cindex Info, documentation format +@cindex man pages +@cindex manual pages +In most cases packages installed with Guix come with documentation. +There are two main documentation formats: ``Info'', a browseable +hypertext format used for GNU software, and ``manual pages'' (or ``man +pages''), the linear documentation format traditionally found on Unix. +Info manuals are accessed with the @command{info} command or with Emacs, +and man pages are accessed using @command{man}. + +You can look for documentation of software installed on your system by +keyword. For example, the following command searches for information +about ``TLS'' in Info manuals: + +@example +$ info -k TLS +"(emacs)Network Security" -- STARTTLS +"(emacs)Network Security" -- TLS +"(gnutls)Core TLS API" -- gnutls_certificate_set_verify_flags +"(gnutls)Core TLS API" -- gnutls_certificate_set_verify_function +@dots{} +@end example + +@noindent +The command below searches for the same keyword in man pages: + +@example +$ man -k TLS +SSL (7) - OpenSSL SSL/TLS library +certtool (1) - GnuTLS certificate tool +@dots {} +@end example + +These searches are purely local to your computer so you have the +guarantee that documentation you find corresponds to what you have +actually installed, you can access it off-line, and your privacy is +respected. + +Once you have these results, you can view the relevant documentation by +running, say: + +@example +$ info "(gnutls)Core TLS API" +@end example + +@noindent +or: + +@example +$ man certtool +@end example + +Info manuals contain sections and indices as well as hyperlinks like +those found in Web pages. The @command{info} reader (@pxref{Top, Info +reader,, info-stnd, Stand-alone GNU Info}) and its Emacs counterpart +(@pxref{Misc Help,,, emacs, The GNU Emacs Manual}) provide intuitive key +bindings to navigate manuals. @xref{Getting Started,,, info, Info: An +Introduction}, for an introduction to Info navigation. + @node Installing Debugging Files @section Installing Debugging Files From 50f4ea18c46ea6e702dbd20841401662ba925f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Apr 2017 22:50:21 +0200 Subject: [PATCH 051/301] environment: Deal with single-entry search paths. This is a followup to fcd75bdbfa99d14363b905afbf914eec20e69df8. * guix/scripts/environment.scm (create-environment): Check whether SEPARATOR is #f. --- guix/scripts/environment.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 44f490043c..5a6abd00fb 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -79,7 +79,9 @@ (define (create-environment profile paths pure?) (let ((current (getenv variable))) (setenv variable (if (and current (not pure?)) - (string-append value separator current) + (if separator + (string-append value separator current) + value) value))))) (evaluate-profile-search-paths profile paths)) From a09b45da6fe951112eb30da5feb0f86266f8ba8a Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Tue, 4 Apr 2017 20:24:54 -0700 Subject: [PATCH 052/301] build: Add and export procedure 'register-root*'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/scripts/build.scm (register-root*): Add and export it. Signed-off-by: Ludovic Courtès --- guix/scripts/build.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index ba47b1232d..6bb1f72eb9 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -52,7 +52,8 @@ (define-module (guix scripts build) show-transformation-options-help guix-build - register-root)) + register-root + register-root*)) (define %default-log-urls ;; Default base URLs for build logs. @@ -123,6 +124,9 @@ (define (register-root store paths root) (leave (_ "failed to create GC root `~a': ~a~%") root (strerror (system-error-errno args))))))) +(define register-root* + (store-lift register-root)) + (define (package-with-source store p uri) "Return a package based on P but with its source taken from URI. Extract the new package's version number from URI." From 5ea69d9a563fa1e2890c94fe9574c7e16f778f3b Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Mon, 3 Apr 2017 23:49:22 -0700 Subject: [PATCH 053/301] system: Support the --root option in 'guix system'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * guix/scripts/system.scm (perform-action): Add #:gc-root parameter and honor it. (show-help): Document the --root option. (%options): Add 'root'. (process-action): Pass 'root' option to perform-action as #:gc-root. * doc/guix.texi (Invoking guix system): Document '--root'. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 5 +++++ guix/scripts/system.scm | 31 ++++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index c29af46ff1..d413ea4a50 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15238,6 +15238,11 @@ of the given @var{size}. @var{size} may be a number of bytes, or it may include a unit as a suffix (@pxref{Block size, size specifications,, coreutils, GNU Coreutils}). +@item --root=@var{file} +@itemx -r @var{file} +Make @var{file} a symlink to the result, and register it as a garbage +collector root. + @item --on-error=@var{strategy} Apply @var{strategy} when an error occurs when reading @var{file}. @var{strategy} may be one of the following: diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 144a7fd377..b0a794bf8e 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2016 Alex Kost -;;; Copyright © 2016 Chris Marusich +;;; Copyright © 2016, 2017 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -593,7 +593,8 @@ (define* (perform-action action os #:key grub? dry-run? derivations-only? use-substitutes? device target image-size full-boot? - (mappings '())) + (mappings '()) + (gc-root #f)) "Perform ACTION for OS. GRUB? specifies whether to install GRUB; DEVICE is the target devices for GRUB; TARGET is the target root directory; IMAGE-SIZE is the size of the image to be built, for the 'vm-image' and 'disk-image' @@ -601,7 +602,10 @@ (define* (perform-action action os boot directly to the kernel or to the bootloader. When DERIVATIONS-ONLY? is true, print the derivation file name(s) without -building anything." +building anything. + +When GC-ROOT is a path, also make that path an indirect root of the build +output when building a system derivation, such as a disk image." (define println (cut format #t "~a~%" <>)) @@ -665,8 +669,13 @@ (define println #:grub.cfg (derivation->output-path grub.cfg) #:device device)) (else - ;; All we had to do was to build SYS. - (return (derivation->output-path sys)))))))) + ;; All we had to do was to build SYS and maybe register an + ;; indirect GC root. + (let ((output (derivation->output-path sys))) + (mbegin %store-monad + (mwhen gc-root + (register-root* (list output) gc-root)) + (return output))))))))) (define (export-extension-graph os port) "Export the service extension graph of OS to PORT." @@ -740,6 +749,10 @@ (define (show-help) --no-grub for 'init', do not install GRUB")) (display (_ " --share=SPEC for 'vm', share host file system according to SPEC")) + (display (_ " + -r, --root=FILE for 'vm', 'vm-image', 'disk-image', 'container', + and 'build', make FILE a symlink to the result, and + register it as a garbage collector root")) (display (_ " --expose=SPEC for 'vm', expose host file system according to SPEC")) (display (_ " @@ -797,6 +810,9 @@ (define %options (lambda (opt name arg result) (alist-cons 'system arg (alist-delete 'system result eq?)))) + (option '(#\r "root") #t #f + (lambda (opt name arg result) + (alist-cons 'gc-root arg result))) %standard-build-options)) (define %default-options @@ -863,7 +879,8 @@ (define (process-action action args opts) (_ #f)) opts) #:grub? grub? - #:target target #:device device)))) + #:target target #:device device + #:gc-root (assoc-ref opts 'gc-root))))) #:system system)))) (define (process-command command args opts) From 234ea3d65330af4c62b086419f23343433cd58c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 Apr 2017 10:37:52 +0200 Subject: [PATCH 054/301] gnu: guile-aspell: Update to 0.4. * gnu/packages/guile.scm (guile-aspell): Update to 0.4. [arguments] <#:phases>: Adjust 'set-libaspell-file-name' to new source tree layout. --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 96fc84a960..99b2ca1180 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1520,7 +1520,7 @@ (define-public guile-bytestructures (define-public guile-aspell (package (name "guile-aspell") - (version "0.3") + (version "0.4") (source (origin (method url-fetch) (uri (string-append @@ -1528,7 +1528,7 @@ (define-public guile-aspell version ".tar.gz")) (sha256 (base32 - "1wknn57x2qcsbn7zw6sbn1ma6fjsg8cvpnf78ak47s8jw6k6j75n")))) + "0vpk5xj9m9qc702z3khmkwhgpb949qbsyz8kw2qycda6qnxk0077")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--with-guilesitedir=" @@ -1538,7 +1538,7 @@ (define-public guile-aspell (add-before 'build 'set-libaspell-file-name (lambda* (#:key inputs #:allow-other-keys) (let ((aspell (assoc-ref inputs "aspell"))) - (substitute* "aspell/aspell.scm" + (substitute* "aspell.scm" (("\"libaspell\\.so\"") (string-append "\"" aspell "/lib/libaspell\""))) From 7295087eb1fad67978b7f787b8e92de3fdf70f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 Apr 2017 10:41:59 +0200 Subject: [PATCH 055/301] gnu: guile-aspell: Remove hard-coded "site/2.0" from $(guilesitedir). * gnu/packages/guile.scm (guile-aspell)[arguments]: Remove #:configure-flags. Add 'set-guilesitedir' phase. --- gnu/packages/guile.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 99b2ca1180..62a58dcf98 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1531,10 +1531,14 @@ (define-public guile-aspell "0vpk5xj9m9qc702z3khmkwhgpb949qbsyz8kw2qycda6qnxk0077")))) (build-system gnu-build-system) (arguments - '(#:configure-flags (list (string-append "--with-guilesitedir=" - (assoc-ref %outputs "out") - "/share/guile/site/2.0")) - #:phases (modify-phases %standard-phases + '(#:phases (modify-phases %standard-phases + (add-before 'configure 'set-guilesitedir + (lambda _ + (substitute* "Makefile.in" + (("^guilesitedir =.*$") + "guilesitedir = \ +$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) + #t)) (add-before 'build 'set-libaspell-file-name (lambda* (#:key inputs #:allow-other-keys) (let ((aspell (assoc-ref inputs "aspell"))) From cb5be6df9191ae00b495cf37a35e6b3b3cd4b5a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 Apr 2017 10:45:29 +0200 Subject: [PATCH 056/301] gnu: guile-aspell: Switch to Guile 2.2. * gnu/packages/guile.scm (guile-aspell)[inputs]: Replace GUILE-2.0 with GUILE-2.2. --- gnu/packages/guile.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 62a58dcf98..d69b627f9a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1548,7 +1548,7 @@ (define-public guile-aspell "/lib/libaspell\""))) #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.0) + (inputs `(("guile" ,guile-2.2) ("aspell" ,aspell))) (home-page "https://github.com/spk121/guile-aspell") (synopsis "Spell-checking from Guile") From 538bce2472fb17e29619bb67ae67cbab09191225 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 14:32:06 +0200 Subject: [PATCH 057/301] gnu: ldc-bootstrap: Delete failing test. * gnu/packages/ldc.scm (ldc-bootstrap)[arguments]: Delete failing test in build phase. --- gnu/packages/ldc.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm index fd4d60e8b8..881029a43d 100644 --- a/gnu/packages/ldc.scm +++ b/gnu/packages/ldc.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015, 2016 Roel Janssen ;;; Copyright © 2015 Pjotr Prins ;;; Copyright © 2017 Frederick Muriithi +;;; Copyright © 2017 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,6 +121,8 @@ (define-public ldc-bootstrap (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) (substitute* "tests/d2/dmd-testsuite/Makefile" (("/bin/bash") (which "bash"))) + ;; FIXME: this test cannot be linked. + (delete-file "tests/d2/dmd-testsuite/runnable/cppa.d") #t))))) (inputs `(("libconfig" ,libconfig) From aad7808526987f56a93c7a50a5dd969badbdbd28 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 11:12:16 +0200 Subject: [PATCH 058/301] gnu: r-jsonlite: Update to 1.3. * gnu/packages/web.scm (r-jsonlite): Update to 1.3. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7215dcbed1..a279fc5944 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013 Aljosha Papsch ;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016 Mark H Weaver -;;; Copyright © 2015, 2016 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016, 2017 Eric Bavier ;;; Copyright © 2015 Eric Dvorsak @@ -3316,13 +3316,13 @@ (define-public r-httpuv (define-public r-jsonlite (package (name "r-jsonlite") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) (uri (cran-uri "jsonlite" version)) (sha256 (base32 - "0k966hzp3qnwck7fgd76w49zrz39s7pqyywws17bhbcd8rh4csyb")))) + "0y55znjn69af4d4cy7n8r3nlgblnri7vdhvzpvp4fq4n43faqzsw")))) (build-system r-build-system) (home-page "http://arxiv.org/abs/1403.2805") (synopsis "Robust, high performance JSON parser and generator for R") From 33eb555e6f8fcdbbd3e7a6b0abb3df725e34a93c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 11:47:50 +0200 Subject: [PATCH 059/301] gnu: r-tibble: Update to 1.3.0. * gnu/packages/statistics.scm (r-tibble): Update to 1.3.0. [propagated-inputs]: Remove "r-assertthat". --- gnu/packages/statistics.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 86646fcfe3..f3f99eb7bf 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1525,18 +1525,17 @@ (define-public r-r6 (define-public r-tibble (package (name "r-tibble") - (version "1.2") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "tibble" version)) (sha256 (base32 - "011i352ylq9b4xfcj7h10h7qsqd9qkc1rzc0pr1gf8qjb788p2pd")))) + "1q25i1cv3qms6d3lw7jd3z142w188znkcbyam460gn9si8l8g2bk")))) (build-system r-build-system) (propagated-inputs - `(("r-assertthat" ,r-assertthat) - ("r-lazyeval" ,r-lazyeval) + `(("r-lazyeval" ,r-lazyeval) ("r-rcpp" ,r-rcpp))) (home-page "https://github.com/hadley/tibble") (synopsis "Simple data frames") From 67deeea41b57a734aa471469dcbdac07f1aa5a70 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 11:55:40 +0200 Subject: [PATCH 060/301] gnu: r-readr: Update to 1.1.0. * gnu/packages/statistics.scm (r-readr): Update to 1.1.0. [propagated-inputs]: Remove "r-curl". --- gnu/packages/statistics.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f3f99eb7bf..19040f4985 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2307,17 +2307,16 @@ (define-public r-hms (define-public r-readr (package (name "r-readr") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "readr" version)) (sha256 (base32 - "0xji0dbal6xcxnsmjj678fw29n7wrj45wrd5ng99yhqqijcm9f6g")))) + "1g7g3gdmvq7nj8asw6fi13k38c420sy9696nqgkrhlvv5h13yqs7")))) (build-system r-build-system) (propagated-inputs - `(("r-curl" ,r-curl) - ("r-rcpp" ,r-rcpp) + `(("r-rcpp" ,r-rcpp) ("r-hms" ,r-hms) ("r-tibble" ,r-tibble) ("r-r6" ,r-r6) From 1cbb07a8e4c4ee1debc023ee5ce345490699df43 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:07:47 +0200 Subject: [PATCH 061/301] gnu: Add r-desc. * gnu/packages/statistics.scm (r-desc): New variable. --- gnu/packages/statistics.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 19040f4985..292cc5032e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2111,6 +2111,31 @@ (define-public r-brew module, Java Server Pages, and Python's psp module.") (license license:gpl2+))) +(define-public r-desc + (package + (name "r-desc") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "desc" version)) + (sha256 + (base32 + "0mc1jmiwqyj7s6gzxz6fyamzjpmdn3rpfpllby2fq11ml30c6jpr")))) + (build-system r-build-system) + (propagated-inputs + `(("r-assertthat" ,r-assertthat) + ("r-crayon" ,r-crayon) + ("r-r6" ,r-r6) + ("r-rprojroot" ,r-rprojroot))) + (home-page "https://github.com/r-pkgs/desc") + (synopsis "Manipulate DESCRIPTION Files") + (description + "This package provides tools to read, write, create, and manipulate +DESCRIPTION files. It is intended for packages that create or manipulate +other packages.") + (license license:expat))) + (define-public r-roxygen2 (package (name "r-roxygen2") From bf6dcf59ebe64a679e141559d979655d24cba7cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:08:10 +0200 Subject: [PATCH 062/301] gnu: Add r-commonmark. * gnu/packages/statistics.scm (r-commonmark): New variable. --- gnu/packages/statistics.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 292cc5032e..9bb6a76be2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2136,6 +2136,30 @@ (define-public r-desc other packages.") (license license:expat))) +(define-public r-commonmark + (package + (name "r-commonmark") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "commonmark" version)) + (sha256 + (base32 + "12q5mncxvkwdxc35is6y5idx8a1h99hyz5x6ri0arni6k25krchk")))) + (build-system r-build-system) + ;;(inputs `(("zlib" ,zlib))) + (home-page "http://cran.r-project.org/web/packages/commonmark") + (synopsis "CommonMark and Github Markdown Rendering in R") + (description + "The CommonMark specification defines a rationalized version of markdown +syntax. This package uses the 'cmark' reference implementation for converting +markdown text into various formats including HTML, LaTeX and groff man. In +addition, it exposes the markdown parse tree in XML format. The latest +version of this package also adds support for Github extensions including +tables, autolinks and strikethrough text.") + (license license:bsd-2))) + (define-public r-roxygen2 (package (name "r-roxygen2") From 1db293757b9b3e9c232830f3cb6c6d0093f063c9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:08:37 +0200 Subject: [PATCH 063/301] gnu: r-roxygen2: Update to 6.0.1. * gnu/packages/statistics.scm (r-roxygen2): Update to 6.0.1. [propagated-inputs]: Add "r-commonmark", "r-desc", "r-r6", and "r-xml2". --- gnu/packages/statistics.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 9bb6a76be2..20ccc25705 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2163,20 +2163,24 @@ (define-public r-commonmark (define-public r-roxygen2 (package (name "r-roxygen2") - (version "5.0.1") + (version "6.0.1") (source (origin (method url-fetch) (uri (cran-uri "roxygen2" version)) (sha256 (base32 - "19gblyrrn29msbpawcb1hn5m1rshiqwxy0lby0vf92rm13fmsxcz")))) + "0xpzziminf225kjwhyl51kgkzhplyzhk5farhf5s822krl2xqbfj")))) (build-system r-build-system) (propagated-inputs `(("r-brew" ,r-brew) + ("r-commonmark" ,r-commonmark) + ("r-desc" ,r-desc) ("r-digest" ,r-digest) + ("r-r6" ,r-r6) ("r-rcpp" ,r-rcpp) ("r-stringi" ,r-stringi) - ("r-stringr" ,r-stringr))) + ("r-stringr" ,r-stringr) + ("r-xml2" ,r-xml2))) (home-page "https://github.com/klutometis/roxygen") (synopsis "In-source documentation system for R") (description From d51f05f76928681a83d5da8b103457e3d65e510a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:17:34 +0200 Subject: [PATCH 064/301] gnu: r-tidyr: Update to 0.6.1. * gnu/packages/statistics.scm (r-tidyr): Update to 0.6.1. [propagated-inputs]: Add "r-tibble". --- gnu/packages/statistics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 20ccc25705..03292c7875 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3571,21 +3571,22 @@ (define-public r-viridislite (define-public r-tidyr (package (name "r-tidyr") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "tidyr" version)) (sha256 (base32 - "1bpwbphgl43ym433b0nrshwhr7pprmj1wkpkamdzix1zvf9dcbc2")))) + "11hs3gqpbaw3w281as4m7j9n594ix5axfpwbyjsd0l62pwnzj217")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) ("r-lazyeval" ,r-lazyeval) ("r-magrittr" ,r-magrittr) ("r-rcpp" ,r-rcpp) - ("r-stringi" ,r-stringi))) + ("r-stringi" ,r-stringi) + ("r-tibble" ,r-tibble))) (home-page "https://github.com/hadley/tidyr") (synopsis "Tidy data with `spread()` and `gather()` functions") (description From da250f733a90fd1e478d6f4114a9f7186355cbee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:24:00 +0200 Subject: [PATCH 065/301] gnu: r-bioccheck: Update to 1.10.1. * gnu/packages/bioinformatics.scm (r-bioccheck): Update to 1.10.1. [propagated-inputs]: Remove "r-knitr" and "r-devtools". --- gnu/packages/bioinformatics.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c8219cc2cc..396d2d68ac 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6142,13 +6142,13 @@ (define-public r-biocstyle (define-public r-bioccheck (package (name "r-bioccheck") - (version "1.10.0") + (version "1.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocCheck" version)) (sha256 (base32 - "1rfy37xg1nc2cmgbclvzsi7sgmdcdjiahsx9crgx3yaw7kxgiack")))) + "197kpiycyl3qawm6801fxyxj81d2g57a00qxaqprapsf1d140l52")))) (properties `((upstream-name . "BiocCheck"))) (build-system r-build-system) @@ -6176,10 +6176,8 @@ (define-public r-bioccheck (propagated-inputs `(("r-codetools" ,r-codetools) ("r-graph" ,r-graph) - ("r-knitr" ,r-knitr) ("r-httr" ,r-httr) ("r-optparse" ,r-optparse) - ("r-devtools" ,r-devtools) ("r-biocinstaller" ,r-biocinstaller) ("r-biocviews" ,r-biocviews))) (home-page "http://bioconductor.org/packages/BiocCheck") From acbeb2d56be7557f014d4e756438c54acaa61a81 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:27:53 +0200 Subject: [PATCH 066/301] gnu: r-xvector: Update to 0.14.1. * gnu/packages/bioinformatics.scm (r-xvector): Update to 0.14.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 396d2d68ac..4f2bfcd3e2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6447,13 +6447,13 @@ (define-public r-limma (define-public r-xvector (package (name "r-xvector") - (version "0.14.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "XVector" version)) (sha256 (base32 - "09lbqxpqr80g0kw77mpz0p1a8cq706j33kz8194wp71il67cdzi7")))) + "1j14ip4c260kdp3zcmgfa2v8ky88csa0gfdg6a1xsb64s03hdbm6")))) (properties `((upstream-name . "XVector"))) (build-system r-build-system) From 4cd07e487ef275c0d9d5f68d5f43bf9b2a641e6d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:29:11 +0200 Subject: [PATCH 067/301] gnu: r-genomeinfodb: Update to 1.10.3. * gnu/packages/bioinformatics.scm (r-genomeinfodb): Update to 1.10.3. [propagated-inputs]: Add "r-rcurl". --- gnu/packages/bioinformatics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4f2bfcd3e2..93bdc29dbe 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6337,19 +6337,20 @@ (define-public r-iranges (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.10.2") + (version "1.10.3") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "0zh894qd1sgpjbn0wfvq6hs2dzn7y1pyicvzk2aa48y3zbidanv7")))) + "18g24cf6b3vi13w85ki2mam6i2gl4yxr1zchyga34xc3dkdngzrw")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) ("r-iranges" ,r-iranges) + ("r-rcurl" ,r-rcurl) ("r-s4vectors" ,r-s4vectors))) (home-page "http://bioconductor.org/packages/GenomeInfoDb") (synopsis "Utilities for manipulating chromosome identifiers") From d3812fb23356eff52fb91511b1f58543dec7d095 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:30:40 +0200 Subject: [PATCH 068/301] gnu: r-curl: Update to 2.4. * gnu/packages/web.scm (r-curl): Update to 2.4. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a279fc5944..841825c768 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3451,13 +3451,13 @@ (define-public r-htmltable (define-public r-curl (package (name "r-curl") - (version "2.3") + (version "2.4") (source (origin (method url-fetch) (uri (cran-uri "curl" version)) (sha256 (base32 - "0gbw5l0wnsw26fbr08gj9vgxrzxg8axvqxfshmd8g9khpgbdl0gr")))) + "0j1i24irpn4hvpcs61rzq0n19rmgmn29v48qc36csjk3r661l4pm")))) (build-system r-build-system) (arguments `(#:phases From e15f962fef65355fc8d8523edaaab05c49767931 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:31:07 +0200 Subject: [PATCH 069/301] gnu: r-htmltable: Update to 1.9. * gnu/packages/web.scm (r-htmltable): Update to 1.9. [propagated-inputs]: Add "r-checkmate" and "r-htmlwidgets". --- gnu/packages/web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 841825c768..b0e317059b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3422,18 +3422,20 @@ (define-public r-htmlwidgets (define-public r-htmltable (package (name "r-htmltable") - (version "1.7") + (version "1.9") (source (origin (method url-fetch) (uri (cran-uri "htmlTable" version)) (sha256 (base32 - "0x2f2hrbhvm53zqwn0ny9wxbk34nwf6zww8cx4bjy5ax15asdllm")))) + "0ciic1f4iczq14j81fg7kxibn65sy8z1zxkvk1yxnxxg6dzplj2v")))) (properties `((upstream-name . "htmlTable"))) (build-system r-build-system) (propagated-inputs - `(("r-knitr" ,r-knitr) + `(("r-checkmate" ,r-checkmate) + ("r-htmlwidgets" ,r-htmlwidgets) + ("r-knitr" ,r-knitr) ("r-magrittr" ,r-magrittr) ("r-stringr" ,r-stringr))) (home-page "http://gforge.se/packages/") From 7ceb26ee839fc78808a43033dd0d0c4bcb17246f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:32:28 +0200 Subject: [PATCH 070/301] gnu: r-rprojroot: Update to 1.2. * gnu/packages/statistics.scm (r-rprojroot): Update to 1.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 03292c7875..cb6aef6483 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2527,14 +2527,14 @@ (define-public r-catools (define-public r-rprojroot (package (name "r-rprojroot") - (version "1.1") + (version "1.2") (source (origin (method url-fetch) (uri (cran-uri "rprojroot" version)) (sha256 (base32 - "04ywfpar4d2hyi4rh4fbixrbzd665gpa2jhx67g8857cr70pp0nh")))) + "1fgyxv1zv04sllcclzz089xl6hpdzac7xk61l0l4acb7rqsx5d18")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports))) From 9aea2cdaff2d96bbf05bfc359f153397c0ee724e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:35:30 +0200 Subject: [PATCH 071/301] gnu: r-lattice: Update to 0.20-35. * gnu/packages/statistics.scm (r-lattice): Update to 0.20-35. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index cb6aef6483..015726d832 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -406,13 +406,13 @@ (define-public r-kernsmooth (define-public r-lattice (package (name "r-lattice") - (version "0.20-34") + (version "0.20-35") (source (origin (method url-fetch) (uri (cran-uri "lattice" version)) (sha256 (base32 - "0615h69czr73k47whhzimf1qxv5qk0cabcrkljwhyrn6m6piq6ja")))) + "0pcnmaz3lr62ly0dcy5hnnqxshc4yqd43hrvlz3almgc9l7sna88")))) (build-system r-build-system) (home-page "http://lattice.r-forge.r-project.org/") (synopsis "High-level data visualization system") From 9704bda1b3c8984d7566176c654f458da2672110 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:35:54 +0200 Subject: [PATCH 072/301] gnu: r-matrix: Update to 1.2-8. * gnu/packages/statistics.scm (r-matrix): Update to 1.2-8. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 015726d832..c94ead266e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -426,14 +426,14 @@ (define-public r-lattice (define-public r-matrix (package (name "r-matrix") - (version "1.2-7.1") + (version "1.2-8") (source (origin (method url-fetch) (uri (cran-uri "Matrix" version)) (sha256 (base32 - "09rd51na9spz0lm1lylkfhw43w7c922b83m4jsggmpg3pbd6dssa")))) + "1dyv42d7ranb85y8hvi57hbg5xnvhdzqn56wcq3qmhazqj3s3liw")))) (properties `((upstream-name . "Matrix"))) (build-system r-build-system) (propagated-inputs From a6dcc78cb0acb0bb23169655004846bd79f7c35d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:36:18 +0200 Subject: [PATCH 073/301] gnu: r-mgcv: Update to 1.8-17. * gnu/packages/statistics.scm (r-mgcv): Update to 1.8-17. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c94ead266e..02ac29f34d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -471,14 +471,14 @@ (define-public r-nlme (define-public r-mgcv (package (name "r-mgcv") - (version "1.8-16") + (version "1.8-17") (source (origin (method url-fetch) (uri (cran-uri "mgcv" version)) (sha256 (base32 - "0pj31gdwra7nv8spys4pfcbmsik99q1y1d0d2g37ywc3sz5s0rlj")))) + "1zj223l4a3j15d3c01wv7dkzn9w6084gxrq5600ck9rvr0lfpwwg")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix) From 344e4741a1a5cddf34cc71e937357600523c90cf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:36:38 +0200 Subject: [PATCH 074/301] gnu: r-survival: Update to 2.41-3. * gnu/packages/statistics.scm (r-survival): Update to 2.41-3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 02ac29f34d..5bad0a5a45 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -553,14 +553,14 @@ (define-public r-spatial (define-public r-survival (package (name "r-survival") - (version "2.40-1") + (version "2.41-3") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "10pf0kq0g66k5rgizrvh29mq3r84acljw2jgrv5yp6z38xw23mci")))) + "07cnr0hnki6ybbjll54l4s5lllhk19vni5f8m0mvsfp99ls7qygk")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) From 9948b8e24c81c7c67f0c20b2573f8307e136ee8f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:37:01 +0200 Subject: [PATCH 075/301] gnu: r-digest: Update to 0.6.12. * gnu/packages/statistics.scm (r-digest): Update to 0.6.12. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 5bad0a5a45..da70b19891 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -684,13 +684,13 @@ (define-public r-dichromat (define-public r-digest (package (name "r-digest") - (version "0.6.10") + (version "0.6.12") (source (origin (method url-fetch) (uri (cran-uri "digest" version)) (sha256 - (base32 "07825781nl85gx3pqskc04ywgs0f874qj9z2nyrwz7h0aqks0l8c")))) + (base32 "1awy9phxdvqnadby7rvwy2hkbrj210bqf4xvi27asdq028zlcyd4")))) (build-system r-build-system) ;; Vignettes require r-knitr, which requires r-digest, so we have to ;; disable them and the tests. From 69a8ed6a12aec81edfd93e0fcadb4971f082cc11 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:37:21 +0200 Subject: [PATCH 076/301] gnu: r-rcpp: Update to 0.12.10. * gnu/packages/statistics.scm (r-rcpp): Update to 0.12.10. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index da70b19891..e7055574ae 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -814,13 +814,13 @@ (define-public r-munsell (define-public r-rcpp (package (name "r-rcpp") - (version "0.12.8") + (version "0.12.10") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "0is1vql1q82g7yakad4skx707ip0fx3rgdwv9a8mi8259gly2qji")))) + (base32 "108p485agxwgmnl9p54vsyy94w96lcimlk08v71ddm77gfl13y2f")))) (build-system r-build-system) (home-page "http://www.rcpp.org") (synopsis "Seamless R and C++ Integration") From 5beda28f6bd42b0fc2c7cf3bef126ddf07031efb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:37:40 +0200 Subject: [PATCH 077/301] gnu: r-stringi: Update to 1.1.3. * gnu/packages/statistics.scm (r-stringi): Update to 1.1.3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e7055574ae..d97be44463 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -943,14 +943,14 @@ (define-public r-sendmailr (define-public r-stringi (package (name "r-stringi") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (cran-uri "stringi" version)) (sha256 (base32 - "13i1p6j8mx31hsw2s4c2phm2llrrdakzixkm6i0axsxprri722z5")))) + "12gk38ck06dxx1msj603ifqfsdy2slm85j62nqf7qydywii21wly")))) (build-system r-build-system) (inputs `(("icu4c" ,icu4c))) (native-inputs `(("pkg-config" ,pkg-config))) From 7267f358a06de5eb35317a445a2410345a07a28e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:37:59 +0200 Subject: [PATCH 078/301] gnu: r-stringr: Update to 1.2.0. * gnu/packages/statistics.scm (r-stringr): Update to 1.2.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index d97be44463..2312b57519 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -969,13 +969,13 @@ (define-public r-stringi (define-public r-stringr (package (name "r-stringr") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "stringr" version)) (sha256 - (base32 "0css5j4psl80br75chg6s1s3ipzf89f71bnbys34flp9yghg1cfc")))) + (base32 "16hj2rmv8x03lp6cp2jk0k2plibvbggf444kp05przdvd03v7l31")))) (build-system r-build-system) (propagated-inputs `(("r-magrittr" ,r-magrittr) From 5e0fa201a27dd7061e142d7b92552067a330cd13 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:38:18 +0200 Subject: [PATCH 079/301] gnu: r-gdtools: Update to 0.1.4. * gnu/packages/statistics.scm (r-gdtools): Update to 0.1.4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2312b57519..75f703fe54 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1073,14 +1073,14 @@ (define-public r-ggplot2 (define-public r-gdtools (package (name "r-gdtools") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (cran-uri "gdtools" version)) (sha256 (base32 - "1prh814lw3qkgnf0760cvpic1k68jhlkpcxlksv8chjkvsrnnf09")))) + "0l8c4bh6765x9s6rw3mfm1bgicdzdngir1kxh9pxx4sidrdndcip")))) (build-system r-build-system) (native-inputs `(("r-rcpp" ,r-rcpp) From e8988ff9a02052a967437a18e3632e7d87defe42 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:38:43 +0200 Subject: [PATCH 080/301] gnu: r-dbi: Update to 0.6-1. * gnu/packages/statistics.scm (r-dbi): Update to 0.6-1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 75f703fe54..96f96fdb9a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1162,13 +1162,13 @@ (define-public r-lazyeval (define-public r-dbi (package (name "r-dbi") - (version "0.5-1") + (version "0.6-1") (source (origin (method url-fetch) (uri (cran-uri "DBI" version)) (sha256 (base32 - "1idwm9lkmz6ns6h0vvgml18mg0k7vjqiv9p5svrdcmx7r1rirpdi")))) + "1fg158k4n6l3rzx9nrwhp4nwkwpbmv1q7z2xz5rw138zws68fkgr")))) (build-system r-build-system) (home-page "https://github.com/rstats-db/DBI") (synopsis "R database interface") From b8acb5aa46b864f35273f0ad581d05a5c58ab955 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:39:05 +0200 Subject: [PATCH 081/301] gnu: r-cluster: Update to 2.0.6. * gnu/packages/statistics.scm (r-cluster): Update to 2.0.6. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 96f96fdb9a..0a61d09f09 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1601,14 +1601,14 @@ (define-public r-acepack (define-public r-cluster (package (name "r-cluster") - (version "2.0.5") + (version "2.0.6") (source (origin (method url-fetch) (uri (cran-uri "cluster" version)) (sha256 (base32 - "1bkvqmv8h2c423q9ag2afb6s9j2vcdlxsf559zzbimraphrr2c2b")))) + "1z4gbz7chxxi4ly6c0yjlikwgf8aa8dlg05cn5cd6pjr21zvh97l")))) (build-system r-build-system) (inputs `(("gfortran" ,gfortran))) From 9e8fac0c4539e242d0f28682e817f1d9557ab6b2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:39:27 +0200 Subject: [PATCH 082/301] gnu: r-chron: Update to 2.3-50. * gnu/packages/statistics.scm (r-chron): Update to 2.3-50. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 0a61d09f09..1a66a9e5f2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1686,13 +1686,13 @@ (define-public r-locfit (define-public r-chron (package (name "r-chron") - (version "2.3-48") + (version "2.3-50") (source (origin (method url-fetch) (uri (cran-uri "chron" version)) (sha256 (base32 - "1q1d0p2wq19w3mpfqnrg8nmspxqmhv4ap52r393s6y3abl36ccac")))) + "1w3sl60gsirniqslb3pa75caiqbzbvc44phpd4czvwkb62xx1vx9")))) (build-system r-build-system) (home-page "http://cran.r-project.org/web/packages/chron") (synopsis "Chronological R objects which can handle dates and times") From 10ffdb94e4e2b325ced6bc3013e8a5a9171d9b57 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:40:13 +0200 Subject: [PATCH 083/301] gnu: r-data-table: Update to 1.10.4. * gnu/packages/statistics.scm (r-data-table): Update to 1.10.4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1a66a9e5f2..166ccd2743 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1704,13 +1704,13 @@ (define-public r-chron (define-public r-data-table (package (name "r-data-table") - (version "1.10.0") + (version "1.10.4") (source (origin (method url-fetch) (uri (cran-uri "data.table" version)) (sha256 (base32 - "1168arn4wjd1jj7kgr4sb8xd52hr8p8iqp85g5jwp3mkz4p76qfg")))) + "0ykbjr1x50ajxbri385vi3mnxj7zg1dcgh9y0snp341qmmmdypw6")))) (build-system r-build-system) (home-page "https://github.com/Rdatatable/data.table/wiki") (synopsis "Enhanced version of data.frame R object") From c6e40db528debfe2069a72911575f7acc0196f7c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:40:37 +0200 Subject: [PATCH 084/301] gnu: r-ade4: Update to 1.7-6. * gnu/packages/statistics.scm (r-ade4): Update to 1.7-6. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 166ccd2743..82a33c903e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1866,14 +1866,14 @@ (define-public r-coda (define-public r-ade4 (package (name "r-ade4") - (version "1.7-5") + (version "1.7-6") (source (origin (method url-fetch) (uri (cran-uri "ade4" version)) (sha256 (base32 - "0aaqbnydm5fb37nrvqj4bx6hxax7255j426cwh2lh88nyvznbq37")))) + "0lnc37d6waajmagy8qvw206pyc4vgrpzl3hk3j9frh6wa0b8x140")))) (build-system r-build-system) (home-page "http://pbil.univ-lyon1.fr/ADE-4") (synopsis "Multivariate data analysis and graphical display") From 0fbae8ebcae2e0d3268d05dbb7b7d3fbbc97ddec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:40:58 +0200 Subject: [PATCH 085/301] gnu: r-xml2: Update to 1.1.1. * gnu/packages/statistics.scm (r-xml2): Update to 1.1.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 82a33c903e..396600165d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1885,14 +1885,14 @@ (define-public r-ade4 (define-public r-xml2 (package (name "r-xml2") - (version "1.0.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "xml2" version)) (sha256 (base32 - "0f2alsrk3yykznbhnz4pcsg9mb72cv607vbapqx5kqfv39772kgr")))) + "05iifrcgzx53w5ciw8bbm4vdwc3giv4xsvazv8chqxkndfvf7wq0")))) (build-system r-build-system) (inputs `(("libxml2" ,libxml2))) From d05e45f33c9e7d5a1de384ced21e48312970bcb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:41:15 +0200 Subject: [PATCH 086/301] gnu: r-multitaper: Update to 1.0-13. * gnu/packages/statistics.scm (r-multitaper): Update to 1.0-13. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 396600165d..0c0f181019 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1909,14 +1909,14 @@ (define-public r-xml2 (define-public r-multitaper (package (name "r-multitaper") - (version "1.0-12") + (version "1.0-13") (source (origin (method url-fetch) (uri (cran-uri "multitaper" version)) (sha256 (base32 - "011qpkwpjclfc24y2qqigmdnikqwdnanflfhihigh5b5k7qwgm5j")))) + "1ckf9bhvd5k7ypaw2viqh3cyj9jij0ygcp4q9pxwqs508s6yx3a5")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) From f1870aef998383ded3307f2f881a1dd97e61db11 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:41:40 +0200 Subject: [PATCH 087/301] gnu: r-backports: Update to 1.0.5. * gnu/packages/statistics.scm (r-backports): Update to 1.0.5. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 0c0f181019..e0a2b58486 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1975,14 +1975,14 @@ (define-public r-whisker (define-public r-backports (package (name "r-backports") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (cran-uri "backports" version)) (sha256 (base32 - "0fssh5rnnvpp8wm0ml9gk765idwrgj07xyxpkhpidl9zwydxzif2")))) + "1pn1ii8vbkgxcqvx52kzsbwf9gkn9fp33388087zky2hmdzdirn0")))) (build-system r-build-system) (home-page "http://cran.r-project.org/web/packages/backports") (synopsis "Reimplementations of functions introduced since R 3.0.0") From ac5e81020557187b51e8a49aa1689ffb6feb0905 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:42:11 +0200 Subject: [PATCH 088/301] gnu: r-bbmisc: Update to 1.11. * gnu/packages/statistics.scm (r-bbmisc): Update to 1.11. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e0a2b58486..d5f834deda 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2020,14 +2020,14 @@ (define-public r-checkmate (define-public r-bbmisc (package (name "r-bbmisc") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) (uri (cran-uri "BBmisc" version)) (sha256 (base32 - "0cw2mhw7qhdrx91zzd5iwyh7ch9fy4wxga8j63731q6sxr1airjl")))) + "1lh1n4bvxzivb5rbz69mvd8xdgr3gr2bnqd68a39sd1530l8r90y")))) (properties `((upstream-name . "BBmisc"))) (build-system r-build-system) (propagated-inputs From 0def707ad87cf4e25644b801391c924c43a34f79 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:42:31 +0200 Subject: [PATCH 089/301] gnu: r-rmarkdown: Update to 1.4. * gnu/packages/statistics.scm (r-rmarkdown): Update to 1.4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index d5f834deda..dea0cc9019 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2550,14 +2550,14 @@ (define-public r-rprojroot (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "1.3") + (version "1.4") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 (base32 - "1vvxyf3zhyxx6k697lia299456hryp8nh3zr0fc27f3107a8mcjf")))) + "1dvs9cq88g61wfimifagq6y98yxavxzjan39jvpdsg98mafckq9g")))) (properties `((upstream-name . "rmarkdown"))) (build-system r-build-system) (propagated-inputs From 1c27bb8f449042ea795f636f09e3a24ad8fc9604 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:42:55 +0200 Subject: [PATCH 090/301] gnu: r-rsqlite: Update to 1.1-2. * gnu/packages/statistics.scm (r-rsqlite): Update to 1.1-2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index dea0cc9019..cbf3127a61 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2643,13 +2643,13 @@ (define-public r-plogr (define-public r-rsqlite (package (name "r-rsqlite") - (version "1.1-1") + (version "1.1-2") (source (origin (method url-fetch) (uri (cran-uri "RSQLite" version)) (sha256 (base32 - "11vnzds5gidgakdmsbdn0bvnsz064ym1savwb7l6gc1bjn7xa2k4")))) + "0mg9yhdvny3vjn72agai5ghqxd3vk8cd4x1lsc0gzc2b2dm2w0p4")))) (properties `((upstream-name . "RSQLite"))) (build-system r-build-system) (propagated-inputs From fb708a1c74b63f098cca37ec4b858acb4d0f5f4b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:43:19 +0200 Subject: [PATCH 091/301] gnu: r-xml: Update to 3.98-1.6. * gnu/packages/statistics.scm (r-xml): Update to 3.98-1.6. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index cbf3127a61..aba21fe253 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2700,13 +2700,13 @@ (define-public r-rcurl (define-public r-xml (package (name "r-xml") - (version "3.98-1.5") + (version "3.98-1.6") (source (origin (method url-fetch) (uri (cran-uri "XML" version)) (sha256 (base32 - "0dcdj7ryn8lm7wmv4hqhh9jxa5k97l6ad8xyvb932yfkwj1g1byy")))) + "1amxx7fpik162nimrr7m5lvv6rhx9cwdyg44fxp1i5wm3y4skwnz")))) (properties `((upstream-name . "XML"))) (build-system r-build-system) From 1d1fbb7336dbf356f020f4b6580ca31ee920d270 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:43:50 +0200 Subject: [PATCH 092/301] gnu: r-sparsem: Update to 1.76. * gnu/packages/statistics.scm (r-sparsem): Update to 1.76. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index aba21fe253..7d97976364 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2859,13 +2859,13 @@ (define-public r-snow (define-public r-sparsem (package (name "r-sparsem") - (version "1.74") + (version "1.76") (source (origin (method url-fetch) (uri (cran-uri "SparseM" version)) (sha256 (base32 - "1fpfhld887y5lyb8jydprmv5krqm1fk6n53z942b4g4z1v4g04j7")))) + "16xnl9cacim35aawq6bmd2y6rrhnh1kg6dwsy3k5yslkfr1y9j62")))) (properties `((upstream-name . "SparseM"))) (inputs From 82b281fe12ca8887e82041364b6aff6dad01c46c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:44:13 +0200 Subject: [PATCH 093/301] gnu: r-e1071: Update to 1.6-8. * gnu/packages/statistics.scm (r-e1071): Update to 1.6-8. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 7d97976364..3f30c977ef 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3190,14 +3190,14 @@ (define-public r-rtsne (define-public r-e1071 (package (name "r-e1071") - (version "1.6-7") + (version "1.6-8") (source (origin (method url-fetch) (uri (cran-uri "e1071" version)) (sha256 (base32 - "1069qwj9gsjq6par2cgfah8nn5x2w38830761x1f7mqpmk0gnj3h")))) + "08n6i26nfckjpxjkzi8phhanc3ahsrirkv5rz38y2jcv7ds031pn")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class))) From af7a4cc8a8624fb96e11d96bd03d5aa4ece888a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:44:38 +0200 Subject: [PATCH 094/301] gnu: r-mvtnorm: Update to 1.0-6. * gnu/packages/statistics.scm (r-mvtnorm): Update to 1.0-6. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 3f30c977ef..23d8a340c0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3477,13 +3477,13 @@ (define-public r-r-rsp (define-public r-mvtnorm (package (name "r-mvtnorm") - (version "1.0-5") + (version "1.0-6") (source (origin (method url-fetch) (uri (cran-uri "mvtnorm" version)) (sha256 (base32 - "1pc1mi2h063gh4a40009xk5j6pf5bm4274i5kycln38dixsry3yh")))) + "0i74s9dl4jf1gln6agra8h38qn9ifd5v0gi13caj1da5nrbmn0aa")))) (build-system r-build-system) (inputs `(("gfortran" ,gfortran))) From cdadca5e6f110f2a1f9f47c99e927e4cf144882f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:45:17 +0200 Subject: [PATCH 095/301] gnu: r-matrixstats: Update to 0.52.1. * gnu/packages/statistics.scm (r-matrixstats): Update to 0.52.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 23d8a340c0..3b7d436d53 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3496,13 +3496,13 @@ (define-public r-mvtnorm (define-public r-matrixstats (package (name "r-matrixstats") - (version "0.51.0") + (version "0.52.1") (source (origin (method url-fetch) (uri (cran-uri "matrixStats" version)) (sha256 (base32 - "0bsalx605kgb9nl7mfnq1qinkyd9s97p8plymsyfja1gmcnjrcpj")))) + "0ihxnbbc1czfbccm8mrh7hjwdik3y90964xhbjday6fci0xjcsi5")))) (properties `((upstream-name . "matrixStats"))) (build-system r-build-system) (native-inputs From b5d5344f3256ba39781af56ea6f6084014c52c5c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:45:49 +0200 Subject: [PATCH 096/301] gnu: r-viridislite: Update to 0.2.0. * gnu/packages/statistics.scm (r-viridislite): Update to 0.2.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 3b7d436d53..aa8fcb4bd6 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3546,14 +3546,14 @@ (define-public r-viridis (define-public r-viridislite (package (name "r-viridislite") - (version "0.1.3") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "viridisLite" version)) (sha256 (base32 - "1b0fhj8i1m9jsz91gzag60k7vy7kk5xkdg31rc3h3spq96l66psp")))) + "1546h44ng4dxs130jkh6lkh990hmp90m1w45sq5p47n546gr0k9d")))) (properties `((upstream-name . "viridisLite"))) (build-system r-build-system) (home-page "https://github.com/sjmgarnier/viridisLite") From 7a8efc81f87bec3574c7fd0ba2c4b562e182934e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:46:16 +0200 Subject: [PATCH 097/301] gnu: r-viridis: Update to 0.4.0. * gnu/packages/statistics.scm (r-viridis): Update to 0.4.0. [propagated-inputs]: Add "r-viridislite". --- gnu/packages/statistics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index aa8fcb4bd6..7f405df2c0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3520,17 +3520,18 @@ (define-public r-matrixstats (define-public r-viridis (package (name "r-viridis") - (version "0.3.4") + (version "0.4.0") (source (origin (method url-fetch) (uri (cran-uri "viridis" version)) (sha256 (base32 - "1a9hqn2pccpc51vh8ghw698ni6xzdnp8v0n8kgjh51nlz5hhc87j")))) + "03mha2935k1mw7mjjkq7mrx185hl0m3vq3967iiwbknpivbdxllk")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) - ("r-gridextra" ,r-gridextra))) + ("r-gridextra" ,r-gridextra) + ("r-viridislite" ,r-viridislite))) (home-page "https://github.com/sjmgarnier/viridis") (synopsis "Matplotlib default color map") (description From 2f44ef97a56edc5748d0507c3371c228270b8dbe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 12:47:16 +0200 Subject: [PATCH 098/301] gnu: r-mixtools: Update to 1.1.0. * gnu/packages/statistics.scm (r-mixtools): Update to 1.1.0. [propagated-inputs]: Remove "r-boot", add "r-survival". --- gnu/packages/statistics.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 7f405df2c0..a28a23be34 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4431,19 +4431,19 @@ (define-public r-cowplot (define-public r-mixtools (package (name "r-mixtools") - (version "1.0.4") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "mixtools" version)) (sha256 (base32 - "133rr17ywmlhsc6457hs8qxi8ng443ql9ashxpwc8875gjhv1x32")))) + "13wdm0xs5bakhpa8ypg6lvhjaqkxyabwz4glxdwn0jwdvkcdhgsl")))) (build-system r-build-system) (propagated-inputs - `(("r-boot" ,r-boot) - ("r-mass" ,r-mass) - ("r-segmented" ,r-segmented))) + `(("r-mass" ,r-mass) + ("r-segmented" ,r-segmented) + ("r-survival" ,r-survival))) (home-page "http://cran.r-project.org/web/packages/mixtools") (synopsis "Tools for analyzing finite mixture models") (description From 2fe41e0fad4d3a54a5c2a603d204a2434f70ba5f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:47:23 +0200 Subject: [PATCH 099/301] gnu: r-pracma: Update to 2.0.4. * gnu/packages/maths.scm (r-pracma): Update to 2.0.4. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cefc53d67d..fce5db162c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1583,12 +1583,12 @@ (define-public r-quadprog (define-public r-pracma (package (name "r-pracma") - (version "1.9.5") + (version "2.0.4") (source (origin (method url-fetch) (uri (cran-uri "pracma" version)) (sha256 - (base32 "19nr2jlkbcdgvw3gx5hry12av565lmvqd5q4h7zlch3q13avwwl2")))) + (base32 "1z3i90mkzwvp9di17caf4934z2xlb2imm3hwxllcrbwvmnmhrwyc")))) (build-system r-build-system) (propagated-inputs `(("r-quadprog" ,r-quadprog))) From 4c7ab0309a423405e22c26c73c94b40e18861ed1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:48:39 +0200 Subject: [PATCH 100/301] gnu: r-vipor: Update to 0.4.5. * gnu/packages/statistics.scm (r-vipor): Update to 0.4.5. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a28a23be34..4cf334a20e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4206,13 +4206,13 @@ (define-public r-ztable (define-public r-vipor (package (name "r-vipor") - (version "0.4.4") + (version "0.4.5") (source (origin (method url-fetch) (uri (cran-uri "vipor" version)) (sha256 (base32 - "0p1z9a3fazl78pj8a1i2n62v8hrs8cinq82j9wpawhmfkn3dggss")))) + "112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx")))) (build-system r-build-system) (home-page "http://cran.r-project.org/web/packages/vipor") (synopsis "Plot categorical data using noise and density estimates") From 47f37fd169bb5e3792984171628c9ccee7909841 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:49:03 +0200 Subject: [PATCH 101/301] gnu: r-statmod: Update to 1.4.29. * gnu/packages/statistics.scm (r-statmod): Update to 1.4.29. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4cf334a20e..e3f7167fd8 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4312,13 +4312,13 @@ (define-public r-ggthemes (define-public r-statmod (package (name "r-statmod") - (version "1.4.27") + (version "1.4.29") (source (origin (method url-fetch) (uri (cran-uri "statmod" version)) (sha256 (base32 - "14yilq9d3z20hig4rs8bjqyydw3dfx90mhmzvw9w8p16h0s595sn")))) + "1fgzkwriba39d7946lq892f0si2fjdy37pvxki6ix8xyj8qgnci4")))) (build-system r-build-system) (home-page "http://cran.r-project.org/web/packages/statmod") (native-inputs From 0007e645d9ee2aefec683b0dd99c00117092708e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:49:22 +0200 Subject: [PATCH 102/301] gnu: r-ggthemes: Update to 3.4.0. * gnu/packages/statistics.scm (r-ggthemes): Update to 3.4.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index e3f7167fd8..7fe29fa77f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4287,13 +4287,13 @@ (define-public r-ggbeeswarm (define-public r-ggthemes (package (name "r-ggthemes") - (version "3.3.0") + (version "3.4.0") (source (origin (method url-fetch) (uri (cran-uri "ggthemes" version)) (sha256 (base32 - "1qdxg2siwsiq32fmgcxn4vihgxad9v8q0aqigl7a94c26bwxs7y2")))) + "1jj8lp7jbk3489kpgbw4b5phpn01gkfmksc21c6sn3x6wmzyn6hs")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) From a977576780fffd1c06d33b61b76c390e26a2a1c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:49:40 +0200 Subject: [PATCH 103/301] gnu: r-mclust: Update to 5.2.3. * gnu/packages/statistics.scm (r-mclust): Update to 5.2.3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 7fe29fa77f..267f2b9120 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4589,14 +4589,14 @@ (define-public r-flexmix (define-public r-mclust (package (name "r-mclust") - (version "5.2.2") + (version "5.2.3") (source (origin (method url-fetch) (uri (cran-uri "mclust" version)) (sha256 (base32 - "19cbg7p5h2b6h9mvcx9rjppyd3awma18ymaljakbnclpvhwbqpwd")))) + "0045msdw1xndfmlylbnm1ss716iiqzqwj454a97gmcq5kph86qzz")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) From 4328bad2cdf85122344bc2b25bea064488f36f12 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:50:04 +0200 Subject: [PATCH 104/301] gnu: r-rcppeigen: Update to 0.3.2.9.1. * gnu/packages/statistics.scm (r-rcppeigen): Update to 0.3.2.9.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 267f2b9120..1c0a5e6a6c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4825,14 +4825,14 @@ (define-public r-minqa (define-public r-rcppeigen (package (name "r-rcppeigen") - (version "0.3.2.9.0") + (version "0.3.2.9.1") (source (origin (method url-fetch) (uri (cran-uri "RcppEigen" version)) (sha256 (base32 - "0fy9kr03160f1ywzff3p380s8a59jz7d2d0rggb14g2y0slzpbr5")))) + "1ih940yjbc530cmpl6kx1jic7pz2ps1w5vrvy32qizh6m5s3lk7x")))) (properties `((upstream-name . "RcppEigen"))) (build-system r-build-system) (propagated-inputs From da2260f96c0100fec366f05e0cf43b1172147bc0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:50:29 +0200 Subject: [PATCH 105/301] gnu: r-pbkrtest: Update to 0.4-7. * gnu/packages/statistics.scm (r-pbkrtest): Update to 0.4-7. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1c0a5e6a6c..db10717ccf 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4976,14 +4976,14 @@ (define-public r-lme4 (define-public r-pbkrtest (package (name "r-pbkrtest") - (version "0.4-6") + (version "0.4-7") (source (origin (method url-fetch) (uri (cran-uri "pbkrtest" version)) (sha256 (base32 - "00cw18q7wvddzjrbxz917wkix6r7672vi2wmsp4gwgzady8vha4x")))) + "1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw")))) (build-system r-build-system) (propagated-inputs `(("r-lme4" ,r-lme4) From 20e97759bf614699112ffba066c99ee258a7ab78 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:51:06 +0200 Subject: [PATCH 106/301] gnu: r-ranger: Update to 0.7.0. * gnu/packages/statistics.scm (r-ranger): Update to 0.7.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index db10717ccf..6b05f8553e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5167,14 +5167,14 @@ (define-public r-tclust (define-public r-ranger (package (name "r-ranger") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (cran-uri "ranger" version)) (sha256 (base32 - "1fwqwbi0dnla16x6zj14rf95qr5gmilfmlrwnv7s960h4yiw4n97")))) + "0g1rnpk4c06lmy0r5n0j7i2xna190kqalmxp42d9gnk3drnb1x43")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp))) From e8bec95e69b761ed02b2457e068265728918e104 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:52:59 +0200 Subject: [PATCH 107/301] gnu: r-maldiquant: Update to 1.16.2. * gnu/packages/bioinformatics.scm (r-maldiquant): Update to 1.16.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 93bdc29dbe..4264b64516 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8359,14 +8359,14 @@ (define-public r-raremetals2 (define-public r-maldiquant (package (name "r-maldiquant") - (version "1.16") + (version "1.16.2") (source (origin (method url-fetch) (uri (cran-uri "MALDIquant" version)) (sha256 (base32 - "067xbmy10mpsvmv77g62chd7wwhdhcfn5hmp5fisbnz2h5rq0q60")))) + "0z5srzsfgsgi4bssr4chls4ry6d18y2g9143znqmraylppwrrqzr")))) (properties `((upstream-name . "MALDIquant"))) (build-system r-build-system) (home-page "http://cran.r-project.org/web/packages/MALDIquant") From 57ac1d2f036ee264b7d3b06f39b8376e4d623b92 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:53:24 +0200 Subject: [PATCH 108/301] gnu: r-seqminer: Update to 5.7. * gnu/packages/bioinformatics.scm (r-seqminer): Update to 5.7. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4264b64516..40e77bf3bb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8305,14 +8305,14 @@ (define-public r-sva (define-public r-seqminer (package (name "r-seqminer") - (version "5.3") + (version "5.7") (source (origin (method url-fetch) (uri (cran-uri "seqminer" version)) (sha256 (base32 - "0y0gc5lws3hdxasjb84m532ics6imb7qg9sl1zy62h503jh4j9gw")))) + "0p75wyl70cvp36mwg5y74nv573j1gdqi15ac2a7xf61jmsq7ycpy")))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) From 9ce6cb082efb3fbaac165f661656adb4be5a04f8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:53:42 +0200 Subject: [PATCH 109/301] gnu: r-genomicfeatures: Update to 1.26.4. * gnu/packages/bioinformatics.scm (r-genomicfeatures): Update to 1.26.4. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 40e77bf3bb..af8295906c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6794,13 +6794,13 @@ (define-public r-rtracklayer (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.26.2") + (version "1.26.4") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "1ybi6r3bax07wlv2qcd34y5qjdvcqcfayfvlrjc39ifrkk65wv4f")))) + "1y16lqach0v3ym5zhdhj4r2imfi0kpa0djlb51hj85yf7xkzwdlb")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) From 25d885472370f5dec26769417b518beb37fb9962 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:54:07 +0200 Subject: [PATCH 110/301] gnu: r-rtracklayer: Update to 1.34.2. * gnu/packages/bioinformatics.scm (r-rtracklayer): Update to 1.34.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index af8295906c..abf1aa91d0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6749,13 +6749,13 @@ (define-public r-genomicalignments (define-public r-rtracklayer (package (name "r-rtracklayer") - (version "1.34.1") + (version "1.34.2") (source (origin (method url-fetch) (uri (bioconductor-uri "rtracklayer" version)) (sha256 (base32 - "0x59k2fd0iaqi93gy6bm58p2j2z90z1b7a6w5b4c098y98n096rc")))) + "1j3cyvg1wg1d9l0lkcjk3jn7pb96zi17nd1qsa5lglsimja19mpl")))) (build-system r-build-system) (arguments `(#:phases From 5cc3b7a54829b911a04aecd0bb1805a499d7a7ad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:54:28 +0200 Subject: [PATCH 111/301] gnu: r-genomicalignments: Update to 1.10.1. * gnu/packages/bioinformatics.scm (r-genomicalignments): Update to 1.10.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index abf1aa91d0..f8169d5e17 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6716,13 +6716,13 @@ (define-public r-summarizedexperiment (define-public r-genomicalignments (package (name "r-genomicalignments") - (version "1.10.0") + (version "1.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicAlignments" version)) (sha256 (base32 - "11vb0a0zd36i4yhg4mfijv787v0nihn6pkjj6q7rfy19gwy61xlc")))) + "1dilghbsyf64iz5c0kib2c7if72x7almd5w3ali09a2b2ff2mcjk")))) (properties `((upstream-name . "GenomicAlignments"))) (build-system r-build-system) From 69b356efce3ae6e48b980a90bad4354f6d9d0192 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:54:54 +0200 Subject: [PATCH 112/301] gnu: r-annotationdbi: Update to 1.36.2. * gnu/packages/bioinformatics.scm (r-annotationdbi): Update to 1.36.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f8169d5e17..8de986bbc0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6535,13 +6535,13 @@ (define-public r-biobase (define-public r-annotationdbi (package (name "r-annotationdbi") - (version "1.36.0") + (version "1.36.2") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationDbi" version)) (sha256 (base32 - "0ydrqw1k1j5p6w76bwc753cx545c055x88q87wzya93858synj6r")))) + "0574lmyisn3nv9aicz9x3iivx990da4q2j4i0f1jz0mpj9v3vc2w")))) (properties `((upstream-name . "AnnotationDbi"))) (build-system r-build-system) From 4cd4721dbbd3c3cbcefb0fd9675a934e0be72d35 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:55:15 +0200 Subject: [PATCH 113/301] gnu: r-genomicranges: Update to 1.26.4. * gnu/packages/bioinformatics.scm (r-genomicranges): Update to 1.26.4. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8de986bbc0..c51ced3319 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6484,13 +6484,13 @@ (define-public r-xvector (define-public r-genomicranges (package (name "r-genomicranges") - (version "1.26.2") + (version "1.26.4") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicRanges" version)) (sha256 (base32 - "0if5dswkp77lyqppd0z2iyvnwag9h1gsr03707s8npcx13mzpsia")))) + "1789ycqzv20d8p1axkxrhsz9v0ww6w1dk2mfvm85p8j53zd1f67c")))) (properties `((upstream-name . "GenomicRanges"))) (build-system r-build-system) From 3506a627620fc156d0e71777aa424835486b653c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:55:40 +0200 Subject: [PATCH 114/301] gnu: r-limma: Update to 3.30.13. * gnu/packages/bioinformatics.scm (r-limma): Update to 3.30.13. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c51ced3319..71ff6ae9e7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6429,13 +6429,13 @@ (define-public r-variantannotation (define-public r-limma (package (name "r-limma") - (version "3.30.7") + (version "3.30.13") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "1xg9w4lmn9n4hwyflxiwi6g969lcy569cg4z1x47crwwg7z7qdka")))) + "1ji8kb19anwq2505zii2kzqlrnk75mk1mpz8vy4s1mckzs1cz4m0")))) (build-system r-build-system) (home-page "http://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") From e89cf15091bd4b85eddfb0c5e95b029c720f10a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:56:00 +0200 Subject: [PATCH 115/301] gnu: r-variantannotation: Update to 1.20.3. * gnu/packages/bioinformatics.scm (r-variantannotation): Update to 1.20.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 71ff6ae9e7..e3a1e38874 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6391,13 +6391,13 @@ (define-public r-edger (define-public r-variantannotation (package (name "r-variantannotation") - (version "1.20.2") + (version "1.20.3") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantAnnotation" version)) (sha256 (base32 - "165wda1d2jagd907pnra4m3sla66icyqxvd60xpv09jl5agd5mn9")))) + "10v8apgfw57nd4dxmdxdrijxpw135jpp2p8wrk3wjpb3hhfjp1qj")))) (properties `((upstream-name . "VariantAnnotation"))) (inputs From 7d05eb2dccfd9c0d68b4acd48fd33e600828feef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:56:21 +0200 Subject: [PATCH 116/301] gnu: r-iranges: Update to 2.8.2. * gnu/packages/bioinformatics.scm (r-iranges): Update to 2.8.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e3a1e38874..36170842b7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6308,13 +6308,13 @@ (define-public r-seqinr (define-public r-iranges (package (name "r-iranges") - (version "2.8.1") + (version "2.8.2") (source (origin (method url-fetch) (uri (bioconductor-uri "IRanges" version)) (sha256 (base32 - "0cryqnpqb3p6l9jjw27hyqd550sxlljls3ka7b9rb38hkji7b5hw")))) + "0x8h74ik3xwdnwrkn89hq5ll0qa1lp9jgzlbmpa02dpws7snfwyr")))) (properties `((upstream-name . "IRanges"))) (build-system r-build-system) From 2cea968e413db6dfd5231d70ac625eed9f8b3e9b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:56:44 +0200 Subject: [PATCH 117/301] gnu: r-s4vectors: Update to 0.12.2. * gnu/packages/bioinformatics.scm (r-s4vectors): Update to 0.12.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 36170842b7..9aa5566cef 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6256,13 +6256,13 @@ (define-public r-dnacopy (define-public r-s4vectors (package (name "r-s4vectors") - (version "0.12.1") + (version "0.12.2") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Vectors" version)) (sha256 (base32 - "0i36y3w36h3d8rmazxcrip4gvn54rd9av1wz4lygsprrjmylfhcc")))) + "0syx0qgipx97zsp3b8afhzamsr30835a2a99yb9wnq7b50g3v3p1")))) (properties `((upstream-name . "S4Vectors"))) (build-system r-build-system) From e0d7b318200f93426f6ec7f835a3c2cdb66ee1f8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:57:09 +0200 Subject: [PATCH 118/301] gnu: r-shortread: Update to 1.32.1. * gnu/packages/bioinformatics.scm (r-shortread): Update to 1.32.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9aa5566cef..c520a9904e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5671,14 +5671,14 @@ (define-public r-gostats (define-public r-shortread (package (name "r-shortread") - (version "1.32.0") + (version "1.32.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ShortRead" version)) (sha256 (base32 - "0mjdlg92x5qw4x2djc4dv5lxwl7ai6ix56nnf86zr07jk8vc7yls")))) + "1m7lbfxs7xwcy9xs76zy5rky2mb96anvh457xfw60lh3kygwfpxc")))) (properties `((upstream-name . "ShortRead"))) (build-system r-build-system) (inputs From a3656b11d2aa6ea3615538539bac658e92943e8c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:57:27 +0200 Subject: [PATCH 119/301] gnu: r-annotationforge: Update to 1.16.1. * gnu/packages/bioinformatics.scm (r-annotationforge): Update to 1.16.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c520a9904e..6885a74f7c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5532,14 +5532,14 @@ (define-public r-deseq2 (define-public r-annotationforge (package (name "r-annotationforge") - (version "1.16.0") + (version "1.16.1") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationForge" version)) (sha256 (base32 - "02msyb9p3hywrryx00zpjkjl126mrv827i1ah1092s0cplm6xxvf")))) + "0l1g9hy88sh5g567svyfd8pnjvkyklkn6a3gjn8zalvh62qqjjq1")))) (properties `((upstream-name . "AnnotationForge"))) (build-system r-build-system) From 133cba8cb5c278080ae701fba1c339ae50cc124f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 14:25:14 +0200 Subject: [PATCH 120/301] gnu: armadillo: Update to 7.800.2. * gnu/packages/maths.scm (armadillo): Update to 7.800.2. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fce5db162c..40ab048316 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2159,14 +2159,14 @@ (define-public wxmaxima (define-public armadillo (package (name "armadillo") - (version "7.600.2") + (version "7.800.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/arma/armadillo-" version ".tar.xz")) (sha256 (base32 - "0bac9y46m61zxinj51l82w06v01ra9vw7a9j6rrwdjhznkkdb437")))) + "1qqzy7dp891j9v7062mv1599hdwr97vqzrd3j2fl8c3gmc00dmzg")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no test target (inputs From 0685fe3c86a5fe1ed78b71ae4e41acd841f38da4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 14:29:47 +0200 Subject: [PATCH 121/301] gnu: r-rcpparmadillo: Update to 0.7.700.0.0. * gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.7.700.0.0. [source]: Do not delete bundled armadillo sources, because upstream no longer hosts previous versions. [propagated-inputs]: Remove "armadillo-for-rcpparmadillo". [arguments]: Remove because we no longer need to link with the armadillo library. * gnu/packages/bioinformatics.scm (r-deseq2)[arguments]: Remove because we no longer need to link with armadillo library. --- gnu/packages/bioinformatics.scm | 8 -------- gnu/packages/statistics.scm | 21 +++------------------ 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6885a74f7c..e540627012 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5497,14 +5497,6 @@ (define-public r-deseq2 "1walwkqryn1gnwz7zryr5764a0p6ia7ag4w6w9n8fskg8dkg0fqs")))) (properties `((upstream-name . "DESeq2"))) (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'link-against-armadillo - (lambda _ - (substitute* "src/Makevars" - (("PKG_LIBS =" prefix) - (string-append prefix "-larmadillo")))))))) (propagated-inputs `(("r-biobase" ,r-biobase) ("r-biocgenerics" ,r-biocgenerics) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 6b05f8553e..fcc7e303a8 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2443,32 +2443,17 @@ (define-public r-latticeextra (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.7.600.1.0") + (version "0.7.700.0.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "0k1wniip184j0ckcg9kcjy2q4mcfj5jpd1nkk4l0ab75ad8znywv")) - (modules '((guix build utils))) - ;; Remove bundled armadillo sources - (snippet - '(begin - (delete-file-recursively "inst/include/armadillo_bits") - (delete-file "inst/include/armadillo"))))) + "03cvl2xgmvh4sylw7ff7s020y7k2wzyj34l0zngm09qs44pa9q0m")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'link-against-armadillo - (lambda _ - (substitute* "src/Makevars" - (("PKG_LIBS=" prefix) - (string-append prefix "-larmadillo")))))))) (propagated-inputs - `(("r-rcpp" ,r-rcpp) - ("armadillo" ,armadillo-for-rcpparmadillo))) + `(("r-rcpp" ,r-rcpp))) (home-page "https://github.com/RcppCore/RcppArmadillo") (synopsis "Rcpp integration for the Armadillo linear algebra library") (description From 498d2553ed3a99217ef5f3567ace77165d49e597 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 14:29:53 +0200 Subject: [PATCH 122/301] gnu: Remove armadillo-for-rcpparmadillo. This package is no longer useful, because upstream does not keep the tarballs of older releases. We use the bundled armadillo sources in the r-rccparmadillo package instead. * gnu/packages/maths.scm (armadillo-for-rcpparmadillo): Remove variable. --- gnu/packages/maths.scm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 40ab048316..a877fe5ca2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2185,17 +2185,6 @@ (define-public armadillo associated functions (eg. contiguous and non-contiguous submatrix views).") (license license:mpl2.0))) -(define-public armadillo-for-rcpparmadillo - (package (inherit armadillo) - (version "7.600.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/arma/armadillo-" - version ".tar.xz")) - (sha256 - (base32 - "1dxgfd2r9lbh24nszvqm2lag439s0srxaf1l86f6ww6waqm5r8zk")))))) - (define-public muparser ;; When switching download sites, muparser re-issued a 2.2.5 release with a ;; different hash. In order to make `guix package --upgrade` work correctly, From e18c731ba0706fb921951dc19185b65861ca282e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 14:37:16 +0200 Subject: [PATCH 123/301] gnu: r-seqinr: Update to 3.3-6. * gnu/packages/bioinformatics.scm (r-seqinr): Update to 3.3-6. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e540627012..5753fbb6a4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6275,14 +6275,14 @@ (define-public r-s4vectors (define-public r-seqinr (package (name "r-seqinr") - (version "3.3-3") + (version "3.3-6") (source (origin (method url-fetch) (uri (cran-uri "seqinr" version)) (sha256 (base32 - "0rk4yba8km26c0rh1f4h474zsb5n6kjmqsi55bnzr6p8pymp18hj")))) + "13d0qxm2244wgdl2dy2s8vnrnf5fx4n47if9gkb49dqx6c0sx8s2")))) (build-system r-build-system) (propagated-inputs `(("r-ade4" ,r-ade4) From c9dccf7917938082294d7689b31db330ce86bab4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 14:37:46 +0200 Subject: [PATCH 124/301] gnu: r-sourcetools: Update to 0.1.6. * gnu/packages/statistics.scm (r-sourcetools): Update to 0.1.6. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index fcc7e303a8..8d705a88bd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4229,14 +4229,14 @@ (define-public r-beeswarm (define-public r-sourcetools (package (name "r-sourcetools") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) (uri (cran-uri "sourcetools" version)) (sha256 (base32 - "0jx6kslygfqaic3cmjwag3dy98q1a2dw20cz7z8agsknmmbk6dy2")))) + "0l8c6fql82cb246qh7hfgxb4s35qn0qfgy6dzvkx0zkz1cpqvx69")))) (build-system r-build-system) (home-page "http://cran.r-project.org/web/packages/sourcetools") (synopsis "Tools for reading, tokenizing and parsing R code") From 05b662663d49883aa5b434c0ce94555ced70fed8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Apr 2017 14:58:05 +0200 Subject: [PATCH 125/301] gnu: libmtp: Update to 1.1.13 [security fixes]. * gnu/packages/libusb.scm (libmtp): Update to 1.1.13. --- gnu/packages/libusb.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 215cecee1f..0c9bb044c0 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -136,14 +136,14 @@ (define-public python2-pyusb (define-public libmtp (package (name "libmtp") - (version "1.1.11") + (version "1.1.13") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libmtp/libmtp/" version "/libmtp-" version ".tar.gz")) (sha256 (base32 - "1sc768q2cixwanlwrz95mp389iaadl4s95486caavxx4g7znvn8m")))) + "0h3dv9py5mmvxhfxmkr8ky4s80hgq3d66cmrfnnnlcdwpwpy0kj9")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From 2c273a82f36260cbc68ce65b9f73e581eb471690 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Apr 2017 15:03:07 +0200 Subject: [PATCH 126/301] gnu: libusb: Update to 1.0.21. * gnu/packages/libusb.scm (libusb): Update to 1.0.21. [home-page]: Update to new URL. --- gnu/packages/libusb.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 0c9bb044c0..4c80de2369 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -42,7 +42,7 @@ (define-module (gnu packages libusb) (define-public libusb (package (name "libusb") - (version "1.0.19") + (version "1.0.21") (source (origin (method url-fetch) @@ -50,7 +50,7 @@ (define-public libusb "libusb-" version "/libusb-" version ".tar.bz2")) (sha256 (base32 - "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c")))) + "0jw2n5kdnrqvp7zh792fd6mypzzfap6jp4gfcmq4n6c1kb79rkkx")))) (build-system gnu-build-system) ;; XXX: Enabling udev is now recommended, but eudev indirectly depends on @@ -58,7 +58,7 @@ (define-public libusb (arguments `(#:configure-flags '("--disable-udev"))) ;; (inputs `(("eudev" ,eudev))) - (home-page "http://www.libusb.org") + (home-page "http://libusb.info") (synopsis "User-space USB library") (description "Libusb is a library that gives applications easy access to USB From fdcc9163d56ca208d59ce970c1f34a7a9a9fbe58 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Apr 2017 15:05:40 +0200 Subject: [PATCH 127/301] gnu: feh: Update to 2.18.3. * gnu/packages/image-viewers.scm (feh): Update to 2.18.3. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 05b9472395..ce75b1d835 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -43,7 +43,7 @@ (define-module (gnu packages image-viewers) (define-public feh (package (name "feh") - (version "2.18.2") + (version "2.18.3") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -51,7 +51,7 @@ (define-public feh name "-" version ".tar.bz2")) (sha256 (base32 - "09f5rfzls4h5jcrp7ylwbiljp5qzc2nbw9p2csv0pnlaixj69gil")))) + "0qq567d0g181k6llr6p759lnni39va5xakjqngd6063fm73nhbyq")))) (build-system gnu-build-system) (arguments '(#:phases (alist-delete 'configure %standard-phases) From 2aa78c8f04660fbbca9fc57ecee19788ee6f4e32 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Apr 2017 15:07:55 +0200 Subject: [PATCH 128/301] gnu: re2: Update to 2017-04-01. * gnu/packages/regex.scm (re2): Update to 2017-04-01. --- gnu/packages/regex.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index f55faaf042..492f1d9fb3 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -28,7 +28,7 @@ (define-module (gnu packages regex) (define-public re2 (package (name "re2") - (version "2017-03-01") + (version "2017-04-01") (source (origin (method url-fetch) (uri @@ -38,7 +38,7 @@ (define-public re2 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1s3kdcrz2mwi30k6pz9jkv5vk8b704bz65xgcr67wbn2pn3hpnqr")))) + "14i9pf9ap8h48j1584ifsq7c7a884cr1s4r7zvpcb9x1xr9232wh")))) (build-system gnu-build-system) (arguments `(#:test-target "test" From fe418cc5b28f82b07034bb3115906cf4f23c72ab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 15:41:14 +0200 Subject: [PATCH 129/301] gnu: armadillo: Change license to ASL 2.0. Armadillo versions 7.800 and onwards are licensed under the Apache License 2.0. * gnu/packages/maths.scm (armadillo)[license]: Change to ASL 2.0. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a877fe5ca2..5a06afa220 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2183,7 +2183,7 @@ (define-public armadillo signal processing, bioinformatics, statistics, econometrics, etc. The library provides efficient classes for vectors, matrices and cubes, as well as 150+ associated functions (eg. contiguous and non-contiguous submatrix views).") - (license license:mpl2.0))) + (license license:asl2.0))) (define-public muparser ;; When switching download sites, muparser re-issued a 2.2.5 release with a From 3be437398efd449d56cef427b0574e7fdcf835d7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 6 Apr 2017 17:24:32 -0400 Subject: [PATCH 130/301] gnu: webkitgtk: Update to 2.16.1. * gnu/packages/webkit.scm (webkitgtk): Update to 2.16.1. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index b90bd4d449..de431d0a02 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -53,14 +53,14 @@ (define-module (gnu packages webkit) (define-public webkitgtk (package (name "webkitgtk") - (version "2.16.0") + (version "2.16.1") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "1p3w23n5bq30xg4qg0i9lmrk13vgck2l4wh8gmzwxwqfj7c738sy")))) + "0i99kmv4dvb9m2sd36kig4j6d59pxmq47ih3nxayd31j68r3i4pb")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no tests From 6b6aca9b363d9c453892b41691734a03fabe1faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 Apr 2017 18:13:30 +0200 Subject: [PATCH 131/301] gnu: flann: Move .mex file to a separate "octave" output. That way the closure of flann:out is down from 1 GiB to 290 MiB. * gnu/packages/maths.scm (flann)[outputs]: New field. [arguments]: Add 'set-octave-directory' phase. --- gnu/packages/maths.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5a06afa220..38beb88d0a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2719,6 +2719,8 @@ (define-public flann (base32 "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz")))) (build-system cmake-build-system) + (outputs '("out" + "octave")) ;46 MiB .mex file that pulls Octave (native-inputs `(("unzip" ,unzip))) (inputs @@ -2736,6 +2738,14 @@ (define-public flann ;; Save 12 MiB by not installing .a files. Passing ;; '-DBUILD_STATIC_LIBS=OFF' has no effect. #:phases (modify-phases %standard-phases + (add-before 'configure 'set-octave-directory + (lambda* (#:key outputs #:allow-other-keys) + ;; Install the .mex file in the "octave" output. + (let ((out (assoc-ref outputs "octave"))) + (substitute* "src/matlab/CMakeLists.txt" + (("share/flann/octave") + (string-append out "/share/flann/octave"))) + #t))) (add-after 'install 'remove-static-libraries (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) From 9a3762a768a1f7b8e5eba8cee4f0f883bbd07892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 Apr 2017 18:21:54 +0200 Subject: [PATCH 132/301] size: Avoid '_' as a pattern variable in 'match'. * guix/scripts/size.scm (display-profile, profile->page-map): Don't use '_' as a 'match' pattern variable. --- guix/scripts/size.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm index ea259f3758..f612dae700 100644 --- a/guix/scripts/size.scm +++ b/guix/scripts/size.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -91,7 +91,8 @@ (define MiB (expt 2 20)) (* 100. (/ self whole 1.))))) (sort profile (match-lambda* - ((($ _ _ total1) ($ _ _ total2)) + ((($ name1 self1 total1) + ($ name2 self2 total2)) (> total1 total2))))) (format port (_ "total: ~,1f MiB~%") (/ whole MiB 1.)))) @@ -200,7 +201,8 @@ (define data 0 (sort profiles (match-lambda* - ((($ _ _ total1) ($ _ _ total2)) + ((($ name1 self1 total1) + ($ name2 self2 total2)) (> total1 total2)))))) ;; TRANSLATORS: This is the title of a graph, meaning that the graph From c923f831160ddbda21d8ea1f2df4670550f3e9d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 Apr 2017 18:22:53 +0200 Subject: [PATCH 133/301] size: Add test to multiple 'store-profile' arguments. * tests/size.scm ("store-profile with multiple items"): New test. --- tests/size.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tests/size.scm b/tests/size.scm index 068ebc1d68..575b1abfdd 100644 --- a/tests/size.scm +++ b/tests/size.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,6 +86,22 @@ (define (lookup-profile item) (profile-self-size profile3) (profile-self-size profile4)))))))))))) +(test-assertm "store-profile with multiple items" + (mlet* %store-monad ((file1 (gexp->derivation "file1" + #~(symlink #$%bootstrap-guile + #$output))) + (file2 (text-file* "file2" + "the file => " file1))) + (mbegin %store-monad + (built-derivations (list file2)) + (mlet %store-monad ((profiles (store-profile + (list (derivation->output-path file2) + (derivation->output-path file1)))) + (reference (store-profile + (list (derivation->output-path file2))))) + (return (and (= (length profiles) 4) + (lset= equal? profiles reference))))))) + (test-end "size") ;;; Local Variables: From 0715c0e69c2ec6f91551988d46de07e2e4cfaac2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 6 Apr 2017 22:41:52 -0400 Subject: [PATCH 134/301] gnu: surf: Update to 2.0. * gnu/packages/suckless.scm (surf): Update to 2.0. [inputs]: Replace webkitgtk/gtk+-2 with webkitgtk. --- gnu/packages/suckless.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index ca4cbec91f..223a17f443 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -266,7 +266,7 @@ (define-public st (define-public surf (package (name "surf") - (version "0.7") + (version "2.0") (source (origin (method url-fetch) @@ -274,7 +274,7 @@ (define-public surf version ".tar.gz")) (sha256 (base32 - "0jj93izd8fizxfa6ln9w1h9bwki81sz5dhskh5x1rl34zd38aq4m")))) + "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps")))) (build-system glib-or-gtk-build-system) (arguments '(#:tests? #f ; no tests @@ -294,7 +294,7 @@ (define-public surf `(("dmenu" ,dmenu) ("glib-networking" ,glib-networking) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk/gtk+-2) + ("webkitgtk" ,webkitgtk) ("xprop" ,xprop))) (native-inputs `(("pkg-config" ,pkg-config))) From fbd6fb1a9d75bd7b5d1df24cb805b7df335b0223 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 7 Apr 2017 00:16:18 -0400 Subject: [PATCH 135/301] gnu: qemu: Update to 2.8.1 [security fixes]. Fixes CVE-2016-{9602,9603} and CVE-2017-{2615,2620,2630,5667,5931}. * gnu/packages/qemu.scm (qemu): Update to 2.8.1. * gnu/packages/patches/qemu-CVE-2017-2615.patch, gnu/packages/patches/qemu-CVE-2017-2620.patch, gnu/packages/patches/qemu-CVE-2017-2630.patch, gnu/packages/patches/qemu-CVE-2017-5667.patch, gnu/packages/patches/qemu-CVE-2017-5931.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 5 - gnu/packages/patches/qemu-CVE-2017-2615.patch | 52 ------- gnu/packages/patches/qemu-CVE-2017-2620.patch | 134 ------------------ gnu/packages/patches/qemu-CVE-2017-2630.patch | 47 ------ gnu/packages/patches/qemu-CVE-2017-5667.patch | 46 ------ gnu/packages/patches/qemu-CVE-2017-5931.patch | 55 ------- gnu/packages/qemu.scm | 12 +- 7 files changed, 4 insertions(+), 347 deletions(-) delete mode 100644 gnu/packages/patches/qemu-CVE-2017-2615.patch delete mode 100644 gnu/packages/patches/qemu-CVE-2017-2620.patch delete mode 100644 gnu/packages/patches/qemu-CVE-2017-2630.patch delete mode 100644 gnu/packages/patches/qemu-CVE-2017-5667.patch delete mode 100644 gnu/packages/patches/qemu-CVE-2017-5931.patch diff --git a/gnu/local.mk b/gnu/local.mk index f54ab2a455..93bafa282d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -890,18 +890,13 @@ dist_patch_DATA = \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/qemu-CVE-2016-10155.patch \ - %D%/packages/patches/qemu-CVE-2017-2615.patch \ - %D%/packages/patches/qemu-CVE-2017-2620.patch \ - %D%/packages/patches/qemu-CVE-2017-2630.patch \ %D%/packages/patches/qemu-CVE-2017-5525.patch \ %D%/packages/patches/qemu-CVE-2017-5526.patch \ %D%/packages/patches/qemu-CVE-2017-5552.patch \ %D%/packages/patches/qemu-CVE-2017-5578.patch \ %D%/packages/patches/qemu-CVE-2017-5579.patch \ - %D%/packages/patches/qemu-CVE-2017-5667.patch \ %D%/packages/patches/qemu-CVE-2017-5856.patch \ %D%/packages/patches/qemu-CVE-2017-5898.patch \ - %D%/packages/patches/qemu-CVE-2017-5931.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/rapicorn-isnan.patch \ diff --git a/gnu/packages/patches/qemu-CVE-2017-2615.patch b/gnu/packages/patches/qemu-CVE-2017-2615.patch deleted file mode 100644 index ede1f8c89d..0000000000 --- a/gnu/packages/patches/qemu-CVE-2017-2615.patch +++ /dev/null @@ -1,52 +0,0 @@ -http://git.qemu.org/?p=qemu.git;a=patch;h=62d4c6bd5263bb8413a06c80144fc678df6dfb64 -this patch is from qemu-git. - - -From 62d4c6bd5263bb8413a06c80144fc678df6dfb64 Mon Sep 17 00:00:00 2001 -From: Li Qiang -Date: Wed, 1 Feb 2017 09:35:01 +0100 -Subject: [PATCH] cirrus: fix oob access issue (CVE-2017-2615) - -When doing bitblt copy in backward mode, we should minus the -blt width first just like the adding in the forward mode. This -can avoid the oob access of the front of vga's vram. - -Signed-off-by: Li Qiang - -{ kraxel: with backward blits (negative pitch) addr is the topmost - address, so check it as-is against vram size ] - -Cc: qemu-stable@nongnu.org -Cc: P J P -Cc: Laszlo Ersek -Cc: Paolo Bonzini -Cc: Wolfgang Bumiller -Fixes: d3532a0db02296e687711b8cdc7791924efccea0 (CVE-2014-8106) -Signed-off-by: Gerd Hoffmann -Message-id: 1485938101-26602-1-git-send-email-kraxel@redhat.com -Reviewed-by: Laszlo Ersek ---- - hw/display/cirrus_vga.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c -index 7db6409dc5..16f27e8ac5 100644 ---- a/hw/display/cirrus_vga.c -+++ b/hw/display/cirrus_vga.c -@@ -274,10 +274,9 @@ static bool blit_region_is_unsafe(struct CirrusVGAState *s, - { - if (pitch < 0) { - int64_t min = addr -- + ((int64_t)s->cirrus_blt_height-1) * pitch; -- int32_t max = addr -- + s->cirrus_blt_width; -- if (min < 0 || max > s->vga.vram_size) { -+ + ((int64_t)s->cirrus_blt_height - 1) * pitch -+ - s->cirrus_blt_width; -+ if (min < -1 || addr >= s->vga.vram_size) { - return true; - } - } else { --- -2.11.0 - diff --git a/gnu/packages/patches/qemu-CVE-2017-2620.patch b/gnu/packages/patches/qemu-CVE-2017-2620.patch deleted file mode 100644 index d3111827b7..0000000000 --- a/gnu/packages/patches/qemu-CVE-2017-2620.patch +++ /dev/null @@ -1,134 +0,0 @@ -Fix CVE-2017-2620: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-2620 -https://lists.gnu.org/archive/html/qemu-devel/2017-02/msg04700.html - -Both patches copied from upstream source repository: - -Fixes CVE-2017-2620: -http://git.qemu-project.org/?p=qemu.git;a=commit;h=92f2b88cea48c6aeba8de568a45f2ed958f3c298 - -The CVE-2017-2620 bug-fix depends on this earlier patch: -http://git.qemu-project.org/?p=qemu.git;a=commit;h=913a87885f589d263e682c2eb6637c6e14538061 - -From 92f2b88cea48c6aeba8de568a45f2ed958f3c298 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 8 Feb 2017 11:18:36 +0100 -Subject: [PATCH] cirrus: add blit_is_unsafe call to cirrus_bitblt_cputovideo - (CVE-2017-2620) - -CIRRUS_BLTMODE_MEMSYSSRC blits do NOT check blit destination -and blit width, at all. Oops. Fix it. - -Security impact: high. - -The missing blit destination check allows to write to host memory. -Basically same as CVE-2014-8106 for the other blit variants. - -Cc: qemu-stable@nongnu.org -Signed-off-by: Gerd Hoffmann ---- - hw/display/cirrus_vga.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c -index 1deb52070a..b9e7cb1df1 100644 ---- a/hw/display/cirrus_vga.c -+++ b/hw/display/cirrus_vga.c -@@ -900,6 +900,10 @@ static int cirrus_bitblt_cputovideo(CirrusVGAState * s) - { - int w; - -+ if (blit_is_unsafe(s, true)) { -+ return 0; -+ } -+ - s->cirrus_blt_mode &= ~CIRRUS_BLTMODE_MEMSYSSRC; - s->cirrus_srcptr = &s->cirrus_bltbuf[0]; - s->cirrus_srcptr_end = &s->cirrus_bltbuf[0]; -@@ -925,6 +929,10 @@ static int cirrus_bitblt_cputovideo(CirrusVGAState * s) - } - s->cirrus_srccounter = s->cirrus_blt_srcpitch * s->cirrus_blt_height; - } -+ -+ /* the blit_is_unsafe call above should catch this */ -+ assert(s->cirrus_blt_srcpitch <= CIRRUS_BLTBUFSIZE); -+ - s->cirrus_srcptr = s->cirrus_bltbuf; - s->cirrus_srcptr_end = s->cirrus_bltbuf + s->cirrus_blt_srcpitch; - cirrus_update_memory_access(s); --- -2.12.0 - -From 913a87885f589d263e682c2eb6637c6e14538061 Mon Sep 17 00:00:00 2001 -From: Bruce Rogers -Date: Mon, 9 Jan 2017 13:35:20 -0700 -Subject: [PATCH] display: cirrus: ignore source pitch value as needed in - blit_is_unsafe - -Commit 4299b90 added a check which is too broad, given that the source -pitch value is not required to be initialized for solid fill operations. -This patch refines the blit_is_unsafe() check to ignore source pitch in -that case. After applying the above commit as a security patch, we -noticed the SLES 11 SP4 guest gui failed to initialize properly. - -Signed-off-by: Bruce Rogers -Message-id: 20170109203520.5619-1-brogers@suse.com -Signed-off-by: Gerd Hoffmann ---- - hw/display/cirrus_vga.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c -index bdb092ee9d..379910db2d 100644 ---- a/hw/display/cirrus_vga.c -+++ b/hw/display/cirrus_vga.c -@@ -294,7 +294,7 @@ static bool blit_region_is_unsafe(struct CirrusVGAState *s, - return false; - } - --static bool blit_is_unsafe(struct CirrusVGAState *s) -+static bool blit_is_unsafe(struct CirrusVGAState *s, bool dst_only) - { - /* should be the case, see cirrus_bitblt_start */ - assert(s->cirrus_blt_width > 0); -@@ -308,6 +308,9 @@ static bool blit_is_unsafe(struct CirrusVGAState *s) - s->cirrus_blt_dstaddr & s->cirrus_addr_mask)) { - return true; - } -+ if (dst_only) { -+ return false; -+ } - if (blit_region_is_unsafe(s, s->cirrus_blt_srcpitch, - s->cirrus_blt_srcaddr & s->cirrus_addr_mask)) { - return true; -@@ -673,7 +676,7 @@ static int cirrus_bitblt_common_patterncopy(CirrusVGAState * s, - - dst = s->vga.vram_ptr + (s->cirrus_blt_dstaddr & s->cirrus_addr_mask); - -- if (blit_is_unsafe(s)) -+ if (blit_is_unsafe(s, false)) - return 0; - - (*s->cirrus_rop) (s, dst, src, -@@ -691,7 +694,7 @@ static int cirrus_bitblt_solidfill(CirrusVGAState *s, int blt_rop) - { - cirrus_fill_t rop_func; - -- if (blit_is_unsafe(s)) { -+ if (blit_is_unsafe(s, true)) { - return 0; - } - rop_func = cirrus_fill[rop_to_index[blt_rop]][s->cirrus_blt_pixelwidth - 1]; -@@ -795,7 +798,7 @@ static int cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h) - - static int cirrus_bitblt_videotovideo_copy(CirrusVGAState * s) - { -- if (blit_is_unsafe(s)) -+ if (blit_is_unsafe(s, false)) - return 0; - - return cirrus_do_copy(s, s->cirrus_blt_dstaddr - s->vga.start_addr, --- -2.12.0 - diff --git a/gnu/packages/patches/qemu-CVE-2017-2630.patch b/gnu/packages/patches/qemu-CVE-2017-2630.patch deleted file mode 100644 index b154d171f1..0000000000 --- a/gnu/packages/patches/qemu-CVE-2017-2630.patch +++ /dev/null @@ -1,47 +0,0 @@ -Fix CVE-2017-2630: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-2630 -https://lists.gnu.org/archive/html/qemu-devel/2017-02/msg01246.html - -Patch copied from upstream source repository: - -http://git.qemu-project.org/?p=qemu.git;a=commit;h=2563c9c6b8670400c48e562034b321a7cf3d9a85 - -From 2563c9c6b8670400c48e562034b321a7cf3d9a85 Mon Sep 17 00:00:00 2001 -From: Vladimir Sementsov-Ogievskiy -Date: Tue, 7 Mar 2017 09:16:27 -0600 -Subject: [PATCH] nbd/client: fix drop_sync [CVE-2017-2630] -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Comparison symbol is misused. It may lead to memory corruption. -Introduced in commit 7d3123e. - -Signed-off-by: Vladimir Sementsov-Ogievskiy -Message-Id: <20170203154757.36140-6-vsementsov@virtuozzo.com> -[eblake: add CVE details, update conditional] -Signed-off-by: Eric Blake -Reviewed-by: Marc-André Lureau -Message-Id: <20170307151627.27212-1-eblake@redhat.com> -Signed-off-by: Paolo Bonzini ---- - nbd/client.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nbd/client.c b/nbd/client.c -index 5c9dee37fa..3dc2564cd0 100644 ---- a/nbd/client.c -+++ b/nbd/client.c -@@ -94,7 +94,7 @@ static ssize_t drop_sync(QIOChannel *ioc, size_t size) - char small[1024]; - char *buffer; - -- buffer = sizeof(small) < size ? small : g_malloc(MIN(65536, size)); -+ buffer = sizeof(small) >= size ? small : g_malloc(MIN(65536, size)); - while (size > 0) { - ssize_t count = read_sync(ioc, buffer, MIN(65536, size)); - --- -2.12.0 - diff --git a/gnu/packages/patches/qemu-CVE-2017-5667.patch b/gnu/packages/patches/qemu-CVE-2017-5667.patch deleted file mode 100644 index 5adea0d278..0000000000 --- a/gnu/packages/patches/qemu-CVE-2017-5667.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix CVE-2017-5667 (sdhci OOB access during multi block SDMA transfer): - -http://seclists.org/oss-sec/2017/q1/243 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5667 - -Patch copied from upstream source repository: - -http://git.qemu-project.org/?p=qemu.git;a=commitdiff;h=42922105beb14c2fc58185ea022b9f72fb5465e9 - -From 42922105beb14c2fc58185ea022b9f72fb5465e9 Mon Sep 17 00:00:00 2001 -From: Prasad J Pandit -Date: Tue, 7 Feb 2017 18:29:59 +0000 -Subject: [PATCH] sd: sdhci: check data length during dma_memory_read - -While doing multi block SDMA transfer in routine -'sdhci_sdma_transfer_multi_blocks', the 's->fifo_buffer' starting -index 'begin' and data length 's->data_count' could end up to be same. -This could lead to an OOB access issue. Correct transfer data length -to avoid it. - -Cc: qemu-stable@nongnu.org -Reported-by: Jiang Xin -Signed-off-by: Prasad J Pandit -Reviewed-by: Peter Maydell -Message-id: 20170130064736.9236-1-ppandit@redhat.com -Signed-off-by: Peter Maydell ---- - hw/sd/sdhci.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c -index 01fbf228be..5bd5ab6319 100644 ---- a/hw/sd/sdhci.c -+++ b/hw/sd/sdhci.c -@@ -536,7 +536,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState *s) - boundary_count -= block_size - begin; - } - dma_memory_read(&address_space_memory, s->sdmasysad, -- &s->fifo_buffer[begin], s->data_count); -+ &s->fifo_buffer[begin], s->data_count - begin); - s->sdmasysad += s->data_count - begin; - if (s->data_count == block_size) { - for (n = 0; n < block_size; n++) { --- -2.11.1 - diff --git a/gnu/packages/patches/qemu-CVE-2017-5931.patch b/gnu/packages/patches/qemu-CVE-2017-5931.patch deleted file mode 100644 index 08910e5fac..0000000000 --- a/gnu/packages/patches/qemu-CVE-2017-5931.patch +++ /dev/null @@ -1,55 +0,0 @@ -Fix CVE-2017-5931 (integer overflow in handling virtio-crypto requests): - -http://seclists.org/oss-sec/2017/q1/337 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5931 - -Patch copied from upstream source repository: - -http://git.qemu-project.org/?p=qemu.git;a=commit;h=a08aaff811fb194950f79711d2afe5a892ae03a4 - -From a08aaff811fb194950f79711d2afe5a892ae03a4 Mon Sep 17 00:00:00 2001 -From: Gonglei -Date: Tue, 3 Jan 2017 14:50:03 +0800 -Subject: [PATCH] virtio-crypto: fix possible integer and heap overflow - -Because the 'size_t' type is 4 bytes in 32-bit platform, which -is the same with 'int'. It's easy to make 'max_len' to zero when -integer overflow and then cause heap overflow if 'max_len' is zero. - -Using uint_64 instead of size_t to avoid the integer overflow. - -Cc: qemu-stable@nongnu.org -Reported-by: Li Qiang -Signed-off-by: Gonglei -Tested-by: Li Qiang -Reviewed-by: Michael S. Tsirkin -Signed-off-by: Michael S. Tsirkin ---- - hw/virtio/virtio-crypto.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c -index 2f2467e859..c23e1ad458 100644 ---- a/hw/virtio/virtio-crypto.c -+++ b/hw/virtio/virtio-crypto.c -@@ -416,7 +416,7 @@ virtio_crypto_sym_op_helper(VirtIODevice *vdev, - uint32_t hash_start_src_offset = 0, len_to_hash = 0; - uint32_t cipher_start_src_offset = 0, len_to_cipher = 0; - -- size_t max_len, curr_size = 0; -+ uint64_t max_len, curr_size = 0; - size_t s; - - /* Plain cipher */ -@@ -441,7 +441,7 @@ virtio_crypto_sym_op_helper(VirtIODevice *vdev, - return NULL; - } - -- max_len = iv_len + aad_len + src_len + dst_len + hash_result_len; -+ max_len = (uint64_t)iv_len + aad_len + src_len + dst_len + hash_result_len; - if (unlikely(max_len > vcrypto->conf.max_size)) { - virtio_error(vdev, "virtio-crypto too big length"); - return NULL; --- -2.11.1 - diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index aa12b2c493..e0b4695f3a 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -69,27 +69,23 @@ (define (qemu-patch commit file-name sha256) (define-public qemu (package (name "qemu") - (version "2.8.0") + (version "2.8.1") (source (origin (method url-fetch) (uri (string-append "http://wiki.qemu-project.org/download/qemu-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "0qjy3rcrn89n42y5iz60kgr0rrl29hpnj8mq2yvbc1wrcizmvzfs")) + "0h342v4n44kh89yyfas4iazvhhsy5m5qk94vsjqpz5zpq1i2ykad")) (patches (search-patches "qemu-CVE-2016-10155.patch" - "qemu-CVE-2017-2615.patch" - "qemu-CVE-2017-2620.patch" - "qemu-CVE-2017-2630.patch" "qemu-CVE-2017-5525.patch" "qemu-CVE-2017-5526.patch" "qemu-CVE-2017-5552.patch" "qemu-CVE-2017-5578.patch" "qemu-CVE-2017-5579.patch" - "qemu-CVE-2017-5667.patch" "qemu-CVE-2017-5856.patch" "qemu-CVE-2017-5898.patch" - "qemu-CVE-2017-5931.patch")))) + )))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: From 37982693cada152521d02beac4e8a21dbe6b2606 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 7 Apr 2017 21:35:07 +1000 Subject: [PATCH 136/301] gnu: vsearch: Update to 2.4.3. * gnu/packages/bioinformatics.scm (vsearch): Update to 2.4.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5753fbb6a4..48cf12ff4d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5810,7 +5810,7 @@ (define-public r-txdb-hsapiens-ucsc-hg19-knowngene (define-public vsearch (package (name "vsearch") - (version "2.4.2") + (version "2.4.3") (source (origin (method url-fetch) @@ -5820,7 +5820,7 @@ (define-public vsearch (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "15zy2d9xvgbgdjlxvrhj8s5ga42p13k7a3xv015ingn0bi1p3n6w")) + "0hc110ycqpa54nr6x173qg7190hk08qp7yz7zzqxlsypqnpc5zzp")) (patches (search-patches "vsearch-unbundle-cityhash.patch")) (snippet '(begin From ecc39b3f55be18f9c9d9b71b2d12f037299433f2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 7 Apr 2017 16:03:18 +0300 Subject: [PATCH 137/301] gnu: gnubik: Update to 2.4.3. * gnu/packages/games.scm (gnubik): Update to 2.4.3. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0e0e68afcc..a09ea3e117 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2016 Albin Söderqvist ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2016 Alex Griffin -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Steve Webber ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira @@ -225,7 +225,7 @@ (define-public gnubg (define-public gnubik (package (name "gnubik") - (version "2.4.2") + (version "2.4.3") (source (origin (method url-fetch) @@ -233,7 +233,7 @@ (define-public gnubik version ".tar.gz")) (sha256 (base32 - "0mhpfnxzbns0wfrsjv5vafqr34770rbvkmdzxk0x0aq67hb3zyl5")))) + "1vlf924mq8hg93bsjj0rzvs0crc6psmlxyc6zn0fr7msnmpx6gib")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2) ("mesa" ,mesa) From d46e9fcb2cd637d5f7695638679229dd72d858b4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 7 Apr 2017 16:13:34 +0300 Subject: [PATCH 138/301] gnu: myrepos: Update to 1.20170129. * gnu/packages/version-control.scm (myrepos): Update to 1.20170129. [source]: Source tarballs have been removed from Github, use git-download to download from upstream repository. [home-page]: Use https. --- gnu/packages/version-control.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 6d94170f3c..920e67e74a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1171,24 +1171,24 @@ (define-public findnewest (define-public myrepos (package (name "myrepos") - (version "1.20160123") + (version "1.20170129") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/joeyh/myrepos/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "git://myrepos.branchable.com/myrepos") + (commit version))) + (file-name (string-append name "-" version "-checkout")) (sha256 - (base32 "1723cg5haplz2w9dwdzp6ds1ip33cx3awmj4wnb0h4yq171v5lqk")))) + (base32 "15i9bs2i25l7ibv530ghy8280kklcgm5kr6j86s7iwcqqckd0czp")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) (arguments - `(#:test-target "test" + '(#:test-target "test" #:phases (alist-delete 'configure %standard-phases) #:make-flags (list (string-append "PREFIX=" %output)))) - (home-page "http://myrepos.branchable.com/") + (home-page "https://myrepos.branchable.com/") (synopsis "Multiple repository management tool") (description "Myrepos provides the @code{mr} command, which maps an operation (e.g., From d5a3e8f019a12c1d5763a7f9784b5d025647d614 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 7 Apr 2017 16:15:00 +0300 Subject: [PATCH 139/301] gnu: myrepos: Use 'modify-phases' syntax. * gnu/packages/version-control.scm (myrepos)[arguments]: Use 'modify-phases' syntax. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 920e67e74a..60152ffe8c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1186,7 +1186,7 @@ (define-public myrepos `(("perl" ,perl))) (arguments '(#:test-target "test" - #:phases (alist-delete 'configure %standard-phases) + #:phases (modify-phases %standard-phases (delete 'configure)) #:make-flags (list (string-append "PREFIX=" %output)))) (home-page "https://myrepos.branchable.com/") (synopsis "Multiple repository management tool") From 6cfb860a7ae623f03f14dc3b6b2bed61b84558b4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 7 Apr 2017 07:44:05 -0400 Subject: [PATCH 140/301] gnu: guitarix: Disable webkit features. The only version of webkit supported by guitarix is unmaintained and contains a large number of security vulnerabilities, and should be removed from Guix. * gnu/packages/audio.scm (guitarix)[inputs]: Remove webkitgtk/gtk+-2. --- gnu/packages/audio.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9dc6797343..9acccaf113 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1166,7 +1166,6 @@ (define-public guitarix ("jack" ,jack-1) ("gtkmm" ,gtkmm-2) ("gtk+" ,gtk+-2) - ("webkitgtk/gtk+-2" ,webkitgtk/gtk+-2) ("fftwf" ,fftwf) ("lrdf" ,lrdf) ("zita-resampler" ,zita-resampler) From f214d470d7277370db03825c6cd35a9a5ee40732 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 5 Apr 2017 14:38:51 +0200 Subject: [PATCH 141/301] gnu: ratpoison: Update to 1.4.9. * gnu/packages/ratpoison.scm (ratpoison): Update to 1.4.9. [inputs]: Remove libxinerama. Add libxrandr. Signed-off-by: Leo Famulari --- gnu/packages/ratpoison.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm index 23adf859a7..e68b345b06 100644 --- a/gnu/packages/ratpoison.scm +++ b/gnu/packages/ratpoison.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014 Ludovic Courtès ;;; Copyright © 2015 Mathieu Lirzin +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,14 +44,14 @@ (define ratpoison.desktop (define-public ratpoison (package (name "ratpoison") - (version "1.4.8") + (version "1.4.9") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/ratpoison/ratpoison-" version ".tar.xz")) (sha256 (base32 - "1w502z55vv7zs45l80nsllqh9fvfwjfdfi11xy1qikhzdmirains")) + "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr")) (patches (search-patches "ratpoison-shell.patch")))) (build-system gnu-build-system) (arguments @@ -70,7 +71,7 @@ (define-public ratpoison ("freetype" ,freetype) ("libXft" ,libxft) ("libXi" ,libxi) - ("libxinerama" ,libxinerama) + ("libxrandr" ,libxrandr) ("libXpm" ,libxpm) ("libXt" ,libxt) ("libXtst" ,libxtst) From b25d3bd973fbf6c65de322f9f07a33b0c2dd32a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 7 Apr 2017 16:36:43 +0200 Subject: [PATCH 142/301] gnu: perf: Add support for C++ symbol demangling. * gnu/packages/linux.scm (perf)[inputs]: Add libiberty. --- gnu/packages/linux.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6aee9cd525..876b7ef7b4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2224,6 +2224,7 @@ (define-public perf ;; ("newt" ,newt) ("python" ,python-2) ;'perf' links against libpython ("elfutils" ,elfutils) + ("libiberty" ,libiberty) ;used alongside BDF for symbol demangling ;; Documentation. ("libxml2" ,libxml2) ;for $XML_CATALOG_FILES From b0dd3436ed4387ed768b4e9da9bcedb6d8c08d50 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Fri, 7 Apr 2017 19:52:11 +0300 Subject: [PATCH 143/301] gnu: emacs-debbugs: Update to 0.14. * gnu/packages/emacs.scm (emacs-debbugs): Update to 0.14. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3db31f207b..15ab6b4866 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1979,14 +1979,14 @@ (define-public emacs-ob-ipython (define-public emacs-debbugs (package (name "emacs-debbugs") - (version "0.12") + (version "0.14") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/debbugs-" version ".tar")) (sha256 (base32 - "1swi4d7fhahimid9j12cypmkz7dlqgffrnhfxy5ra44y3j2b35ph")))) + "07wgcvg038l88gxvjr0gjpjhyk743w22x1rqghz3gkmif0g70say")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async))) From 350cfccb069ff6b8fd9625268612ce09be5f66c9 Mon Sep 17 00:00:00 2001 From: humanitiesNerd Date: Wed, 5 Apr 2017 12:42:05 +0200 Subject: [PATCH 144/301] gnu: Add emacs-adaptive-wrap. Suggested-by Ivan Vilata i Balaguer . Fixes . * gnu/packages/emacs.scm (emacs-adaptive-wrap): New variable. Signed-off-by: Alex Kost --- gnu/packages/emacs.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 15ab6b4866..f6f8fcfba4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4057,3 +4057,26 @@ (define-public emacs-highlight-sexp (description "This Emacs package highlights the s-exp at the current position.") (license license:gpl3+))) + +(define-public emacs-adaptive-wrap + (package + (name "emacs-adaptive-wrap") + (version "0.5") + (source (origin + (method url-fetch) + (uri (string-append + "http://elpa.gnu.org/packages/adaptive-wrap-" + version ".el")) + (sha256 + (base32 + "0frgmp8vrrml4iykm60j4d6cl9rbcivy9yh24q6kd10bcyx59ypy")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/adaptive-wrap.html") + (synopsis "Smart line-wrapping with wrap-prefix") + (description + "This Emacs package provides the @code{adaptive-wrap-prefix-mode} +minor mode which sets the wrap-prefix property on the fly so that +single-long-line paragraphs get word-wrapped in a way similar to what +you'd get with @kbd{M-q} using @code{adaptive-fill-mode}, but without +actually changing the buffer's text.") + (license license:gpl3+))) From d71b758f3ae77ccbab766244ee2b2733371fc265 Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu Date: Tue, 28 Mar 2017 21:50:02 +0200 Subject: [PATCH 145/301] gnu: emacs-symon: Update to 20160630. * gnu/packagages/emacs.scm (emacs-symon): Update to 20160630 (this is the latest tag available from the upstream). [source]: Use github instead of melpa. [home-page]: Update. Signed-off-by: Alex Kost --- gnu/packages/emacs.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f6f8fcfba4..cc14fd2280 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1487,17 +1487,18 @@ (define-public emacs-s (define-public emacs-symon (package (name "emacs-symon") - (version "20170224.33") + (version "20160630") (source (origin (method url-fetch) - (uri (string-append "http://melpa.org/packages/symon-" - version ".el")) + (uri (string-append "https://github.com/zk-phi/symon/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "109jd7yjhdrrf5jqpqyv543nb28g7065z58bji9pvxanzi4zl2iz")))) + "0h4jcgdnq98wc9rj72nwyazq8498yg55jfljiij5qwbn1xf1g5zz")))) (build-system emacs-build-system) - (home-page "http://hins11.yu-yake.com/") + (home-page "https://github.com/zk-phi/symon") (synopsis "Tiny graphical system monitor") (description "Tiny graphical system monitor for the Emacs minibuffer when idle.") From d10fa5c7ff878ad4723e1946d4c308261cd9e98f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 9 Feb 2017 18:13:53 +0100 Subject: [PATCH 146/301] gnu: Add intel-gpu-tools. * gnu/packages/admin.scm (intel-gpu-tools): New variable. --- gnu/packages/admin.scm | 53 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 41b0da4c47..f19bf5a48d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Pjotr Prins -;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Peter Feigl ;;; Copyright © 2016 John J. Foerch @@ -67,10 +67,12 @@ (define-module (gnu packages admin) #:use-module (gnu packages texinfo) #:use-module (gnu packages groff) #:use-module (gnu packages pciutils) + #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages libftdi) #:use-module (gnu packages image) #:use-module (gnu packages xorg) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages python) #:use-module (gnu packages man) #:use-module (gnu packages autotools) @@ -1997,3 +1999,52 @@ (define-public sedsed With sedsed you can master any sed script. No more secrets, no more hidden buffers.") (license license:expat))) + +(define-public intel-gpu-tools + (package + (name "intel-gpu-tools") + (version "1.18") + (source (origin + (method url-fetch) + (uri (string-append "https://cgit.freedesktop.org/xorg/app/" + "intel-gpu-tools/snapshot/" + "intel-gpu-tools-" version ".tar.gz")) + (sha256 + (base32 + "0w7djk0y5w76hzn1b3cm39zd5c6w9za1wfn80wd857h0v313rzq3")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; many of the tests try to load kernel modules + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + ;; Don't run configure in this phase + (setenv "NOCONFIGURE" "1") + (zero? (system* "sh" "autogen.sh"))))))) + (inputs + `(("util-macros" ,util-macros) + ("libdrm" ,libdrm) + ("libpciaccess" ,libpciaccess) + ("kmod" ,kmod) + ("procps" ,procps) + ("cairo" ,cairo) + ("libunwind" ,libunwind) + ("libxrandr" ,libxrandr) + ("glib" ,glib))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/") + (synopsis "Tools for development and testing of the Intel DRM driver") + (description "Intel GPU Tools is a collection of tools for development and +testing of the Intel DRM driver. There are many macro-level test suites that +get used against the driver, including xtest, rendercheck, piglit, and +oglconform, but failures from those can be difficult to track down to kernel +changes, and many require complicated build procedures or specific testing +environments to get useful results. Therefore, Intel GPU Tools includes +low-level tools and tests specifically for development and testing of the +Intel DRM Driver.") + (license license:expat))) From 83cfa0247b68adf8fc6461792aa7cdc4f0d838ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 7 Apr 2017 22:20:28 +0200 Subject: [PATCH 147/301] pack: Add '--expression'. * guix/scripts/pack.scm (%options, show-help): Add '--expression'. (guix-pack)[maybe-package-argument]: New procedure. Use it, and remove variable 'specs'. * doc/guix.texi (Invoking guix pack): Document '--expression'. --- doc/guix.texi | 8 ++++++++ guix/scripts/pack.scm | 31 +++++++++++++++++++------------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index d413ea4a50..07ae660f77 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2476,6 +2476,14 @@ This produces a tarball that follows the Docker Image Specification}. @end table +@item --expression=@var{expr} +@itemx -e @var{expr} +Consider the package @var{expr} evaluates to. + +This has the same purpose as the same-named option in @command{guix +build} (@pxref{Additional Build Options, @code{--expression} in +@command{guix build}}). + @item --system=@var{system} @itemx -s @var{system} Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 9e91bc22ac..165e4ccf2a 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -280,6 +280,9 @@ (define %options (option '(#\f "format") #t #f (lambda (opt name arg result) (alist-cons 'format (string->symbol arg) result))) + (option '(#\e "expression") #t #f + (lambda (opt name arg result) + (alist-cons 'expression arg result))) (option '(#\s "system") #t #f (lambda (opt name arg result) (alist-cons 'system arg @@ -323,6 +326,8 @@ (define (show-help) (display (_ " -f, --format=FORMAT build a pack in the given FORMAT")) (display (_ " + -e, --expression=EXPR consider the package EXPR evaluates to")) + (display (_ " -s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\"")) (display (_ " --target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\"")) @@ -349,20 +354,22 @@ (define (guix-pack . args) (define opts (parse-command-line args %options (list %default-options))) + (define maybe-package-argument + ;; Given an option pair, return a package, a package/output tuple, or #f. + (match-lambda + (('argument . spec) + (call-with-values + (lambda () + (specification->package+output spec)) + list)) + (('expression . exp) + (read/eval-package-expression exp)) + (x #f))) + (with-error-handling (parameterize ((%graft? (assoc-ref opts 'graft?))) - (let* ((dry-run? (assoc-ref opts 'dry-run?)) - (specs (filter-map (match-lambda - (('argument . name) - name) - (x #f)) - opts)) - (packages (map (lambda (spec) - (call-with-values - (lambda () - (specification->package+output spec)) - list)) - specs)) + (let* ((dry-run? (assoc-ref opts 'dry-run?)) + (packages (filter-map maybe-package-argument opts)) (pack-format (assoc-ref opts 'format)) (name (string-append (symbol->string pack-format) "-pack")) From 5537f2d27925abc05550eff35d13e1347d60dca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 7 Apr 2017 22:26:12 +0200 Subject: [PATCH 148/301] profiles: Slightly improve the instructions in 'etc/profile'. * guix/build/profiles.scm (build-etc/profile): Fix typo in comment. Add backslash in the generated shell comment. --- guix/build/profiles.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/build/profiles.scm b/guix/build/profiles.scm index 42eabfaf19..5c96fe9067 100644 --- a/guix/build/profiles.scm +++ b/guix/build/profiles.scm @@ -75,14 +75,14 @@ (define (build-etc/profile output search-paths) ;; source ~/.guix-profile/etc/profile ~/.guix-profile ;; ;; However, when 'source' is used with no arguments, $1 refers to the - ;; first positional parameter of the calling scripts, so we can rely on - ;; it. + ;; first positional parameter of the calling script, so we cannot rely + ;; on it. (display "\ # Source this file to define all the relevant environment variables in Bash # for this profile. You may want to define the 'GUIX_PROFILE' environment # variable to point to the \"visible\" name of the profile, like this: # -# GUIX_PROFILE=/path/to/profile +# GUIX_PROFILE=/path/to/profile \\ # source /path/to/profile/etc/profile # # When GUIX_PROFILE is undefined, the various environment variables refer From 1165b08f8683b2a8c12753eb6fd26c2451bce81c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 7 Apr 2017 22:41:46 +0200 Subject: [PATCH 149/301] build: Include 'glibc-utf8-locales' in the binary tarball. * Makefile.am (guix-binary.%.tar.xz): Add 'glibc-utf8-locales' and 'glibc-final' to the 'guix pack' command line. * doc/guix.texi (Binary Installation): Mention 'etc/profile'. --- Makefile.am | 6 ++++-- doc/guix.texi | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index c713d9a3f6..c16a1cf6e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -489,11 +489,13 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-nix-prefix="$(NIX_PREFIX)" \ --enable-daemon -# The self-contained tarball. +# The self-contained tarball. Add 'glibc-utf8-locales' along with glibc just +# so 'etc/profile' defines 'GUIX_LOCPATH' pointing to a valid set of locales. guix-binary.%.tar.xz: $(AM_V_GEN)GUIX_PACKAGE_PATH= \ tarball=`$(top_builddir)/pre-inst-env guix pack -C xz \ - -s "$*" --localstatedir guix` ; \ + -s "$*" --localstatedir guix glibc-utf8-locales \ + -e '(@@ (gnu packages commencement) glibc-final)'` ; \ cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" diff --git a/doc/guix.texi b/doc/guix.texi index 07ae660f77..d0f21edeec 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -439,6 +439,14 @@ Make @code{root}'s profile available under @file{~/.guix-profile}: ~root/.guix-profile @end example +Source @file{etc/profile} to augment @code{PATH} and other relevant +environment variables: + +@example +# GUIX_PROFILE=$HOME/.guix-profile \ + source $GUIX_PROFILE/etc/profile +@end example + @item Create the group and user accounts for build users as explained below (@pxref{Build Environment Setup}). From cf47a8a51dfbc9b6358da29b2d4f150ef732d163 Mon Sep 17 00:00:00 2001 From: ng0 Date: Fri, 24 Mar 2017 16:45:57 +0000 Subject: [PATCH 150/301] gnu: dovecot-trees: Update to 2.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (dovecot-trees): Update to 2.1.0. (source): Change to use 'url-fetch'. Signed-off-by: Ludovic Courtès --- gnu/packages/mail.scm | 75 +++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 65fa9df544..13861a8ad4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1132,44 +1132,41 @@ (define-public dovecot (license (list lgpl2.1 license:expat (non-copyleft "file://COPYING"))))) (define-public dovecot-trees - (let ((commit "006059c8a47d68f14f73c09743e45b9a73014dbf") - (revision "1")) - (package - (name "dovecot-trees") - (version (string-append "2.0.0-" revision "." (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://0xacab.org/riseuplabs/trees.git") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0ax90bzc66x179wi1m7ywqwa8nssyhjngs7ij109hqqxg5ymfp73")))) - (build-system gnu-build-system) - (native-inputs - `(("automake" ,automake) - ("autoconf" ,autoconf) - ("libtool" ,libtool) - ("dovecot" ,dovecot) - ("pkg-config" ,pkg-config))) - (inputs - `(("libsodium" ,libsodium))) - (arguments - `(#:tests? #f ;No tests exist. - #:configure-flags (list (string-append "--with-dovecot=" - (assoc-ref %build-inputs "dovecot") - "/lib/dovecot")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'autogen - (lambda _ - (zero? (system* "./autogen.sh"))))))) - (home-page "https://0xacab.org/riseuplabs/trees") - (synopsis "NaCL-based Dovecot email storage encryption plugin") - (description - "Technology for Resting Email Encrypted Storage (TREES) is a NaCL-based + (package + (name "dovecot-trees") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://0xacab.org/riseuplabs/trees/repository/" + "archive.tar.gz?ref=v" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rkk10b1bsjz979sc864vpgcdchy7yxwmyv4ik50lar1h6awdnrf")))) + (build-system gnu-build-system) + (native-inputs + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("libtool" ,libtool) + ("dovecot" ,dovecot) + ("pkg-config" ,pkg-config))) + (inputs + `(("libsodium" ,libsodium))) + (arguments + `(#:tests? #f ;No tests exist. + #:configure-flags (list (string-append "--with-dovecot=" + (assoc-ref %build-inputs "dovecot") + "/lib/dovecot")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'autogen + (lambda _ + (zero? (system* "./autogen.sh"))))))) + (home-page "https://0xacab.org/riseuplabs/trees") + (synopsis "NaCL-based Dovecot email storage encryption plugin") + (description + "Technology for Resting Email Encrypted Storage (TREES) is a NaCL-based Dovecot encryption plugin. This plugin adds individually encrypted mail storage to the Dovecot IMAP server. It is inspired by Posteo's scrambler which uses OpenSSL and RSA keypairs. TREES works in a similar way, but uses @@ -1185,7 +1182,7 @@ (define-public dovecot-trees using lidsodium sealed boxes. @item New mail is encrypted as it arrives using the Curve25519 public key. @end enumerate\n") - (license agpl3)))) + (license agpl3))) (define-public dovecot-libsodium-plugin (let ((commit "044de73c01c35385df0105f6b387bec5d5317ce7") From f91fcd9c42298e826026bc4eb3c6094a35722599 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 6 Apr 2017 08:55:44 +0200 Subject: [PATCH 151/301] syscalls: Allow mount and umount use from static Guile. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build/syscalls.scm (mount): Use Guile core mount if called from static Guile, otherwise use FFI based mount implementation. (umount): Ditto. This allows to use (guix build syscalls) from a module independently of calling context. Signed-off-by: Ludovic Courtès --- guix/build/syscalls.scm | 86 +++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 38 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 5aae1530f4..4bcb2a871c 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -462,47 +462,57 @@ (define MNT_EXPIRE 4) (define UMOUNT_NOFOLLOW 8) (define mount - (let ((proc (syscall->procedure int "mount" `(* * * ,unsigned-long *)))) - (lambda* (source target type #:optional (flags 0) options - #:key (update-mtab? #f)) - "Mount device SOURCE on TARGET as a file system TYPE. Optionally, FLAGS -may be a bitwise-or of the MS_* constants, and OPTIONS may be a -string. When FLAGS contains MS_REMOUNT, SOURCE and TYPE are ignored. When -UPDATE-MTAB? is true, update /etc/mtab. Raise a 'system-error' exception on -error." - (let-values (((ret err) - (proc (if source - (string->pointer source) - %null-pointer) - (string->pointer target) - (if type - (string->pointer type) - %null-pointer) - flags - (if options - (string->pointer options) - %null-pointer)))) - (unless (zero? ret) - (throw 'system-error "mount" "mount ~S on ~S: ~A" - (list source target (strerror err)) - (list err))) - (when update-mtab? - (augment-mtab source target type options)))))) + ;; If called from the statically linked Guile, use Guile core 'mount'. + ;; Otherwise, use an FFI binding to define 'mount'. + ;; XXX: '#:update-mtab?' is not implemented by core 'mount'. + (if (module-defined? the-scm-module 'mount) + (module-ref the-scm-module 'mount) + (let ((proc (syscall->procedure int "mount" `(* * * ,unsigned-long *)))) + (lambda* (source target type #:optional (flags 0) options + #:key (update-mtab? #f)) + "Mount device SOURCE on TARGET as a file system TYPE. +Optionally, FLAGS may be a bitwise-or of the MS_* +constants, and OPTIONS may be a string. When FLAGS contains +MS_REMOUNT, SOURCE and TYPE are ignored. When UPDATE-MTAB? is true, +update /etc/mtab. Raise a 'system-error' exception on error." + (let-values (((ret err) + (proc (if source + (string->pointer source) + %null-pointer) + (string->pointer target) + (if type + (string->pointer type) + %null-pointer) + flags + (if options + (string->pointer options) + %null-pointer)))) + (unless (zero? ret) + (throw 'system-error "mount" "mount ~S on ~S: ~A" + (list source target (strerror err)) + (list err))) + (when update-mtab? + (augment-mtab source target type options))))))) (define umount - (let ((proc (syscall->procedure int "umount2" `(* ,int)))) - (lambda* (target #:optional (flags 0) - #:key (update-mtab? #f)) - "Unmount TARGET. Optionally FLAGS may be one of the MNT_* or UMOUNT_* + ;; If called from the statically linked Guile, use Guile core 'umount'. + ;; Otherwise, use an FFI binding to define 'umount'. + ;; XXX: '#:update-mtab?' is not implemented by core 'umount'. + (if (module-defined? the-scm-module 'umount) + (module-ref the-scm-module 'umount) + (let ((proc (syscall->procedure int "umount2" `(* ,int)))) + (lambda* (target #:optional (flags 0) + #:key (update-mtab? #f)) + "Unmount TARGET. Optionally FLAGS may be one of the MNT_* or UMOUNT_* constants from ." - (let-values (((ret err) - (proc (string->pointer target) flags))) - (unless (zero? ret) - (throw 'system-error "umount" "~S: ~A" - (list target (strerror err)) - (list err))) - (when update-mtab? - (remove-from-mtab target)))))) + (let-values (((ret err) + (proc (string->pointer target) flags))) + (unless (zero? ret) + (throw 'system-error "umount" "~S: ~A" + (list target (strerror err)) + (list err))) + (when update-mtab? + (remove-from-mtab target))))))) (define (mount-points) "Return the mounts points for currently mounted file systems." From abf0880a67a362122d7c2379594cf3c27c45ffbd Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 6 Apr 2017 08:55:45 +0200 Subject: [PATCH 152/301] vm: Add missing module. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/build/vm.scm (define-module): Use module (guix build syscalls). It fixes the following warnings during guix build : gnu/build/vm.scm:233:3: warning: possibly unbound variable `mount' gnu/build/vm.scm:238:3: warning: possibly unbound variable `umount' gnu/build/vm.scm:268:8: warning: possibly unbound variable `mount' gnu/build/vm.scm:276:8: warning: possibly unbound variable `umount' gnu/build/vm.scm:315:4: warning: possibly unbound variable `mount' gnu/build/vm.scm:323:4: warning: possibly unbound variable `umount' This was not possible until the previous commit because we had to be sure that Guile core implementation of 'mount' and 'umount' was used in initrd context. Signed-off-by: Ludovic Courtès --- gnu/build/vm.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 60ee18ebe0..44a3000eb1 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -21,6 +21,7 @@ (define-module (gnu build vm) #:use-module (guix build utils) #:use-module (guix build store-copy) + #:use-module (guix build syscalls) #:use-module (gnu build linux-boot) #:use-module (gnu build install) #:use-module (guix records) From 4653341b233f84cc8c11768f68e6ad54c35bb84e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 7 Apr 2017 22:03:36 -0400 Subject: [PATCH 153/301] gnu: khal: Update to 0.9.5. * gnu/packages/calendar.scm (khal): Update to 0.9.5. --- gnu/packages/calendar.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 000b2dd62f..b022c0efa7 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -85,13 +85,13 @@ (define-public libical (define-public khal (package (name "khal") - (version "0.9.3") + (version "0.9.5") (source (origin (method url-fetch) (uri (pypi-uri "khal" version)) (sha256 (base32 - "1iva6cw2x3p2jzjj6bsyx7lc7yxin4fsd37j9c96j07x16p4imyl")))) + "0fvv0kjym9q8v20zbpr5m8ig65b8hva4p0c935qsdvgdni68jidr")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases From 1c8ee3fcc2866e214ddf16596f26d8caad75999f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 7 Apr 2017 23:27:37 +0200 Subject: [PATCH 154/301] gnu: r-stringi: Update to 1.1.5. * gnu/packages/statistics.scm (r-stringi): Update to 1.1.5. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8d705a88bd..18136f1396 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -943,14 +943,14 @@ (define-public r-sendmailr (define-public r-stringi (package (name "r-stringi") - (version "1.1.3") + (version "1.1.5") (source (origin (method url-fetch) (uri (cran-uri "stringi" version)) (sha256 (base32 - "12gk38ck06dxx1msj603ifqfsdy2slm85j62nqf7qydywii21wly")))) + "1wh20is24lmzhcd9487ckv7r19009fyz4is3ianp3ky69vy8a7k5")))) (build-system r-build-system) (inputs `(("icu4c" ,icu4c))) (native-inputs `(("pkg-config" ,pkg-config))) From 1d65b5379b33951298cb8a763e0140bb1ec43404 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Apr 2017 10:24:04 +0200 Subject: [PATCH 155/301] gnu: r-vegan: Update to 2.4-3. * gnu/packages/bioinformatics.scm (r-vegan): Update to 2.4-3. [arguments]: Remove build phase "revert-test-deletion". [native-inputs]: Remove "r-vegan-delete-tests-patch". --- gnu/packages/bioinformatics.scm | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 48cf12ff4d..3626db9aae 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5356,40 +5356,18 @@ (define-public r-centipede (define-public r-vegan (package (name "r-vegan") - (version "2.4-2") + (version "2.4-3") (source (origin (method url-fetch) (uri (cran-uri "vegan" version)) (sha256 (base32 - "12wf64izrpq9z3ix7mgm5421mq0xsm8dw5qblvcrz452nfhjf5w9")))) + "15zcxfix2d854897k1lr0sfmj2n00339nlsppcr3zrb238lb2mi5")))) (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'revert-test-deletion - ;; The distributed sources do not include tests with the CRAN - ;; package. Here we revert the commit - ;; `591d0e8ba1deaaf82445474ec6619c0b43db4e63' which deletes these - ;; tests. There are plans to not delete tests in future as - ;; documented at https://github.com/vegandevs/vegan/issues/181. - (lambda* (#:key inputs #:allow-other-keys) - (zero? - (system* "patch" "-R" "-p1" "-i" - (assoc-ref inputs "r-vegan-delete-tests-patch")))))))) (native-inputs `(("gfortran" ,gfortran) - ("r-knitr" ,r-knitr) - ("r-vegan-delete-tests-patch" - ,(origin - (method url-fetch) - (uri (string-append - "https://github.com/vegandevs/vegan/commit/" - "591d0e8ba1deaaf82445474ec6619c0b43db4e63.patch")) - (sha256 - (base32 - "0b1bi7y4jjdl3ph721vm9apm51dr2z9piwvhy4355sf2b4kyyj5a")))))) + ("r-knitr" ,r-knitr))) (propagated-inputs `(("r-cluster" ,r-cluster) ("r-lattice" ,r-lattice) From d922c8e4b773407ca525360e8c564484db34db07 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Thu, 6 Apr 2017 02:28:34 -0700 Subject: [PATCH 156/301] monads: Use intent-revealing parameter names. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/monads.scm (mwhen, munless): Rename parameters from 'exp0' and 'exp' to 'mexp0' and 'mexp', respectively. This makes it more obvious that these expressions must be monadic expressions. Signed-off-by: Ludovic Courtès --- guix/monads.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/guix/monads.scm b/guix/monads.scm index 0b0ad239de..6933f7f151 100644 --- a/guix/monads.scm +++ b/guix/monads.scm @@ -204,23 +204,23 @@ (define-syntax mbegin (define-syntax mwhen (syntax-rules () - "When CONDITION is true, evaluate EXP0..EXP* as in an 'mbegin'. When + "When CONDITION is true, evaluate MEXP0..MEXP* as in an 'mbegin'. When CONDITION is false, return *unspecified* in the current monad." - ((_ condition exp0 exp* ...) + ((_ condition mexp0 mexp* ...) (if condition (mbegin %current-monad - exp0 exp* ...) + mexp0 mexp* ...) (return *unspecified*))))) (define-syntax munless (syntax-rules () - "When CONDITION is false, evaluate EXP0..EXP* as in an 'mbegin'. When + "When CONDITION is false, evaluate MEXP0..MEXP* as in an 'mbegin'. When CONDITION is true, return *unspecified* in the current monad." - ((_ condition exp0 exp* ...) + ((_ condition mexp0 mexp* ...) (if condition (return *unspecified*) (mbegin %current-monad - exp0 exp* ...))))) + mexp0 mexp* ...))))) (define-syntax define-lift (syntax-rules () From 60a9fcb1377e4acc78a930904ef80b69a1c63f25 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Thu, 6 Apr 2017 02:28:35 -0700 Subject: [PATCH 157/301] monads, doc: Improve mwhen and munless documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi (The Store Monad) : Document them. * guix/monads.scm (mwhen, munless): Clarify their intended use. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 14 ++++++++++++++ guix/monads.scm | 12 ++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index d0f21edeec..62f4483b85 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4054,6 +4054,20 @@ monadic expressions are ignored. In that sense, it is analogous to @code{begin}, but applied to monadic expressions. @end deffn +@deffn {Scheme System} mwhen @var{condition} @var{mexp0} @var{mexp*} ... +When @var{condition} is true, evaluate the sequence of monadic +expressions @var{mexp0}..@var{mexp*} as in an @code{mbegin}. When +@var{condition} is false, return @code{*unspecified*} in the current +monad. Every expression in the sequence must be a monadic expression. +@end deffn + +@deffn {Scheme System} munless @var{condition} @var{mexp0} @var{mexp*} ... +When @var{condition} is false, evaluate the sequence of monadic +expressions @var{mexp0}..@var{mexp*} as in an @code{mbegin}. When +@var{condition} is true, return @code{*unspecified*} in the current +monad. Every expression in the sequence must be a monadic expression. +@end deffn + @cindex state monad The @code{(guix monads)} module provides the @dfn{state monad}, which allows an additional value---the state---to be @emph{threaded} through diff --git a/guix/monads.scm b/guix/monads.scm index 6933f7f151..fe3d5d78f1 100644 --- a/guix/monads.scm +++ b/guix/monads.scm @@ -204,8 +204,10 @@ (define-syntax mbegin (define-syntax mwhen (syntax-rules () - "When CONDITION is true, evaluate MEXP0..MEXP* as in an 'mbegin'. When -CONDITION is false, return *unspecified* in the current monad." + "When CONDITION is true, evaluate the sequence of monadic expressions +MEXP0..MEXP* as in an 'mbegin'. When CONDITION is false, return *unspecified* +in the current monad. Every expression in the sequence must be a monadic +expression." ((_ condition mexp0 mexp* ...) (if condition (mbegin %current-monad @@ -214,8 +216,10 @@ (define-syntax mwhen (define-syntax munless (syntax-rules () - "When CONDITION is false, evaluate MEXP0..MEXP* as in an 'mbegin'. When -CONDITION is true, return *unspecified* in the current monad." + "When CONDITION is false, evaluate the sequence of monadic expressions +MEXP0..MEXP* as in an 'mbegin'. When CONDITION is true, return *unspecified* +in the current monad. Every expression in the sequence must be a monadic +expression." ((_ condition mexp0 mexp* ...) (if condition (return *unspecified*) From 8bc2183fe54487793e9eb6b39ba01329671840b9 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Thu, 6 Apr 2017 02:28:36 -0700 Subject: [PATCH 158/301] monads: Improve mlet, mlet*, and mbegin documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi (The Store Monad) : Clarify their intended usage. * guix/monads.scm (mbegin): Update docstring accordingly. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 14 +++++++++++--- guix/monads.scm | 5 +++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 62f4483b85..974d9b3a4f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4038,8 +4038,15 @@ in this example: @deffnx {Scheme Syntax} mlet* @var{monad} ((@var{var} @var{mval}) ...) @ @var{body} ... Bind the variables @var{var} to the monadic values @var{mval} in -@var{body}. The form (@var{var} -> @var{val}) binds @var{var} to the -``normal'' value @var{val}, as per @code{let}. +@var{body}, which is a sequence of expressions. As with the bind +operator, this can be thought of as ``unpacking'' the raw, non-monadic +value ``contained'' in @var{mval} and making @var{var} refer to that +raw, non-monadic value within the scope of the @var{body}. The form +(@var{var} -> @var{val}) binds @var{var} to the ``normal'' value +@var{val}, as per @code{let}. The binding operations occur in sequence +from left to right. The last expression of @var{body} must be a monadic +expression, and its result will become the result of the @code{mlet} or +@code{mlet*} when run in the @var{monad}. @code{mlet*} is to @code{mlet} what @code{let*} is to @code{let} (@pxref{Local Bindings,,, guile, GNU Guile Reference Manual}). @@ -4047,7 +4054,8 @@ Bind the variables @var{var} to the monadic values @var{mval} in @deffn {Scheme System} mbegin @var{monad} @var{mexp} ... Bind @var{mexp} and the following monadic expressions in sequence, -returning the result of the last expression. +returning the result of the last expression. Every expression in the +sequence must be a monadic expression. This is akin to @code{mlet}, except that the return values of the monadic expressions are ignored. In that sense, it is analogous to diff --git a/guix/monads.scm b/guix/monads.scm index fe3d5d78f1..317f85d079 100644 --- a/guix/monads.scm +++ b/guix/monads.scm @@ -185,8 +185,9 @@ (define-syntax mlet (define-syntax mbegin (syntax-rules (%current-monad) - "Bind the given monadic expressions in sequence, returning the result of -the last one." + "Bind MEXP and the following monadic expressions in sequence, returning +the result of the last expression. Every expression in the sequence must be a +monadic expression." ((_ %current-monad mexp) mexp) ((_ %current-monad mexp rest ...) From 725d8d2c0845d2da5f2e9a7d01841d405d2b1fd6 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 3 Apr 2017 21:16:54 +0530 Subject: [PATCH 159/301] gnu: Add gl2ps. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gl.scm (gl2ps): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gl.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 37a1bd9098..db708308d5 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016 David Thompson ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,12 +28,14 @@ (define-module (gnu packages gl) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) + #:use-module (gnu packages compression) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages guile) + #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) @@ -612,3 +615,35 @@ (define-public nanovg-for-extempore aimed to be a practical and fun toolset for building scalable user interfaces and visualizations.") (license license:zlib))) + +(define-public gl2ps + (package + (name "gl2ps") + (version "1.3.9") + (source + (origin + (method url-fetch) + (uri (string-append + "http://geuz.org/gl2ps/src/gl2ps-" + version ".tgz")) + (sha256 + (base32 + "0h1nrhmkc4qjw2ninwpj2zbgwhc0qg6pdhpsibbvry0d2bzhns4a")))) + (build-system cmake-build-system) + (inputs + `(("libpng" ,libpng) + ("mesa" ,mesa) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f)) ;; no tests + (home-page "http://www.geuz.org/gl2ps/") + (synopsis "OpenGL to PostScript printing library") + (description "GL2PS is a C library providing high quality vector +output for any OpenGL application. GL2PS uses sorting algorithms +capable of handling intersecting and stretched polygons, as well as +non-manifold objects. GL2PS provides many features including advanced +smooth shading and text rendering, culling of invisible primitives and +mixed vector/bitmap output.") + (license (list license:lgpl2.0+ + (license:fsf-free "http://www.geuz.org/gl2ps/COPYING.GL2PS" + "GPL-incompatible copyleft license"))))) From 181170c6ee871d4410a5ffabd4bc517a1d5cbc80 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 3 Apr 2017 21:16:55 +0530 Subject: [PATCH 160/301] gnu: octave: Build with gl2ps support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (octave)[inputs]: Add gl2ps. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 38beb88d0a..a924764db0 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1001,6 +1001,7 @@ (define-public octave (inputs `(("lapack" ,lapack) ("readline" ,readline) + ("gl2ps" ,gl2ps) ("glpk" ,glpk) ("fftw" ,fftw) ("fftwf" ,fftwf) From 72fa66674d17bdf6acef87665295e604c56c15e9 Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Fri, 7 Apr 2017 21:18:55 +0800 Subject: [PATCH 161/301] gnu: Add you-get. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (you-get): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/video.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4f005f5940..bb5391d89e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2017 Feng Shu ;;; ;;; This file is part of GNU Guix. ;;; @@ -1023,6 +1024,31 @@ (define-public youtube-dl (home-page "https://yt-dl.org") (license license:public-domain))) +(define-public you-get + (package + (name "you-get") + (version "0.4.652") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/soimort/you-get/releases/download/v" + version "/you-get-" version ".tar.gz")) + (sha256 + (base32 + "0brkz98lycx8mmxjwmn7jlhqfdbvl0hy070n7skwr1k75kh99q30")))) + (build-system python-build-system) + (arguments + ;; no tests + '(#:tests? #f)) + (inputs + `(("ffmpeg" ,ffmpeg))) + (synopsis "Download videos, audios, or images from Web sites") + (description + "You-Get is a command-line utility to download media contents (videos, +audio, images) from the Web. It can use either mpv or vlc for playback.") + (home-page "https://you-get.org/") + (license license:expat))) + (define-public libbluray (package (name "libbluray") From d2b51c08fdf646822e038c520302af8e98583adf Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 15 Feb 2017 10:09:22 +0000 Subject: [PATCH 162/301] gnu: Add python-defusedxml. * gnu/packages/xml.scm (python-defusedxml): New variable. Signed-off-by: Kei Kebreau --- gnu/packages/xml.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b2e8959df0..283d5112ae 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2016 ng0 +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Marius Bakke ;;; @@ -1068,3 +1068,24 @@ (define-public xlsx2csv XLSM) format spreadsheets into plaintext @dfn{comma separated values} (CSV) files. It is designed to be fast and to handle large input files.") (license license:gpl2+))) + +(define-public python-defusedxml + (package + (name "python-defusedxml") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "defusedxml" version)) + (sha256 + (base32 + "0y147zy3jqmk6ly7fbhqmzn1hf41xcb53f2vcc3m8x4ba5d1smfd")))) + (build-system python-build-system) + (home-page "https://bitbucket.org/tiran/defusedxml") + (synopsis "XML bomb protection for Python stdlib modules") + (description + "Defusedxml provides XML bomb protection for Python stdlib modules.") + (license license:psfl))) + +(define-public python2-defusedxml + (package-with-python2 python-defusedxml)) From ccda56886625af84d34ebf1f26b22345e5dbe235 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 15 Feb 2017 10:09:23 +0000 Subject: [PATCH 163/301] gnu: Add python-openid. * gnu/packages/python.scm (python-openid): New variable. Signed-off-by: Kei Kebreau --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0746af24a1..875908505c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5549,6 +5549,32 @@ (define-public python2-openid for clients and servers.") (license license:asl2.0))) +;; This is named "python3-openid" upstream, but python-python3-openid +;; is too much of an tautology. +(define-public python-openid + (package + (name "python-openid") + (version "3.0.10") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python3-openid" version)) + (sha256 + (base32 + "1x3nh3fycqfn43jp5j5pb4q4y2jxp4mdka4absaa3bc0078qd758")))) + (propagated-inputs + `(("python-defusedxml" ,python-defusedxml))) + (native-inputs + `(("python-coverage" ,python-coverage))) + (build-system python-build-system) + (home-page "https://github.com/necaris/python3-openid") + (synopsis "OpenID support for modern servers and consumers") + (description + "This library provides OpenID authentication for Python, both +for clients and servers. This package provides the Python 3 port +of python-openid.") + (license license:asl2.0))) + (define-public python-urwidtrees (package (name "python-urwidtrees") From e1f06e1192f57551bcb67d93411affb9d497e30c Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 15 Feb 2017 10:09:24 +0000 Subject: [PATCH 164/301] gnu: Add python-django-allauth. * gnu/packages/django.scm (python-django-allauth): New variable. Signed-off-by: Kei Kebreau --- gnu/packages/django.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 805dca6c9e..4f7620ee27 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -189,3 +190,34 @@ (define-public python-django-filter (define-public python2-django-filter (package-with-python2 python-django-filter)) + +(define-public python-django-allauth + (package + (name "python-django-allauth") + (version "0.30.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-allauth" version)) + (sha256 + (base32 + "1fslqc5qqb0b66yscvkyjwfv8cnbfx5nlkpnwimyb3pf1nc1w7r3")))) + (build-system python-build-system) + (propagated-inputs + `(("python-openid" ,python-openid) + ("python-requests" ,python-requests) + ("python-requests-oauthlib" ,python-requests-oauthlib))) + (native-inputs + `(("python-mock" ,python-mock))) + (inputs + `(("python-django" ,python-django))) + (home-page "https://github.com/pennersr/django-allauth") + (synopsis "Set of Django applications addressing authentication") + (description + "Integrated set of Django applications addressing authentication, +registration, account management as well as 3rd party (social) +account authentication.") + (license license:expat))) + +(define-public python2-django-allauth + (package-with-python2 python-django-allauth)) From 14d8f6538f3af04c2bc879837f94f0bc54177aed Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 15 Feb 2017 10:09:25 +0000 Subject: [PATCH 165/301] gnu: Add python-django-gravatar2. * gnu/packages/django.scm (python-django-gravatar2): New variable. Signed-off-by: Kei Kebreau --- gnu/packages/django.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 4f7620ee27..2038473f52 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -221,3 +221,27 @@ (define-public python-django-allauth (define-public python2-django-allauth (package-with-python2 python-django-allauth)) + +(define-public python-django-gravatar2 + (package + (name "python-django-gravatar2") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-gravatar2" version)) + (sha256 + (base32 + "1v4qyj6kms321yw0z2g1kch6b2dskmv6fjd6sfxzwr4xshq9mccl")))) + (build-system python-build-system) + (inputs + `(("python-django" ,python-django))) + (home-page "https://github.com/twaddington/django-gravatar") + (synopsis "Gravatar support for Django, improved version") + (description + "Essential Gravatar support for Django. Features helper methods, +templatetags and a full test suite.") + (license license:expat))) + +(define-public python2-django-gravatar2 + (package-with-python2 python-django-gravatar2)) From 8a3741e61bc310090c73b521d29e67404336e590 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 15 Feb 2017 10:09:26 +0000 Subject: [PATCH 166/301] gnu: Add python-django-mailman3. * gnu/packages/mail.scm (python-django-mailman3): New variable. Signed-off-by: Kei Kebreau --- gnu/packages/mail.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 13861a8ad4..2585af99e6 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -50,6 +50,7 @@ (define-module (gnu packages mail) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) #:use-module (gnu packages dejagnu) + #:use-module (gnu packages django) #:use-module (gnu packages dns) #:use-module (gnu packages documentation) #:use-module (gnu packages emacs) @@ -2062,6 +2063,44 @@ (define-public mlmmj @end enumerate\n") (license license:expat))) +(define-public python-django-mailman3 + (package + (name "python-django-mailman3") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "django-mailman3" version)) + (sha256 + (base32 + "1adxyh8knw9knjlh73xq0jpn5adml0ck4alsv0swakm95wfyx46z")))) + (build-system python-build-system) + (inputs + `(("python-django" ,python-django) + (propagated-inputs + `(("python-requests" ,python-requests) + ("python-requests-oauthlib" ,python-requests-oauthlib) + ("python-openid" ,python-openid) + ("python-mailmanclient" ,python-mailmanclient) + ("python-django-allauth" ,python-django-allauth) + ("python-django-gravatar2" ,python-django-gravatar2) + ("python-pytz" ,python-pytz))) + (home-page "https://gitlab.com/mailman/django-mailman3") + (synopsis "Django library for Mailman UIs") + (description + "Libraries and templates for Django-based interfaces +interacting with Mailman.") + (license gpl3+))) + +(define-public python2-django-mailman3 + (let ((base (package-with-python2 + python-django-mailman3))) + (package + (inherit base) + (propagated-inputs + `(("python2-openid" ,python2-openid) + ,@(package-propagated-inputs base)))))) + (define-public blists (package (name "blists") From d99a2add28bb6f5e79d23e7d6788d215372b370f Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 15 Feb 2017 10:09:27 +0000 Subject: [PATCH 167/301] gnu: Add postorius. * gnu/packages/mail.scm (postorius): New variable. Signed-off-by: Kei Kebreau --- gnu/packages/mail.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 2585af99e6..b65c801162 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2101,6 +2101,36 @@ (define-public python2-django-mailman3 `(("python2-openid" ,python2-openid) ,@(package-propagated-inputs base)))))) +(define-public postorius + (package + (name "postorius") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "postorius" version "+post2.tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wymcpv2icjjy8h1ni52p6dr7wwxf71ivqgbqhzx4i82yqphcaq5")))) + (build-system python-build-system) + (arguments + `(; One test dependency relies on Persona, which was shut down in + ;; November 2016. + #:tests? #f + ;; The part of the frontend of Mailman is still python 2.7. + #:python ,python-2)) + (inputs + `(("python2-django" ,python2-django) + ("python2-django-mailman3" ,python2-django-mailman3) + ("python2-mailmanclient" ,python2-mailmanclient))) + (home-page "https://gitlab.com/mailman/postorius") + (synopsis "Web user interface for GNU Mailman") + (description + "Postorius is a Django app which provides a web user interface +to access GNU Mailman.") + (license (list gpl3+ lgpl3+)))) + (define-public blists (package (name "blists") From 99a8c8bd7ddd2806db7c6402ec1307adada717d5 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 8 Apr 2017 12:54:48 -0400 Subject: [PATCH 168/301] gnu: python-django-mailman3: Balance parentheses for inputs. * gnu/packages/mail.scm (python-django-mailman3)[inputs]: Balance them. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b65c801162..08d0838a62 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2076,7 +2076,7 @@ (define-public python-django-mailman3 "1adxyh8knw9knjlh73xq0jpn5adml0ck4alsv0swakm95wfyx46z")))) (build-system python-build-system) (inputs - `(("python-django" ,python-django) + `(("python-django" ,python-django))) (propagated-inputs `(("python-requests" ,python-requests) ("python-requests-oauthlib" ,python-requests-oauthlib) From f0e9fda6beaf3c44993b2cc7264fa05ad887b0a8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 7 Apr 2017 22:03:56 -0400 Subject: [PATCH 169/301] gnu: certbot, python-acme: Update to 0.13.0. * gnu/packages/tls.scm (certbot, python-acme, python2-acme): Update to 0.13.0. [arguments]: Add 'patch-dependency' phase. --- gnu/packages/tls.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 5f06140e72..ac5e406c7f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -469,18 +469,29 @@ (define-public python-acme (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.12.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "1pzv8fcfwdqzvvpyhgjz412is0b98yj9495k8sidzzqgbdmvlp50")))) + "05cqadwzgfcianw3v0qxwja65dxnzw429f7dk8w0mnh21pib72bl")))) (build-system python-build-system) + + ;; TODO factorize the 'docs' phase and share arguments between python-acme + ;; and certbot. (arguments `(#:phases (modify-phases %standard-phases - (add-after 'install 'docs + (add-after 'unpack 'patch-dependency + ;; This module is part of the Python standard library, so we don't + ;; need to use an external package. + ;; https://github.com/certbot/certbot/pull/2249 + (lambda _ + (substitute* "setup.py" + (("'argparse',") "")) + #t)) + (add-after 'build 'docs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (man (string-append out "/share/man/man1")) @@ -526,12 +537,20 @@ (define-public certbot (uri (pypi-uri name version)) (sha256 (base32 - "1dw86gb8lyap5ckjawmli1hxgbchw2g62g1lqfvxyqjv0df94waa")))) + "1wq0khcf4ixda71cgfd9rkqqzx6j8hp8ha0cssvjzjnsgrsdffpn")))) (build-system python-build-system) (arguments `(#:python ,python-2 #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-dependency + ;; This module is part of the Python standard library, so we don't + ;; need to use an external package. + ;; https://github.com/certbot/certbot/pull/2249 + (lambda _ + (substitute* "setup.py" + (("'argparse',") "")) + #t)) (add-after 'build 'docs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) From f26d6e4e9c5efbe060697f54456cfc9144350114 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 8 Apr 2017 12:45:16 -0400 Subject: [PATCH 170/301] gnu: certbot: Share python-acme's arguments. * gnu/packages/tls.scm (certbot)[arguments]: Use substitute-keyword-arguments to inherit from python-acme. --- gnu/packages/tls.scm | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index ac5e406c7f..08cc6075b6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -478,8 +478,6 @@ (define-public python-acme "05cqadwzgfcianw3v0qxwja65dxnzw429f7dk8w0mnh21pib72bl")))) (build-system python-build-system) - ;; TODO factorize the 'docs' phase and share arguments between python-acme - ;; and certbot. (arguments `(#:phases (modify-phases %standard-phases @@ -541,28 +539,21 @@ (define-public certbot (build-system python-build-system) (arguments `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-dependency - ;; This module is part of the Python standard library, so we don't - ;; need to use an external package. - ;; https://github.com/certbot/certbot/pull/2249 - (lambda _ - (substitute* "setup.py" - (("'argparse',") "")) - #t)) - (add-after 'build 'docs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man1 (string-append out "/share/man/man1")) - (man7 (string-append out "/share/man/man7")) - (info (string-append out "/info"))) - (and - (zero? (system* "make" "-C" "docs" "man" "info")) - (install-file "docs/_build/texinfo/Certbot.info" info) - (install-file "docs/_build/man/certbot.1" man1) - (install-file "docs/_build/man/certbot.7" man7) - #t))))))) + ,@(substitute-keyword-arguments (package-arguments python-acme) + ((#:phases phases) + `(modify-phases ,phases + (replace 'docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man1 (string-append out "/share/man/man1")) + (man7 (string-append out "/share/man/man7")) + (info (string-append out "/info"))) + (and + (zero? (system* "make" "-C" "docs" "man" "info")) + (install-file "docs/_build/texinfo/Certbot.info" info) + (install-file "docs/_build/man/certbot.1" man1) + (install-file "docs/_build/man/certbot.7" man7) + #t))))))))) ;; TODO: Add optional inputs for testing. (native-inputs `(("python2-nose" ,python2-nose) From b0eb2af2e6ccb1026b322db7240d40251cfca88d Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 15 Feb 2017 03:20:38 +0000 Subject: [PATCH 171/301] gnu: Add alpine. * gnu/packages/mail.scm (alpine): New variable. Signed-off-by: Kei Kebreau --- gnu/packages/mail.scm | 73 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 08d0838a62..49fdb32e8d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 Troy Sankey -;;; Copyright © 2016, 2017 +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Clément Lassieur ;;; Copyright © 2016, 2017 Arun Isaac ;;; Copyright © 2016 John Darrington @@ -40,6 +40,7 @@ (define-module (gnu packages mail) #:use-module (gnu packages) + #:use-module (gnu packages aspell) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages backup) @@ -64,6 +65,7 @@ (define-module (gnu packages mail) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages flex) + #:use-module (gnu packages kerberos) #:use-module (gnu packages libcanberra) #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) @@ -71,6 +73,7 @@ (define-module (gnu packages mail) #:use-module (gnu packages lua) #:use-module (gnu packages m4) #:use-module (gnu packages ncurses) + #:use-module (gnu packages openldap) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -86,6 +89,7 @@ (define-module (gnu packages mail) #:use-module (gnu packages ruby) #:use-module (gnu packages samba) #:use-module (gnu packages screen) + #:use-module (gnu packages tcl) #:use-module (gnu packages tls) #:use-module (gnu packages networking) #:use-module (gnu packages web) @@ -96,7 +100,7 @@ (define-module (gnu packages mail) #:select (gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ non-copyleft (expat . license:expat) bsd-3 public-domain bsd-4 isc (openssl . license:openssl) - bsd-2 x11-style agpl3)) + bsd-2 x11-style agpl3 asl2.0)) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -2214,3 +2218,68 @@ (define-public swaks the command line allowing maximum configurability and ease of use for operators and scripters.") (license gpl2+))) + +(define-public alpine + (package + (name "alpine") + (version "2.21") + (source + (origin + (method url-fetch) + ;; There are two versions: the plain continuation of Alpine without extra + ;; patches and the version which adds extra fixes. Every distro uses + ;; the patched version, and so do we to not break expectations. + ;; http://patches.freeiz.com/alpine/readme/README.patches + (uri (string-append "http://patches.freeiz.com/alpine/patches/alpine-" + version "/alpine-" version ".tar.xz")) + (sha256 + (base32 + "1k9hcfjywfk3mpsl71hjza3nk6icgf1b6xxzgx10kdzg5yci5x5m")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list "CC=gcc") + #:configure-flags (list (string-append "--with-ssl-include-dir=" + (assoc-ref %build-inputs "openssl") + "/include/openssl") + (string-append "--with-ssl-dir=" + (assoc-ref %build-inputs "openssl")) + (string-append "--with-ssl-certs-dir=" + "/etc/ssl/certs/") + (string-append "--with-ssl-lib-dir=" + (assoc-ref %build-inputs "openssl") + "/lib") + (string-append "--with-interactive-spellcheck=" + (assoc-ref %build-inputs "aspell") + "/bin/aspell")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-reproducible + (lambda _ + ;; This removes time-dependent code to make alpine reproducible. + (substitute* "pico/blddate.c" + (("%02d-%s-%d") "1970-01-01")) + (substitute* (list "alpine/Makefile.in" + "web/src/alpined.d/Makefile.in") + (("`date`") "1970-01-01")) + #t))))) + (inputs + `(("ncurses" ,ncurses) + ("openssl" ,openssl) + ("gnutls" ,gnutls) + ("openldap" ,openldap) + ("cyrus-sasl" ,cyrus-sasl) + ("mit-krb5" ,mit-krb5) + ("aspell" ,aspell) + ("tcl" ,tcl) + ("linux-pam" ,linux-pam))) + (home-page "http://patches.freeiz.com/alpine/") + (synopsis "Alternatively Licensed Program for Internet News and Email") + (description + "Alpine is a text-based mail and news client. Alpine includes several +tools and applications: +@enumerate +@item alpine, the Alpine mailer +@item pico, the standalone text editor, GNU nano's predecessor +@item pilot, the standalone file system navigator +@end enumerate\n") + (license asl2.0))) From b496bfea415750d710dd3ead4bc2ded9d4a6e71d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 25 Jan 2017 00:22:19 -0500 Subject: [PATCH 172/301] gnu: lz4: Update to 1.7.5. * gnu/packages/compression.scm (lz4): Update to 1.7.5. [source]: Update source URL. Use patch 'lz4-fix-test-failures.patch'. [home-page]: Update URL. * gnu/packages/patches/lz4-fix-test-failures.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/compression.scm | 12 +- .../patches/lz4-fix-test-failures.patch | 136 ++++++++++++++++++ 3 files changed, 144 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/lz4-fix-test-failures.patch diff --git a/gnu/local.mk b/gnu/local.mk index 93bafa282d..ac6a596923 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -759,6 +759,7 @@ dist_patch_DATA = \ %D%/packages/patches/luit-posix.patch \ %D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/lxsession-use-gapplication.patch \ + %D%/packages/patches/lz4-fix-test-failures.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 5404f66ecf..4793755c21 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016 Eric Bavier ;;; Copyright © 2015, 2016 Ricardo Wurmus -;;; Copyright © 2015 Leo Famulari +;;; Copyright © 2015, 2017 Leo Famulari ;;; Copyright © 2015 Jeff Mickey ;;; Copyright © 2015, 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft @@ -673,14 +673,16 @@ (define-public perl-io-compress (define-public lz4 (package (name "lz4") - (version "1.7.4.2") + (version "1.7.5") (source (origin (method url-fetch) - (uri (string-append "https://github.com/Cyan4973/lz4/archive/" + (uri (string-append "https://github.com/lz4/lz4/archive/" "v" version ".tar.gz")) + (patches (search-patches "lz4-fix-test-failures.patch")) (sha256 - (base32 "0l39bymif15rmmfz7h6wvrr853rix4wj8wbqq8z8fm49xa7gx9fb")) + (base32 + "0zkykqqjfa1q3ji0qmb1ml3l9063qqfh99agyj3cnb02cg6wm401")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (native-inputs `(("valgrind" ,valgrind))) ; for tests @@ -691,7 +693,7 @@ (define-public lz4 (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script - (home-page "https://github.com/Cyan4973/lz4") + (home-page "https://github.com/lz4/lz4") (synopsis "Compression algorithm focused on speed") (description "LZ4 is a lossless compression algorithm, providing compression speed at 400 MB/s per core (0.16 Bytes/cycle). It also features an diff --git a/gnu/packages/patches/lz4-fix-test-failures.patch b/gnu/packages/patches/lz4-fix-test-failures.patch new file mode 100644 index 0000000000..d38357d402 --- /dev/null +++ b/gnu/packages/patches/lz4-fix-test-failures.patch @@ -0,0 +1,136 @@ +These two patches fix some bugs in lz4's test suite: + +https://github.com/lz4/lz4/issues/308 + +Patches copied from upstream source repository: + +https://github.com/lz4/lz4/commit/b89cac7b2e92b792af98bb0a12e4d14684d07629 +https://github.com/lz4/lz4/commit/0dfb0b9dad2a8cb7cc347d2139bf9b84de7e1481 + +From b89cac7b2e92b792af98bb0a12e4d14684d07629 Mon Sep 17 00:00:00 2001 +From: Eric Siegerman +Date: Tue, 14 Feb 2017 14:17:06 -0500 +Subject: [PATCH] Don't use "foo && false || true" + +Replace it with either: + test ! -f $FILE_THAT_SHOULD_NOT_EXIST +or: + ! $COMMAND_THAT_SHOULD_FAIL + +as appropriate. +--- + tests/Makefile | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/tests/Makefile b/tests/Makefile +index 77e6ae7..ebab278 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -236,17 +236,17 @@ test-lz4-basic: lz4 datagen unlz4 lz4cat + ./datagen -g256MB | $(LZ4) -vqB4D | $(LZ4) -t + @echo "hello world" > tmp + $(LZ4) --rm -f tmp +- ls -ls tmp && false || true # must fail (--rm) +- ls -ls tmp.lz4 +- $(PRGDIR)/lz4cat tmp.lz4 # must display hello world +- ls -ls tmp.lz4 ++ test ! -f tmp # must fail (--rm) ++ test -f tmp.lz4 ++ $(PRGDIR)/lz4cat tmp.lz4 # must display hello world ++ test -f tmp.lz4 + $(PRGDIR)/unlz4 --rm tmp.lz4 +- ls -ls tmp +- ls -ls tmp.lz4 && false || true # must fail (--rm) +- ls -ls tmp.lz4.lz4 && false || true # must fail (unlz4) +- $(PRGDIR)/lz4cat tmp # pass-through mode +- ls -ls tmp +- ls -ls tmp.lz4 && false || true # must fail (lz4cat) ++ test -f tmp ++ test ! -f tmp.lz4 # must fail (--rm) ++ test ! -f tmp.lz4.lz4 # must fail (unlz4) ++ $(PRGDIR)/lz4cat tmp # pass-through mode ++ test -f tmp ++ test ! -f tmp.lz4 # must fail (lz4cat) + $(LZ4) tmp # creates tmp.lz4 + $(PRGDIR)/lz4cat < tmp.lz4 > tmp3 # checks lz4cat works with stdin (#285) + $(DIFF) -q tmp tmp3 +@@ -262,22 +262,22 @@ test-lz4-hugefile: lz4 datagen + + test-lz4-testmode: lz4 datagen + @echo "\n ---- bench mode ----" +- $(LZ4) -bi1 ++ $(LZ4) -bi1 + @echo "\n ---- test mode ----" +- ./datagen | $(LZ4) -t && false || true +- ./datagen | $(LZ4) -tf && false || true ++ ! ./datagen | $(LZ4) -t ++ ! ./datagen | $(LZ4) -tf + @echo "\n ---- pass-through mode ----" +- ./datagen | $(LZ4) -d > $(VOID) && false || true +- ./datagen | $(LZ4) -df > $(VOID) ++ ! ./datagen | $(LZ4) -d > $(VOID) ++ ./datagen | $(LZ4) -df > $(VOID) + @echo "Hello World !" > tmp1 + $(LZ4) -dcf tmp1 + @echo "from underground..." > tmp2 + $(LZ4) -dcfm tmp1 tmp2 + @echo "\n ---- test cli ----" +- $(LZ4) file-does-not-exist && false || true +- $(LZ4) -f file-does-not-exist && false || true +- $(LZ4) -fm file1-dne file2-dne && false || true +- $(LZ4) -fm file1-dne file2-dne && false || true ++ ! $(LZ4) file-does-not-exist ++ ! $(LZ4) -f file-does-not-exist ++ ! $(LZ4) -fm file1-dne file2-dne ++ ! $(LZ4) -fm file1-dne file2-dne + + test-lz4-opt-parser: lz4 datagen + @echo "\n ---- test opt-parser ----" +-- +2.12.2 + +From 0dfb0b9dad2a8cb7cc347d2139bf9b84de7e1481 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Sun, 5 Mar 2017 23:20:10 +0000 +Subject: [PATCH] Fix test-lz4-basic + +When no output filename is specified and stdout is not a terminal, +lz4 doesn't attempt to guess an output filename and uses stdout for +output. + +This change fixes test-lz4-basic when run without a terminal +by specifying output filenames. +--- + tests/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/Makefile b/tests/Makefile +index ebab278..d68c700 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -235,19 +235,19 @@ test-lz4-basic: lz4 datagen unlz4 lz4cat + ./datagen -g33M | $(LZ4) --no-frame-crc | $(LZ4) -t + ./datagen -g256MB | $(LZ4) -vqB4D | $(LZ4) -t + @echo "hello world" > tmp +- $(LZ4) --rm -f tmp ++ $(LZ4) --rm -f tmp tmp.lz4 + test ! -f tmp # must fail (--rm) + test -f tmp.lz4 + $(PRGDIR)/lz4cat tmp.lz4 # must display hello world + test -f tmp.lz4 +- $(PRGDIR)/unlz4 --rm tmp.lz4 ++ $(PRGDIR)/unlz4 --rm tmp.lz4 tmp + test -f tmp + test ! -f tmp.lz4 # must fail (--rm) + test ! -f tmp.lz4.lz4 # must fail (unlz4) + $(PRGDIR)/lz4cat tmp # pass-through mode + test -f tmp + test ! -f tmp.lz4 # must fail (lz4cat) +- $(LZ4) tmp # creates tmp.lz4 ++ $(LZ4) tmp tmp.lz4 # creates tmp.lz4 + $(PRGDIR)/lz4cat < tmp.lz4 > tmp3 # checks lz4cat works with stdin (#285) + $(DIFF) -q tmp tmp3 + $(PRGDIR)/lz4cat < tmp > tmp2 # checks lz4cat works with stdin (#285) +-- +2.12.2 + From ea240de4af85ae8ecc0c1afcd4778e01a88e6f5c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 8 Apr 2017 15:52:13 -0400 Subject: [PATCH 173/301] screen: Fix info page build failure. * gnu/packages/patches/screen-fix-info-syntax-error.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/screen.scm (screen)[source]: Use it. --- gnu/local.mk | 1 + .../screen-fix-info-syntax-error.patch | 47 +++++++++++++++++++ gnu/packages/screen.scm | 1 + 3 files changed, 49 insertions(+) create mode 100644 gnu/packages/patches/screen-fix-info-syntax-error.patch diff --git a/gnu/local.mk b/gnu/local.mk index ac6a596923..a8d0066019 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -916,6 +916,7 @@ dist_patch_DATA = \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ %D%/packages/patches/scheme48-tests.patch \ %D%/packages/patches/scotch-test-threading.patch \ + %D%/packages/patches/screen-fix-info-syntax-error.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/serf-comment-style-fix.patch \ diff --git a/gnu/packages/patches/screen-fix-info-syntax-error.patch b/gnu/packages/patches/screen-fix-info-syntax-error.patch new file mode 100644 index 0000000000..6ee9091daa --- /dev/null +++ b/gnu/packages/patches/screen-fix-info-syntax-error.patch @@ -0,0 +1,47 @@ +Fix errors when building the info manual: + +[...] +./screen.texinfo:5799: unknown command `suse' +./screen.texinfo:5800: unknown command `deuxchevaux' +make[2]: *** [Makefile:31: screen.info] Error 1 +[...] + +Patch copied from upstream source repository: + +http://git.savannah.gnu.org/cgit/screen.git/commit/?id=a7d2f9e6ecfa794dd0bd3dbeaf6780c88a6f3152 + +From a7d2f9e6ecfa794dd0bd3dbeaf6780c88a6f3152 Mon Sep 17 00:00:00 2001 +From: Andreas Stieger +Date: Tue, 28 Feb 2017 19:23:01 +0100 +Subject: [PATCH] fix texinfo syntax errors + +thanks to Andreas Stieger +--- + src/doc/screen.texinfo | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/doc/screen.texinfo b/src/doc/screen.texinfo +index bc4cbae..aadad33 100644 +--- a/doc/screen.texinfo ++++ b/doc/screen.texinfo +@@ -5795,7 +5795,7 @@ and Alexander Naumov . + Contributors @* + ============ + +-@example ++@verbatim + Thomas Renninger , + Axel Beckert , + Ken Beal , +@@ -5826,7 +5826,7 @@ Contributors @* + Jason Merrill , + Johannes Zellner , + Pablo Averbuj . +-@end example ++@end verbatim + + @noindent + Version @* +-- +cgit v1.0-41-gc330 + diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index f5c914e88a..5ab5351e35 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -40,6 +40,7 @@ (define-public screen (method url-fetch) (uri (string-append "mirror://gnu/screen/screen-" version ".tar.gz")) + (patches (search-patches "screen-fix-info-syntax-error.patch")) (sha256 (base32 "0bbv16gpxrh64sn4bvjy3qjy7jsxjlqlilyysin02fwnvla23nwp")))) (build-system gnu-build-system) From 0bf11648fc90cf0689fdc674f4aee4592694b341 Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Sat, 8 Apr 2017 21:28:47 -0400 Subject: [PATCH 174/301] gnu: Add leafpad. * gnu/packages/text-editors.scm (leafpad): New variable. --- gnu/packages/text-editors.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index f860b0e8a8..7aa4cb6035 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 José Miguel Sánchez García ;;; Copyright © 2016 Carlo Zancanaro ;;; Copyright © 2017 Eric Bavier +;;; Copyright © 2017 Feng Shu ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,8 +30,11 @@ (define-module (gnu packages text-editors) #:use-module (gnu packages boost) #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) + #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages ruby) #:use-module (gnu packages terminals) #:use-module (gnu packages xml)) @@ -161,3 +165,28 @@ (define-public joe interface similar to many user-friendly editors. JOE has some of the key bindings and many of the powerful features of GNU Emacs.") (license license:gpl3+))) + +(define-public leafpad + (package + (name "leafpad") + (version "0.8.18.1") + (source (origin + (method url-fetch) + (uri (string-append "https://download.savannah.gnu.org/releases/" + "leafpad/leafpad-" version ".tar.gz")) + (sha256 + (base32 + "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm")))) + (build-system gnu-build-system) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("gtk+" ,gtk+-2))) + (home-page "https://wiki.gnome.org/Apps/Gedit") + (synopsis "GTK+ based text editor") + (description "Leafpad is a GTK+ text editor that emphasizes simplicity. As +development focuses on keeping weight down to a minimum, only the most essential +features are implemented in the editor. Leafpad is simple to use, is easily +compiled, requires few libraries, and starts up quickly. ") + (license license:gpl2+))) From dde5831c0048b506374edec1fe91273cdc54654e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 8 Apr 2017 21:33:37 -0400 Subject: [PATCH 175/301] gnu: leafpad: Fix home-page URL. * gnu/packages/text-editors.scm (leafpad)[home-page]: Fix URL. --- gnu/packages/text-editors.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 7aa4cb6035..9da627b65b 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -183,7 +183,7 @@ (define-public leafpad ("pkg-config" ,pkg-config))) (inputs `(("gtk+" ,gtk+-2))) - (home-page "https://wiki.gnome.org/Apps/Gedit") + (home-page "http://tarot.freeshell.org/leafpad/") (synopsis "GTK+ based text editor") (description "Leafpad is a GTK+ text editor that emphasizes simplicity. As development focuses on keeping weight down to a minimum, only the most essential From a3c57693e42ff9bba088af50b7472d981e6ac387 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Apr 2017 05:30:43 +0300 Subject: [PATCH 176/301] gnu: qjackctl: Build with modular Qt. * gnu/packages/audio.scm (qjackctl)[source]: Use sourceforge mirror. [inputs]: Remove qt, add qtbase, qtx11extras. --- gnu/packages/audio.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9acccaf113..2d2417abb0 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2015, 2016 Mark H Weaver -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017 Alex Griffin ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Lukas Gradl @@ -1874,18 +1874,18 @@ (define-public qjackctl (method url-fetch) (uri (string-append - "https://downloads.sourceforge.net/project/qjackctl/qjackctl/" + "mirror://sourceforge/qjackctl/qjackctl/" version "/qjackctl-" version ".tar.gz")) (sha256 (base32 "19bbljb3iz5ss4s5fmra1dxabg2fnp61sa51d63zsm56xkvv47ak")))) (build-system gnu-build-system) (arguments - `(#:tests? #f)) ; no check target - + '(#:tests? #f)) ; no check target (inputs `(("jack-2" ,jack-2) - ("qt" ,qt))) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) From f3cf25c3c2aef91a47b790fe69b5008cdb6a6316 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 7 Apr 2017 08:49:43 -0500 Subject: [PATCH 177/301] gnu: torsocks: Patch references to 'getcap' and 'which'. * gnu/packages/tor.scm (torsocks)[inputs,arguments]: New fields. --- gnu/packages/tor.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index e48017e640..06b6c4febc 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,7 +29,9 @@ (define-module (gnu packages tor) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages libevent) + #:use-module (gnu packages linux) #:use-module (gnu packages compression) #:use-module (gnu packages pcre) #:use-module (gnu packages python) @@ -88,6 +91,19 @@ (define-public torsocks (base32 "0byr9ga9w79qz4vp0m11sbmspad7fsal9wm67r4znzb7zb7cis19")))) (build-system gnu-build-system) + (inputs + `(("which" ,which) + ("libcap" ,libcap))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'build 'absolutize + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/bin/torsocks" + (("getcap=`.*`") + (string-append "getcap=" (which "getcap"))) + (("`which") + (string-append "`" (which "which")))) + #t))))) (home-page "https://www.torproject.org/") (synopsis "Use socks-friendly applications with Tor") (description From 482cd367c674e211b34cfb3b6e8b1620281ac888 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 9 Apr 2017 03:50:40 -0400 Subject: [PATCH 178/301] Revert "gnu: Add python-openid." This reverts commit ccda56886625af84d34ebf1f26b22345e5dbe235. --- gnu/packages/python.scm | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 875908505c..0746af24a1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5549,32 +5549,6 @@ (define-public python2-openid for clients and servers.") (license license:asl2.0))) -;; This is named "python3-openid" upstream, but python-python3-openid -;; is too much of an tautology. -(define-public python-openid - (package - (name "python-openid") - (version "3.0.10") - (source - (origin - (method url-fetch) - (uri (pypi-uri "python3-openid" version)) - (sha256 - (base32 - "1x3nh3fycqfn43jp5j5pb4q4y2jxp4mdka4absaa3bc0078qd758")))) - (propagated-inputs - `(("python-defusedxml" ,python-defusedxml))) - (native-inputs - `(("python-coverage" ,python-coverage))) - (build-system python-build-system) - (home-page "https://github.com/necaris/python3-openid") - (synopsis "OpenID support for modern servers and consumers") - (description - "This library provides OpenID authentication for Python, both -for clients and servers. This package provides the Python 3 port -of python-openid.") - (license license:asl2.0))) - (define-public python-urwidtrees (package (name "python-urwidtrees") From 3ca1c5e2eca8ea8c1355cd41f5c96eaa37ec0fde Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 9 Apr 2017 06:00:00 -0400 Subject: [PATCH 179/301] gnu: linux-libre@4.4: Update to 4.4.60. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.60. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 876b7ef7b4..31433728eb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -368,8 +368,8 @@ (define-public linux-libre-4.9 #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.59" - "1nrg7mg6cn0xzsdklg24aj5fqx05hab11j9nq4b8dabjf4crlkx5" + (make-linux-libre "4.4.60" + "0rahii7nxfhn3zh289x4xpx4fk3nbij0jnrbvfpa59p15iamwyi2" %intel-compatible-systems #:configuration-file kernel-config)) From 0ab8ff138ca8c5b0ec9957796b4fd554b3d49c5f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 9 Apr 2017 06:00:47 -0400 Subject: [PATCH 180/301] gnu: linux-libre@4.9: Update to 4.9.21. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.21. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 31433728eb..bf9916e294 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -362,8 +362,8 @@ (define-public linux-libre #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.20" - "0hnxylfnyz3xf7k3qcq2wri2wpbi2islngxjmqp445v1pzr4k9xp" + (make-linux-libre "4.9.21" + "0zmn3261rf5asd4r64qiv1h4ka93pb1aagj7rmw6lyi36yqxc19b" %intel-compatible-systems #:configuration-file kernel-config)) From c8ce351afc8e55ebd7f3c0675397e3f70c851b3b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 9 Apr 2017 06:01:31 -0400 Subject: [PATCH 181/301] gnu: linux-libre: Update to 4.10.9. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.10.9. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bf9916e294..800f07b1c5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,8 +352,8 @@ (define* (make-linux-libre version hash supported-systems (define %intel-compatible-systems '("x86_64-linux" "i686-linux")) -(define %linux-libre-version "4.10.8") -(define %linux-libre-hash "0936i2h9l4gn67gby9kx70w6zqv1nbzbgwssry6k11wrjwa2p8n4") +(define %linux-libre-version "4.10.9") +(define %linux-libre-hash "1id2nx0k70akmwx9l4ga4i2p8wjpxx5jdmgckrfxqgprw19jkn6p") (define-public linux-libre (make-linux-libre %linux-libre-version From 3420ed32d8119a033cb91671d76edd53c55b57f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Apr 2017 13:00:17 +0200 Subject: [PATCH 182/301] gnu: r-jsonlite: Update to 1.4. * gnu/packages/web.scm (r-jsonlite): Update to 1.4. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b0e317059b..3685993515 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3316,13 +3316,13 @@ (define-public r-httpuv (define-public r-jsonlite (package (name "r-jsonlite") - (version "1.3") + (version "1.4") (source (origin (method url-fetch) (uri (cran-uri "jsonlite" version)) (sha256 (base32 - "0y55znjn69af4d4cy7n8r3nlgblnri7vdhvzpvp4fq4n43faqzsw")))) + "11rgkjp5qir79niad0aizjxvjzyvkl6l9nsrv3ikv446vllmrasn")))) (build-system r-build-system) (home-page "http://arxiv.org/abs/1403.2805") (synopsis "Robust, high performance JSON parser and generator for R") From dc8ebe43af88480036a6ae7e7013313d3c102b55 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Apr 2017 13:00:45 +0200 Subject: [PATCH 183/301] gnu: r-biocparallel: Update to 1.8.2. * gnu/packages/bioinformatics.scm (r-biocparallel): Update to 1.8.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3626db9aae..34b4f73903 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6562,13 +6562,13 @@ (define-public r-biomart (define-public r-biocparallel (package (name "r-biocparallel") - (version "1.8.1") + (version "1.8.2") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocParallel" version)) (sha256 (base32 - "123i928rwi4h4sy4fpysv6pinw5nns0sm3myxi2ghqhm34ws8gyl")))) + "18zpa0vl375n9pvxsgbid1k96m17nqqgv1g1sfnlmm7kj34jxg6v")))) (properties `((upstream-name . "BiocParallel"))) (build-system r-build-system) From 6acdff587579a5cf97bcb698ad61cd8cc2ade088 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Apr 2017 13:01:09 +0200 Subject: [PATCH 184/301] gnu: r-rsamtools: Update to 1.26.2. * gnu/packages/bioinformatics.scm (r-rsamtools): Update to 1.26.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 34b4f73903..ce937176ba 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6612,13 +6612,13 @@ (define-public r-biostrings (define-public r-rsamtools (package (name "r-rsamtools") - (version "1.26.1") + (version "1.26.2") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsamtools" version)) (sha256 (base32 - "0pf4f6brf4bl5zgjrah0f38qslazrs49ayqgyh0xfqgrh63yx4ck")))) + "118nsajgghi4cy3h0wi7777kc70a5j1fdyxv5n1dy01glix2z4qk")))) (properties `((upstream-name . "Rsamtools"))) (build-system r-build-system) From e9e0fab079257dc41955ad1d0b960c2abb82f74a Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sun, 9 Apr 2017 21:42:17 +1000 Subject: [PATCH 185/301] gnu: raxml: Update to 8.2.10. * gnu/packages/bioinformatics.scm (raxml): Update to 8.2.10. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ce937176ba..8f0913fcbd 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4041,7 +4041,7 @@ (define-public roary (define-public raxml (package (name "raxml") - (version "8.2.9") + (version "8.2.10") (source (origin (method url-fetch) @@ -4052,7 +4052,7 @@ (define-public raxml (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1pv8p2fy67y21a9y4cm7xpvxqjwz2v4201flfjshdq1p8j52rqf7")))) + "13s7aspfdcfr6asynwdg1x6vznys6pzap5f8wsffbnnwpkkg9ya8")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; There are no tests. From 6bb9c854241193c0a0ab8099fd6588d635ab234a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Apr 2017 13:33:08 +0200 Subject: [PATCH 186/301] gnu: Add freegish. * gnu/packages/games.scm (freegish): New variable. --- gnu/packages/games.scm | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a09ea3e117..ed04239c69 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3458,3 +3458,60 @@ (define-public megaglest game, where you control the armies of one of seven different factions: Tech, Magic, Egypt, Indians, Norsemen, Persian or Romans.") (license license:gpl2+))) + +(define-public freegish + (let ((commit "8795cd7adc95957883f2d3465eb9036a774667a7") + (revision "1")) + (package + (name "freegish") + (version (string-append "0-" revision "." (string-take commit 9))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/freegish/freegish.git") + (commit commit))) + (sha256 + (base32 + "1p1zf5qqagmcpi1db2bs02cnalpy3qiymp6yzan7k1bhmv859gsx")) + (modules '((guix build utils))) + ;; The audio files in the "music" directory are licensed under + ;; CC-BY-NC, so we delete them. + (snippet + '(begin + (delete-file-recursively "music") + #t)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no tests included + #:configure-flags + (list "-DCMAKE_INSTALL_FHS=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-DATAPATH + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("^option\\(INSTALL_FHS" line) + (string-append "add_definitions(-DDATAPATH=\"" + (assoc-ref outputs "out") "/share/freegish\")\n" + line))) + #t))))) + (inputs + `(("sdl-union" ,(sdl-union (list sdl sdl-mixer))) + ("openal" ,openal) + ("libvorbis" ,libvorbis) + ("libogg" ,libogg) + ("mesa" ,mesa) + ("libpng" ,libpng) + ("zlib" ,zlib))) + (home-page "https://github.com/freegish/freegish") + (synopsis "Side-scrolling physics platformer with a ball of tar") + (description "In FreeGish you control Gish, a ball of tar who lives +happily with his girlfriend Brea, until one day a mysterious dark creature +emerges from a sewer hole and pulls her below ground.") + ;; The textures are available under the Expat license. All other assets + ;; (including levels) are covered under CC-BY-SA or public domain. The + ;; source code is under GPLv2+. + (license (list license:gpl2+ + license:expat + license:public-domain + license:cc-by-sa3.0))))) From 6461c44c2e8327165b4bee5c2089cdad68b99f92 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sun, 9 Apr 2017 17:19:34 -0400 Subject: [PATCH 187/301] gnu: emacs-projectile: Update to 0.14.0. * gnu/packages/emacs.scm (emacs-projectile): Update to 0.14.0. Signed-off-by: Marius Bakke --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index cc14fd2280..0d53ffc84b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3065,7 +3065,7 @@ (define-public emacs-markdown-mode (define-public emacs-projectile (package (name "emacs-projectile") - (version "0.13.0") + (version "0.14.0") (source (origin (method url-fetch) (uri (string-append "https://raw.githubusercontent.com/bbatsov" @@ -3073,7 +3073,7 @@ (define-public emacs-projectile (file-name (string-append "projectile-" version ".el")) (sha256 (base32 - "1pc6xb61hzxzc5hkqkli1ab0s7wz0rfgx4kcn9y30ksvhw18smbz")))) + "1ql1wnzhblbwnv66hf2y0wq45g71hh6s9inc090lmhm1vgylbd1f")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) From 96e98d51a7057b443a1c1b32046f8be6a1987a2f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Apr 2017 19:11:47 +0200 Subject: [PATCH 188/301] gnu: nss, nss-certs: Update to 3.30.1. * gnu/packages/certs.scm (nss-certs): Update to 3.30.1. * gnu/packages/gnuzilla.scm (nss): Update to 3.30.1. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/gnuzilla.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 4b43348a50..31841d0e06 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -74,7 +74,7 @@ (define certdata2pem (define-public nss-certs (package (name "nss-certs") - (version "3.30") + (version "3.30.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -85,7 +85,7 @@ (define-public nss-certs "nss-" version ".tar.gz"))) (sha256 (base32 - "1agkkwb51si4raw46p44vl3d0l7wzvdjcblpcdjjz6aymq6h1h58")))) + "1djypq081m22iw0wg0q7gnpndam5f8qjhqfd5v9by4c6l6lp78hz")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 74063cfb74..4a2e784eec 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -194,7 +194,7 @@ (define-public nspr (define-public nss (package (name "nss") - (version "3.30") + (version "3.30.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -205,7 +205,7 @@ (define-public nss "nss-" version ".tar.gz"))) (sha256 (base32 - "1agkkwb51si4raw46p44vl3d0l7wzvdjcblpcdjjz6aymq6h1h58")) + "1djypq081m22iw0wg0q7gnpndam5f8qjhqfd5v9by4c6l6lp78hz")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) From 5c7815f205e9164d4b82378de91bee7a65bcfbcb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 10 Apr 2017 05:20:36 +0300 Subject: [PATCH 189/301] gnu: gcl: Build with gcc@4.9. * gnu/packages/lisp.scm (gcl)[native-inputs]: Add gcc@4.9. --- gnu/packages/lisp.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 2bbe398079..2e840a087f 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -113,7 +114,8 @@ (define-public gcl (alist-delete 'strip %standard-phases)))) (native-inputs - `(("m4" ,m4) + `(("gcc" ,gcc-4.9) + ("m4" ,m4) ("readline" ,readline) ("texinfo" ,texinfo) ("texlive" ,texlive))) From 47fb74aebc45005d8045f81e69d2c69da31621f0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 10 Apr 2017 05:29:44 +0300 Subject: [PATCH 190/301] gnu: gcl: Clean up inputs. * gnu/packages/lisp.scm (gcl)[arguments]: Remove readline substitution, correctly substitute '/bin/sh' calls. [inputs]: Add gmp, readline. [native-inputs]: Remove readline. --- gnu/packages/lisp.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 2e840a087f..6246840afa 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -91,13 +91,6 @@ (define-public gcl #:phases (alist-cons-before 'configure 'pre-conf (lambda _ - ;; Patch bug when building readline support. This bug was - ;; also observed by Debian - ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741819 - (substitute* "o/gcl_readline.d" - (("rl_attempted_completion_function = \ -\\(CPPFunction \\*\\)rl_completion;") - "rl_attempted_completion_function = rl_completion;")) (substitute* (append '("pcl/impl/kcl/makefile.akcl" @@ -107,16 +100,21 @@ (define-public gcl "gcl-tk/makefile.prev" "add-defs1") (find-files "h" "\\.defs")) - (("SHELL=/bin/(ba)?sh") - (string-append "SHELL=" (which "bash"))))) + (("SHELL=/bin/bash") + (string-append "SHELL=" (which "bash"))) + (("SHELL=/bin/sh") + (string-append "SHELL=" (which "sh")))) + #t) ;; drop strip phase to make maxima build, see ;; https://www.ma.utexas.edu/pipermail/maxima/2008/009769.html (alist-delete 'strip %standard-phases)))) + (inputs + `(("gmp" ,gmp) + ("readline" ,readline))) (native-inputs `(("gcc" ,gcc-4.9) ("m4" ,m4) - ("readline" ,readline) ("texinfo" ,texinfo) ("texlive" ,texlive))) (home-page "https://www.gnu.org/software/gcl/") From 1803f2493ebe3baf0ce1ce279372e0396c02b76f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 10 Apr 2017 05:34:17 +0300 Subject: [PATCH 191/301] gnu: gcl: Use 'modify-phases' syntax. * gnu/packages/lisp.scm (gcl)[arguments]: Use 'modify-phases' syntax. --- gnu/packages/lisp.scm | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6246840afa..fc78a60f18 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -88,27 +88,26 @@ (define-public gcl `(#:parallel-build? #f ; The build system seems not to be thread safe. #:tests? #f ; There does not seem to be make check or anything similar. #:configure-flags '("--enable-ansi") ; required for use by the maxima package - #:phases (alist-cons-before - 'configure 'pre-conf - (lambda _ - (substitute* - (append - '("pcl/impl/kcl/makefile.akcl" - "add-defs" - "unixport/makefile.dos" - "add-defs.bat" - "gcl-tk/makefile.prev" - "add-defs1") - (find-files "h" "\\.defs")) - (("SHELL=/bin/bash") - (string-append "SHELL=" (which "bash"))) - (("SHELL=/bin/sh") - (string-append "SHELL=" (which "sh")))) - #t) - ;; drop strip phase to make maxima build, see - ;; https://www.ma.utexas.edu/pipermail/maxima/2008/009769.html - (alist-delete 'strip - %standard-phases)))) + #:phases (modify-phases %standard-phases + (add-before 'configure 'pre-conf + (lambda _ + (substitute* + (append + '("pcl/impl/kcl/makefile.akcl" + "add-defs" + "unixport/makefile.dos" + "add-defs.bat" + "gcl-tk/makefile.prev" + "add-defs1") + (find-files "h" "\\.defs")) + (("SHELL=/bin/bash") + (string-append "SHELL=" (which "bash"))) + (("SHELL=/bin/sh") + (string-append "SHELL=" (which "sh")))) + #t)) + ;; drop strip phase to make maxima build, see + ;; https://www.ma.utexas.edu/pipermail/maxima/2008/009769.html + (delete 'strip)))) (inputs `(("gmp" ,gmp) ("readline" ,readline))) From ae792dbae029092e37cda3ab223dac129689fb24 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Apr 2017 22:45:11 +0200 Subject: [PATCH 192/301] gnu: Add tango-icon-theme. * gnu/packages/gnome.scm (tango-icon-theme): New variable. --- gnu/packages/gnome.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b94c36636e..535b8ae68e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -89,6 +89,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages lirc) #:use-module (gnu packages lua) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages networking) #:use-module (gnu packages password-utils) #:use-module (gnu packages pcre) @@ -723,6 +724,29 @@ (define-public adwaita-icon-theme (native-inputs `(("gtk-encode-symbolic-svg" ,gtk+ "bin"))))) +(define-public tango-icon-theme + (package + (name "tango-icon-theme") + (version "0.8.90") + (source (origin + (method url-fetch) + (uri (string-append "http://tango.freedesktop.org/releases/" + "tango-icon-theme-" version ".tar.bz2")) + (sha256 + (base32 + "034r9s944b4yikyfgn602yv7s54wdzlq0qfvqh52b9x6kbx08h79")))) + (build-system gnu-build-system) + (native-inputs + `(("icon-naming-utils" ,icon-naming-utils) + ("intltool" ,intltool) + ("imagemagick" ,imagemagick) + ("pkg-config" ,pkg-config))) + (home-page "http://tango-project.org/") + (synopsis "Tango icon theme") + (description "This is an icon theme that follows the Tango visual +guidelines.") + (license license:public-domain))) + (define-public shared-mime-info (package (name "shared-mime-info") From 9ea0cdaf7f60823c861868e210add3d1b3af11fd Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 24 Mar 2017 21:53:14 +0100 Subject: [PATCH 193/301] gnu: rustc: Update to 1.16.0. gnu: cargo: Update to 0.17.0. * gnu/packages/rust.scm (rustc): Update to 1.16.0. patch-configure: Patch LLVM references. (cargo): Update to 0.17.0. [native-inputs]: Update rust-openssl to 0.9.6. Update rust-libssh2-sys 0.2.5. Update rust-libz-sys 1.0.13. Add rust-error-chain 0.7.2. Add rust-metadeps 1.1.1. Update rust-openssl-sys 0.9.6. Update rust-libgit2-sys to 0.6.6. Add rust-shell-escape 0.1.3. --- gnu/packages/rust.scm | 70 ++++++++++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 17 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 9a56b1ffed..a9710ba4d7 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -44,7 +44,7 @@ (define-module (gnu packages rust) #:use-module (srfi srfi-26)) ;; Should be one less than the current released version. -(define %rust-bootstrap-binaries-version "1.14.0") +(define %rust-bootstrap-binaries-version "1.15.0") (define %rust-bootstrap-binaries (origin @@ -55,7 +55,7 @@ (define %rust-bootstrap-binaries "-i686-unknown-linux-gnu.tar.gz")) (sha256 (base32 - "0h384prpabcl08mxs1bilyb0dbk0knpdylcnz4b84ij4idr7ap4d")))) + "0wmkfx8pxmkkw021mrq9s3xhra8f0daqdl6j56pxyn4w39i0rzrw")))) (define (increment-rust-version rust-version major patch) (match (string-split rust-version #\.) @@ -205,7 +205,7 @@ (define-public rustc "rustc-" version "-src.tar.gz")) (sha256 (base32 - "0wvn8m1nfg664b95qrdpfh72q1a6ir09rqkrnlzbkay2r7xf8mgn")))) + "1d78jq7mc34n265by68amr9r4nzbiqrilfbwh7gx56ydn4gb6rpr")))) (build-system gnu-build-system) (native-inputs `(("cmake" ,cmake) @@ -226,7 +226,22 @@ (define-public rustc (lambda _ (substitute* "configure" (("/usr/bin/env") (which "env")) ; Detect target CPU correctly. - (("probe_need CFG_CURL curl") "")) ; Avoid curl as a build dependency. + (("probe_need CFG_CURL curl") "") ; Avoid curl build dependency. + ;; Newer LLVM has a NVPTX (NVIDIA) backend which the Rust + ;; Makefiles don't know about, causing a linker failure + ;; if we don't intervene. + ;; Therefore, we add NVPTX here. + ;; See . + ;; For the next release, we will have to use rustbuild. + ;; Right now, rustbuild doesn't work yet. + (("-DLLVM_TARGETS_TO_BUILD='") + "-DLLVM_TARGETS_TO_BUILD='NVPTX;")) ; Make LLVM >= 3.8.1 work. + (substitute* "src/tools/compiletest/src/util.rs" + (("(\"amd64\", \"x86_64\"),") "(\"amd64\", \"x86_64\"), +(\"nvptx\", \"nvptx\"),")) ; Make LLVM >= 3.8.1 work. + (substitute* "mk/main.mk" + (("LLVM_OPTIONAL_COMPONENTS=") + "LLVM_OPTIONAL_COMPONENTS=nvptx ")) ; Make LLVM >= 3.8.1 work. #t)) (add-after 'unpack 'set-env (lambda _ @@ -263,7 +278,7 @@ (define-public rustc "--release-channel=stable" "--enable-rpath" "--enable-local-rust" - "--disable-rustbuild" ; use Makefiles + "--disable-rustbuild" ; rustbuild doesn't work yet. "--disable-manage-submodules"))) ;; Rust uses a custom configure script (no autoconf). (zero? (apply system* "./configure" flags))))) @@ -297,7 +312,7 @@ (define-public cargo (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "194i06y9nql0p93gahh0vm4qwv6c1kpd9rprpf22w5gav9lpcyjz")))) + "1y0zy8gk1ly0wh57y78fisk7cdd92qk0x7z664f6l7lzl2krqs7w")))) (build-system cargo-build-system) (propagated-inputs `(("cmake" ,cmake) @@ -313,10 +328,10 @@ (define-public cargo `(("rust-openssl" ,(origin (method url-fetch) - (uri (crate-uri "openssl" "0.9.1")) + (uri (crate-uri "openssl" "0.9.6")) (sha256 (base32 - "1m2mhiar87qnw4gxci286q9g85ljafbc41salbj2hmcgh8aagchy")))) + "0g28g692gby6izp9qmnwnyxyhf9b0870yhd500p18j9l69lxl00c")))) ("rust-strsim" ,(origin (method url-fetch) @@ -411,17 +426,17 @@ (define-public cargo ("rust-libssh2-sys" ,(origin (method url-fetch) - (uri (crate-uri "libssh2-sys" "0.2.4")) + (uri (crate-uri "libssh2-sys" "0.2.5")) (sha256 (base32 - "1pmmh0hcx14856wg9bp740yf618qfl2765vhf67sfs5lmf39227d")))) + "0d2r36hrh9vc1821r0v4kywv30svpf37d31calwql69fbij3bqci")))) ("rust-libz-sys" ,(origin (method url-fetch) - (uri (crate-uri "libz-sys" "1.0.10")) + (uri (crate-uri "libz-sys" "1.0.13")) (sha256 (base32 - "1rl85x045sk5d345hgcahx99plpbdg2a3bx5vjfxig30qah74p4h")))) + "034pgvxzgsv37iafgs0lmvd1ifm0bg0zm1xcsn9x71nn8lm93vp5")))) ("rust-curl-sys" ,(origin (method url-fetch) @@ -429,13 +444,27 @@ (define-public cargo (sha256 (base32 "0fi8kjz3f8m8vfazycs3ddm0h6j3x78hw78gwbvybx71129192i1")))) + ("rust-error-chain" + ,(origin + (method url-fetch) + (uri (crate-uri "error-chain" "0.7.2")) + (sha256 + (base32 + "03qjh6l2a9fkiyg0428p7q3dcpi47cbmrqf9zmlymkg43v3v731i")))) + ("rust-metadeps" + ,(origin + (method url-fetch) + (uri (crate-uri "metadeps" "1.1.1")) + (sha256 + (base32 + "0l818461bslb7nrs7r1amkqv45n53fcp5sabyqipwx0xxbkzz7w2")))) ("rust-openssl-sys" ,(origin (method url-fetch) - (uri (crate-uri "openssl-sys" "0.9.1")) + (uri (crate-uri "openssl-sys" "0.9.6")) (sha256 (base32 - "1sdhgalfm2zdqf144xhdnxdha7ifjgsfbmlrqbx0j9f3mh4gpscm")))) + "1hzpyf9z8xg1yn5r9g17bl5j20nifd6s2zp10xh90v7m0sd2yj5i")))) ("rust-fs2" ,(origin (method url-fetch) @@ -635,10 +664,10 @@ (define-public cargo ("rust-libgit2-sys" ,(origin (method url-fetch) - (uri (crate-uri "libgit2-sys" "0.6.5")) + (uri (crate-uri "libgit2-sys" "0.6.6")) (sha256 (base32 - "0yl80n12ih4jh1halpbj3zqlqvw5zxdr6m6xdcvdz67svjy50bjh")))) + "074h9q4p60xh6canb0sj4vrc801wqv6p53l9lp0q724bkwzf7967")))) ("rust-env_logger" ,(origin (method url-fetch) @@ -785,7 +814,14 @@ (define-public cargo (uri (crate-uri "num-complex" "0.1.35")) (sha256 (base32 - "0bzrjfppnnzf9vmkpklhp2dw9sb1lqzydb8r6k83z76i9l2qxizh")))))) + "0bzrjfppnnzf9vmkpklhp2dw9sb1lqzydb8r6k83z76i9l2qxizh")))) + ("rust-shell-escape" + ,(origin + (method url-fetch) + (uri (crate-uri "shell-escape" "0.1.3")) + (sha256 + (base32 + "1y2fp2brv639icv4a0fdqs1zhlrxq8qbz27ygfa86ifmh5jcjp6x")))))) (arguments `(#:cargo ,cargo-bootstrap #:tests? #f ; FIXME From 8b1e572d0f19de39225ae6e6935b1d53e9e1215c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 9 Apr 2017 12:02:35 +0200 Subject: [PATCH 194/301] gnu: lxde: Add leafpad. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxde.scm (lxde)[propagated-inputs]: Add leafpad. Signed-off-by: Ludovic Courtès --- gnu/packages/lxde.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index e7654053d8..7abaab2c7e 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 ng0 +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ (define-module (gnu packages lxde) #:use-module (gnu packages openbox) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) + #:use-module (gnu packages text-editors) #:use-module (gnu packages wm) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -433,9 +435,10 @@ (define-public lxde (arguments '(#:builder (mkdir %output))) (propagated-inputs ;; TODO: - ;; lxshortcut, lxsession-edit, gpicview, leafpad, + ;; lxshortcut, lxsession-edit, gpicview ;; lxappearance-obconf `(("menu-cache" ,menu-cache) + ("leafpad" ,leafpad) ("lxappearance" ,lxappearance) ("lxde-icon-theme" ,lxde-icon-theme) ("lxde-common" ,lxde-common) From 31b7af7659cf3840f6038f76feab8e1b6a4bfaa7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 14:50:18 +0200 Subject: [PATCH 195/301] gnu: jack-1: Update to 0.125.0. * gnu/packages/audio.scm (jack-1): Update to 0.125.0. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2d2417abb0..1f8361a084 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1301,7 +1301,7 @@ (define-public ir (define-public jack-1 (package (name "jack") - (version "0.124.1") + (version "0.125.0") (source (origin (method url-fetch) (uri (string-append @@ -1310,7 +1310,7 @@ (define-public jack-1 ".tar.gz")) (sha256 (base32 - "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb")))) + "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm")))) (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) From c66529d82d219ae8af367406104e38ca37475102 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 16:52:40 +0200 Subject: [PATCH 196/301] gnu: yoshimi: Update to 1.5.1.1. * gnu/packages/music.scm (yoshimi): Update to 1.5.1.1. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1fe5cef41d..5475688b69 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1639,7 +1639,7 @@ (define-public zynaddsubfx (define-public yoshimi (package (name "yoshimi") - (version "1.5.1") + (version "1.5.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/yoshimi/" @@ -1647,7 +1647,7 @@ (define-public yoshimi "/yoshimi-" version ".tar.bz2")) (sha256 (base32 - "09kmq5bwgwwpa5z2mm1pxhnqcryd0cm5ixlafb3g6d3aspja2mkn")))) + "1gjanmbn08x11iz4bjlkx3m66x0yk401ddkz8fqkj7y3p5ih1kna")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests From f0c5856df7aaf1ec25b76a3cad9e919c7c9ac3e8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 17:06:45 +0200 Subject: [PATCH 197/301] gnu: ams-lv2: Update to 1.2.1. * gnu/packages/music.scm (ams-lv2): Update to 1.2.1. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5475688b69..2d271ea14d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1824,7 +1824,7 @@ (define-public qtractor (define-public ams-lv2 (package (name "ams-lv2") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) @@ -1833,7 +1833,7 @@ (define-public ams-lv2 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1392spswkhfd38fggf584wb3m8aqpg7csfrs9zxnzyvhgmp0fgqk")))) + "1xacxyzqcj83g9c1gwfn36gg1c6yi15v7km4vidfidrjzb4x27fq")))) (build-system waf-build-system) (arguments `(#:phases From 3999b6643eb3a33804b42c12cd33a432f29ccb89 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 17:07:22 +0200 Subject: [PATCH 198/301] gnu: pianobar: Update to 2016.06.02. * gnu/packages/music.scm (pianobar): Update to 2016.06.02. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2d271ea14d..06c9f39900 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1951,7 +1951,7 @@ (define-public mod-host (define-public pianobar (package (name "pianobar") - (version "2015.11.22") + (version "2016.06.02") (source (origin (method url-fetch) (uri (string-append "https://github.com/PromyLOPh/" @@ -1959,7 +1959,7 @@ (define-public pianobar (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "022df19bhxqvkhy0qy21xahba5s1fm17b13y0p9p9dnf2yl44wfv")))) + "1hi5rr6jcr0kwf4xfz007ndwkjkp287lhwlsgfz6iryqa5n6jzcp")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests From 82bf45c8bd60873eb59aa5e72aac9aeb1402fa51 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 17:18:22 +0200 Subject: [PATCH 199/301] gnu: mod-host: Update to 0.10.6-2-299a39774. * gnu/packages/music.scm (mod-host): Update to 0.10.6-2-299a39774. --- gnu/packages/music.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 06c9f39900..a64511e625 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1902,8 +1902,8 @@ (define-public gxtuner (define-public mod-host ;; The last release was in 2014 but since then more than 140 commits have ;; been made. - (let ((commit "72aca771e3a4e3889641b9bab84985586c9bb926") - (revision "1")) + (let ((commit "299a3977476e8eb0285837fbd7522cec506a11de") + (revision "2")) (package (name "mod-host") (version (string-append "0.10.6-" revision "." (string-take commit 9))) @@ -1914,7 +1914,7 @@ (define-public mod-host (commit commit))) (sha256 (base32 - "19szi8cy65jlchbrmbjbma03g6gxj9zyyp4dgw1k06r0cxbx82gq")) + "128q7p5mph086v954rqnafalfbkyvhgwclaq6ks6swrhj45wnag6")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments From 35f909d45c21739ac6f69dae6b98fec8a10b4c5b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 17:31:02 +0200 Subject: [PATCH 200/301] gnu: gx-guvnor-lv2: Update to 0.1. * gnu/packages/music.scm (gx-guvnor-lv2): Update to 0.1. [source]: Use release tarball. [arguments]: Remove obsolete Makefile patching. --- gnu/packages/music.scm | 69 ++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 37 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a64511e625..0d45774ef6 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2307,44 +2307,39 @@ (define-public midicsv (license license:public-domain))) (define-public gx-guvnor-lv2 - (let ((commit "9f528a7623a201383e119bb6a2df32b18396a9d5") - (revision "1")) - (package - (name "gx-guvnor-lv2") - (version (string-append "0-" revision "." (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/brummer10/GxGuvnor.lv2") - (commit commit))) - (sha256 - (base32 - "10zx84p2vd7i1yqc5ma9p17927265j4g0zfwv9rxladw0nm8y45k")) - (file-name (string-append name "-" version "-checkout")))) - (build-system gnu-build-system) - (arguments - `(;; The check target is used only to output a warning. - #:tests? #f - #:make-flags - (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda _ - (substitute* "Makefile" - (("INSTALL_DIR = .*") "INSTALL_DIR=/lib/lv2\n") - ;; Avoid rebuilding everything - (("install : all") "install:")) - #t))))) - (inputs - `(("lv2" ,lv2))) - (home-page "https://github.com/brummer10/GxGuvnor.lv2") - (synopsis "Overdrive/distortion pedal simulation") - (description "This package provides the LV2 plugin \"GxGuvnor\", a + (package + (name "gx-guvnor-lv2") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/brummer10/GxGuvnor.lv2/" + "archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rnfvrvs8qmmldyfmx4llyly33zp68448gx40ywdwj42x0mam92p")))) + (build-system gnu-build-system) + (arguments + `(;; The check target is used only to output a warning. + #:tests? #f + #:make-flags + (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (substitute* "Makefile" + (("INSTALL_DIR = .*") "INSTALL_DIR=/lib/lv2\n")) + #t))))) + (inputs + `(("lv2" ,lv2))) + (home-page "https://github.com/brummer10/GxGuvnor.lv2") + (synopsis "Overdrive/distortion pedal simulation") + (description "This package provides the LV2 plugin \"GxGuvnor\", a simulation of an overdrive or distortion pedal for guitars.") - ;; The LICENSE file says GPLv3 but the license headers in the files say - ;; GPLv2 or later. - (license license:gpl2+)))) + ;; The LICENSE file says GPLv3 but the license headers in the files say + ;; GPLv2 or later. + (license license:gpl2+))) (define-public gx-vbass-preamp-lv2 (let ((commit "0e599abab10c7669dd444e5d06f671c2fc1b9c6c") From f959991dd053bd3cdcf5bab35bfda6daac3212bc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 17:37:38 +0200 Subject: [PATCH 201/301] gnu: gx-suppa-tone-bender-lv2: Update to 0.1. * gnu/packages/music.scm (gx-suppa-tone-bender-lv2): Update to 0.1. --- gnu/packages/music.scm | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 0d45774ef6..b4e3845635 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2423,25 +2423,23 @@ (define-public gx-push-pull-lv2 simulation of a push pull transistor fuzz effect with added high octave.")))) (define-public gx-suppa-tone-bender-lv2 - (let ((commit "4e6dc713ec24e7fcf5ea23b7e685af627c01b9c9") - (revision "1")) - (package (inherit gx-guvnor-lv2) - (name "gx-suppa-tone-bender-lv2") - (version (string-append "0-" revision "." (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/brummer10/GxSuppaToneBender.lv2") - (commit commit))) - (sha256 - (base32 - "1i22xr252nkbazkwidll2zb3i96610gx65qn5djdkijlz7j77138")) - (file-name (string-append name "-" version "-checkout")))) - (home-page "https://github.com/brummer10/GxSuppaToneBender.lv2") - (synopsis "Simulation of the Vox Suppa Tone Bender pedal") - (description "This package provides the LV2 plugin + (package (inherit gx-guvnor-lv2) + (name "gx-suppa-tone-bender-lv2") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/brummer10/" + "GxSuppaToneBender.lv2/archive/v" + version ".tar.gz")) + (sha256 + (base32 + "1j90fns87035sfr6bxs4cvqxbyy3pqjhihx1nis8xajn202nl1hx")) + (file-name (string-append name "-" version ".tar.gz")))) + (home-page "https://github.com/brummer10/GxSuppaToneBender.lv2") + (synopsis "Simulation of the Vox Suppa Tone Bender pedal") + (description "This package provides the LV2 plugin \"GxSuppaToneBender\", a simulation modelled after the Vox Suppa Tone Bender -pedal.")))) +pedal."))) (define-public gx-saturator-lv2 (let ((commit "0b581ac85c515325b9f16e51937cae6e1bf81a0a") From 4396e9b54a0a6da977d3816c1e5ebed9a3f5f40f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 17:42:17 +0200 Subject: [PATCH 202/301] gnu: gx-hyperion-lv2: Update to 0.1. * gnu/packages/music.scm (gx-hyperion-lv2): Update to 0.1. --- gnu/packages/music.scm | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b4e3845635..b1e8dd7865 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2462,24 +2462,22 @@ (define-public gx-saturator-lv2 saturation effect.")))) (define-public gx-hyperion-lv2 - (let ((commit "6a096a664e553e551e179e85cf390bd1683410fb") - (revision "2")) - (package (inherit gx-guvnor-lv2) - (name "gx-hyperion-lv2") - (version (string-append "0-" revision "." (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/brummer10/GxHyperion.lv2") - (commit commit))) - (sha256 - (base32 - "1ksv3wmylhwbf6kjl2lnhr14h9rfl291cfm21471gnb1r68yqfxh")) - (file-name (string-append name "-" version "-checkout")))) - (home-page "https://github.com/brummer10/GxHyperion.lv2") - (synopsis "Simulation of the Hyperion Fuzz pedal") - (description "This package provides the LV2 plugin \"GxHyperion\", a -simulation of the Hyperion Fuzz pedal.")))) + (package (inherit gx-guvnor-lv2) + (name "gx-hyperion-lv2") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/brummer10/" + "GxHyperion.lv2/archive/v" + version ".tar.gz")) + (sha256 + (base32 + "1pd7l33a14kq73wavgqq7csw4n3mwjz9d5rxaj0jgsyxd3llp3wh")) + (file-name (string-append name "-" version ".tar.gz")))) + (home-page "https://github.com/brummer10/GxHyperion.lv2") + (synopsis "Simulation of the Hyperion Fuzz pedal") + (description "This package provides the LV2 plugin \"GxHyperion\", a +simulation of the Hyperion Fuzz pedal."))) (define-public gx-voodoo-fuzz-lv2 (let ((commit "aec7889b489385e8add06126e7a36ae2e26254b1") From ad67ca3d411349aa2f968f34c069baad94f9a364 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 17:42:42 +0200 Subject: [PATCH 203/301] gnu: Fix build for packages inheriting from gx-guvnor-lv2. This is a follow-up to commit 35f909d45c21739ac6f69dae6b98fec8a10b4c5b. * gnu/packages/music.scm (gx-vbass-preamp-lv2)[arguments]: Make "install" target independent from "all". (gx-overdriver-lv2, gx-tone-mender-lv2, gx-push-pull-lv2, gx-saturator-lv2, gx-switchless-wah-lv2, gx-slow-gear-lv2): Inherit from "gx-vbass-preamp-lv2". --- gnu/packages/music.scm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b1e8dd7865..c384f8bc73 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2356,6 +2356,16 @@ (define-public gx-vbass-preamp-lv2 (base32 "1dzksdfrva666gpi62fd2ni9rhf18sl917f1894qr0b17pbdh9k1")) (file-name (string-append name "-" version "-checkout")))) + (arguments + (substitute-keyword-arguments (package-arguments gx-guvnor-lv2) + ((#:phases phases) + `(modify-phases ,phases + (replace 'configure + (lambda _ + (substitute* "Makefile" + (("INSTALL_DIR = .*") "INSTALL_DIR=/lib/lv2\n") + (("install : all") "install :")) + #t)))))) (home-page "https://github.com/brummer10/GxVBassPreAmp.lv2") (synopsis "Simulation of the Vox Venue Bass 100 Pre Amp Section") (description "This package provides the LV2 plugin \"GxVBassPreAmp\", a @@ -2365,7 +2375,7 @@ (define-public gx-vbass-preamp-lv2 (define-public gx-overdriver-lv2 (let ((commit "ed71801987449414bf3adaa0dbfac68e8775f1ce") (revision "1")) - (package (inherit gx-guvnor-lv2) + (package (inherit gx-vbass-preamp-lv2) (name "gx-overdriver-lv2") (version (string-append "0-" revision "." (string-take commit 9))) (source (origin @@ -2385,7 +2395,7 @@ (define-public gx-overdriver-lv2 (define-public gx-tone-mender-lv2 (let ((commit "b6780b4a3e4782b3ed0e5882d6788f178aed138f") (revision "1")) - (package (inherit gx-guvnor-lv2) + (package (inherit gx-vbass-preamp-lv2) (name "gx-tone-mender-lv2") (version (string-append "0-" revision "." (string-take commit 9))) (source (origin @@ -2405,7 +2415,7 @@ (define-public gx-tone-mender-lv2 (define-public gx-push-pull-lv2 (let ((commit "7f76ae2068498643ac8671ee0930b13ee3fd8eb5") (revision "1")) - (package (inherit gx-guvnor-lv2) + (package (inherit gx-vbass-preamp-lv2) (name "gx-push-pull-lv2") (version (string-append "0-" revision "." (string-take commit 9))) (source (origin @@ -2444,7 +2454,7 @@ (define-public gx-suppa-tone-bender-lv2 (define-public gx-saturator-lv2 (let ((commit "0b581ac85c515325b9f16e51937cae6e1bf81a0a") (revision "2")) - (package (inherit gx-guvnor-lv2) + (package (inherit gx-vbass-preamp-lv2) (name "gx-saturator-lv2") (version (string-append "0-" revision "." (string-take commit 9))) (source (origin @@ -2546,7 +2556,7 @@ (define-public gx-vintage-fuzz-master-lv2 (define-public gx-slow-gear-lv2 (let ((commit "cb852e0426f4e6fe077e7f1ede73a4da335cfc5e") (revision "2")) - (package (inherit gx-guvnor-lv2) + (package (inherit gx-vbass-preamp-lv2) (name "gx-slow-gear-lv2") (version (string-append "0-" revision "." (string-take commit 9))) (source (origin @@ -2566,7 +2576,7 @@ (define-public gx-slow-gear-lv2 (define-public gx-switchless-wah-lv2 (let ((commit "7b08691203314612999f0ce2328cdc1161cd6665") (revision "2")) - (package (inherit gx-guvnor-lv2) + (package (inherit gx-vbass-preamp-lv2) (name "gx-switchless-wah-lv2") (version (string-append "0-" revision "." (string-take commit 9))) (source (origin From cf44ebebc45264fb9b95c775f606f2fc33c10dae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 17:54:16 +0200 Subject: [PATCH 204/301] gnu: gx-voodoo-fuzz-lv2: Update to 0.1. * gnu/packages/music.scm (gx-voodoo-fuzz-lv2): Update to 0.1. --- gnu/packages/music.scm | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c384f8bc73..6d9d398647 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2490,26 +2490,24 @@ (define-public gx-hyperion-lv2 simulation of the Hyperion Fuzz pedal."))) (define-public gx-voodoo-fuzz-lv2 - (let ((commit "aec7889b489385e8add06126e7a36ae2e26254b1") - (revision "2")) - (package (inherit gx-guvnor-lv2) - (name "gx-voodoo-fuzz-lv2") - (version (string-append "0-" revision "." (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/brummer10/GxVoodoFuzz.lv2") - (commit commit))) - (sha256 - (base32 - "0mc41ldlv89069iaysnfiqxy5h5sr8mdi5cxm3ij5q5v4jv3viwx")) - (file-name (string-append name "-" version "-checkout")))) - (home-page "https://github.com/brummer10/GxVoodoFuzz.lv2") - (synopsis "Fuzz effect modelled after the Voodoo Lab SuperFuzz") - (description "This package provides the LV2 plugin \"GxVoodooFuzz\", a + (package (inherit gx-guvnor-lv2) + (name "gx-voodoo-fuzz-lv2") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/brummer10/" + "GxVoodoFuzz.lv2/archive/v" + version ".tar.gz")) + (sha256 + (base32 + "0cc8sg7q493bs6pcq4ipqp6czpxv04nh9yvn8kq2x65ni2208n2f")) + (file-name (string-append name "-" version ".tar.gz")))) + (home-page "https://github.com/brummer10/GxVoodoFuzz.lv2") + (synopsis "Fuzz effect modelled after the Voodoo Lab SuperFuzz") + (description "This package provides the LV2 plugin \"GxVoodooFuzz\", a simulation modelled after the Voodoo Lab SuperFuzz pedal. It's basically a Bosstone circuit, followed by the tone control of the FoxToneMachine in -parallel with a DarkBooster, followed by a volume control.")))) +parallel with a DarkBooster, followed by a volume control."))) (define-public gx-super-fuzz-lv2 (let ((commit "f40389575812c909007d140d327ce579930b71f7") From 34a3ecfec09de2bd19e3a052b0bce9f9757a5a4d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 17:54:44 +0200 Subject: [PATCH 205/301] gnu: gx-super-fuzz-lv2: Update to 0.1. * gnu/packages/music.scm (gx-super-fuzz-lv2): Update to 0.1. --- gnu/packages/music.scm | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6d9d398647..7546da99f8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2510,26 +2510,24 @@ (define-public gx-voodoo-fuzz-lv2 parallel with a DarkBooster, followed by a volume control."))) (define-public gx-super-fuzz-lv2 - (let ((commit "f40389575812c909007d140d327ce579930b71f7") - (revision "2")) - (package (inherit gx-guvnor-lv2) - (name "gx-super-fuzz-lv2") - (version (string-append "0-" revision "." (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/brummer10/GxSuperFuzz.lv2") - (commit commit))) - (sha256 - (base32 - "174bibj8qzm8zr6f5h8bcj94iry17zravk8flpdy84n6yg7cixji")) - (file-name (string-append name "-" version "-checkout")))) - (home-page "https://github.com/brummer10/GxSuperFuzz.lv2") - (synopsis "Fuzz effect modelled after the UniVox SuperFuzz") - (description "This package provides the LV2 plugin \"GxVoodooFuzz\", an + (package (inherit gx-guvnor-lv2) + (name "gx-super-fuzz-lv2") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/brummer10/" + "GxSuperFuzz.lv2/archive/v" + version ".tar.gz")) + (sha256 + (base32 + "0pnivq05f1kji8c5jxsqdzhdfk3xn422v2d1x20x3jfsxnaf115x")) + (file-name (string-append name "-" version ".tar.gz")))) + (home-page "https://github.com/brummer10/GxSuperFuzz.lv2") + (synopsis "Fuzz effect modelled after the UniVox SuperFuzz") + (description "This package provides the LV2 plugin \"GxVoodooFuzz\", an analog simulation of the UniVox SuperFuzz pedal. In this simulation the trim pot, which is usualy in the housing, is exposed as a control parameter. It -adjusts the amount of harmonics.")))) +adjusts the amount of harmonics."))) (define-public gx-vintage-fuzz-master-lv2 (let ((commit "0fec0bc1e8a8ba909a68e916e036138a3425d7db") From a6f39d7cd5e2957b8eb58976e1f4d1ce77538cb9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 17:55:30 +0200 Subject: [PATCH 206/301] gnu: gx-super-fuzz-lv2: Fix description. * gnu/packages/music.scm (gx-super-fuzz-lv2)[description]: Replace "GxVoodooFuzz" with "GxSuperFuzz". --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7546da99f8..dbf362d64d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2524,7 +2524,7 @@ (define-public gx-super-fuzz-lv2 (file-name (string-append name "-" version ".tar.gz")))) (home-page "https://github.com/brummer10/GxSuperFuzz.lv2") (synopsis "Fuzz effect modelled after the UniVox SuperFuzz") - (description "This package provides the LV2 plugin \"GxVoodooFuzz\", an + (description "This package provides the LV2 plugin \"GxSuperFuzz\", an analog simulation of the UniVox SuperFuzz pedal. In this simulation the trim pot, which is usualy in the housing, is exposed as a control parameter. It adjusts the amount of harmonics."))) From 38050923854acc40dc7ee412806e499faedfb845 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 18:17:56 +0200 Subject: [PATCH 207/301] gnu: gx-vintage-fuzz-master-lv2: Update to 0.1. * gnu/packages/music.scm (gx-vintage-fuzz-master-lv2): Update to 0.1. --- gnu/packages/music.scm | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index dbf362d64d..a3e508d134 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2530,24 +2530,22 @@ (define-public gx-super-fuzz-lv2 adjusts the amount of harmonics."))) (define-public gx-vintage-fuzz-master-lv2 - (let ((commit "0fec0bc1e8a8ba909a68e916e036138a3425d7db") - (revision "2")) - (package (inherit gx-guvnor-lv2) - (name "gx-vintage-fuzz-master-lv2") - (version (string-append "0-" revision "." (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/brummer10/GxVintageFuzzMaster.lv2") - (commit commit))) - (sha256 - (base32 - "06szi6d2iwkygbw5azhwzhcl2as4lmk2gs9hanngsf46a1zbdcp7")) - (file-name (string-append name "-" version "-checkout")))) - (home-page "https://github.com/brummer10/GxVintageFuzzMaster.lv2") - (synopsis "Fuzz effect simulation of the vintage Fuzz Master") - (description "This package provides the LV2 plugin -\"GxVintageFuzzMaster\", a simulation of the vintage Fuzz Master pedal.")))) + (package (inherit gx-guvnor-lv2) + (name "gx-vintage-fuzz-master-lv2") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/brummer10/" + "GxVintageFuzzMaster.lv2/archive/v" + version ".tar.gz")) + (sha256 + (base32 + "0bdkfj6xi2g4izfw3pmr4i0nqzg8jnkdwc23x9ifxwc6p1kbayzk")) + (file-name (string-append name "-" version ".tar.gz")))) + (home-page "https://github.com/brummer10/GxVintageFuzzMaster.lv2") + (synopsis "Fuzz effect simulation of the vintage Fuzz Master") + (description "This package provides the LV2 plugin +\"GxVintageFuzzMaster\", a simulation of the vintage Fuzz Master pedal."))) (define-public gx-slow-gear-lv2 (let ((commit "cb852e0426f4e6fe077e7f1ede73a4da335cfc5e") From 7421467afb910f7fcf743c7f5910b686e14eabaa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 18:39:12 +0200 Subject: [PATCH 208/301] gnu: serd: Update to 0.26.0. * gnu/packages/rdf.scm (serd): Update to 0.26.0. --- gnu/packages/rdf.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 97e6b881cc..fdef3947ab 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -233,15 +233,14 @@ (define-public redland (define-public serd (package (name "serd") - (version "0.22.0") + (version "0.26.0") (source (origin (method url-fetch) (uri (string-append "http://download.drobilla.net/serd-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 - "1lmgca2s6r7ysakcld2lrj06bgn0pr45c51b47k3apxpnj3h40vv")))) + "164j43am4hka2vbzw4n52zy7rafgp6kmkgbcbvap368az644mr73")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target From a1d419c7cc2f1f1e0627e5035d1c742a31d9de50 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 18:39:55 +0200 Subject: [PATCH 209/301] gnu: sord: Update to 0.16.0. * gnu/packages/rdf.scm (sord): Update to 0.16.0. --- gnu/packages/rdf.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index fdef3947ab..7b7fe60855 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -266,15 +266,14 @@ (define-public serd (define-public sord (package (name "sord") - (version "0.14.0") + (version "0.16.0") (source (origin (method url-fetch) (uri (string-append "http://download.drobilla.net/sord-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 - "16piw1s3l95cf9x3rdcplp9l52k2lxq8drwg2q50ygm4avndhmkn")))) + "0nh3i867g9z4kdlnk82cg2kcw8r02qgifxvkycvzb4vfjv4v4g4x")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target From 7181981fd8dfb3cf36e44e2d85084cc39eaa7a2c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 18:36:38 +0200 Subject: [PATCH 210/301] gnu: sratom: Update to 0.6.0. * gnu/packages/audio.scm (sratom): Update to 0.6.0. --- gnu/packages/audio.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 1f8361a084..5a9508993d 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2022,15 +2022,14 @@ (define-public rtmidi (define-public sratom (package (name "sratom") - (version "0.4.6") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append "http://download.drobilla.net/sratom-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 - "080jjiyxjnj7hf25844hd9rb01grvzz1rk8mxcdnakywmspbxfd4")))) + "0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4")))) (build-system waf-build-system) (arguments `(#:tests? #f)) ; no check target (inputs From b1d3bb765fb5a3a53956ba69296d65c0289d0319 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 18:39:29 +0200 Subject: [PATCH 211/301] gnu: suil: Update to 0.8.4. * gnu/packages/audio.scm (suil): Update to 0.8.4. --- gnu/packages/audio.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5a9508993d..e3f73f272f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2048,15 +2048,14 @@ (define-public sratom (define-public suil (package (name "suil") - (version "0.8.2") + (version "0.8.4") (source (origin (method url-fetch) (uri (string-append "http://download.drobilla.net/suil-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 - "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq")))) + "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf")))) (build-system waf-build-system) (arguments `(#:tests? #f)) ; no check target (inputs From d4d3df82bcea1bb78dbbf07f33a42cfc1c50dd71 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 18:43:07 +0200 Subject: [PATCH 212/301] gnu: lilv: Update to 0.24.2. * gnu/packages/audio.scm (lilv): Update to 0.24.2. --- gnu/packages/audio.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e3f73f272f..861179bca3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1600,15 +1600,14 @@ (define-public python2-pyliblo (define-public lilv (package (name "lilv") - (version "0.22.0") + (version "0.24.2") (source (origin (method url-fetch) (uri (string-append "http://download.drobilla.net/lilv-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 - "1d3ss7vv8drf1c5340lyd0gv736n2qy7sxji2nh1rw9y48hr69yd")))) + "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target From f1d81568b5d837da4d5099e38114fd4adf25ed41 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 18:45:40 +0200 Subject: [PATCH 213/301] gnu: jalv: Update to 1.6.0. * gnu/packages/audio.scm (jalv): Update to 1.6.0. [inputs]: Replace "gtk+-2" with "gtk+" and "gtkmm-2" with "gtkmm". --- gnu/packages/audio.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 861179bca3..f4421df18a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1402,14 +1402,14 @@ (define-public jack-2 (define-public jalv (package (name "jalv") - (version "1.4.6") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "http://download.drobilla.net/jalv-" version ".tar.bz2")) (sha256 (base32 - "1f1hcq74n3ziw8bk97mn5a1vgw028dxikv3fchaxd430pbbhqgl9")))) + "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target @@ -1425,8 +1425,8 @@ (define-public jalv `(("lv2" ,lv2) ("lilv" ,lilv) ("suil" ,suil) - ("gtk" ,gtk+-2) - ("gtkmm" ,gtkmm-2) + ("gtk" ,gtk+) + ("gtkmm" ,gtkmm) ("jack" ,jack-1))) (native-inputs `(("pkg-config" ,pkg-config))) From 0201c5d41ecda9b55d4217b31ef6efa1c78b5a25 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 9 Apr 2017 22:20:43 +0530 Subject: [PATCH 214/301] gnu: Add emacs-diminish. * gnu/packages/emacs.scm (emacs-diminish): New variable. --- gnu/packages/emacs.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 0d53ffc84b..e9e56ee280 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4081,3 +4081,24 @@ (define-public emacs-adaptive-wrap you'd get with @kbd{M-q} using @code{adaptive-fill-mode}, but without actually changing the buffer's text.") (license license:gpl3+))) + +(define-public emacs-diminish + (package + (name "emacs-diminish") + (version "0.45") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/myrjola/diminish.el/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0i3629sv5cfrrb00hcnmaqzgs8mk36yasc1ax3ry1ga09nr6rkj9")))) + (build-system emacs-build-system) + (home-page "https://github.com/myrjola/diminish.el") + (synopsis "Diminish minor modes with no modeline display") + (description "@code{emacs-diminish} implements hiding or +abbreviation of the mode line displays (lighters) of minor modes.") + (license license:gpl2+))) From b247fb86ac5d406368fbc30e9ba516cd01143d48 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 9 Apr 2017 22:21:37 +0530 Subject: [PATCH 215/301] gnu: Add emacs-use-package. * gnu/packages/emacs.scm (emacs-use-package): New variable. --- gnu/packages/emacs.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e9e56ee280..ff33daf71d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4102,3 +4102,38 @@ (define-public emacs-diminish (description "@code{emacs-diminish} implements hiding or abbreviation of the mode line displays (lighters) of minor modes.") (license license:gpl2+))) + +(define-public emacs-use-package + (package + (name "emacs-use-package") + (version "2.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/jwiegley/use-package/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0x4h136jb3imyli6zsh7dyzjrra6pv0v6b0yk94jdng3rdfcmsf5")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-diminish" ,emacs-diminish))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'check + (lambda _ + (zero? (system* "emacs" "--batch" "-L" "." + "-l" "use-package-tests.el" + "-f" "ert-run-tests-batch-and-exit")) + ;; Tests fail in this release, but have been fixed in + ;; upstream commit 7956d40eed57d6c06bef36ebc174cf57d934e30d + #t))))) + (home-page "https://github.com/jwiegley/use-package") + (synopsis "Declaration for simplifying your .emacs") + (description "The use-package macro allows you to isolate package +configuration in your @file{.emacs} file in a way that is both +performance-oriented and tidy.") + (license license:gpl2+))) From 64463bd7c9d01257b8a02d9d50501f1eed4f0f0a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 10 Apr 2017 15:23:29 -0400 Subject: [PATCH 216/301] gnu: gnucash: Update to 2.6.16. * gnu/packages/gnucash.scm (gnucash): Update to 2.6.16. --- gnu/packages/gnucash.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index e7828b7bbb..b33cd26a81 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -42,7 +42,7 @@ (define-module (gnu packages gnucash) (define-public gnucash (package (name "gnucash") - (version "2.6.15") + (version "2.6.16") (source (origin (method url-fetch) @@ -50,7 +50,7 @@ (define-public gnucash version "/gnucash-" version ".tar.bz2")) (sha256 (base32 - "1bnvnv1sxv85bgpfklykbhymjl4sbfqc1z9as5ym97s3cf1fn68n")) + "1088rssg9xgwi3wdfrhdcga46gby6lrd9a1fvn9zq456lscn4m9c")) (patches (search-patches "gnucash-price-quotes-perl.patch")))) (build-system gnu-build-system) (inputs From d81f131ff8472652cd9132fe885455eb4e2bdbcd Mon Sep 17 00:00:00 2001 From: ng0 Date: Fri, 24 Feb 2017 21:04:18 +0000 Subject: [PATCH 217/301] gnu: Add darcs. * gnu/packages/version-control.scm (darcs): New variable. Signed-off-by: Kei Kebreau --- gnu/packages/version-control.scm | 103 +++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 60152ffe8c..45b9e92404 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -35,6 +35,7 @@ (define-module (gnu packages version-control) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system haskell) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (gnu packages apr) @@ -50,6 +51,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages flex) #:use-module (gnu packages gettext) #:use-module (gnu packages groff) + #:use-module (gnu packages haskell) #:use-module (gnu packages linux) #:use-module (gnu packages nano) #:use-module (gnu packages ncurses) @@ -1307,3 +1309,104 @@ (define-public stagit (description "Stagit creates static pages for git repositories, the results can be served with a HTTP file server of your choice.") (license license:expat))) + +;; Darcs has no https support: http://irclog.perlgeek.de/darcs/2016-09-17 +;; http://darcs.net/manual/Configuring_darcs.html#SECTION00440070000000000000 +;; and results of search engines will show that if the protocol is http, https +;; is never mentioned. +(define-public darcs + (package + (name "darcs") + (version "2.12.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/darcs/" + "darcs-" version ".tar.gz")) + (sha256 + (base32 + "0jfwiwl5k8wspciq1kpmvh5yap4japrf97s9pvhcybxxhaj3ds28")) + (modules '((guix build utils))) + ;; Remove time-dependent code for reproducibility. + (snippet + '(begin + (substitute* "darcs/darcs.hs" + (("__DATE__") "\"1970-01-01\"") + (("__TIME__") "\"00:00:00\"")) + (substitute* "src/impossible.h" + (("__DATE__") "\"\"") + (("__TIME__") "\"\"")))))) + (build-system haskell-build-system) + (arguments + `(#:configure-flags '("-fpkgconfig" "-fcurl" "-flibiconv" "-fthreaded" + "-fnetwork-uri" "-fhttp" "--flag=executable" + "--flag=library") + #:tests? #f)) ; 20 failing shell tests out of over 400 + (inputs + `(("ghc-cmdargs" ,ghc-cmdargs) + ("ghc-split" ,ghc-split) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-findbin" ,ghc-findbin) + ("ghc-hunit" ,ghc-hunit) + ("ghc-array" ,ghc-array) + ("ghc-async" ,ghc-async) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-binary" ,ghc-binary) + ("ghc-bytestring-builder" ,ghc-bytestring-builder) + ("ghc-cryptohash" ,ghc-cryptohash) + ("ghc-data-ordlist" ,ghc-data-ordlist) + ("ghc-directory" ,ghc-directory) + ("ghc-fgl" ,ghc-fgl) + ("ghc-system-filepath" ,ghc-system-filepath) + ("ghc-graphviz" ,ghc-graphviz) + ("ghc-hashable" ,ghc-hashable) + ("ghc-haskeline" ,ghc-haskeline) + ("ghc-html" ,ghc-html) + ("ghc-mmap" ,ghc-mmap) + ("ghc-mtl" ,ghc-mtl) + ("ghc-old-time" ,ghc-old-time) + ("ghc-parsec" ,ghc-parsec) + ("ghc-process" ,ghc-process) + ("ghc-random" ,ghc-random) + ("ghc-regex-applicative" ,ghc-regex-applicative) + ("ghc-regex-compat-tdfa" ,ghc-regex-compat-tdfa) + ("ghc-sandi" ,ghc-sandi) + ("ghc-shelly" ,ghc-shelly) + ("ghc-tar" ,ghc-tar) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-unix-compat" ,ghc-unix-compat) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-vector" ,ghc-vector) + ("ghc-zip-archive" ,ghc-zip-archive) + ("ghc-zlib" ,ghc-zlib) + ("ghc-http" ,ghc-http) + ("curl" ,curl) + ("ghc" ,ghc) + ("ncurses" ,ncurses) + ("perl" ,perl) + ("libiconv" ,libiconv) + ("ghc-network" ,ghc-network) + ("ghc-network-uri" ,ghc-network-uri))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://darcs.net") + (synopsis "Distributed Revision Control System") + (description + "Darcs is a revision control system. It is: + +@enumerate +@item Distributed: Every user has access to the full command set, removing boundaries +between server and client or committer and non-committers. +@item Interactive: Darcs is easy to learn and efficient to use because it asks you +questions in response to simple commands, giving you choices in your work flow. +You can choose to record one change in a file, while ignoring another. As you update +from upstream, you can review each patch name, even the full diff for interesting +patches. +@item Smart: Originally developed by physicist David Roundy, darcs is based on a +unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. +@end enumerate") + (license license:gpl2))) From 0ef83ec9d0d98cecf682c426e3ed10da5f2d4c1a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 25 Feb 2017 18:54:39 -0500 Subject: [PATCH 218/301] gnu: Add tclx. * gnu/packages/tcl.scm (tclx): New variable. --- gnu/packages/tcl.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index f9a23c3230..adad55e2da 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2017 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -290,3 +291,35 @@ (define-public tclxml (license (non-copyleft "file://LICENCE" "See LICENCE in the distribution.")))) + +(define-public tclx + (package + (name "tclx") + (version "8.4.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/tclx/TclX/" + version "/tclx" version ".tar.bz2")) + (sha256 + (base32 + "1v2qwzzidz0is58fd1p7wfdbscxm3ip2wlbqkj5jdhf6drh1zd59")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; a test named profile.test segfaults + #:configure-flags (list (string-append "--with-tcl=" + (assoc-ref %build-inputs "tcl") + "/lib") + (string-append "--libdir=" + (assoc-ref %outputs "out") + "/lib")))) + (inputs + `(("tcl" ,tcl) + ("tk" ,tk))) + (home-page "http://tclx.sourceforge.net/") + (synopsis "System programming extensions for Tcl") + (description + "Extended Tcl is oriented towards system programming tasks and large +application development. TclX provides additional interfaces to the operating +system, and adds many new programming constructs, text manipulation tools, and +debugging tools.") + (license tcl/tk))) From 958d357a38cf2811ce64229a515e488dc957d7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 Apr 2017 15:00:27 +0200 Subject: [PATCH 219/301] gnu: guile-ncurses: Update to 2.2. * gnu/packages/guile.scm (guile-ncurses): Update to 2.2. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d69b627f9a..93567da4e9 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -470,14 +470,14 @@ (define-public guile2.2-reader (define-public guile-ncurses (package (name "guile-ncurses") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/guile-ncurses/guile-ncurses-" version ".tar.gz")) (sha256 (base32 - "1h7rnq4g7xlxxybcb3vjq6nscm9zhlmfaxb7258c8ax7him4azg6")))) + "1wvggbr4xv8idh1hzd8caj4xfp4pln78a7w1wqzd4zgzwmnzxr2f")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) ("guile" ,guile-2.0))) From 81eaa3f8579df42dbf0410db78b45a718fc544e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 Apr 2017 15:03:07 +0200 Subject: [PATCH 220/301] gnu: guile-ncurses: Switch to Guile 2.2. * gnu/packages/guile.scm (guile-ncurses)[inputs]: Switch to GUILE-2.2. [arguments] : Ajust accordingly. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 93567da4e9..d2e832aae5 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -480,7 +480,7 @@ (define-public guile-ncurses "1wvggbr4xv8idh1hzd8caj4xfp4pln78a7w1wqzd4zgzwmnzxr2f")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) - ("guile" ,guile-2.0))) + ("guile" ,guile-2.2))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments '(#:configure-flags (list "--with-ncursesw" ; Unicode support @@ -498,7 +498,7 @@ (define-public guile-ncurses (files (find-files dir ".scm"))) (substitute* files (("\"libguile-ncurses\"") - (format #f "\"~a/lib/guile/2.0/libguile-ncurses\"" + (format #f "\"~a/lib/guile/2.2/libguile-ncurses\"" out))) #t))))))) (home-page "https://www.gnu.org/software/guile-ncurses/") From 18d0cec29e22cdbc27c486129d1a1425de27f03f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 Apr 2017 15:29:28 +0200 Subject: [PATCH 221/301] gnu: pcre2: Patch CVE-2017-7186. * gnu/packages/patches/pcre2-CVE-2017-7186.patch: New file. * gnu/packages/pcre.scm (pcre2)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../patches/pcre2-CVE-2017-7186.patch | 68 +++++++++++++++++++ gnu/packages/pcre.scm | 3 +- 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/pcre2-CVE-2017-7186.patch diff --git a/gnu/local.mk b/gnu/local.mk index a8d0066019..c3a65789a3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -825,6 +825,7 @@ dist_patch_DATA = \ %D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchutils-xfail-gendiff-tests.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ + %D%/packages/patches/pcre2-CVE-2017-7186.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-deterministic-ordering.patch \ %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \ diff --git a/gnu/packages/patches/pcre2-CVE-2017-7186.patch b/gnu/packages/patches/pcre2-CVE-2017-7186.patch new file mode 100644 index 0000000000..5c16955aaa --- /dev/null +++ b/gnu/packages/patches/pcre2-CVE-2017-7186.patch @@ -0,0 +1,68 @@ +Patch for +taken from . + +--- trunk/src/pcre2_internal.h 2016/11/19 12:46:24 600 ++++ trunk/src/pcre2_internal.h 2017/02/24 18:25:32 670 +@@ -1774,10 +1774,17 @@ + /* UCD access macros */ + + #define UCD_BLOCK_SIZE 128 +-#define GET_UCD(ch) (PRIV(ucd_records) + \ ++#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \ + PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \ + UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE]) + ++#if PCRE2_CODE_UNIT_WIDTH == 32 ++#define GET_UCD(ch) ((ch > MAX_UTF_CODE_POINT)? \ ++ PRIV(dummy_ucd_record) : REAL_GET_UCD(ch)) ++#else ++#define GET_UCD(ch) REAL_GET_UCD(ch) ++#endif ++ + #define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype + #define UCD_SCRIPT(ch) GET_UCD(ch)->script + #define UCD_CATEGORY(ch) PRIV(ucp_gentype)[UCD_CHARTYPE(ch)] +@@ -1834,6 +1841,9 @@ + #define _pcre2_default_compile_context PCRE2_SUFFIX(_pcre2_default_compile_context_) + #define _pcre2_default_match_context PCRE2_SUFFIX(_pcre2_default_match_context_) + #define _pcre2_default_tables PCRE2_SUFFIX(_pcre2_default_tables_) ++#if PCRE2_CODE_UNIT_WIDTH == 32 ++#define _pcre2_dummy_ucd_record PCRE2_SUFFIX(_pcre2_dummy_ucd_record_) ++#endif + #define _pcre2_hspace_list PCRE2_SUFFIX(_pcre2_hspace_list_) + #define _pcre2_vspace_list PCRE2_SUFFIX(_pcre2_vspace_list_) + #define _pcre2_ucd_caseless_sets PCRE2_SUFFIX(_pcre2_ucd_caseless_sets_) +@@ -1858,6 +1868,9 @@ + extern const uint32_t PRIV(vspace_list)[]; + extern const uint32_t PRIV(ucd_caseless_sets)[]; + extern const ucd_record PRIV(ucd_records)[]; ++#if PCRE2_CODE_UNIT_WIDTH == 32 ++extern const ucd_record PRIV(dummy_ucd_record)[]; ++#endif + extern const uint8_t PRIV(ucd_stage1)[]; + extern const uint16_t PRIV(ucd_stage2)[]; + extern const uint32_t PRIV(ucp_gbtable)[]; + +--- trunk/src/pcre2_ucd.c 2015/07/17 15:44:51 316 ++++ trunk/src/pcre2_ucd.c 2017/02/24 18:25:32 670 +@@ -41,6 +41,20 @@ + + const char *PRIV(unicode_version) = "8.0.0"; + ++/* If the 32-bit library is run in non-32-bit mode, character values ++greater than 0x10ffff may be encountered. For these we set up a ++special record. */ ++ ++#if PCRE2_CODE_UNIT_WIDTH == 32 ++const ucd_record PRIV(dummy_ucd_record)[] = {{ ++ ucp_Common, /* script */ ++ ucp_Cn, /* type unassigned */ ++ ucp_gbOther, /* grapheme break property */ ++ 0, /* case set */ ++ 0, /* other case */ ++ }}; ++#endif ++ + /* When recompiling tables with a new Unicode version, please check the + types in this structure definition from pcre2_internal.h (the actual + field names will be different): diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 011a30dd38..9f610e59fd 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -81,7 +81,8 @@ (define-public pcre2 (sha256 (base32 - "0vn5g0mkkp99mmzpissa06hpyj6pk9s4mlwbjqrjvw3ihy8rpiyz")))) + "0vn5g0mkkp99mmzpissa06hpyj6pk9s4mlwbjqrjvw3ihy8rpiyz")) + (patches (search-patches "pcre2-CVE-2017-7186.patch")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) ("readline" ,readline) From a97f0ee1368499dc40ea30002fcb6e06c7880acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 Apr 2017 15:35:24 +0200 Subject: [PATCH 222/301] gnu: pcre: Patch CVE-2017-7186. * gnu/packages/patches/pcre-CVE-2017-7186.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/pcre.scm (pcre)[replacement]: New field. (pcre/fixed): New variable. --- gnu/local.mk | 1 + gnu/packages/patches/pcre-CVE-2017-7186.patch | 56 +++++++++++++++++++ gnu/packages/pcre.scm | 10 ++++ 3 files changed, 67 insertions(+) create mode 100644 gnu/packages/patches/pcre-CVE-2017-7186.patch diff --git a/gnu/local.mk b/gnu/local.mk index c3a65789a3..5782f83908 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -825,6 +825,7 @@ dist_patch_DATA = \ %D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchutils-xfail-gendiff-tests.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ + %D%/packages/patches/pcre-CVE-2017-7186.patch \ %D%/packages/patches/pcre2-CVE-2017-7186.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-deterministic-ordering.patch \ diff --git a/gnu/packages/patches/pcre-CVE-2017-7186.patch b/gnu/packages/patches/pcre-CVE-2017-7186.patch new file mode 100644 index 0000000000..d23aa10374 --- /dev/null +++ b/gnu/packages/patches/pcre-CVE-2017-7186.patch @@ -0,0 +1,56 @@ +Patch for +from . + +--- trunk/pcre_internal.h 2016/05/21 13:34:44 1649 ++++ trunk/pcre_internal.h 2017/02/24 17:30:30 1688 +@@ -2772,6 +2772,9 @@ + extern const pcre_uint16 PRIV(ucd_stage2)[]; + extern const pcre_uint32 PRIV(ucp_gentype)[]; + extern const pcre_uint32 PRIV(ucp_gbtable)[]; ++#ifdef COMPILE_PCRE32 ++extern const ucd_record PRIV(dummy_ucd_record)[]; ++#endif + #ifdef SUPPORT_JIT + extern const int PRIV(ucp_typerange)[]; + #endif +@@ -2780,9 +2783,15 @@ + /* UCD access macros */ + + #define UCD_BLOCK_SIZE 128 +-#define GET_UCD(ch) (PRIV(ucd_records) + \ ++#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \ + PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \ + UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE]) ++ ++#ifdef COMPILE_PCRE32 ++#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch)) ++#else ++#define GET_UCD(ch) REAL_GET_UCD(ch) ++#endif + + #define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype + #define UCD_SCRIPT(ch) GET_UCD(ch)->script + +--- trunk/pcre_ucd.c 2014/06/19 07:51:39 1490 ++++ trunk/pcre_ucd.c 2017/02/24 17:30:30 1688 +@@ -38,6 +38,20 @@ + const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0}; + #else + ++/* If the 32-bit library is run in non-32-bit mode, character values ++greater than 0x10ffff may be encountered. For these we set up a ++special record. */ ++ ++#ifdef COMPILE_PCRE32 ++const ucd_record PRIV(dummy_ucd_record)[] = {{ ++ ucp_Common, /* script */ ++ ucp_Cn, /* type unassigned */ ++ ucp_gbOther, /* grapheme break property */ ++ 0, /* case set */ ++ 0, /* other case */ ++ }}; ++#endif ++ + /* When recompiling tables with a new Unicode version, please check the + types in this structure definition from pcre_internal.h (the actual + field names will be different): diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 9f610e59fd..1946f5229c 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ (define-public pcre (package (name "pcre") (version "8.40") + (replacement pcre/fixed) (source (origin (method url-fetch) (uri (list @@ -70,6 +72,14 @@ (define-public pcre (license license:bsd-3) (home-page "http://www.pcre.org/"))) +(define pcre/fixed + (package + (inherit pcre) + (replacement #f) + (source (origin + (inherit (package-source pcre)) + (patches (search-patches "pcre-CVE-2017-7186.patch")))))) + (define-public pcre2 (package (name "pcre2") From ed3a9ec5acfb96cf79ede69b96ecc396d2312185 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 10 Apr 2017 20:33:22 +0200 Subject: [PATCH 223/301] gnu: Add gpicview. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image-viewers.scm (gpicview): New variable. * gnu/packages/lxde.scm (lxde)[propagated-inputs]: Add gpicview. Signed-off-by: Ludovic Courtès --- gnu/packages/image-viewers.scm | 24 ++++++++++++++++++++++++ gnu/packages/lxde.scm | 4 +++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index ce75b1d835..a7e108a292 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Alex Griffin ;;; Copyright © 2017 ng0 +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -122,6 +123,29 @@ (define-public geeqie collection. Geeqie was initially based on GQview.") (license license:gpl2+))) +(define-public gpicview + (package + (name "gpicview") + (version "0.2.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/lxde/" + "GPicView%20%28image%20Viewer%29/0.2.x/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0hi9v0rdx47nys0wvm9xasdrafa34r5kq6crb074a0ipwmc60iiq")))) + (build-system gnu-build-system) + (inputs `(("gtk+" ,gtk+-2) + ("libjpeg" ,libjpeg))) + (native-inputs `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (synopsis "Simple and fast image viewer for X") + (description "gpicview is a lightweight GTK+ 2.x based image viewer. +It is the default image viewer on LXDE desktop environment.") + (home-page "http://lxde.sourceforge.net/gpicview/") + (license license:gpl2+))) + (define-public sxiv (package (name "sxiv") diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 7abaab2c7e..1164ba8cbb 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -27,6 +27,7 @@ (define-module (gnu packages lxde) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages image-viewers) #:use-module (gnu packages linux) #:use-module (gnu packages openbox) #:use-module (gnu packages pkg-config) @@ -435,9 +436,10 @@ (define-public lxde (arguments '(#:builder (mkdir %output))) (propagated-inputs ;; TODO: - ;; lxshortcut, lxsession-edit, gpicview + ;; lxshortcut, lxsession-edit ;; lxappearance-obconf `(("menu-cache" ,menu-cache) + ("gpicview" ,gpicview) ("leafpad" ,leafpad) ("lxappearance" ,lxappearance) ("lxde-icon-theme" ,lxde-icon-theme) From 0c3953ea603e6abd885a5a91b84f7f7788d0829f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 10 Apr 2017 17:49:47 -0400 Subject: [PATCH 224/301] gnu: Move dillo to web-browsers.scm. * gnu/packages/dillo.scm: Remove file and move dillo... * gnu/packages/web-browsers.scm: ...here. New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Remove dillo.scm and add web-browsers.scm. --- gnu/local.mk | 2 +- gnu/packages/{dillo.scm => web-browsers.scm} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename gnu/packages/{dillo.scm => web-browsers.scm} (98%) diff --git a/gnu/local.mk b/gnu/local.mk index 5782f83908..d755d8248e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -105,7 +105,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/dejagnu.scm \ %D%/packages/dico.scm \ %D%/packages/dictionaries.scm \ - %D%/packages/dillo.scm \ %D%/packages/disk.scm \ %D%/packages/display-managers.scm \ %D%/packages/django.scm \ @@ -389,6 +388,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/w3m.scm \ %D%/packages/wdiff.scm \ %D%/packages/web.scm \ + %D%/packages/web-browsers.scm \ %D%/packages/webkit.scm \ %D%/packages/wget.scm \ %D%/packages/wicd.scm \ diff --git a/gnu/packages/dillo.scm b/gnu/packages/web-browsers.scm similarity index 98% rename from gnu/packages/dillo.scm rename to gnu/packages/web-browsers.scm index 6e0c4d17a9..3ff69611bf 100644 --- a/gnu/packages/dillo.scm +++ b/gnu/packages/web-browsers.scm @@ -16,7 +16,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (gnu packages dillo) +(define-module (gnu packages web-browsers) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages) From cd12f922246ae798ec248768713848d939d31ea0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Apr 2017 06:34:17 +0200 Subject: [PATCH 225/301] gnu: dub: Update to 1.3.0. * gnu/packages/ldc.scm (dub): Update to 1.3.0. [arguments]: Add comment, remove spurious MKDIR-P, and rename OUTBIN. --- gnu/packages/ldc.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm index 881029a43d..42e6c04a84 100644 --- a/gnu/packages/ldc.scm +++ b/gnu/packages/ldc.scm @@ -279,7 +279,7 @@ (define-public ldc-beta ldc) (define-public dub (package (name "dub") - (version "1.2.2") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/dlang/dub/archive/" @@ -287,22 +287,21 @@ (define-public dub (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "02k11x34nck0lbv13ww103niiswnwnslbnswj3b5faszzadbi1v4")))) + "056mvf01z51qc3i1qnx7yaqr728q8pss8zabiv5zpfx2ynfsw3k7")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; it would have tested itself by installing some packages (vibe etc) #:phases (modify-phases %standard-phases - (delete 'configure) + (delete 'configure) ; no configure script (replace 'build (lambda _ (zero? (system* "./build.sh")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (outbin (string-append out "/bin"))) - (mkdir-p outbin) - (install-file "bin/dub" outbin) + (bin (string-append out "/bin"))) + (install-file "bin/dub" bin) #t)))))) (inputs `(("curl" ,curl))) From f0f7bf95aebbe30d2a8bae31cff1cb86884f458b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 21:38:49 +0200 Subject: [PATCH 226/301] gnu: Add cdogs-sdl. * gnu/packages/games.scm (cdogs-sdl): New variable. --- gnu/packages/games.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ed04239c69..71f35e2fef 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3515,3 +3515,40 @@ (define-public freegish license:expat license:public-domain license:cc-by-sa3.0))))) + +(define-public cdogs-sdl + (package + (name "cdogs-sdl") + (version "0.6.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/cxong/cdogs-sdl/" + "archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08c3y8ijimx6mp0gm90abz4lsnbflqka519q2v0id0096vsc2pxn")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list (string-append "-DCDOGS_DATA_DIR=" + (assoc-ref %outputs "out") + "/share/cdogs-sdl/")))) + (inputs + `(("sdl2" ,sdl2) + ("sdl2-image" ,sdl2-image) + ("sdl2-mixer" ,sdl2-mixer))) + (home-page "http://cxong.github.io/cdogs-sdl/") + (synopsis "Classic overhead run-and-gun game") + (description "C-Dogs SDL is a classic overhead run-and-gun game, +supporting up to 4 players in co-op and deathmatch modes. Customize your +player, choose from many weapons, and blast, slide and slash your way through +over 100 user-created campaigns.") + ;; GPLv2+ for code (includes files under BSD-2 and BSD-3), + ;; CC0/CC-BY/CC-BY-SA for assets. + (license (list license:gpl2+ + license:bsd-2 + license:bsd-3 + license:cc0 + license:cc-by3.0 + license:cc-by-sa3.0)))) From 99bcae94bcd50fc15bf44b5cc06cd39450f01ad5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Apr 2017 19:35:48 +0200 Subject: [PATCH 227/301] gnu: Add python-poppler-qt5. * gnu/packages/pdf.scm (python-poppler-qt5): New variable. --- gnu/packages/pdf.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 7f3dccc8ba..0882d3b942 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -184,6 +184,53 @@ (define-public python-poppler-qt4 Poppler PDF rendering library.") (license license:lgpl2.1+))) +(define-public python-poppler-qt5 + (package + (name "python-poppler-qt5") + (version "0.24.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-poppler-qt5" version)) + (sha256 + (base32 + "0l69llw1fzwz8y90q0qp9q5pifbrqjjbwii7di54dwghw5fc6w1r")))) + (build-system python-build-system) + (arguments + `(;; There are no tests. The check phase just causes a rebuild. + #:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "setup.py" + ;; This check always fails, so disable it. + (("if not check_qtxml\\(\\)") + "if True") + ;; Enable C++11, which is needed because of Qt5. + (("\\*\\*ext_args" line) + (string-append "extra_compile_args=['-std=gnu++11'], " line))) + ;; We need to pass an extra flag here. This cannot be in + ;; configure-flags because it should not be passed for the + ;; installation phase. + ((@@ (guix build python-build-system) call-setuppy) + "build_ext" (list (string-append "--pyqt-sip-dir=" + (assoc-ref inputs "python-pyqt") + "/share/sip")) #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("python-sip" ,python-sip) + ("python-pyqt" ,python-pyqt) + ("poppler-qt5" ,poppler-qt5) + ("qtbase" ,qtbase))) + (home-page "https://pypi.python.org/pypi/python-poppler-qt5") + (synopsis "Python bindings for Poppler-Qt5") + (description + "This package provides Python bindings for the Qt5 interface of the +Poppler PDF rendering library.") + (license license:lgpl2.1+))) + (define-public libharu (package (name "libharu") From e40335b27547064f0fefb62041fe5aa73f1ad7db Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Apr 2017 22:15:55 +0200 Subject: [PATCH 228/301] gnu: frescobaldi: Update to 3.0.0. * gnu/packages/music.scm (frescobaldi): Update to 3.0.0. [inputs]: Replace "python-pyqt-4" and "python-poppler-qt4" with "python-pyqt" and "python-poppler-qt5", respectively. --- gnu/packages/music.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a3e508d134..2a37cf4a4e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1513,7 +1513,7 @@ (define-public python-pyportmidi (define-public frescobaldi (package (name "frescobaldi") - (version "2.19.0") + (version "3.0.0") (source (origin (method url-fetch) (uri (string-append @@ -1521,17 +1521,17 @@ (define-public frescobaldi version "/frescobaldi-" version ".tar.gz")) (sha256 (base32 - "1rnk8i8dlshzx16n2qxcsqcs7kywgyazzyzw2vy4vp2gsm9vs9ml")))) + "15cqhbjbjikr7ljgiq56bz2gxrr38j8p0f78p2vhyzydaviy9a2z")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; no tests included (inputs `(("lilypond" ,lilypond) ("portmidi" ,portmidi) - ("python-pyqt-4" ,python-pyqt-4) + ("python-pyqt" ,python-pyqt) ("python-ly" ,python-ly) ("python-pyportmidi" ,python-pyportmidi) ("poppler" ,poppler) - ("python-poppler-qt4" ,python-poppler-qt4) + ("python-poppler-qt5" ,python-poppler-qt5) ("python-sip" ,python-sip))) (home-page "http://www.frescobaldi.org/") (synopsis "LilyPond sheet music text editor") From 8336df0668e401a724cd61aa83ba4537591aa7bf Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 10 Apr 2017 19:18:10 +0200 Subject: [PATCH 229/301] syscalls: Add reboot. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build/syscalls.scm (define-as-needed): New macro. (reboot): New procedure. Reimplemented from guile-linux-syscalls.patch. (RB_AUTOBOOT, ..., RB_KEXEC): New flags copied from static Guile patch. Co-Authored-By: Ludovic Courtès Signed-off-by: Ludovic Courtès --- guix/build/syscalls.scm | 51 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 4bcb2a871c..0de39aee6b 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -149,8 +150,19 @@ (define-module (guix build syscalls) ;;; Commentary: ;;; ;;; This module provides bindings to libc's syscall wrappers. It uses the -;;; FFI, and thus requires a dynamically-linked Guile. (For statically-linked -;;; Guile, we instead apply 'guile-linux-syscalls.patch'.) +;;; FFI, and thus requires a dynamically-linked Guile. +;;; +;;; Some syscalls are already defined in statically-linked Guile by applying +;;; 'guile-linux-syscalls.patch'. +;;; +;;; Visibility of syscall's symbols shared between this module and static Guile +;;; is a bit delicate. It is handled by 'define-as-needed' macro. +;;; +;;; This macro is used to export symbols in dynamic Guile context, and to +;;; re-export them in static Guile context. +;;; +;;; This way, even if they don't appear in #:export list, it is safe to use +;;; syscalls from this module in static or dynamic Guile context. ;;; ;;; Code: @@ -409,6 +421,25 @@ (define (syscall->procedure return-type name argument-types) (error (format #f "~a: syscall->procedure failed: ~s" name args)))))) +(define-syntax define-as-needed + (syntax-rules () + "Define VARIABLE. If VARIABLE already exists in (guile) then re-export it, + otherwise export the newly-defined VARIABLE." + ((_ (proc args ...) body ...) + (define-as-needed proc (lambda* (args ...) body ...))) + ((_ variable value) + (begin + (when (module-defined? the-scm-module 'variable) + (re-export variable)) + + (define variable + (if (module-defined? the-scm-module 'variable) + (module-ref the-scm-module 'variable) + value)) + + (unless (module-defined? the-scm-module 'variable) + (export variable)))))) + ;;; ;;; File systems. @@ -547,6 +578,22 @@ (define swapoff (list device (strerror err)) (list err))))))) +(define-as-needed RB_AUTOBOOT #x01234567) +(define-as-needed RB_HALT_SYSTEM #xcdef0123) +(define-as-needed RB_ENABLED_CAD #x89abcdef) +(define-as-needed RB_DISABLE_CAD 0) +(define-as-needed RB_POWER_OFF #x4321fedc) +(define-as-needed RB_SW_SUSPEND #xd000fce2) +(define-as-needed RB_KEXEC #x45584543) + +(define-as-needed (reboot #:optional (cmd RB_AUTOBOOT)) + (let ((proc (syscall->procedure int "reboot" (list int)))) + (let-values (((ret err) (proc cmd))) + (unless (zero? ret) + (throw 'system-error "reboot" "~S: ~A" + (list cmd (strerror err)) + (list err)))))) + (define (kernel? pid) "Return #t if PID designates a \"kernel thread\" rather than a normal user-land process." From 7df4d3465d305271d4fdf4e6f886a248d63b82c4 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 10 Apr 2017 19:18:11 +0200 Subject: [PATCH 230/301] syscalls: Use define-as-needed for mount and umount. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build/syscalls.scm (mount): Use define-as-needed macro and remove from export list. (umount): Ditto. Signed-off-by: Ludovic Courtès --- guix/build/syscalls.scm | 84 ++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 47 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 0de39aee6b..79a0da7c54 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -45,8 +45,6 @@ (define-module (guix build syscalls) MNT_EXPIRE UMOUNT_NOFOLLOW restart-on-EINTR - mount - umount mount-points swapon swapoff @@ -492,58 +490,50 @@ (define MNT_DETACH 2) (define MNT_EXPIRE 4) (define UMOUNT_NOFOLLOW 8) -(define mount - ;; If called from the statically linked Guile, use Guile core 'mount'. - ;; Otherwise, use an FFI binding to define 'mount'. - ;; XXX: '#:update-mtab?' is not implemented by core 'mount'. - (if (module-defined? the-scm-module 'mount) - (module-ref the-scm-module 'mount) - (let ((proc (syscall->procedure int "mount" `(* * * ,unsigned-long *)))) - (lambda* (source target type #:optional (flags 0) options +(define-as-needed (mount source target type + #:optional (flags 0) options #:key (update-mtab? #f)) - "Mount device SOURCE on TARGET as a file system TYPE. + "Mount device SOURCE on TARGET as a file system TYPE. Optionally, FLAGS may be a bitwise-or of the MS_* constants, and OPTIONS may be a string. When FLAGS contains MS_REMOUNT, SOURCE and TYPE are ignored. When UPDATE-MTAB? is true, update /etc/mtab. Raise a 'system-error' exception on error." - (let-values (((ret err) - (proc (if source - (string->pointer source) - %null-pointer) - (string->pointer target) - (if type - (string->pointer type) - %null-pointer) - flags - (if options - (string->pointer options) - %null-pointer)))) - (unless (zero? ret) - (throw 'system-error "mount" "mount ~S on ~S: ~A" - (list source target (strerror err)) - (list err))) - (when update-mtab? - (augment-mtab source target type options))))))) + ;; XXX: '#:update-mtab?' is not implemented by core 'mount'. + (let ((proc (syscall->procedure int "mount" `(* * * ,unsigned-long *)))) + (let-values (((ret err) + (proc (if source + (string->pointer source) + %null-pointer) + (string->pointer target) + (if type + (string->pointer type) + %null-pointer) + flags + (if options + (string->pointer options) + %null-pointer)))) + (unless (zero? ret) + (throw 'system-error "mount" "mount ~S on ~S: ~A" + (list source target (strerror err)) + (list err))) + (when update-mtab? + (augment-mtab source target type options))))) -(define umount - ;; If called from the statically linked Guile, use Guile core 'umount'. - ;; Otherwise, use an FFI binding to define 'umount'. - ;; XXX: '#:update-mtab?' is not implemented by core 'umount'. - (if (module-defined? the-scm-module 'umount) - (module-ref the-scm-module 'umount) - (let ((proc (syscall->procedure int "umount2" `(* ,int)))) - (lambda* (target #:optional (flags 0) - #:key (update-mtab? #f)) - "Unmount TARGET. Optionally FLAGS may be one of the MNT_* or UMOUNT_* +(define-as-needed (umount target + #:optional (flags 0) + #:key (update-mtab? #f)) + "Unmount TARGET. Optionally FLAGS may be one of the MNT_* or UMOUNT_* constants from ." - (let-values (((ret err) - (proc (string->pointer target) flags))) - (unless (zero? ret) - (throw 'system-error "umount" "~S: ~A" - (list target (strerror err)) - (list err))) - (when update-mtab? - (remove-from-mtab target))))))) + ;; XXX: '#:update-mtab?' is not implemented by core 'umount'. + (let ((proc (syscall->procedure int "umount2" `(* ,int)))) + (let-values (((ret err) + (proc (string->pointer target) flags))) + (unless (zero? ret) + (throw 'system-error "umount" "~S: ~A" + (list target (strerror err)) + (list err))) + (when update-mtab? + (remove-from-mtab target))))) (define (mount-points) "Return the mounts points for currently mounted file systems." From c5cd4fad09af1c68d07c7d93608a18b8261d4a4e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 10 Apr 2017 19:18:12 +0200 Subject: [PATCH 231/301] syscalls: Use define-as-needed for network-interface syscalls. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build/syscalls.scm (network-interface-flags): Use define-as-needed macro and remove from export list. (set-network-interface-flags): Ditto. (set-network-interface-address): Ditto. (IFF_UP, IFF_BROADCAST and IFF_LOOPBACK): Ditto. Signed-off-by: Ludovic Courtès --- guix/build/syscalls.scm | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 79a0da7c54..d1f3cd65c4 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -82,17 +82,11 @@ (define-module (guix build syscalls) PF_PACKET AF_PACKET - IFF_UP - IFF_BROADCAST - IFF_LOOPBACK all-network-interface-names network-interface-names - network-interface-flags network-interface-netmask loopback-network-interface? network-interface-address - set-network-interface-flags - set-network-interface-address set-network-interface-netmask set-network-interface-up configure-network-interface @@ -920,9 +914,9 @@ (define SIOCDELRT ;; Flags and constants from . -(define IFF_UP #x1) ;Interface is up -(define IFF_BROADCAST #x2) ;Broadcast address valid. -(define IFF_LOOPBACK #x8) ;Is a loopback net. +(define-as-needed IFF_UP #x1) ;Interface is up +(define-as-needed IFF_BROADCAST #x2) ;Broadcast address valid. +(define-as-needed IFF_LOOPBACK #x8) ;Is a loopback net. (define IF_NAMESIZE 16) ;maximum interface name size @@ -1069,7 +1063,7 @@ (define (all-network-interface-names) (else (loop interfaces)))))))) -(define (network-interface-flags socket name) +(define-as-needed (network-interface-flags socket name) "Return a number that is the bit-wise or of 'IFF*' flags for network interface NAME." (let ((req (make-bytevector ifreq-struct-size))) @@ -1080,8 +1074,8 @@ (define (network-interface-flags socket name) (bytevector->pointer req)))) (if (zero? ret) - ;; The 'ifr_flags' field is IF_NAMESIZE bytes after the beginning of - ;; 'struct ifreq', and it's a short int. + ;; The 'ifr_flags' field is IF_NAMESIZE bytes after the + ;; beginning of 'struct ifreq', and it's a short int. (bytevector-sint-ref req IF_NAMESIZE (native-endianness) (sizeof short)) @@ -1097,7 +1091,7 @@ (define (loopback-network-interface? name) (close-port sock) (not (zero? (logand flags IFF_LOOPBACK))))) -(define (set-network-interface-flags socket name flags) +(define-as-needed (set-network-interface-flags socket name flags) "Set the flag of network interface NAME to FLAGS." (let ((req (make-bytevector ifreq-struct-size))) (bytevector-copy! (string->utf8 name) 0 req 0 @@ -1114,7 +1108,7 @@ (define (set-network-interface-flags socket name flags) (list name (strerror err)) (list err)))))) -(define (set-network-interface-address socket name sockaddr) +(define-as-needed (set-network-interface-address socket name sockaddr) "Set the address of network interface NAME to SOCKADDR." (let ((req (make-bytevector ifreq-struct-size))) (bytevector-copy! (string->utf8 name) 0 req 0 From 23e525e1097f6f993aecd4f0b14d518546b876a4 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 10 Apr 2017 19:18:13 +0200 Subject: [PATCH 232/301] syscalls: Add load-linux-module. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build/syscalls.scm (load-linux-module): New procedure. Reimplemented from guile-linux-syscalls.patch. Signed-off-by: Ludovic Courtès --- guix/build/syscalls.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index d1f3cd65c4..0529c228a5 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -578,6 +578,18 @@ (define-as-needed (reboot #:optional (cmd RB_AUTOBOOT)) (list cmd (strerror err)) (list err)))))) +(define-as-needed (load-linux-module data #:optional (options "")) + (let ((proc (syscall->procedure int "init_module" + (list '* unsigned-long '*)))) + (let-values (((ret err) + (proc (bytevector->pointer data) + (bytevector-length data) + (string->pointer options)))) + (unless (zero? ret) + (throw 'system-error "load-linux-module" "~A" + (list (strerror err)) + (list err)))))) + (define (kernel? pid) "Return #t if PID designates a \"kernel thread\" rather than a normal user-land process." From a5e13c3be907f143ac54cf81ec078a260eae894c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 10 Apr 2017 19:18:14 +0200 Subject: [PATCH 233/301] build: Fix compilation warnings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/build/linux-boot.scm (define-module): Use (guix build syscalls). * gnu/build/linux-modules.scm (define-module): Ditto. * gnu/build/file-systems (define-module): Stop re-exporting mount, umount and MS_* flags as this is now safe to include (guix build syscalls) instead. (mount): Remove procedure. (umount): Ditto. Signed-off-by: Ludovic Courtès --- gnu/build/file-systems.scm | 15 ++------------- gnu/build/linux-boot.scm | 2 ++ gnu/build/linux-modules.scm | 2 ++ 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index fe98df95d5..eb9f07861f 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2016, 2017 David Craven +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,12 +48,7 @@ (define-module (gnu build file-systems) mount-flags->bit-mask check-file-system - mount-file-system) - #:re-export (mount - umount - MS_BIND - MS_MOVE - MS_RDONLY)) + mount-file-system)) ;;; Commentary: ;;; @@ -61,13 +57,6 @@ (define-module (gnu build file-systems) ;;; ;;; Code: -;; 'mount' is already defined in the statically linked Guile used for initial -;; RAM disks, in which case the bindings in (guix build syscalls) do not work -;; (the FFI bindings do not work there). Override them in that case. -(when (module-defined? the-scm-module 'mount) - (set! mount (@ (guile) mount)) - (set! umount (@ (guile) umount))) - (define (bind-mount source target) "Bind-mount SOURCE at TARGET." (mount source target "" MS_BIND)) diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index c34a3f7c18..360ef3faed 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (define-module (gnu build linux-boot) #:use-module (ice-9 match) #:use-module (ice-9 ftw) #:use-module (guix build utils) + #:use-module (guix build syscalls) #:use-module (gnu build linux-modules) #:use-module (gnu build file-systems) #:export (mount-essential-file-systems diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index d7feb3a080..5ca7bf8e38 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2016 Ludovic Courtès +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,6 +19,7 @@ (define-module (gnu build linux-modules) #:use-module (guix elf) + #:use-module (guix build syscalls) #:use-module (rnrs io ports) #:use-module (rnrs bytevectors) #:use-module (srfi srfi-1) From acf7d4a78b121abaef8e06e783f766756f647f68 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 5 Apr 2017 15:06:25 -0400 Subject: [PATCH 234/301] gnu: Add emacspeak. * gnu/packages/emacs.scm (emacspeak): New variable. --- gnu/packages/emacs.scm | 70 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ff33daf71d..c6a97db5ed 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Kyle Meyer +;;; Copyright © 2017 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,6 +52,7 @@ (define-module (gnu packages emacs) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages audio) #:use-module (gnu packages code) #:use-module (gnu packages guile) #:use-module (gnu packages gtk) @@ -58,6 +60,7 @@ (define-module (gnu packages emacs) #:use-module (gnu packages ncurses) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) + #:use-module (gnu packages tcl) #:use-module (gnu packages tls) #:use-module (gnu packages pkg-config) #:use-module (gnu packages xorg) @@ -4059,6 +4062,73 @@ (define-public emacs-highlight-sexp "This Emacs package highlights the s-exp at the current position.") (license license:gpl3+))) +(define-public emacspeak + (package + (name "emacspeak") + (version "45.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/tvraman/emacspeak/releases/download/" + version "/emacspeak-" version ".tar.bz2")) + (sha256 + (base32 + "0npcr867xbbhwa0i7v26hnk4z2d51522jwcfwc594j74kbv3g6ka")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags (list (string-append "prefix=" + (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("\\$\\(INSTALL\\) -d \\$\\(libdir\\)/servers/linux-outloud") + "") + (("\\$\\(INSTALL\\) -m 755 \\$\\{OUTLOUD\\}.*$") "") + (("\\*info\\*") "*")) + (substitute* "etc/emacspeak.sh.def" + (("") + (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp/emacspeak/lisp"))) + (zero? (system* "make" "config")))) + (add-after 'install 'install-espeak-server + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion "servers/linux-espeak" + (and (zero? (system* "make")) + (zero? (system* "make" "install" + (string-append "PREFIX=" out)))))))) + (add-after 'install-espeak-server 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (emacspeak (string-append out "/bin/emacspeak")) + (espeak (string-append (assoc-ref inputs "espeak") + "/bin/espeak"))) + ;; The environment variable DTK_PROGRAM tells emacspeak what + ;; program to use for speech. + (wrap-program emacspeak + `("DTK_PROGRAM" ":" prefix (,espeak))) + #t)))) + #:tests? #f)) ; no check target + (inputs + `(("espeak" ,espeak) + ("tcl" ,tcl) + ("tclx" ,tclx))) + (native-inputs `(("emacs" ,emacs-minimal))) + (home-page "http://emacspeak.sourceforge.net") + (synopsis "Audio desktop interface for Emacs") + (description + "Emacspeak is a speech interface that allows visually impaired users to +interact independently and efficiently with the computer. Audio formatting +--a technique pioneered by AsTeR-- and full support for W3C's Aural CSS (ACSS) +allows Emacspeak to produce rich aural presentations of electronic information. +By seamlessly blending all aspects of the Internet such as Web-surfing and +messaging, Emacspeak speech-enables local and remote information via a +consistent and well-integrated user interface.") + (license license:gpl2+))) + (define-public emacs-adaptive-wrap (package (name "emacs-adaptive-wrap") From e79bfa181a91f15e93d7de6bd8691e4b77fbe678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 11 Apr 2017 15:37:48 +0200 Subject: [PATCH 235/301] gnu: Add Luminance HDR. * gnu/packages/image-viewers.scm (luminance-hdr): New variable. * gnu/packages/patches/luminance-hdr-qt-printer.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/image-viewers.scm | 74 ++++++++++++++++++- .../patches/luminance-hdr-qt-printer.patch | 28 +++++++ 3 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/luminance-hdr-qt-printer.patch diff --git a/gnu/local.mk b/gnu/local.mk index d755d8248e..f3a4e54afa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -757,6 +757,7 @@ dist_patch_DATA = \ %D%/packages/patches/luajit-no_ldconfig.patch \ %D%/packages/patches/luajit-symlinks.patch \ %D%/packages/patches/luit-posix.patch \ + %D%/packages/patches/luminance-hdr-qt-printer.patch \ %D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/lxsession-use-gapplication.patch \ %D%/packages/patches/lz4-fix-test-failures.patch \ diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index a7e108a292..830ce10ea6 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2017 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015, 2016 Alex Kost ;;; Copyright © 2016 Efraim Flashner @@ -29,17 +29,24 @@ (define-module (gnu packages image-viewers) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (gnu packages autotools) + #:use-module (gnu packages algebra) #:use-module (gnu packages base) + #:use-module (gnu packages boost) + #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages graphics) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages maths) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages qt) + #:use-module (gnu packages xorg) + #:use-module (gnu packages)) (define-public feh (package @@ -290,3 +297,66 @@ (define-public catimg "Catimg is a little program that prints images in the terminal. It supports JPEG, PNG and GIF formats.") (license license:expat))) + +(define-public luminance-hdr + (package + (name "luminance-hdr") + (version "2.4.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/qtpfsgui/luminance/" + version "/luminance-hdr-" version ".tar.bz2")) + (sha256 + (base32 + "00fldbcizrx8jcnjgq74n3zmbm27dxzl96fxa7q49689mfnlw08l")) + (patches (search-patches "luminance-hdr-qt-printer.patch")))) + (build-system cmake-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtwebkit" ,qtwebkit) + ("boost" ,boost) + ;; ("gtest" ,gtest) + ("libraw" ,libraw) + ("zlib" ,zlib) + ("exiv2" ,exiv2) + ("libpng" ,libpng) + ("libjpeg" ,libjpeg) + ("lcms" ,lcms) + ("openexr" ,openexr) + ("fftw" ,fftwf) + ("gsl" ,gsl) + ("libtiff" ,libtiff))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'set-paths 'add-ilmbase-include-path + (lambda* (#:key inputs #:allow-other-keys) + ;; 'OpenEXR.pc' has a -I for IlmBase but 'FindOpenEXR.cmake' does + ;; not use 'OpenEXR.pc'. Thus, we need to add + ;; "$ilmbase/include/OpenEXR/" to the CPATH. + (setenv "CPATH" + (string-append (assoc-ref inputs "ilmbase") + "/include/OpenEXR" + ":" (or (getenv "CPATH") ""))) + #t))))) + (home-page "http://qtpfsgui.sourceforge.net") + (synopsis "High dynamic range (HDR) imaging application") + (description + "Luminance HDR (formerly QtPFSGui) is a graphical user interface +application that aims to provide a workflow for high dynamic range (HDR) +imaging. It supports several HDR and LDR image formats, and it can: + +@itemize +@item Create an HDR file from a set of images (formats: JPEG, TIFF 8bit and +16bit, RAW) of the same scene taken at different exposure setting; +@item Save load HDR images; +@item Rotate, resize and crop HDR images; +@item Tone-map HDR images; +@item Copy EXIF data between sets of images. +@end itemize\n") + (license license:gpl2+))) diff --git a/gnu/packages/patches/luminance-hdr-qt-printer.patch b/gnu/packages/patches/luminance-hdr-qt-printer.patch new file mode 100644 index 0000000000..c65f9537cd --- /dev/null +++ b/gnu/packages/patches/luminance-hdr-qt-printer.patch @@ -0,0 +1,28 @@ +Allow the 'QtPrinter' header to be found, as described +at . + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fbad8a2..8379c8a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,6 +29,7 @@ find_package(Qt5Xml) + find_package(Qt5Sql) + find_package(Qt5Network) + find_package(Qt5LinguistTools) ++find_package(Qt5PrintSupport REQUIRED) + IF(WIN32) + find_package(Qt5WinExtras) + ENDIF() +diff --git a/src/HelpBrowser/CMakeLists.txt b/src/HelpBrowser/CMakeLists.txt +index 04319a8..5537dae 100644 +--- a/src/HelpBrowser/CMakeLists.txt ++++ b/src/HelpBrowser/CMakeLists.txt +@@ -29,7 +29,7 @@ QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) + + + ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX}) +-qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets) ++qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets PrintSupport) + + SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE) + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE) From e23455543b875c92b66ec25bde10a068e4db9e9b Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Tue, 11 Apr 2017 01:49:50 -0700 Subject: [PATCH 236/301] gnu: Add emacs-default-encrypt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-default-encrypt): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c6a97db5ed..a70fb2167f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus -;;; Copyright © 2016 Chris Marusich +;;; Copyright © 2016, 2017 Chris Marusich ;;; Copyright © 2015, 2016 Christopher Allan Webber ;;; Copyright © 2016 humanitiesNerd ;;; Copyright © 2016 Efraim Flashner @@ -4207,3 +4207,31 @@ (define-public emacs-use-package configuration in your @file{.emacs} file in a way that is both performance-oriented and tidy.") (license license:gpl2+))) + +(define-public emacs-default-encrypt + (package + (name "emacs-default-encrypt") + (version "4.3") + (source + (origin + (method url-fetch) + (uri (string-append + ;; A versioned, signed copy of this package is avialable on the + ;; home page, but 'guix download' fails to download it. + "https://github.com/emacsmirror/emacswiki.org/raw/master/jl-encrypt.el")) + (file-name (string-append "jl-encrypt-" version ".el")) + (sha256 + (base32 + "16i3rlfp3jxlqvndn8idylhmczync3gwmy8a019v29vyr48rnnr0")))) + (build-system emacs-build-system) + (home-page "https://www.informationelle-selbstbestimmung-im-internet.de/Emacs.html") + (synopsis "Automatically encrypt or sign Gnus messages in Emacs") + (description + "DefaultEncrypt is designed to be used with Gnus in Emacs. It +automatically encrypts messages that you send (e.g., email) when public keys +for all recipients are available, and it protects you from accidentally +sending un-encrypted messages. It can also be configured to automatically +sign messages that you send. For details and instructions on how to use +DefaultEncrypt, please refer to the home page or read the comments in the +source file, @file{jl-encrypt.el}.") + (license license:gpl3+))) From c1aba1a7c8d82e9b734f5e0ea41fe3b468fb31a5 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Tue, 11 Apr 2017 00:06:20 +1000 Subject: [PATCH 237/301] gnu: python-paramiko: Update to 1.17.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-paramiko): Update to 1.17.4. Signed-off-by: Ludovic Courtès --- gnu/packages/admin.scm | 1 + gnu/packages/python.scm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f19bf5a48d..327dd36376 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2048,3 +2048,4 @@ (define-public intel-gpu-tools low-level tools and tests specifically for development and testing of the Intel DRM Driver.") (license license:expat))) + diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0746af24a1..231c629297 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -529,14 +529,14 @@ (define-public python2-py-bcrypt (define-public python-paramiko (package (name "python-paramiko") - (version "1.16.0") + (version "1.17.4") (source (origin (method url-fetch) (uri (pypi-uri "paramiko" version)) (sha256 (base32 - "14k8z7ndc3zk5xivnm4d8lncchx475ll5izpf8vmfbq7rp9yp5rj")))) + "1rs2qcmskcmq66q6g5al08wa41l9am0fad5r719m8wf91msyylqw")))) (build-system python-build-system) (arguments '(;; FIXME: One test fails with "EOFError not raised by connect". From b611f9c28239b43420b9a8161422a10bcfe186bf Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Tue, 11 Apr 2017 17:56:52 +0200 Subject: [PATCH 238/301] gnu: Add Fabric. * gnu/packages/admin.scm (fabric): New variable. --- gnu/packages/admin.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 327dd36376..bff480b204 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -15,6 +15,7 @@ ;;; Coypright © 2016, 2017 ng0 ;;; Coypright © 2016 Tobias Geerinckx-Rice ;;; Coypright © 2016 John Darrington +;;; Coypright © 2017 Ben Sturmfels ;;; ;;; This file is part of GNU Guix. ;;; @@ -2049,3 +2050,36 @@ (define-public intel-gpu-tools Intel DRM Driver.") (license license:expat))) +(define-public fabric + (package + (name "fabric") + (version "1.13.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Fabric" version)) + (sha256 + (base32 + "1z17hw0yiqp1blq217zxkg2jzkv8qd79saqhscgsw14mwlcqpwd0")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ;XXX: Tests attempt to download Python "fudge" package. + #:python ,python-2)) ;Python 2 only + (propagated-inputs + ;; Required upgrading python-paramiko 1.17.4 to fix an incompatibility + ;; between python-paramiko and newer python-pycrypto. Without this, the + ;; `fab` command fails with "ValueError: CTR mode needs counter + ;; parameter, not IV". See: + ;; https://github.com/paramiko/paramiko/pull/714#issuecomment-281191548. + `(("python2-paramiko" ,python2-paramiko))) + (home-page "http://fabfile.org") + (synopsis "Simple Pythonic remote execution and deployment tool") + (description + "Fabric is designed to upload files and run shell commands on a number of +servers in parallel or serially. These commands are grouped in tasks (which +are regular Python functions) and specified in a @dfn{fabfile}. + +It is similar to Capistrano, except it's implemented in Python and doesn't +expect you to be deploying Rails applications. Fabric is a simple, Pythonic +tool for remote execution and deployment.") + (license license:bsd-2))) From fb4d6f6c2a2a90b7e7cae41b3493390ce0b41691 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Tue, 11 Apr 2017 11:32:55 +1000 Subject: [PATCH 239/301] doc: Update Python Modules subtitle to refer to Monty Python. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi (Packaging Guidelines): Update Python Modules subtitle. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 974d9b3a4f..07f52becf8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -234,7 +234,7 @@ Packaging Guidelines * Package Naming:: What's in a name? * Version Numbers:: When the name is not enough. * Synopses and Descriptions:: Helping users find the right package. -* Python Modules:: Taming the snake. +* Python Modules:: A touch of British comedy. * Perl Modules:: Little pearls. * Java Packages:: Coffee break. * Fonts:: Fond of fonts. @@ -16325,7 +16325,7 @@ needed is to review and apply the patch. * Package Naming:: What's in a name? * Version Numbers:: When the name is not enough. * Synopses and Descriptions:: Helping users find the right package. -* Python Modules:: Taming the snake. +* Python Modules:: A touch of British comedy. * Perl Modules:: Little pearls. * Java Packages:: Coffee break. * Fonts:: Fond of fonts. From d4bcbbb994c56e97e06067839d55b4eb42c5d455 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Apr 2017 18:11:34 +0200 Subject: [PATCH 240/301] gnu: knot: Update to 2.4.3. * gnu/packages/dns.scm (knot): Update to 2.4.3. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 57ac297a05..0c965f8c20 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -318,14 +318,14 @@ (define-public yadifa (define-public knot (package (name "knot") - (version "2.4.2") + (version "2.4.3") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" name "-" version ".tar.xz")) (sha256 (base32 - "0licfnjl0mq9lzdn6frzdasrj65253xc9n33dhvxcjqr3z7pznip")) + "0kvhibnnk77nqi9gdw2zbnp0dydfcy6zy96qv0f3a7wwnay5h0pr")) (modules '((guix build utils))) (snippet '(begin From 8ad5a20f41f7333049d7a1f371b4a4a66ce16e8a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 11 Apr 2017 19:51:58 +0200 Subject: [PATCH 241/301] gnu: Add emacs-strace-mode. * gnu/packages/emacs.scm (emacs-strace-mode): New variable. Signed-off-by: Kei Kebreau --- gnu/packages/emacs.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a70fb2167f..c7d28d37a4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4208,6 +4208,28 @@ (define-public emacs-use-package performance-oriented and tidy.") (license license:gpl2+))) +(define-public emacs-strace-mode + (let* ((commit "6a69b4b06db6797af56f33eda5cb28af94e59f11") + (revision "1")) + (package + (name "emacs-strace-mode") + (version (string-append "0.0.2-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pkmoore/strace-mode") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1lbk2kzdznf2bkfazizfbimaxxzfzv00lrz1ran9dc2zqbc0bj9f")))) + (build-system emacs-build-system) + (home-page "https://github.com/pkmoore/strace-mode") + (synopsis "Emacs major mode to highlight strace outputs") + (description "@code{emacs-strace-mode} provides an Emacs major mode + highlighting strace outputs.") + (license license:gpl3+)))) + (define-public emacs-default-encrypt (package (name "emacs-default-encrypt") From 25e810b8128412fdaea812ed4ff2edf507534b42 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 11 Apr 2017 23:47:22 +0530 Subject: [PATCH 242/301] gnu: Add emacs-htmlize. * gnu/packages/emacs.scm (emacs-htmlize): New variable. Signed-off-by: Kei Kebreau --- gnu/packages/emacs.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c7d28d37a4..aa41e8c63f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4257,3 +4257,25 @@ (define-public emacs-default-encrypt DefaultEncrypt, please refer to the home page or read the comments in the source file, @file{jl-encrypt.el}.") (license license:gpl3+))) + +(define-public emacs-htmlize + (package + (name "emacs-htmlize") + (version "1.51") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/hniksic/emacs-htmlize/archive/release/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1fy1lybzrxl8a8r88f6p19nz8ygmvcxhxbnymkxh7jqaz25viwld")))) + (build-system emacs-build-system) + (home-page "https://github.com/hniksic/emacs-htmlize") + (synopsis "Convert buffer text and decorations to HTML") + (description "@code{emacs-htmlize} converts the buffer text and +the associated decorations to HTML. Output to CSS, inline CSS and +fonts is supported.") + (license license:gpl2+))) From efbca0877623de3c51d04d4a6ea2d45105f2262e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Apr 2017 21:18:46 +0200 Subject: [PATCH 243/301] gnu: youtube-dl: Update to 2017.04.11. * gnu/packages/video.scm (youtube-dl): Update to 2017.04.11. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index bb5391d89e..3478d92026 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -985,7 +985,7 @@ (define-public libvpx (define-public youtube-dl (package (name "youtube-dl") - (version "2017.04.03") + (version "2017.04.11") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -993,7 +993,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "1zfhq20i7xz0djfps39k3yrpdl8ni2yqh43211ma5m40ms78j4yk")))) + "0jf1zpywx9b5113wkapfrrjv0nb7vb3f13f59mz3macr65mszxad")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion From 69121e95cd5568238a0f207dfab708501ec4a753 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 11 Apr 2017 13:09:03 -0400 Subject: [PATCH 244/301] gnu: libressl: Update to 2.5.3. * gnu/packages/tls.scm (libressl): Update to 2.5.3. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 08cc6075b6..95c56803a4 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -431,7 +431,7 @@ (define-public openssl-next (define-public libressl (package (name "libressl") - (version "2.5.2") + (version "2.5.3") (source (origin (method url-fetch) @@ -440,7 +440,7 @@ (define-public libressl version ".tar.gz")) (sha256 (base32 - "10hw434azw0gvfkmfm46r85r7my1c6592rg9jsna914jh1q7vyhg")))) + "0c4awq45cl757fv7f7f75i5i0ibc6v7ns13n7xvfak7chv2lrqql")))) (build-system gnu-build-system) (native-search-paths ;; FIXME: These two variables must designate a single file or directory From 0adb47bdc7d15e53b8c4c443ad19ebdfcc4177a0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 11 Apr 2017 00:36:07 -0400 Subject: [PATCH 245/301] gnu: dovecot: Update to 2.2.29 [fixes CVE-2017-2669]. * gnu/packages/mail.scm (dovecot): Update to 2.2.29. [source]: Use 'dovecot-fix-failing-test.patch'. * gnu/packages/patches/dovecot-fix-failing-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/mail.scm | 8 +- .../patches/dovecot-fix-failing-test.patch | 118 ++++++++++++++++++ 3 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/dovecot-fix-failing-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index f3a4e54afa..212228d5c2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -539,6 +539,7 @@ dist_patch_DATA = \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ + %D%/packages/patches/dovecot-fix-failing-test.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-disable-failing-tests.patch \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 49fdb32e8d..1a6c505efd 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1086,15 +1086,17 @@ (define-public exim (define-public dovecot (package (name "dovecot") - (version "2.2.28") + (version "2.2.29") (source (origin (method url-fetch) (uri (string-append "https://www.dovecot.org/releases/" (version-major+minor version) "/" name "-" version ".tar.gz")) - (sha256 (base32 - "098zpkmkk93372qnv6drgbfg8hp5mynspzc1735qgar6wdcqya70")))) + (patches (search-patches "dovecot-fix-failing-test.patch")) + (sha256 + (base32 + "19irf7b5mjqq68mrpdd38gxc0zp2nqib942kjp3aif3f2acylffr")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/dovecot-fix-failing-test.patch b/gnu/packages/patches/dovecot-fix-failing-test.patch new file mode 100644 index 0000000000..343bab03f9 --- /dev/null +++ b/gnu/packages/patches/dovecot-fix-failing-test.patch @@ -0,0 +1,118 @@ +This patch fixes a test failure in dovecot 2.2.29, like this [0]: + +------ +Making check in lib-imap-client +make[2]: Entering directory +`/builddir/build/BUILD/dovecot-2.2.29/src/lib-imap-client' +for bin in test-imapc-client; do \ + if ! ./$bin; then exit 1; fi; \ + done +Warning: imapc(127.0.0.1:0): connect(127.0.0.1, 0) failed: Connection +refused - reconnecting (delay 10 ms) +Error: imapc(127.0.0.1:0): connect(127.0.0.1, 0) failed: Connection +refused - disconnecting +test: random seed #1 was 1492054294 +imapc connect failed ................................................. : ok +Warning: imapc(127.0.0.1:42704): connect(127.0.0.1, 42704) timed out +after 0 seconds - reconnecting (delay 0 ms) +Error: imapc(127.0.0.1:42704): connect(127.0.0.1, 42704) timed out after +0 seconds - disconnecting +imapc banner hangs ................................................... : ok +Warning: imapc(127.0.0.1:36762): Authentication timed out after 0 +seconds - reconnecting (delay 0 ms) +Error: imapc(127.0.0.1:36762): Authentication failed: Disconnected from +server +imapc login hangs .................................................... : ok +test-imapc-client.c:358: Assert failed: test_imapc_cmd_last_reply_pop() +== IMAPC_COMMAND_STATE_OK +imapc reconnect ...................................................... : +FAILED +imapc reconnect resend commands ...................................... : ok +imapc reconnect resend commands failed ............................... : ok +imapc reconnect mailbox .............................................. : ok +1 / 7 tests failed +------ + +Patch copied from upstream source repository: + +https://github.com/dovecot/core/commit/3a1c64363a64cdfe9153eb6292d8923f38955d82 + +[0] +https://dovecot.org/pipermail/dovecot/2017-April/107751.html + +From 3a1c64363a64cdfe9153eb6292d8923f38955d82 Mon Sep 17 00:00:00 2001 +From: Timo Sirainen +Date: Mon, 10 Apr 2017 17:07:28 +0300 +Subject: [PATCH] lib-imap-client: Fix reconnection + +There was already code for reconnection. We just shouldn't have gone very +far in imapc_connection_connect() if we were still waiting for reconnection +delay to pass. +--- + src/lib-imap-client/imapc-connection.c | 25 +++++++++---------------- + 1 file changed, 9 insertions(+), 16 deletions(-) + +diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c +index 95067e6..6eaf1ab 100644 +--- a/src/lib-imap-client/imapc-connection.c ++++ b/src/lib-imap-client/imapc-connection.c +@@ -130,6 +130,7 @@ struct imapc_connection { + struct timeout *to_throttle, *to_throttle_shrink; + + unsigned int reconnecting:1; ++ unsigned int reconnect_waiting:1; + unsigned int reconnect_ok:1; + unsigned int idling:1; + unsigned int idle_stopping:1; +@@ -504,6 +505,7 @@ static bool imapc_connection_can_reconnect(struct imapc_connection *conn) + static void imapc_connection_reconnect(struct imapc_connection *conn) + { + conn->reconnect_ok = FALSE; ++ conn->reconnect_waiting = FALSE; + + if (conn->selected_box != NULL) + imapc_client_mailbox_reconnect(conn->selected_box); +@@ -536,6 +538,7 @@ imapc_connection_try_reconnect(struct imapc_connection *conn, + imapc_connection_disconnect_full(conn, TRUE); + conn->to = timeout_add(delay_msecs, imapc_connection_reconnect, conn); + conn->reconnect_count++; ++ conn->reconnect_waiting = TRUE; + } + } + } +@@ -1785,6 +1788,12 @@ void imapc_connection_connect(struct imapc_connection *conn) + + if (conn->fd != -1 || conn->dns_lookup != NULL) + return; ++ if (conn->reconnect_waiting) { ++ /* wait for the reconnection delay to finish before ++ doing anything. */ ++ return; ++ } ++ + conn->reconnecting = FALSE; + /* if we get disconnected before we've finished all the pending + commands, don't reconnect */ +@@ -1792,22 +1801,6 @@ void imapc_connection_connect(struct imapc_connection *conn) + array_count(&conn->cmd_send_queue); + + imapc_connection_input_reset(conn); +- +- int msecs_since_last_connect = +- timeval_diff_msecs(&ioloop_timeval, &conn->last_connect); +- if (!conn->reconnect_ok && +- msecs_since_last_connect < (int)conn->client->set.connect_retry_interval_msecs) { +- if (conn->to != NULL) +- timeout_remove(&conn->to); +- conn->reconnecting = TRUE; +- imapc_connection_set_disconnected(conn); +- /* don't wait longer than necessary */ +- unsigned int delay_msecs = +- conn->client->set.connect_retry_interval_msecs - +- msecs_since_last_connect; +- conn->to = timeout_add(delay_msecs, imapc_connection_reconnect, conn); +- return; +- } + conn->last_connect = ioloop_timeval; + + if (conn->client->set.debug) { From 0eb0fe2d302028b51185b98ac55e45b483a5ea82 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 12 Apr 2017 06:19:56 +0300 Subject: [PATCH 246/301] gnu: jasper: Fixx CVE-2017-6850. * gnu/packages/image.scm (jasper)[source]: Add patch. * gnu/packages/patches/jasper-CVE-2017-6850.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/image.scm | 3 +- .../patches/jasper-CVE-2017-6850.patch | 284 ++++++++++++++++++ 3 files changed, 287 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/jasper-CVE-2017-6850.patch diff --git a/gnu/local.mk b/gnu/local.mk index 212228d5c2..006dbe7997 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -661,6 +661,7 @@ dist_patch_DATA = \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ + %D%/packages/patches/jasper-CVE-2017-6850.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ %D%/packages/patches/jbig2dec-CVE-2016-9601.patch \ %D%/packages/patches/jq-CVE-2015-8863.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index b5b3a7283d..2725c168b6 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -905,7 +905,8 @@ (define-public jasper "/software/jasper-" version ".tar.gz")) (sha256 (base32 - "1njdbxv7d4anzrd476wjww2qsi96dd8vfnp4hri0srrqxpszl92v")))) + "1njdbxv7d4anzrd476wjww2qsi96dd8vfnp4hri0srrqxpszl92v")) + (patches (search-patches "jasper-CVE-2017-6850.patch")))) (build-system cmake-build-system) (inputs `(("libjpeg" ,libjpeg))) (synopsis "JPEG-2000 library") diff --git a/gnu/packages/patches/jasper-CVE-2017-6850.patch b/gnu/packages/patches/jasper-CVE-2017-6850.patch new file mode 100644 index 0000000000..07672762a1 --- /dev/null +++ b/gnu/packages/patches/jasper-CVE-2017-6850.patch @@ -0,0 +1,284 @@ +This patch is from upstream and should be fixed included in the next release + +From e96fc4fdd525fa0ede28074a7e2b1caf94b58b0d Mon Sep 17 00:00:00 2001 +From: Michael Adams +Date: Sat, 4 Mar 2017 14:43:24 -0800 +Subject: [PATCH] Fixed bugs due to uninitialized data in the JP2 decoder. + Also, added some comments marking I/O stream interfaces that probably need to + be changed (in the long term) to fix integer overflow problems. + +--- + src/libjasper/base/jas_stream.c | 18 +++++++++++++++++ + src/libjasper/jp2/jp2_cod.c | 44 ++++++++++++++++++++++++++++------------- + 2 files changed, 48 insertions(+), 14 deletions(-) + +diff --git a/src/libjasper/base/jas_stream.c b/src/libjasper/base/jas_stream.c +index 327ee57..d70408f 100644 +--- a/src/libjasper/base/jas_stream.c ++++ b/src/libjasper/base/jas_stream.c +@@ -664,6 +664,7 @@ int jas_stream_ungetc(jas_stream_t *stream, int c) + return 0; + } + ++/* FIXME integral type */ + int jas_stream_read(jas_stream_t *stream, void *buf, int cnt) + { + int n; +@@ -690,6 +691,7 @@ int jas_stream_read(jas_stream_t *stream, void *buf, int cnt) + return n; + } + ++/* FIXME integral type */ + int jas_stream_write(jas_stream_t *stream, const void *buf, int cnt) + { + int n; +@@ -742,6 +744,7 @@ int jas_stream_puts(jas_stream_t *stream, const char *s) + return 0; + } + ++/* FIXME integral type */ + char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize) + { + int c; +@@ -765,6 +768,7 @@ char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize) + return buf; + } + ++/* FIXME integral type */ + int jas_stream_gobble(jas_stream_t *stream, int n) + { + int m; +@@ -783,6 +787,7 @@ int jas_stream_gobble(jas_stream_t *stream, int n) + return n; + } + ++/* FIXME integral type */ + int jas_stream_pad(jas_stream_t *stream, int n, int c) + { + int m; +@@ -885,6 +890,7 @@ long jas_stream_tell(jas_stream_t *stream) + * Buffer initialization code. + \******************************************************************************/ + ++/* FIXME integral type */ + static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf, + int bufsize) + { +@@ -1060,6 +1066,7 @@ static int jas_strtoopenmode(const char *s) + return openmode; + } + ++/* FIXME integral type */ + int jas_stream_copy(jas_stream_t *out, jas_stream_t *in, int n) + { + int all; +@@ -1085,6 +1092,7 @@ int jas_stream_copy(jas_stream_t *out, jas_stream_t *in, int n) + return 0; + } + ++/* FIXME integral type */ + long jas_stream_setrwcount(jas_stream_t *stream, long rwcnt) + { + int old; +@@ -1094,6 +1102,7 @@ long jas_stream_setrwcount(jas_stream_t *stream, long rwcnt) + return old; + } + ++/* FIXME integral type */ + int jas_stream_display(jas_stream_t *stream, FILE *fp, int n) + { + unsigned char buf[16]; +@@ -1168,6 +1177,7 @@ long jas_stream_length(jas_stream_t *stream) + * Memory stream object. + \******************************************************************************/ + ++/* FIXME integral type */ + static int mem_read(jas_stream_obj_t *obj, char *buf, int cnt) + { + ssize_t n; +@@ -1209,6 +1219,7 @@ static int mem_resize(jas_stream_memobj_t *m, size_t bufsize) + return 0; + } + ++/* FIXME integral type */ + static int mem_write(jas_stream_obj_t *obj, char *buf, int cnt) + { + size_t n; +@@ -1264,6 +1275,7 @@ static int mem_write(jas_stream_obj_t *obj, char *buf, int cnt) + return ret; + } + ++/* FIXME integral type */ + static long mem_seek(jas_stream_obj_t *obj, long offset, int origin) + { + jas_stream_memobj_t *m = (jas_stream_memobj_t *)obj; +@@ -1310,6 +1322,7 @@ static int mem_close(jas_stream_obj_t *obj) + * File stream object. + \******************************************************************************/ + ++/* FIXME integral type */ + static int file_read(jas_stream_obj_t *obj, char *buf, int cnt) + { + jas_stream_fileobj_t *fileobj; +@@ -1318,6 +1331,7 @@ static int file_read(jas_stream_obj_t *obj, char *buf, int cnt) + return read(fileobj->fd, buf, cnt); + } + ++/* FIXME integral type */ + static int file_write(jas_stream_obj_t *obj, char *buf, int cnt) + { + jas_stream_fileobj_t *fileobj; +@@ -1326,6 +1340,7 @@ static int file_write(jas_stream_obj_t *obj, char *buf, int cnt) + return write(fileobj->fd, buf, cnt); + } + ++/* FIXME integral type */ + static long file_seek(jas_stream_obj_t *obj, long offset, int origin) + { + jas_stream_fileobj_t *fileobj; +@@ -1352,6 +1367,7 @@ static int file_close(jas_stream_obj_t *obj) + * Stdio file stream object. + \******************************************************************************/ + ++/* FIXME integral type */ + static int sfile_read(jas_stream_obj_t *obj, char *buf, int cnt) + { + FILE *fp; +@@ -1367,6 +1383,7 @@ static int sfile_read(jas_stream_obj_t *obj, char *buf, int cnt) + return result; + } + ++/* FIXME integral type */ + static int sfile_write(jas_stream_obj_t *obj, char *buf, int cnt) + { + FILE *fp; +@@ -1377,6 +1394,7 @@ static int sfile_write(jas_stream_obj_t *obj, char *buf, int cnt) + return (n != JAS_CAST(size_t, cnt)) ? (-1) : cnt; + } + ++/* FIXME integral type */ + static long sfile_seek(jas_stream_obj_t *obj, long offset, int origin) + { + FILE *fp; +diff --git a/src/libjasper/jp2/jp2_cod.c b/src/libjasper/jp2/jp2_cod.c +index 7f3608a..8d98a2c 100644 +--- a/src/libjasper/jp2/jp2_cod.c ++++ b/src/libjasper/jp2/jp2_cod.c +@@ -183,15 +183,28 @@ jp2_boxinfo_t jp2_boxinfo_unk = { + * Box constructor. + \******************************************************************************/ + +-jp2_box_t *jp2_box_create(int type) ++jp2_box_t *jp2_box_create0() + { + jp2_box_t *box; +- jp2_boxinfo_t *boxinfo; +- + if (!(box = jas_malloc(sizeof(jp2_box_t)))) { + return 0; + } + memset(box, 0, sizeof(jp2_box_t)); ++ box->type = 0; ++ box->len = 0; ++ // Mark the box data as never having been constructed ++ // so that we will not errantly attempt to destroy it later. ++ box->ops = &jp2_boxinfo_unk.ops; ++ return box; ++} ++ ++jp2_box_t *jp2_box_create(int type) ++{ ++ jp2_box_t *box; ++ jp2_boxinfo_t *boxinfo; ++ if (!(box = jp2_box_create0())) { ++ return 0; ++ } + box->type = type; + box->len = 0; + if (!(boxinfo = jp2_boxinfolookup(type))) { +@@ -248,14 +261,9 @@ jp2_box_t *jp2_box_get(jas_stream_t *in) + box = 0; + tmpstream = 0; + +- if (!(box = jas_malloc(sizeof(jp2_box_t)))) { ++ if (!(box = jp2_box_create0())) { + goto error; + } +- +- // Mark the box data as never having been constructed +- // so that we will not errantly attempt to destroy it later. +- box->ops = &jp2_boxinfo_unk.ops; +- + if (jp2_getuint32(in, &len) || jp2_getuint32(in, &box->type)) { + goto error; + } +@@ -263,10 +271,12 @@ jp2_box_t *jp2_box_get(jas_stream_t *in) + box->info = boxinfo; + box->len = len; + JAS_DBGLOG(10, ( +- "preliminary processing of JP2 box: type=%c%s%c (0x%08x); length=%d\n", ++ "preliminary processing of JP2 box: " ++ "type=%c%s%c (0x%08x); length=%"PRIuFAST32"\n", + '"', boxinfo->name, '"', box->type, box->len + )); + if (box->len == 1) { ++ JAS_DBGLOG(10, ("big length\n")); + if (jp2_getuint64(in, &extlen)) { + goto error; + } +@@ -382,6 +392,7 @@ static int jp2_bpcc_getdata(jp2_box_t *box, jas_stream_t *in) + { + jp2_bpcc_t *bpcc = &box->data.bpcc; + unsigned int i; ++ bpcc->bpcs = 0; + bpcc->numcmpts = box->datalen; + if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) { + return -1; +@@ -462,6 +473,7 @@ static int jp2_cdef_getdata(jp2_box_t *box, jas_stream_t *in) + jp2_cdef_t *cdef = &box->data.cdef; + jp2_cdefchan_t *chan; + unsigned int channo; ++ cdef->ents = 0; + if (jp2_getuint16(in, &cdef->numchans)) { + return -1; + } +@@ -518,7 +530,9 @@ int jp2_box_put(jp2_box_t *box, jas_stream_t *out) + } + + if (dataflag) { +- if (jas_stream_copy(out, tmpstream, box->len - JP2_BOX_HDRLEN(false))) { ++ if (jas_stream_copy(out, tmpstream, box->len - ++ JP2_BOX_HDRLEN(false))) { ++ jas_eprintf("cannot copy box data\n"); + goto error; + } + jas_stream_close(tmpstream); +@@ -777,6 +791,7 @@ static int jp2_cmap_getdata(jp2_box_t *box, jas_stream_t *in) + jp2_cmap_t *cmap = &box->data.cmap; + jp2_cmapent_t *ent; + unsigned int i; ++ cmap->ents = 0; + + cmap->numchans = (box->datalen) / 4; + if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) { +@@ -835,6 +850,7 @@ static int jp2_pclr_getdata(jp2_box_t *box, jas_stream_t *in) + int_fast32_t x; + + pclr->lutdata = 0; ++ pclr->bpc = 0; + + if (jp2_getuint16(in, &pclr->numlutents) || + jp2_getuint8(in, &pclr->numchans)) { +@@ -869,9 +885,9 @@ static int jp2_pclr_putdata(jp2_box_t *box, jas_stream_t *out) + #if 0 + jp2_pclr_t *pclr = &box->data.pclr; + #endif +-/* Eliminate warning about unused variable. */ +-box = 0; +-out = 0; ++ /* Eliminate warning about unused variable. */ ++ box = 0; ++ out = 0; + return -1; + } + From d04687dc83bdb3f1d8d77ade2a4ae1cf437f9b1c Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 26 Mar 2017 21:24:31 +0200 Subject: [PATCH 247/301] gnu: Update networkmanager to version 1.6.2. * gnu/packages/gnome.scm (networkmanager): [source] Update to 1.6.2 [arguments] : Adopt to now used single Makefile.in. : Also pass "nmstatedir". [native-inputs]: Add docbook-xsl, libxslt, libxml2. [inputs]: Add jansson. --- gnu/packages/gnome.scm | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 535b8ae68e..105348c9d1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2017 Thomas Danckaert +;;; Copyright © 2017 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -4573,7 +4574,7 @@ (define-public caribou (define-public network-manager (package (name "network-manager") - (version "1.4.4") + (version "1.6.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/NetworkManager/" @@ -4581,7 +4582,7 @@ (define-public network-manager "NetworkManager-" version ".tar.xz")) (sha256 (base32 - "029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2")) + "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj")) (snippet '(begin (use-modules (guix build utils)) @@ -4625,12 +4626,14 @@ (define-public network-manager ;; cope with being already in the Guix build jail as that jail ;; lacks some features that they would like to proxy over (like ;; a /sys mount). - (substitute* '("src/platform/Makefile.in" - "src/devices/Makefile.in") - (("SUBDIRS = tests") "")) - (substitute* '("src/tests/Makefile.in") - (("\ttest-route-manager-linux") "\t") - (("\ttest-route-manager-fake") "\t")) + (substitute* '("Makefile.in") + (("src/platform/tests/test-address-linux") " ") + (("src/platform/tests/test-cleanup-linux") " ") + (("src/platform/tests/test-link-linux") " ") + (("src/platform/tests/test-route-linux") " ") + (("src/devices/tests/test-arping") " ") + (("src/devices/tests/test-lldp") " ") + (("src/tests/test-route-manager-linux") " ")) #t)) (add-before 'check 'pre-check (lambda _ @@ -4643,13 +4646,17 @@ (define-public network-manager "sysconfdir=/tmp" "rundir=/tmp" "statedir=/tmp" + "nmstatedir=/tmp/nm" "install"))))))) (propagated-inputs `(("glib" ,glib))) (native-inputs `(("glib:bin" ,glib "bin") ; for gdbus-codegen ("gobject-introspection" ,gobject-introspection) + ("docbook-xsl" ,docbook-xsl) ("intltool" ,intltool) + ("libxslt" ,libxslt) + ("libxml2" ,libxml2) ("pkg-config" ,pkg-config) ;; For testing. ("python" ,python-wrapper) @@ -4661,6 +4668,7 @@ (define-public network-manager ("gnutls" ,gnutls) ("iptables" ,iptables) ("isc-dhcp" ,isc-dhcp) + ("jansson" ,jansson) ("libgcrypt" ,libgcrypt) ("libgudev" ,libgudev) ("libndp" ,libndp) From 446809fb359fb7089ebc8db7843c84377c046905 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 28 Mar 2017 12:07:09 +0200 Subject: [PATCH 248/301] gnu: Update phonon to 4.9.1 * gnu/packages/kde-frameworks.scm (phonon): Update to 4.9.1. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 1001813db3..b431a85604 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -103,7 +103,7 @@ (define-public extra-cmake-modules (define-public phonon (package (name "phonon") - (version "4.9.0") + (version "4.9.1") (source (origin (method url-fetch) (uri (string-append @@ -112,7 +112,7 @@ (define-public phonon name "-" version ".tar.xz")) (sha256 (base32 - "1q5hvsk4sfcb91625wcmldy7kgjmfpmpmkgzi6mxkqdd307v8x5v")))) + "177647r2jqfm32hqcz2nqfqv6v48hn5ab2vc31svba2wz23fkgk7")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) From 4467c2d1dcbf88e26767616a49ed49de8ee48f57 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 28 Mar 2017 17:49:41 +0200 Subject: [PATCH 249/301] gnu: Update kde-frameworks to 5.32.0 * gnu/packages/kde-frameworks.scm (breeze-icons): Update to 5.32.0. [arguments]: Re-enable tests. (kio): Update to 5.32.0. [source]: Remove patch. (ktexteditor): Update to 5.32.0. [inputs]: Add ksyntaxhighlighting. (networkmanager-qt): Update to 5.32.0. [source]: Add patches. (kunitconversion): Update to 5.32.0. [arguments] : New phase. (ksyntaxhighlighting): Update to 5.32.0.[native-iputs]: Add qtools. (knewstuff): Update to 5.32.0. [inputs]: Add qtdeclarative. (attica, baloo, bluez-qt, extra-cmake-modules, kactivities, kactivities-stats, kapidox, karchive, kauth, kbookmarks, kcmutils, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdbusaddons, kdeclarative, kded, kdesignerplugin, kdesu, kdnssd, kdoctools, kemoticons, kfilemetadata, kglobalaccel, kguiaddons, ki18n, kiconthemes, kidletime, kimageformats, kinit, kitemmodels, kitemviews, kjobwidgets, knotifications, knotifyconfig, kpackage, kparts, kpeople, kplotting, kpty, krunner, kservice, ktextwidgets, kwallet, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, kxmlrpcclient, modemmanager-qt, oxygen-icons, plasma-framework, solid, sonnet, threadweaver): Update to 5.32.0. * gnu/packages/patches/kio-CVE-2017-6410.patch: Delete file. * gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch, gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch: New files. * gnu/local.mk (dist_patch_DATA): Remove resp. add the patch files. --- gnu/local.mk | 3 +- gnu/packages/kde-frameworks.scm | 286 +++++++++--------- gnu/packages/patches/kio-CVE-2017-6410.patch | 53 ---- ...rkmanager-qt-activeconnection-test-1.patch | 60 ++++ ...rkmanager-qt-activeconnection-test-2.patch | 57 ++++ 5 files changed, 268 insertions(+), 191 deletions(-) delete mode 100644 gnu/packages/patches/kio-CVE-2017-6410.patch create mode 100644 gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch create mode 100644 gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch diff --git a/gnu/local.mk b/gnu/local.mk index 006dbe7997..98dffff648 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -667,7 +667,6 @@ dist_patch_DATA = \ %D%/packages/patches/jq-CVE-2015-8863.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/khmer-use-libraries.patch \ - %D%/packages/patches/kio-CVE-2017-6410.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \ @@ -796,6 +795,8 @@ dist_patch_DATA = \ %D%/packages/patches/netsurf-system-utf8proc.patch \ %D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ + %D%/packages/patches/networkmanager-qt-activeconnection-test-1.patch \ + %D%/packages/patches/networkmanager-qt-activeconnection-test-2.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ninja-zero-mtime.patch \ %D%/packages/patches/node-9077.patch \ diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index b431a85604..2c263e4718 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2016 Hartmut Goebel +;;; Copyright © 2016,2017 Hartmut Goebel ;;; Copyright © 2016 David Craven ;;; Copyright © 2017 Thomas Danckaert ;;; @@ -59,7 +59,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -68,7 +68,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0yi60qd08x5093wb8dv9cx370iaabn44hzcang92g9ssfmz0zd2h")))) + "1iqakxzr6bcs9wgyi8if1smpq6px0bvlcyddyk0hxhindzl7pn5i")))) (build-system cmake-build-system) (native-inputs `(("qtbase" ,qtbase))) ; For tests (needs qmake) @@ -240,7 +240,7 @@ (define-public kpmcore (define-public attica (package (name "attica") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -249,7 +249,7 @@ (define-public attica name "-" version ".tar.xz")) (sha256 (base32 - "14v6vi8awk1m58l9svpjd54ckd6milzavgfbkdspsz0km1cpqlks")))) + "16vl3gpwqcvfms82grv1bvqlxj085bqssv5ixjx007826pd8qhp5")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -272,7 +272,7 @@ (define-public attica (define-public bluez-qt (package (name "bluez-qt") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -281,7 +281,7 @@ (define-public bluez-qt name "-" version ".tar.xz")) (sha256 (base32 - "1rfzwrvvkc5f4l943f4r235gdniqc7njyw4fx36v00daj2r4aqi9")))) + "0pl6cp0rgjkh7d06ik35rw7qd96j5sh2flgjx4vi21zl5vf3vgyh")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -306,7 +306,7 @@ (define-public bluez-qt (define-public breeze-icons (package (name "breeze-icons") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -315,7 +315,7 @@ (define-public breeze-icons name "-" version ".tar.xz")) (sha256 (base32 - "06zwg2g0157ac6xsgxs5f8s1sk8rh2j3y057iqmfg2ng2sh9byh2")))) + "1n51kahzk09v52yhi7k4kqgavqlz3ghqv5cx2ssz2djpyavs18r3")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -323,11 +323,6 @@ (define-public breeze-icons ("libxml2" ,libxml2))) (inputs `(("qtbase" ,qtbase))) - ;; FIXME: Dupes test fails. Issue is fixed upstream - ;; Remove when updating to 5.28. - ;; https://github.com/KDE/breeze-icons/commit/22b383359e3a0e02d4828e6fa8ed8a3d213440b1 - (arguments - `(#:tests? #f)) (home-page "https://community.kde.org/Frameworks") (synopsis "Default KDE Plasma 5 icon theme") (description "Breeze provides a freedesktop.org compatible icon theme. @@ -340,7 +335,7 @@ (define-public breeze-icons (define-public kapidox (package (name "kapidox") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -349,7 +344,7 @@ (define-public kapidox name "-" version ".tar.xz")) (sha256 (base32 - "1whkl9rzhjnnmpj532d23mlrwhp5wcfxfvq4z4bxyr64g9plbzyq")))) + "1z6hdsppwrmqkcanrppxhqcrjvblg9i02rh3bz5m3pn66wwz0sdw")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; has no test target @@ -382,7 +377,7 @@ (define-public kapidox (define-public karchive (package (name "karchive") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -391,7 +386,7 @@ (define-public karchive name "-" version ".tar.xz")) (sha256 (base32 - "1s068z0ih6qk3m4lm10wm28y0nq5qwn4gpnx9vckar51xbrl4bb7")))) + "1dzvphqnc09mmaydqggpxg6zwwyr56p6l4jdf1rf6ns90fzxy0m4")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -416,7 +411,7 @@ (define-public karchive (define-public kcodecs (package (name "kcodecs") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -425,7 +420,7 @@ (define-public kcodecs name "-" version ".tar.xz")) (sha256 (base32 - "0r01raiva4iddiz5qqshmbmidgkf4q6illanz6zwmc4n66c6s3q3")))) + "0yybkp52i8nm4qjady6jqswn6v70cqbvjqwgrghjnc88b2cly253")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -451,7 +446,7 @@ (define-public kcodecs (define-public kconfig (package (name "kconfig") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -460,7 +455,7 @@ (define-public kconfig name "-" version ".tar.xz")) (sha256 (base32 - "0kdsaqv880wihxv6il8wailmymh0rh0jrbhg8iz2ljf3ir7g56zy")))) + "1pajh1l08b995shp6l75ri9z4vr6wjapvrkmrmv8hksnxvfi97dp")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -518,7 +513,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -527,7 +522,7 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10x2sgd1acsg1kmb741zk8sbss1j9nncfr1ac2pq0fc236ivkiyb")))) + "1n1xzvwwji9pwyxrvwp4rmpc7qzp9nlis26xmn81k607jn587ksx")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -557,7 +552,7 @@ (define-public kcoreaddons (define-public kdbusaddons (package (name "kdbusaddons") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -566,7 +561,7 @@ (define-public kdbusaddons name "-" version ".tar.xz")) (sha256 (base32 - "07mzb1xr8wyiid25p8kg6mjp6vq8ngvv1ikhq75zvd2cbax530c8")) + "1a15jjsrkza0ll2viyk834pgdxsdgdacm0982xxwl5z937f75609")) (patches (search-patches "kdbusaddons-kinit-file-name.patch")))) (build-system cmake-build-system) (native-inputs @@ -602,7 +597,7 @@ (define-public kdbusaddons (define-public kdnssd (package (name "kdnssd") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -611,7 +606,7 @@ (define-public kdnssd name "-" version ".tar.xz")) (sha256 (base32 - "1gkqfcz8glfa6krbayaay4kyq3zazcyr21zjg78la76vfnranh0r")))) + "1xakbs2wm627zn01ni8fyrz64xl5jw4by0pdrb70aad7w37dijrw")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -629,7 +624,7 @@ (define-public kdnssd (define-public kguiaddons (package (name "kguiaddons") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -638,7 +633,7 @@ (define-public kguiaddons name "-" version ".tar.xz")) (sha256 (base32 - "1f3k6g8cqgq49ka9wsfflp0vnqgk81nlp012lb5v875yil6f9m3f")))) + "0rbfd0rykmwl9hs1q22pqg2by8vi9y1pgs2ishgnan4sc4w87wjb")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -662,7 +657,7 @@ (define-public kguiaddons (define-public ki18n (package (name "ki18n") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -671,7 +666,7 @@ (define-public ki18n name "-" version ".tar.xz")) (sha256 (base32 - "0ymg8mnpvas101war3pgm3wv8ssf1wxa6mxg9ym1xx24mx7xzhzw")))) + "068xvw2hy4hlpj85wgjjdj0nc37fygpd8wb1dnpqcvzzy8rc1rsf")))) (build-system cmake-build-system) (propagated-inputs `(("gettext" ,gettext-minimal) @@ -705,7 +700,7 @@ (define-public ki18n (define-public kidletime (package (name "kidletime") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -714,7 +709,7 @@ (define-public kidletime name "-" version ".tar.xz")) (sha256 (base32 - "0cwq8jvsimxriiazivls8yix9jyglk2giqwv34a1ic1cnackhwq7")))) + "0rkxx3bnspjwm4vcy4rdfahk6vcfpkh8fldww0zfdn7s7pigqwch")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -732,7 +727,7 @@ (define-public kidletime (define-public kitemmodels (package (name "kitemmodels") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -741,7 +736,7 @@ (define-public kitemmodels name "-" version ".tar.xz")) (sha256 (base32 - "0zi7wsqcmjd7fms8r2vqvwwvzw75p275qyn6whpgblb09l0pn78z")))) + "0lxld7jdixpq23sycv8n4ckzmdr34aycrsf2zffziw6r59f0mzki")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -793,7 +788,7 @@ (define-public kitemmodels (define-public kitemviews (package (name "kitemviews") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -802,7 +797,7 @@ (define-public kitemviews name "-" version ".tar.xz")) (sha256 (base32 - "0wrlwawgnz1yjav4hfirc3lcki0hqy0cgr8bwhr9nhm27ndgv28p")))) + "1h1zgawdi4vbgymdl5215lx7hpcx9jqxy7vjf5hwgs6b2cls1sws")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -834,7 +829,7 @@ (define-public kitemviews (define-public kplotting (package (name "kplotting") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -843,7 +838,7 @@ (define-public kplotting name "-" version ".tar.xz")) (sha256 (base32 - "1vmwxj03qhrfnz3jg30ka28afpqg0hlgm46dbzyg86kg8hc2hgb2")))) + "0a0pfmdlx84526lb2jvx94i2pf85km57fm2ygis4z5mjgbzsmb6v")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -872,7 +867,7 @@ (define-public kplotting (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -881,11 +876,12 @@ (define-public ksyntaxhighlighting "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "0gf1ldlk4gav6bg5b1231hphaal4simyngirvr1yizcb1rrlygdy")))) + "1d9m7x53mwggwmhhba1c7b8v4f8qjql889y674ldpzs2nrk5y7x3")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("perl" ,perl) + ("qttools" ,qttools) ;; Optional, for compile-time validation of syntax definition files: ("qtxmlpatterns" ,qtxmlpatterns))) (inputs @@ -923,7 +919,7 @@ (define-public ksyntaxhighlighting (define-public kwayland (package (name "kwayland") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -932,7 +928,7 @@ (define-public kwayland name "-" version ".tar.xz")) (sha256 (base32 - "0xm4agsv8hyx8aaiv4zpa121s08ayhbps3pbfbds2ckk57k6ba8k")))) + "1kzvq7qx102rfdv975x5sd37lsl6wn0mzm2m1f9fnnn2rvii3h5d")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -962,7 +958,7 @@ (define-public kwayland (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -971,7 +967,7 @@ (define-public kwidgetsaddons name "-" version ".tar.xz")) (sha256 (base32 - "1p22s1cbwpwbm03qxs0wqb1i7w1s19b119diwkmb8xl90cqfdwnn")))) + "1aksy326ppdfcx20zl9hxsd8j0br32j6dlx4i1xxbd976csys9b2")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1011,7 +1007,7 @@ (define-public kwidgetsaddons (define-public kwindowsystem (package (name "kwindowsystem") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1020,7 +1016,7 @@ (define-public kwindowsystem name "-" version ".tar.xz")) (sha256 (base32 - "0lzafiwj58gg5vccnvwrhiwjq67y8cn3gllirgw13vz3f69sbr3i")))) + "1c3kd23c4wwzdhfcyhv41czw3y2kk1492xn6ah9n3r98akrhgar1")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1051,7 +1047,7 @@ (define-public kwindowsystem (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1060,7 +1056,7 @@ (define-public modemmanager-qt name "-" version ".tar.xz")) (sha256 (base32 - "1yfqqp596srvsi0yqrkpm5gzlwjf4szk6hy0wszr12gjjzqprilq")))) + "0ywyiq1kj4ya5knn0r12j9m1ig9mlyfypnrzihlvipddjrqs7jyd")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1089,7 +1085,7 @@ (define-public modemmanager-qt (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1098,7 +1094,12 @@ (define-public networkmanager-qt name "-" version ".tar.xz")) (sha256 (base32 - "1iq8xrw55k2k9af57l4lfrw72gjxgk7pp7k3m7amjfp0hdqw8602")))) + "0bcy7nzfvx2xah3kxklmrjn08qbjddiny7wf7nkxsbc3kkhrxqyd")) + ;; TODO: Remove these patches when updating to 5.33. + (patches + (search-patches + "networkmanager-qt-activeconnection-test-1.patch" + "networkmanager-qt-activeconnection-test-2.patch")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1128,7 +1129,7 @@ (define-public networkmanager-qt (define-public oxygen-icons (package (name "oxygen-icons") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1137,7 +1138,7 @@ (define-public oxygen-icons name "5" "-" version ".tar.xz")) (sha256 (base32 - "05bypc4k86lsjp7d4lpbpsnms7k1gnjyahdbks420585ca0v4qkp")))) + "05v3blgs4qbjl8s6470baahy9a98cfi3mplzp462axcgkqdj1nwf")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1153,7 +1154,7 @@ (define-public oxygen-icons (define-public solid (package (name "solid") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1162,7 +1163,7 @@ (define-public solid name "-" version ".tar.xz")) (sha256 (base32 - "0g6frc7hckbkvzgq40qrymllgp56a3v39l5d2ajqipwb4kabhdpy")))) + "1jhymivravgix0sa0szkax50j09l5fl55xi3fbyjxlb4cil114v5")))) (build-system cmake-build-system) (native-inputs `(("bison" ,bison) @@ -1182,7 +1183,7 @@ (define-public solid (define-public sonnet (package (name "sonnet") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1191,7 +1192,7 @@ (define-public sonnet name "-" version ".tar.xz")) (sha256 (base32 - "1vzn3kvi126jnkq2s5110yii8946kaxp452735fx0l0jqjn92dy8")))) + "17sjv48b3z5fgplsy16ilcw6p7mlqjs61ib6jqd1mqzv4xrr27yi")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1208,7 +1209,7 @@ (define-public sonnet (define-public threadweaver (package (name "threadweaver") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1217,7 +1218,7 @@ (define-public threadweaver name "-" version ".tar.xz")) (sha256 (base32 - "10hy4pvw84l2z8778gsfv5i8pqrfjidvlgd5rc8xffx65s3f28b5")))) + "1qpy2rzqyd4ap5fibkfk87z66ijh2h79cd7f0h506jh2dbx20g0h")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1238,7 +1239,7 @@ (define-public threadweaver (define-public kauth (package (name "kauth") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1247,7 +1248,7 @@ (define-public kauth name "-" version ".tar.xz")) (sha256 (base32 - "09m7dipkykw75dbka6mhsvrikbniwshl1l0qxcny3ywc0fkzgf40")))) + "00kdq16n9w6nf1bpwzl5lp5c2xq74g8nn6081kvnjcd4ld66ncmq")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -1285,7 +1286,7 @@ (define-public kauth (define-public kcompletion (package (name "kcompletion") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1294,7 +1295,7 @@ (define-public kcompletion name "-" version ".tar.xz")) (sha256 (base32 - "1yrlhf6n7xlkid3xbpirf8n6kybc3sqp5fnb01kr1rcl89qs273f")))) + "0fn8imr3m219r38a0rafbnylcpjq4rqhz1w66mx80sc7l10mhcni")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1322,7 +1323,7 @@ (define-public kcompletion (define-public kcrash (package (name "kcrash") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1331,7 +1332,7 @@ (define-public kcrash name "-" version ".tar.xz")) (sha256 (base32 - "0gsly5wvyh0d6yfk5yyv1pgaazwlwvahz245y9sliwzrbxhgj1yv")))) + "1zrkjrpj88ymdy5vbn9db73vxppswvmbn2gkn4gpx773dsmflhz3")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1360,7 +1361,7 @@ (define-public kcrash (define-public kdoctools (package (name "kdoctools") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1369,7 +1370,7 @@ (define-public kdoctools name "-" version ".tar.xz")) (sha256 (base32 - "1mndmxy7vgdkii8axzkzclqqimg0ksn2dmwiqsljcjcik0zfx47c")))) + "0i7zgg7iw6w0sdr6cv3yf4blcr61i8zczgmyqa964ka6p3ywwjs9")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1408,7 +1409,7 @@ (define-public kdoctools (define-public kfilemetadata (package (name "kfilemetadata") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1417,7 +1418,7 @@ (define-public kfilemetadata name "-" version ".tar.xz")) (sha256 (base32 - "0sxifxzyqq0haxfira8ldq9gwali7p5vbbh8jslj8wlxm0dczyw6")))) + "01d91gmrxlax0g13ib841vc4qwmv6r4qdr10wfs77rrxsvw7z08f")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1438,7 +1439,7 @@ (define-public kfilemetadata (define-public kimageformats (package (name "kimageformats") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1447,7 +1448,7 @@ (define-public kimageformats name "-" version ".tar.xz")) (sha256 (base32 - "1h17jm55r9ijmng5mb1w9nqk2hw6h965j9c2nrd8wl9dzy616kra")))) + "05hn8n4sc3rj5c30ki068f76k1gfgvq19zcw5jlqpnn1l5db5fvz")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1475,7 +1476,7 @@ (define-public kimageformats (define-public kjobwidgets (package (name "kjobwidgets") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1484,7 +1485,7 @@ (define-public kjobwidgets name "-" version ".tar.xz")) (sha256 (base32 - "0xh62bjd6qqbmx1jbv9qac1ng0h056mwrs8rkdqd8k10ghmsfx6a")))) + "0lhv3mg2liija0g8x14jpv1mdhb0zjh868p1cs24bs9xrw1l8984")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1503,7 +1504,7 @@ (define-public kjobwidgets (define-public knotifications (package (name "knotifications") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1512,7 +1513,7 @@ (define-public knotifications name "-" version ".tar.xz")) (sha256 (base32 - "1a55c0abs9yg7qaajgidj8bmfbwkysf24300532lnia71n1ms25s")))) + "06ap7m8c2py49pqrnhadbyl69y3nsyamzahbpwipqgh9k62sy34y")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1546,7 +1547,7 @@ (define-public knotifications (define-public kpackage (package (name "kpackage") - (version "5.28.1") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1555,7 +1556,7 @@ (define-public kpackage name "-" version ".tar.xz")) (sha256 (base32 - "0ym5fhhigp7argk7c1zyn2fvfjykgxh3miipidf142c8y3d98vbp")))) + "070zasl5c58n01fk18mjgccfizymc9griwicxizqjgzzbgvkns3r")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1584,7 +1585,7 @@ (define-public kpackage (define-public kpty (package (name "kpty") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1593,7 +1594,7 @@ (define-public kpty name "-" version ".tar.xz")) (sha256 (base32 - "1q22wzx5xpmbj56xg4miiscb1xqqk2lfkljfdi87zl05vwmnc7hn")))) + "0h4318rc9902cvqj69capb8lh7s84y44jd59d11fyhq21jhy152s")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1621,7 +1622,7 @@ (define-public kpty (define-public kunitconversion (package (name "kunitconversion") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1630,8 +1631,18 @@ (define-public kunitconversion name "-" version ".tar.xz")) (sha256 (base32 - "0n6ndy1yarilnk2l09h92qk32v02hknafif1i9mmwcibldvc963q")))) + "0crc8riwafcx6fwhgrc8vfbwmdygd6vlz1fbbgni09gamm8mbcin")))) (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-a-failing-test-case + (lambda _ + ;; TODO: Re-enable this test-case. It was committed with the + ;; message: "tsan says it's clean, apart from issues in Qt + ;; (reported upstream)" + (substitute* "autotests/convertertest.cpp" + (("const int numThreads = 2") "const int numThreads = 0"))))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs @@ -1654,7 +1665,7 @@ (define-public kunitconversion (define-public baloo (package (name "baloo") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1663,7 +1674,7 @@ (define-public baloo name "-" version ".tar.xz")) (sha256 (base32 - "071in785y1qplm59fmsmifzbmczvlvkf5gxdb6d0iw93pb36r7h5")))) + "0a4qwinkp4gmcbx4j0qxbj5qb40h7594s39za7sc7bymadicasy1")))) (build-system cmake-build-system) (propagated-inputs `(("kcoreaddons" ,kcoreaddons) @@ -1712,7 +1723,7 @@ (define-public baloo (define-public kactivities (package (name "kactivities") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1721,7 +1732,7 @@ (define-public kactivities name "-" version ".tar.xz")) (sha256 (base32 - "162ilqcfp8b3lb3gpzbw94ppsdqzn6i6ymiwh12xy5nrxixdpagb")))) + "0xin4shaj0zsfsww84mwk5n4ldaqy730jhc369px2j2nq57sg9g7")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1759,7 +1770,7 @@ (define-public kactivities (define-public kactivities-stats (package (name "kactivities-stats") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1768,7 +1779,7 @@ (define-public kactivities-stats name "-" version ".tar.xz")) (sha256 (base32 - "0pjgjl5bwmq0n23nwcqjp3b412fsibnvwsr3s3l67k9scmdpbm4v")))) + "1b3z7bcap3vjc0155y0a9xkbd477fklmpj8dr3rs0ccyc6qxxbvw")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1789,7 +1800,7 @@ (define-public kactivities-stats (define-public kbookmarks (package (name "kbookmarks") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1798,7 +1809,7 @@ (define-public kbookmarks name "-" version ".tar.xz")) (sha256 (base32 - "1lfvps0xzpzn42n7rpsdcmsiryclykz6h1hk8sp6nsbhqwzd0r65")))) + "03a024phcjv46afbp5lbmj2p8hb6srfzyaslc6ln6ms473bf5k4w")))) (build-system cmake-build-system) (propagated-inputs `(("kwidgetsaddons" ,kwidgetsaddons))) @@ -1832,7 +1843,7 @@ (define-public kbookmarks (define-public kcmutils (package (name "kcmutils") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1841,7 +1852,7 @@ (define-public kcmutils name "-" version ".tar.xz")) (sha256 (base32 - "0wj3f5ykzb7q9536y9wk8mnfcb6zay2mmc25dg67mdznzwdy36aa")))) + "1mr9h7wc22bfrbm92ajsjfcs16c5xpkrxbxzcma3a0s7jhy6qrm9")))) (build-system cmake-build-system) (propagated-inputs `(("kconfigwidgets" ,kconfigwidgets) @@ -1871,7 +1882,7 @@ (define-public kcmutils (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1880,7 +1891,7 @@ (define-public kconfigwidgets name "-" version ".tar.xz")) (sha256 (base32 - "0cy53jaq15n8hw2m67l0y6x722ywg0ijfz5ak5vq3fjjhc9fmq8d")))) + "1cq0a3k6pvl9f098ssqqk2rddxh0xn1kk4p5kfyd7w0m3c604zw3")))) (build-system cmake-build-system) (propagated-inputs `(("kauth" ,kauth) @@ -1913,7 +1924,7 @@ (define-public kconfigwidgets (define-public kdeclarative (package (name "kdeclarative") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1922,7 +1933,7 @@ (define-public kdeclarative name "-" version ".tar.xz")) (sha256 (base32 - "1g7bf3smdiwgfhdzwskp3l7l4bn838q1cdy4hp9mzqdssz956wmn")))) + "1y5g3yi1l0g1mkqhhakg265r25zm23qc2fqg55rq0g7l9ss7w7g9")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -1973,7 +1984,7 @@ (define-public kdeclarative (define-public kded (package (name "kded") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -1982,7 +1993,7 @@ (define-public kded name "-" version ".tar.xz")) (sha256 (base32 - "115ywk3vdyhwzna59bpiqfffcc128vafl823yh5fzkwbp8w7qdn5")))) + "0pmmsvqwkw86yvxxf9i6lg13vg80m0kmhjjs88lbm60cgvr5jhq6")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2006,7 +2017,7 @@ (define-public kded (define-public kdesignerplugin (package (name "kdesignerplugin") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2015,7 +2026,7 @@ (define-public kdesignerplugin name "-" version ".tar.xz")) (sha256 (base32 - "12v9pbfniljp23bllxxq6hfv6qnp2q8yjsix6fy6hwf8yrsq42m3")))) + "1hapj8x8nky3m6lx2ianmxwprf00jqyjsknjz3pi4vk3i714vhnf")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2044,7 +2055,7 @@ (define-public kdesignerplugin (define-public kdesu (package (name "kdesu") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2053,7 +2064,7 @@ (define-public kdesu name "-" version ".tar.xz")) (sha256 (base32 - "1f6awbnqs14si13n1ryibb0z3mj90bg0vk320hgabd2zxma00vwp")))) + "0zsy1hivy5bbczrpkpgj72mlx0km2nm53kpgrj2hfdy3ss0vn3hl")))) (build-system cmake-build-system) (propagated-inputs `(("kpty" ,kpty))) @@ -2075,7 +2086,7 @@ (define-public kdesu (define-public kemoticons (package (name "kemoticons") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2084,7 +2095,7 @@ (define-public kemoticons name "-" version ".tar.xz")) (sha256 (base32 - "10qxm9q7bsbbg419f8d0703mikd8w99a8fh501fpm3sgh6k7pbyv")))) + "1ncjs9iy6z6rhk83ff7fj1b68rkylnry0h698rh4jvs98gpw8sgj")))) (build-system cmake-build-system) (propagated-inputs `(("kservice" ,kservice))) @@ -2117,7 +2128,7 @@ (define-public kemoticons (define-public kglobalaccel (package (name "kglobalaccel") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2126,7 +2137,7 @@ (define-public kglobalaccel name "-" version ".tar.xz")) (sha256 (base32 - "0a60f2bs7dhx0rsrgva2p97dcala6jrjfg4z2nv0m4bv82i4kchc")))) + "0dxwjznnqlgnvn15pl34rxlzk3i21cvzn8xbgqmxakny8qiib9ry")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2160,7 +2171,7 @@ (define-public kglobalaccel (define-public kiconthemes (package (name "kiconthemes") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2169,7 +2180,7 @@ (define-public kiconthemes name "-" version ".tar.xz")) (sha256 (base32 - "1i5cpsqfn1vcch8izbrgig2km580gdxf02qmib4ynbwzcfvrnbqc")))) + "00azbyk5y3jgdqv03a2nd0627kdkhq1bkghvw7w62kcnih9k8lq5")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2209,7 +2220,7 @@ (define-public kiconthemes (define-public kinit (package (name "kinit") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2218,7 +2229,7 @@ (define-public kinit name "-" version ".tar.xz")) (sha256 (base32 - "0hwa4anljh5v53gswziacwr6ryvhp136k6y85d10074lrckdr912")))) + "0103lflppdw55l9xiqs68lzaq9897m5qnkmy6fp7dm9wfh9aplqn")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2253,17 +2264,16 @@ (define-public kinit (define-public kio (package (name "kio") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches (search-patches "kio-CVE-2017-6410.patch")) (sha256 (base32 - "1hqc88c2idi9fkb7jy82csb0i740lghv0p2fg1gaglcarjdz7nia")))) + "19da02l0aj0l07x9bbklhvx9slci3v1d8q80jvam4vyzs4qdyjin")))) (build-system cmake-build-system) (propagated-inputs `(("kbookmarks" ,kbookmarks) @@ -2328,7 +2338,7 @@ (define-public kio (define-public knewstuff (package (name "knewstuff") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2337,7 +2347,7 @@ (define-public knewstuff name "-" version ".tar.xz")) (sha256 (base32 - "0p5a6zprqfnhiim0l0qigjy7kky0m4w2nykhllwvr6lda1rg8qs3")))) + "1i3ldy9wwnjhpgdd2d0bg4304k88riin89zqzdl52lpqa6hjl3fp")))) (build-system cmake-build-system) (propagated-inputs `(("attica" ,attica) @@ -2362,6 +2372,7 @@ (define-public knewstuff ("ktextwidgets" ,ktextwidgets) ("kwidgetsaddons" ,kwidgetsaddons) ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) ("solid" ,solid) ("sonnet" ,sonnet))) (arguments @@ -2385,7 +2396,7 @@ (define-public knewstuff (define-public knotifyconfig (package (name "knotifyconfig") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2394,7 +2405,7 @@ (define-public knotifyconfig name "-" version ".tar.xz")) (sha256 (base32 - "0riia9lvp33lqh8ld5r1r0adnfnxikbvmdi4k7kfc4pzra93h10f")))) + "14qc6wj4j5i45vzqsvl2wlc07c6x30hb2680gwfqsvwgiaszkzv4")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2427,7 +2438,7 @@ (define-public knotifyconfig (define-public kparts (package (name "kparts") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2436,7 +2447,7 @@ (define-public kparts name "-" version ".tar.xz")) (sha256 (base32 - "1jghgddgz0ghq6n51l1i6jc1s10g0ckda5nlwh4myziv229g9pik")))) + "0hrx0mdvw301nbdyw5fkvgkw60ya6kmfw6hfzmj48bws8mi33rs5")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio) @@ -2478,7 +2489,7 @@ (define-public kparts (define-public kpeople (package (name "kpeople") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2487,7 +2498,7 @@ (define-public kpeople name "-" version ".tar.xz")) (sha256 (base32 - "0dqz6varz3nrnp8jfysdsp2r2mm46hn3vfcqcyyqk3nmv6sd9mpp")))) + "1xqi8zr76hajgyv016iaqlmnr5b84s71fbx412q153g92jglp4mk")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2522,7 +2533,7 @@ (define-public kpeople (define-public krunner (package (name "krunner") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2531,7 +2542,7 @@ (define-public krunner name "-" version ".tar.xz")) (sha256 (base32 - "1mmbrpgw090z41l2vg350hmm3ya2qkfkjmq7v5d90jpb7z7y6pr9")))) + "1k4rg9vqr6h5aj7v51fx3i5z9kxlfpacahs81hkwksi6if8ik4kr")))) (build-system cmake-build-system) (propagated-inputs `(("plasma-framework" ,plasma-framework))) @@ -2578,7 +2589,7 @@ (define-public krunner (define-public kservice (package (name "kservice") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2587,7 +2598,7 @@ (define-public kservice name "-" version ".tar.xz")) (sha256 (base32 - "0mlc3vw0vq1rwcg803dsybzlwxj1n6hg13z9sg0h28wsbyss3l4l")))) + "02xk3ajspprmx964zhwh2l3axm4gns9h0m0pvcb1v5j8pfh9v70q")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -2624,7 +2635,7 @@ (define-public kservice (define-public ktexteditor (package (name "ktexteditor") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2633,7 +2644,7 @@ (define-public ktexteditor name "-" version ".tar.xz")) (sha256 (base32 - "1sl152xasbhgpph4f6apkc54b26smgxbd3cxbvch2hfi5cxgb8fq")))) + "1sybw8k3f36mcs5qh3b51v7ynbqn4pbiiabkyxfmyi82i09m2jgw")))) (build-system cmake-build-system) (propagated-inputs `(("kparts" ,kparts))) @@ -2655,6 +2666,7 @@ (define-public ktexteditor ("ki18n" ,ki18n) ("kjobwidgets" ,kjobwidgets) ("kservice" ,kservice) + ("ksyntaxhighlighting" ,ksyntaxhighlighting) ("ktextwidgets" ,ktextwidgets) ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) @@ -2692,7 +2704,7 @@ (define-public ktexteditor (define-public ktextwidgets (package (name "ktextwidgets") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2701,7 +2713,7 @@ (define-public ktextwidgets name "-" version ".tar.xz")) (sha256 (base32 - "0gwjb0isjfrqd15lvln6bwql1lpk2r1vp5f72zxygz2ay8ar1wxp")))) + "1s2fd4n4hfkzscxv0cdfjynjzi1f57pfi9a3fp6rrm5c5645zk7r")))) (build-system cmake-build-system) (propagated-inputs `(("ki18n" ,ki18n) @@ -2738,7 +2750,7 @@ (define-public ktextwidgets (define-public kwallet (package (name "kwallet") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2747,7 +2759,7 @@ (define-public kwallet name "-" version ".tar.xz")) (sha256 (base32 - "0n25mvjwy3sv5bg2x75psz6d6f8yl53j3wfmx9ayh57jk4rq24rm")))) + "0psc4n6lck9gbx2nn7mgv33x4z2r0xp1mx1xcsgy8smvalrfv5xa")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2779,7 +2791,7 @@ (define-public kwallet (define-public kxmlgui (package (name "kxmlgui") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2788,7 +2800,7 @@ (define-public kxmlgui name "-" version ".tar.xz")) (sha256 (base32 - "0plw6fckpssgwf18f5i4vhfp55jmdvfh2rc5lg8fwmlqgqkvrbac")))) + "1pxi4z7z3bzwcnfwq0pvjsmds401fkisyr353lyxf4rvcpwj3a65")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -2832,7 +2844,7 @@ (define-public kxmlgui (define-public kxmlrpcclient (package (name "kxmlrpcclient") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2841,7 +2853,7 @@ (define-public kxmlrpcclient name "-" version ".tar.xz")) (sha256 (base32 - "1xrdh5ipldahcv0pxp7dnzjz1ihnkg4r2hpylg6bwvq81clw8xd1")))) + "1kaczibdfdph5mpg1dldsmqb1six57w7ch3v0v7av5h6j6sx0xaq")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio))) @@ -2875,7 +2887,7 @@ (define-public kxmlrpcclient (define-public plasma-framework (package (name "plasma-framework") - (version "5.28.0") + (version "5.32.0") (source (origin (method url-fetch) (uri (string-append @@ -2884,7 +2896,7 @@ (define-public plasma-framework name "-" version ".tar.xz")) (sha256 (base32 - "0j4mfd8wzrspvyy281lww981fly2rkbhnixb9b0pj5k9i8gvkh7q")))) + "1hrnmilc30d1kh20cky329i5ji3qyy7m4f8jzax5cgl7nrjca31h")))) (build-system cmake-build-system) (propagated-inputs `(("kpackage" ,kpackage) diff --git a/gnu/packages/patches/kio-CVE-2017-6410.patch b/gnu/packages/patches/kio-CVE-2017-6410.patch deleted file mode 100644 index 748636f806..0000000000 --- a/gnu/packages/patches/kio-CVE-2017-6410.patch +++ /dev/null @@ -1,53 +0,0 @@ -Fix CVE-2017-6410, "Information Leak when accessing https when using a -malicious PAC file": - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6410 -https://www.kde.org/info/security/advisory-20170228-1.txt - -Patch copied from upstream source repository: - -https://cgit.kde.org/kio.git/commit/?id=f9d0cb47cf94e209f6171ac0e8d774e68156a6e4 - -From f9d0cb47cf94e209f6171ac0e8d774e68156a6e4 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Tue, 28 Feb 2017 19:00:48 +0100 -Subject: Sanitize URLs before passing them to FindProxyForURL - -Remove user/password information -For https: remove path and query - -Thanks to safebreach.com for reporting the problem - -CCMAIL: yoni.fridburg@safebreach.com -CCMAIL: amit.klein@safebreach.com -CCMAIL: itzik.kotler@safebreach.com ---- - src/kpac/script.cpp | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/kpac/script.cpp b/src/kpac/script.cpp -index a0235f7..2485c54 100644 ---- a/src/kpac/script.cpp -+++ b/src/kpac/script.cpp -@@ -754,9 +754,16 @@ QString Script::evaluate(const QUrl &url) - } - } - -+ QUrl cleanUrl = url; -+ cleanUrl.setUserInfo(QString()); -+ if (cleanUrl.scheme() == QLatin1String("https")) { -+ cleanUrl.setPath(QString()); -+ cleanUrl.setQuery(QString()); -+ } -+ - QScriptValueList args; -- args << url.url(); -- args << url.host(); -+ args << cleanUrl.url(); -+ args << cleanUrl.host(); - - QScriptValue result = func.call(QScriptValue(), args); - if (result.isError()) { --- -cgit v0.11.2 - diff --git a/gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch b/gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch new file mode 100644 index 0000000000..2dd39294ea --- /dev/null +++ b/gnu/packages/patches/networkmanager-qt-activeconnection-test-1.patch @@ -0,0 +1,60 @@ +From 61337983ba74361938b7d5323de5d2819a235fdc Mon Sep 17 00:00:00 2001 +From: Jan Grulich +Date: Mon, 3 Apr 2017 12:53:12 +0200 +Subject: Fix unit test for active connections + +Instead of sending PropertiesChanged signal for an active connection we +added recently we should set all properties initially and just advertise +that we have a new active connection once everything is set +--- + src/fakenetwork/fakenetwork.cpp | 26 +++++++------------------- + 1 file changed, 7 insertions(+), 19 deletions(-) + +diff --git a/src/fakenetwork/fakenetwork.cpp b/src/fakenetwork/fakenetwork.cpp +index bc1144e..261fe8e 100644 +--- a/src/fakenetwork/fakenetwork.cpp ++++ b/src/fakenetwork/fakenetwork.cpp +@@ -215,8 +215,14 @@ void FakeNetwork::unregisterService() + + QDBusObjectPath FakeNetwork::ActivateConnection(const QDBusObjectPath &connection, const QDBusObjectPath &device, const QDBusObjectPath &specific_object) + { +- ActiveConnection *newActiveConnection = new ActiveConnection(this); + QString newActiveConnectionPath = QString("/org/kde/fakenetwork/ActiveConnection/") + QString::number(m_activeConnectionsCounter++); ++ ActiveConnection *newActiveConnection = new ActiveConnection(this); ++ newActiveConnection->addDevice(device); ++ newActiveConnection->setActiveConnectionPath(newActiveConnectionPath); ++ newActiveConnection->setConnection(connection); ++ newActiveConnection->setSpecificObject(specific_object); ++ newActiveConnection->setState(NetworkManager::ActiveConnection::Activating); ++ + m_activeConnections.insert(QDBusObjectPath(newActiveConnectionPath), newActiveConnection); + QDBusConnection::sessionBus().registerObject(newActiveConnectionPath, newActiveConnection, QDBusConnection::ExportScriptableContents); + +@@ -227,24 +233,6 @@ QDBusObjectPath FakeNetwork::ActivateConnection(const QDBusObjectPath &connectio + map.insert(QLatin1Literal("ActivatingConnection"), QVariant::fromValue(QDBusObjectPath(newActiveConnectionPath))); + Q_EMIT PropertiesChanged(map); + +- newActiveConnection->addDevice(device); +- newActiveConnection->setActiveConnectionPath(newActiveConnectionPath); +- newActiveConnection->setConnection(connection); +- newActiveConnection->setSpecificObject(specific_object); +- newActiveConnection->setState(NetworkManager::ActiveConnection::Activating); +- +- map.clear(); +- const QList deviceList { device }; +- map.insert(QLatin1Literal("Devices"), QVariant::fromValue >(deviceList)); +- map.insert(QLatin1Literal("Connection"), QVariant::fromValue(connection)); +- if (!specific_object.path().isEmpty()) { +- map.insert(QLatin1Literal("SpecificObject"), QVariant::fromValue(connection)); +- } +- map.insert(QLatin1Literal("State"), NetworkManager::ActiveConnection::Activating); +- QDBusMessage message = QDBusMessage::createSignal(newActiveConnectionPath, QLatin1Literal("org.kde.fakenetwork.Connection.Active"), QLatin1Literal("PropertiesChanged")); +- message << map; +- QDBusConnection::sessionBus().send(message); +- + Device *usedDevice = static_cast(QDBusConnection::sessionBus().objectRegisteredAt(device.path())); + if (usedDevice) { + m_activatedDevice = usedDevice->devicePath(); +-- +cgit v0.11.2 + diff --git a/gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch b/gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch new file mode 100644 index 0000000000..af3cdff729 --- /dev/null +++ b/gnu/packages/patches/networkmanager-qt-activeconnection-test-2.patch @@ -0,0 +1,57 @@ +From 3f6155389abc8e2b3dafc5eefa1ce0c929b007fa Mon Sep 17 00:00:00 2001 +From: Jan Grulich +Date: Mon, 3 Apr 2017 14:13:54 +0200 +Subject: One more attempt to fix unit test for active connections + +--- + src/activeconnection.cpp | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/activeconnection.cpp b/src/activeconnection.cpp +index 05582fa..3a8e6b2 100644 +--- a/src/activeconnection.cpp ++++ b/src/activeconnection.cpp +@@ -79,11 +79,13 @@ NetworkManager::ActiveConnection::ActiveConnection(const QString &path, QObject + connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged); + #endif + ++#ifndef NMQT_STATIC + /* + * Workaround: Re-check connection state before we watch changes in case it gets changed too quickly + * BUG:352326 + */ + d->recheckProperties(); ++#endif + } + + NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate &dd, QObject *parent) +@@ -91,18 +93,26 @@ NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate &dd, + { + Q_D(ActiveConnection); + ++#ifndef NMQT_STATIC + #if NM_CHECK_VERSION(1, 4, 0) + QDBusConnection::systemBus().connect(NetworkManagerPrivate::DBUS_SERVICE, d->path, NetworkManagerPrivate::FDO_DBUS_PROPERTIES, + QLatin1String("PropertiesChanged"), d, SLOT(dbusPropertiesChanged(QString,QVariantMap,QStringList))); + #else + connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged); + #endif ++#endif ++ ++#ifdef NMQT_STATIC ++ connect(&d->iface, &OrgFreedesktopNetworkManagerConnectionActiveInterface::PropertiesChanged, d, &ActiveConnectionPrivate::propertiesChanged); ++#endif + ++#ifndef NMQT_STATIC + /* + * Workaround: Re-check connection state before we watch changes in case it gets changed too quickly + * BUG:352326 + */ + d->recheckProperties(); ++#endif + } + + NetworkManager::ActiveConnection::~ActiveConnection() +-- +cgit v0.11.2 + From 1aab5e8320292f9414e1289173b5781422da3f14 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 3 Apr 2017 21:08:46 +0200 Subject: [PATCH 250/301] gnu: kde-frameworks: No longer setenv CTEST_OUTPUT_ON_FAILURE. This is now done my the cmake-build-system. * gnu/packages/kde-frameworks.scm (kcoreaddons, kwidgetsaddons, kpackage, kemoticons kiconthemes, kio, knewstuff, kpeople, krunner,kservice, ktexteditor, kxmlgui plasma-framework) [arguments] : Remove setenv CTEST_OUTPUT_ON_FAILURE. (kpty) [arguments] : Remove setenv CTEST_OUTPUT_ON_FAILURE. (ksyntaxhighlighting) [arguments] : Remove phase. --- gnu/packages/kde-frameworks.scm | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 2c263e4718..78654a1cd3 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -536,7 +536,6 @@ (define-public kcoreaddons (modify-phases %standard-phases (add-before 'check 'check-setup (lambda _ - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug output (setenv "HOME" (getcwd)) (setenv "TMPDIR" (getcwd)) #t))))) @@ -902,10 +901,6 @@ (define-public ksyntaxhighlighting (substitute* '("autotests/input/highlight.pl" "autotests/folding/highlight.pl.fold") (((which "perl")) "/usr/bin/perl")) - #t)) - (add-before 'check 'check-setup - (lambda _ - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug info #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Syntax highlighting engine for Kate syntax definitions") @@ -983,7 +978,6 @@ (define-public kwidgetsaddons (lambda _ ;; make Qt render "offscreen", required for tests (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug info (setenv "DBUS_FATAL_WARNINGS" "0") #t)) (add-before 'check 'start-xorg-server @@ -1572,7 +1566,6 @@ (define-public kpackage (modify-phases %standard-phases (add-before 'check 'check-setup (lambda _ - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug output (setenv "HOME" (getcwd)) #t))))) (home-page "https://community.kde.org/Frameworks") @@ -1608,7 +1601,6 @@ (define-public kpty (modify-phases %standard-phases (add-after 'unpack 'patch-tests (lambda _ - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") (substitute* "autotests/kptyprocesstest.cpp" (("/bin/bash") (which "bash"))) #t))))) @@ -2113,7 +2105,6 @@ (define-public kemoticons (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output ;; make Qt render "offscreen", required for tests (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) @@ -2207,7 +2198,6 @@ (define-public kiconthemes (string-append (assoc-ref inputs "shared-mime-info") "/share")) (setenv "HOME" (getcwd)) - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output ;; make Qt render "offscreen", required for tests (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) @@ -2316,7 +2306,6 @@ (define-public kio (lambda _ (setenv "HOME" (getcwd)) (setenv "XDG_RUNTIME_DIR" (getcwd)) - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ;; make Qt render "offscreen", required for tests (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) @@ -2382,7 +2371,6 @@ (define-public knewstuff (add-before 'check 'check-setup (lambda _ ; XDG_DATA_DIRS isn't set (setenv "HOME" (getcwd)) - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ;; make Qt render "offscreen", required for tests (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) @@ -2517,7 +2505,6 @@ (define-public kpeople (modify-phases %standard-phases (add-before 'check 'check-setup (lambda _ - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output ;; make Qt render "offscreen", required for tests (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) @@ -2574,7 +2561,6 @@ (define-public krunner (modify-phases %standard-phases (add-before 'check 'check-setup (lambda _ - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output ;; make Qt render "offscreen", required for tests (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) @@ -2620,7 +2606,6 @@ (define-public kservice (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ;; make Qt render "offscreen", required for tests (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) @@ -2691,7 +2676,6 @@ (define-public ktexteditor (setenv "HOME" (getcwd)) ;; make Qt render "offscreen", required for tests (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Full text editor component") @@ -2830,7 +2814,6 @@ (define-public kxmlgui (setenv "HOME" (getcwd)) ;; make Qt render "offscreen", required for tests (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Framework for managing menu and toolbar actions") @@ -2940,7 +2923,6 @@ (define-public plasma-framework (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output ;; make Qt render "offscreen", required for tests (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) From a97f6da4227177895e21bc811203bc12309cc368 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Tue, 11 Apr 2017 21:05:26 -0700 Subject: [PATCH 251/301] gnu: emacs-default-encrypt: Update source URI. * gnu/packages/emacs.scm (emacs-default-encrypt)[source]: Update URI. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index aa41e8c63f..532c1ce618 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4238,9 +4238,8 @@ (define-public emacs-default-encrypt (origin (method url-fetch) (uri (string-append - ;; A versioned, signed copy of this package is avialable on the - ;; home page, but 'guix download' fails to download it. - "https://github.com/emacsmirror/emacswiki.org/raw/master/jl-encrypt.el")) + "https://www.informationelle-selbstbestimmung-im-internet.de" + "/emacs/jl-encrypt" version "/jl-encrypt.el")) (file-name (string-append "jl-encrypt-" version ".el")) (sha256 (base32 From 4d6ce834bb32aedc0ecd52e67ab3f96603f54d31 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Apr 2017 14:20:30 +0200 Subject: [PATCH 252/301] gnu: dovecot: Update to 2.2.29.1. * gnu/packages/mail.scm (dovecot): Update to 2.2.29.1. [source]: Remove 'dovecot-fix-failing-test.patch'. * gnu/packages/patches/dovecot-fix-failing-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/mail.scm | 8 +- .../patches/dovecot-fix-failing-test.patch | 118 ------------------ 3 files changed, 3 insertions(+), 124 deletions(-) delete mode 100644 gnu/packages/patches/dovecot-fix-failing-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 98dffff648..0f3b4bd7a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -539,7 +539,6 @@ dist_patch_DATA = \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ - %D%/packages/patches/dovecot-fix-failing-test.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-disable-failing-tests.patch \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 1a6c505efd..255837198b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1086,17 +1086,15 @@ (define-public exim (define-public dovecot (package (name "dovecot") - (version "2.2.29") + (version "2.2.29.1") (source (origin (method url-fetch) (uri (string-append "https://www.dovecot.org/releases/" (version-major+minor version) "/" name "-" version ".tar.gz")) - (patches (search-patches "dovecot-fix-failing-test.patch")) - (sha256 - (base32 - "19irf7b5mjqq68mrpdd38gxc0zp2nqib942kjp3aif3f2acylffr")))) + (sha256 (base32 + "127kn3fgmahw9fvgz2w3zaghq98ip4j8640wqa3rw7mrgvxrzync")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/dovecot-fix-failing-test.patch b/gnu/packages/patches/dovecot-fix-failing-test.patch deleted file mode 100644 index 343bab03f9..0000000000 --- a/gnu/packages/patches/dovecot-fix-failing-test.patch +++ /dev/null @@ -1,118 +0,0 @@ -This patch fixes a test failure in dovecot 2.2.29, like this [0]: - ------- -Making check in lib-imap-client -make[2]: Entering directory -`/builddir/build/BUILD/dovecot-2.2.29/src/lib-imap-client' -for bin in test-imapc-client; do \ - if ! ./$bin; then exit 1; fi; \ - done -Warning: imapc(127.0.0.1:0): connect(127.0.0.1, 0) failed: Connection -refused - reconnecting (delay 10 ms) -Error: imapc(127.0.0.1:0): connect(127.0.0.1, 0) failed: Connection -refused - disconnecting -test: random seed #1 was 1492054294 -imapc connect failed ................................................. : ok -Warning: imapc(127.0.0.1:42704): connect(127.0.0.1, 42704) timed out -after 0 seconds - reconnecting (delay 0 ms) -Error: imapc(127.0.0.1:42704): connect(127.0.0.1, 42704) timed out after -0 seconds - disconnecting -imapc banner hangs ................................................... : ok -Warning: imapc(127.0.0.1:36762): Authentication timed out after 0 -seconds - reconnecting (delay 0 ms) -Error: imapc(127.0.0.1:36762): Authentication failed: Disconnected from -server -imapc login hangs .................................................... : ok -test-imapc-client.c:358: Assert failed: test_imapc_cmd_last_reply_pop() -== IMAPC_COMMAND_STATE_OK -imapc reconnect ...................................................... : -FAILED -imapc reconnect resend commands ...................................... : ok -imapc reconnect resend commands failed ............................... : ok -imapc reconnect mailbox .............................................. : ok -1 / 7 tests failed ------- - -Patch copied from upstream source repository: - -https://github.com/dovecot/core/commit/3a1c64363a64cdfe9153eb6292d8923f38955d82 - -[0] -https://dovecot.org/pipermail/dovecot/2017-April/107751.html - -From 3a1c64363a64cdfe9153eb6292d8923f38955d82 Mon Sep 17 00:00:00 2001 -From: Timo Sirainen -Date: Mon, 10 Apr 2017 17:07:28 +0300 -Subject: [PATCH] lib-imap-client: Fix reconnection - -There was already code for reconnection. We just shouldn't have gone very -far in imapc_connection_connect() if we were still waiting for reconnection -delay to pass. ---- - src/lib-imap-client/imapc-connection.c | 25 +++++++++---------------- - 1 file changed, 9 insertions(+), 16 deletions(-) - -diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c -index 95067e6..6eaf1ab 100644 ---- a/src/lib-imap-client/imapc-connection.c -+++ b/src/lib-imap-client/imapc-connection.c -@@ -130,6 +130,7 @@ struct imapc_connection { - struct timeout *to_throttle, *to_throttle_shrink; - - unsigned int reconnecting:1; -+ unsigned int reconnect_waiting:1; - unsigned int reconnect_ok:1; - unsigned int idling:1; - unsigned int idle_stopping:1; -@@ -504,6 +505,7 @@ static bool imapc_connection_can_reconnect(struct imapc_connection *conn) - static void imapc_connection_reconnect(struct imapc_connection *conn) - { - conn->reconnect_ok = FALSE; -+ conn->reconnect_waiting = FALSE; - - if (conn->selected_box != NULL) - imapc_client_mailbox_reconnect(conn->selected_box); -@@ -536,6 +538,7 @@ imapc_connection_try_reconnect(struct imapc_connection *conn, - imapc_connection_disconnect_full(conn, TRUE); - conn->to = timeout_add(delay_msecs, imapc_connection_reconnect, conn); - conn->reconnect_count++; -+ conn->reconnect_waiting = TRUE; - } - } - } -@@ -1785,6 +1788,12 @@ void imapc_connection_connect(struct imapc_connection *conn) - - if (conn->fd != -1 || conn->dns_lookup != NULL) - return; -+ if (conn->reconnect_waiting) { -+ /* wait for the reconnection delay to finish before -+ doing anything. */ -+ return; -+ } -+ - conn->reconnecting = FALSE; - /* if we get disconnected before we've finished all the pending - commands, don't reconnect */ -@@ -1792,22 +1801,6 @@ void imapc_connection_connect(struct imapc_connection *conn) - array_count(&conn->cmd_send_queue); - - imapc_connection_input_reset(conn); -- -- int msecs_since_last_connect = -- timeval_diff_msecs(&ioloop_timeval, &conn->last_connect); -- if (!conn->reconnect_ok && -- msecs_since_last_connect < (int)conn->client->set.connect_retry_interval_msecs) { -- if (conn->to != NULL) -- timeout_remove(&conn->to); -- conn->reconnecting = TRUE; -- imapc_connection_set_disconnected(conn); -- /* don't wait longer than necessary */ -- unsigned int delay_msecs = -- conn->client->set.connect_retry_interval_msecs - -- msecs_since_last_connect; -- conn->to = timeout_add(delay_msecs, imapc_connection_reconnect, conn); -- return; -- } - conn->last_connect = ioloop_timeval; - - if (conn->client->set.debug) { From a7a4345de12725b4e4d349e037d5de6b5dc93b1d Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 12 Apr 2017 15:29:45 +0530 Subject: [PATCH 253/301] gnu: darkhttpd: Update source URI. * gnu/packages/web.scm (darkhttpd)[source]: Update URI. --- gnu/packages/web.scm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3685993515..fb5082af26 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Clément Lassieur ;;; Copyright © 2016, 2017 ng0 -;;; Copyright © 2016 Arun Isaac +;;; Copyright © 2016, 2017 Arun Isaac ;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2016 Bake Timmons ;;; Copyright © 2017 Thomas Danckaert @@ -4220,17 +4220,12 @@ (define-public darkhttpd (version "1.12") (source (origin - ;; The darkhttpd release tarball URL fails to download with a - ;; 'TLS warning alert'. Download from the darkhttpd git repo - ;; until the problem has been fixed upstream. - (method git-fetch) - (uri (git-reference - (url (string-append "https://unix4lyfe.org/git/darkhttpd")) - (commit "41b68476c35270f47dcd2ddebe27cbcd87e43d41"))) + (method url-fetch) + (uri (string-append "https://unix4lyfe.org/darkhttpd/darkhttpd-" + version ".tar.bz2")) (sha256 (base32 - "0wi8dfgj4ic0fsy4dszl69xgxdxlwxz4c30vsw2i2dpnczgjm04k")) - (file-name (string-append name "-" version "-checkout")))) + "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155")))) (build-system gnu-build-system) (arguments `(#:make-flags '("CC=gcc") From 0ee59b81c739d08863363e7f901e130135617b23 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 12 Apr 2017 01:22:45 +0530 Subject: [PATCH 254/301] gnu: Add emacs-xmlgen. * gnu/packages/emacs.scm (emacs-xmlgen): New variable. --- gnu/packages/emacs.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 532c1ce618..741b01e558 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4278,3 +4278,33 @@ (define-public emacs-htmlize the associated decorations to HTML. Output to CSS, inline CSS and fonts is supported.") (license license:gpl2+))) + +(define-public emacs-xmlgen + (package + (name "emacs-xmlgen") + (version "0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/philjackson/xmlgen/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zay490vjby3f7455r0vydmjg7q1gwc78hilpfb0rg4gwz224z8r")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'check + (lambda _ + (zero? (system* "emacs" "--batch" "-L" "." + "-l" "xmlgen-test.el" + "-f" "ert-run-tests-batch-and-exit"))))))) + (home-page "https://github.com/philjackson/xmlgen") + (synopsis "S-expression to XML domain specific language (DSL) in +Emacs Lisp") + (description "@code{emacs-xmlgen} provides S-expression to XML +conversion for Emacs Lisp.") + (license license:gpl2+))) From eea2f45369f49d244e99257fcc71a9f367fdf0fd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 8 Apr 2017 21:38:54 -0400 Subject: [PATCH 255/301] doc: Use OpenSSH instead of lsh in bare-bones template. * gnu/system/examples/bare-bones.tmpl (services): Use openssh-service-type instead of lsh-service. --- gnu/system/examples/bare-bones.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl index 222ddda579..f7b8823d4f 100644 --- a/gnu/system/examples/bare-bones.tmpl +++ b/gnu/system/examples/bare-bones.tmpl @@ -43,5 +43,7 @@ ;; Add services to the baseline: a DHCP client and ;; an SSH server. (services (cons* (dhcp-client-service) - (lsh-service #:port-number 2222) + (service openssh-service-type + (openssh-configuration + (port-number 2222))) %base-services))) From 1fc8476d36e21711f0bd46dea753329d97d915c0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Apr 2017 00:26:45 +0200 Subject: [PATCH 256/301] gnu: certbot, python-acme: Build documentation in separate phase. * gnu/packages/tls.scm (python-acme)[arguments]<:phases>: Add 'build-documentation' phase. Rename 'docs' phase to 'install-documentation'. (certbot)[arguments]<:phases>: Adjust accordingly. --- gnu/packages/tls.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 95c56803a4..faa4fcce86 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -489,15 +489,17 @@ (define-public python-acme (substitute* "setup.py" (("'argparse',") "")) #t)) - (add-after 'build 'docs + (add-after 'build 'build-documentation + (lambda _ + (zero? (system* "make" "-C" "docs" "man" "info")))) + (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (man (string-append out "/share/man/man1")) (info (string-append out "/info"))) - (and (zero? (system* "make" "-C" "docs" "man" "info")) - (install-file "docs/_build/texinfo/acme-python.info" info) - (install-file "docs/_build/man/acme-python.1" man) - #t))))))) + (install-file "docs/_build/texinfo/acme-python.info" info) + (install-file "docs/_build/man/acme-python.1" man) + #t)))))) ;; TODO: Add optional inputs for testing. (native-inputs `(("python-mock" ,python-mock) @@ -542,18 +544,16 @@ (define-public certbot ,@(substitute-keyword-arguments (package-arguments python-acme) ((#:phases phases) `(modify-phases ,phases - (replace 'docs + (replace 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (man1 (string-append out "/share/man/man1")) (man7 (string-append out "/share/man/man7")) (info (string-append out "/info"))) - (and - (zero? (system* "make" "-C" "docs" "man" "info")) - (install-file "docs/_build/texinfo/Certbot.info" info) - (install-file "docs/_build/man/certbot.1" man1) - (install-file "docs/_build/man/certbot.7" man7) - #t))))))))) + (install-file "docs/_build/texinfo/Certbot.info" info) + (install-file "docs/_build/man/certbot.1" man1) + (install-file "docs/_build/man/certbot.7" man7) + #t)))))))) ;; TODO: Add optional inputs for testing. (native-inputs `(("python2-nose" ,python2-nose) From 4e5dbf92f7d0980e73c4d4b89644cc59a215b4e8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Apr 2017 18:34:09 +0200 Subject: [PATCH 257/301] gnu: nginx: Update to 1.12.0. * gnu/packages/web.scm (nginx): Update to 1.12.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index fb5082af26..6be196f615 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -130,14 +130,14 @@ (define-public httpd (define-public nginx (package (name "nginx") - (version "1.11.11") + (version "1.12.0") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "0qkj4xqv2f986dwqwlkidmr6jpxhv3ds67pxd1pd4a4f4j0c8yjs")))) + "0c2vg6530qplwk8rhldww5r3cwcbw1avka53qg9sh85nzlk2w8ml")))) (build-system gnu-build-system) (inputs `(("pcre" ,pcre) ("openssl" ,openssl) From fc901d168b5b6ad84cbc260f6dcd0b525abb8171 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 12 Apr 2017 17:32:03 +0300 Subject: [PATCH 258/301] gnu: nano: Update to 2.8.1. * gnu/packages/nano.scm (nano): Update to 2.8.1. --- gnu/packages/nano.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 36909032a1..15cf7cf609 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -29,7 +29,7 @@ (define-module (gnu packages nano) (define-public nano (package (name "nano") - (version "2.8.0") + (version "2.8.1") (source (origin (method url-fetch) @@ -37,7 +37,7 @@ (define-public nano version ".tar.gz")) (sha256 (base32 - "0dlid11c8jkv0b9n73lc3mj274y5c7y08n7pzv947qz50m446yqb")))) + "042rbhhkiw6nvwklm8zmmdlhjr8gdhdp486hafwrn1pwnpd511m4")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) From 352074d5a96aa47cc7977d38b948b9d219006792 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sun, 9 Apr 2017 21:10:45 +0300 Subject: [PATCH 259/301] gnu: emacs-ivy: Update to 0.9.1. * gnu/packages/emacs.scm (emacs-ivy): Update to 0.9.1. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 741b01e558..d8f3c228ba 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2659,7 +2659,7 @@ (define-public emacs-hydra (define-public emacs-ivy (package (name "emacs-ivy") - (version "0.8.0") + (version "0.9.1") (source (origin (method url-fetch) @@ -2668,7 +2668,7 @@ (define-public emacs-ivy (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "18nqwl05is71dzswnvpfhlg7b0v3apvbsfxrwab9c0apwavi892q")))) + "1abi1rvjarwfxxylpx8qlhck0kbavnj0nmlaaizk9q5zr02xfx1j")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-hydra" ,emacs-hydra))) From 99517d92709ee979c3507994caeb18db1eed08a6 Mon Sep 17 00:00:00 2001 From: George Clemmer Date: Mon, 10 Apr 2017 18:31:52 -0400 Subject: [PATCH 260/301] gnu: emacs-ag: Build and install info. * gnu/packages/emacs.scm (emacs-ag)[arguments]: Add 'make-info' and 'install-info' phases. Signed-off-by: Alex Kost --- gnu/packages/emacs.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d8f3c228ba..65a491302c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Kyle Meyer ;;; Copyright © 2017 Kei Kebreau +;;; Copyright © 2017 George Clemmer ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,6 +59,7 @@ (define-module (gnu packages emacs) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) #:use-module (gnu packages ncurses) + #:use-module (gnu packages python) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages tcl) @@ -1128,9 +1130,22 @@ (define-public emacs-ag ("ag-executable" (string-append (assoc-ref inputs "the-silver-searcher") "/bin/ag"))) - #t))))) + #t)) + (add-before 'install 'make-info + (lambda _ + (with-directory-excursion "docs" + (zero? (system* "make" "info"))))) + (add-after 'install 'install-info + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (info (string-append out "/share/info"))) + (install-file "docs/_build/texinfo/agel.info" info) + #t)))))) (inputs `(("the-silver-searcher" ,the-silver-searcher))) + (native-inputs + `(("python-sphinx" ,python-sphinx) + ("texinfo" ,texinfo))) (propagated-inputs `(("dash" ,emacs-dash) ("s" ,emacs-s))) From 57fe07dbc009a2f619ed80a2c559b71015f37c63 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 3 Feb 2017 15:05:44 +0100 Subject: [PATCH 261/301] gnu: python-acme: Remove unused dependencies. Removed in python-acme@0.10.0 and 0.4.1, respectively: https://github.com/certbot/certbot/commit/edbb3a73c6085219bef0cbf008bd1c82088bfcf6 https://github.com/certbot/certbot/commit/df383ee6e408f3be4bc3beb59aa33abc8e90f268 * gnu/packages/tls.scm (python-acme, python2-acme)[propagated-inputs]: Remove python-ndg-httpsclient and python-werkzeug. --- gnu/packages/tls.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index faa4fcce86..483cfca22d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -509,9 +509,7 @@ (define-public python-acme ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) ("texinfo" ,texinfo))) (propagated-inputs - `(("python-ndg-httpsclient" ,python-ndg-httpsclient) - ("python-werkzeug" ,python-werkzeug) - ("python-six" ,python-six) + `(("python-six" ,python-six) ("python-requests" ,python-requests) ("python-pytz" ,python-pytz) ("python-pyrfc3339" ,python-pyrfc3339) From 012863081d44a916b8d0403701f364c5aa141117 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 3 Feb 2017 15:06:41 +0100 Subject: [PATCH 262/301] gnu: certbot: Remove unused dependency. This dependency was removed in certbot@0.10.0: https://github.com/certbot/certbot/commit/d54cb76432a2eff43cc9cc3c1cc4d9136eac2221 * gnu/packages/tls.scm (certbot)[propagated-inputs]: Remove python2-pythondialog. --- gnu/packages/tls.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 483cfca22d..1c99a3ad75 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -565,7 +565,6 @@ (define-public certbot (propagated-inputs `(("python2-acme" ,python2-acme) ("python2-zope-interface" ,python2-zope-interface) - ("python2-pythondialog" ,python2-pythondialog) ("python2-pyrfc3339" ,python2-pyrfc3339) ("python2-pyopenssl" ,python2-pyopenssl) ("python2-configobj" ,python2-configobj) From 6ddf4fcfaeff8c9c1c6bd43c172ca33fe6d62c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 Apr 2017 14:08:33 +0200 Subject: [PATCH 263/301] services: Define '%linux-bare-metal-service' using 'simple-service'. * gnu/services.scm (linux-bare-metal-service-type): Remove. (%linux-bare-metal-service): Define in terms of 'simple-service'. --- gnu/services.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index 6c88f2621b..9f6e323e18 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -403,16 +403,13 @@ (define %linux-kernel-activation ;; Let users debug their own processes! (activate-ptrace-attach))) -(define linux-bare-metal-service-type - (service-type (name 'linux-bare-metal) - (extensions - (list (service-extension activation-service-type - (const %linux-kernel-activation)))))) - (define %linux-bare-metal-service ;; The service that does things that are needed on the "bare metal", but not ;; necessary or impossible in a container. - (service linux-bare-metal-service-type #f)) + (simple-service 'linux-bare-metal + activation-service-type + %linux-kernel-activation)) + (define special-files-service-type ;; Service to install "special files" such as /bin/sh and /usr/bin/env. From bb5cad4eb2473889dd9938ab3d0453d30b0765e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 Apr 2017 16:26:00 +0200 Subject: [PATCH 264/301] file-systems: Allow for bind-mounts of named sockets. Previously a named socket such as /dev/log would fail the 'regular-file?' test and we'd end up mkdir'ing it. * gnu/build/file-systems.scm (regular-file?): Remove. (mount-file-system): Change (regular-file? source) to (not (file-is-directory? source)). --- gnu/build/file-systems.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index eb9f07861f..0cb84b8aad 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -565,10 +565,6 @@ (define (mount-flags->bit-mask flags) (() 0)))) -(define (regular-file? file-name) - "Return #t if FILE-NAME is a regular file." - (eq? (stat:type (stat file-name)) 'regular)) - (define* (mount-file-system spec #:key (root "/root")) "Mount the file system described by SPEC under ROOT. SPEC must have the form: @@ -608,9 +604,9 @@ (define (mount-nfs source mount-point type flags options) (check-file-system source type)) ;; Create the mount point. Most of the time this is a directory, but - ;; in the case of a bind mount, a regular file may be needed. + ;; in the case of a bind mount, a regular file or socket may be needed. (if (and (= MS_BIND (logand flags MS_BIND)) - (regular-file? source)) + (not (file-is-directory? source))) (unless (file-exists? mount-point) (mkdir-p (dirname mount-point)) (call-with-output-file mount-point (const #t))) From ee295346ce81c276ffb4ee34cc6f5b134b415097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 Apr 2017 16:44:18 +0200 Subject: [PATCH 265/301] services: tor: Run in a container. * gnu/services/networking.scm (tor-shepherd-service): Use (gnu build shepherd) and use 'make-forkexec-constructor/container' instead of 'make-forkexec-constructor'. --- gnu/services/networking.scm | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 85fc0b843a..ae9b8f87cc 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -595,17 +595,31 @@ (define (tor-shepherd-service config) (match config (($ tor) (let ((torrc (tor-configuration->torrc config))) - (list (shepherd-service - (provision '(tor)) + (with-imported-modules (source-module-closure + '((gnu build shepherd) + (gnu system file-systems))) + (list (shepherd-service + (provision '(tor)) - ;; Tor needs at least one network interface to be up, hence the - ;; dependency on 'loopback'. - (requirement '(user-processes loopback syslogd)) + ;; Tor needs at least one network interface to be up, hence the + ;; dependency on 'loopback'. + (requirement '(user-processes loopback syslogd)) - (start #~(make-forkexec-constructor - (list (string-append #$tor "/bin/tor") "-f" #$torrc))) - (stop #~(make-kill-destructor)) - (documentation "Run the Tor anonymous network overlay."))))))) + (modules '((gnu build shepherd) + (gnu system file-systems))) + + (start #~(make-forkexec-constructor/container + (list #$(file-append tor "/bin/tor") "-f" #$torrc) + + #:mappings (list (file-system-mapping + (source "/var/lib/tor") + (target source) + (writable? #t)) + (file-system-mapping + (source "/dev/log") ;for syslog + (target source))))) + (stop #~(make-kill-destructor)) + (documentation "Run the Tor anonymous network overlay.")))))))) (define (tor-hidden-service-activation config) "Return the activation gexp for SERVICES, a list of hidden services." From 61b64acf41684eff56f46dea15124161e9501dd6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Apr 2017 01:48:15 +0200 Subject: [PATCH 266/301] gnu: bind: Update to 9.10.4-P8 [fixes CVE-2017-{3136,3137,3138}]. * gnu/packages/dns.scm (bind): Update to 9.10.4-P8. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 0c965f8c20..53ffa54630 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -90,7 +90,7 @@ (define-public dnsmasq (define-public bind (package (name "bind") - (version "9.10.4-P6") + (version "9.10.4-P8") (source (origin (method url-fetch) (uri (string-append @@ -98,7 +98,7 @@ (define-public bind version ".tar.gz")) (sha256 (base32 - "0rgffdm0h6dks0np4h9q4kd8nyb3azrdxw2skqnjzd8ws78vzpx1")))) + "1sv6fp5gznjj1kmx9q8wr2c6js10wqckgy25sqj83bbf8smmdlvx")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs From d24b989424eac2b317d506ae7e34c919e52e3033 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 12 Apr 2017 03:54:33 -0400 Subject: [PATCH 267/301] gnu: icecat: Add more fixes from mozilla-esr45. * gnu/packages/gnuzilla.scm (icecat)[source]: Add fixes from the upstream mozilla-esr45 repository. --- gnu/packages/gnuzilla.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 4a2e784eec..3b69a6b815 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -376,7 +376,22 @@ (define-public icecat (mozilla-patch "icecat-bug-1292534.patch" "c709d4b36145" "18cdck3fr4a1ygszb6qk07g6fi3kv6i697pjfcipvqrk358qb0hq") (mozilla-patch "icecat-bug-1336830.patch" "18e355831dd5" "042487xhq9zkky3pxiqy1rpy69z0j20w0jnl7kwg2j1bzfbnniip") (mozilla-patch "icecat-bug-1336832.patch" "ebeb0b45a84b" "17ch2aqsrnkiwbnkf6x7a1cpi8jgfjhwr6wp0bsa89s8v1dax6w4") - (mozilla-patch "icecat-bug-1349946.patch" "ccbecbe17a45" "19vwmhvqarpzai8mcq6i7szkrp1h9m8v5lyimkmmdlmagrivjw7f"))) + (mozilla-patch "icecat-bug-1349946.patch" "ccbecbe17a45" "19vwmhvqarpzai8mcq6i7szkrp1h9m8v5lyimkmmdlmagrivjw7f") + (mozilla-patch "icecat-bug-1350683.patch" "00ed655efad1" "0nfk9345lshim8xl29qka5man73jgxcppv3pzfrgjhk97z7h6ifq") + (mozilla-patch "icecat-bug-1342823.patch" "609145968cfe" "1y5kw8khzxnx5cbrv4zmdd1nzha85r3cmxn3inami9fx8vikxjq8") + (mozilla-patch "icecat-bug-1336828.patch" "982cfe33c513" "0amj3qx5399mrdcqakvfn5pabp562i1s87a8zd65jyqs4mwgcjap") + (mozilla-patch "icecat-bug-1348894.patch" "eed8086d0af7" "18p567nhj7nvh740fhh3l0mqx0b7370b45005j43ll08rf2nhygl") + (mozilla-patch "icecat-bug-1344467.patch" "38664f88d8f5" "0zdkmiqjr6h1bfs4qw74p5bnw74kcx9fxr4mcnshpavv2gvc6dn4") + (mozilla-patch "icecat-bug-1350844.patch" "c071fab59d05" "16hf5c4appca8vwxl5yvl5ig5bw8cb8hl8apvknsn5rdsjwjlrpr") + (mozilla-patch "icecat-bug-1352926.patch" "8fade3eebca2" "165v18545g4br1j6nbbhq2h9098iqvqpbd54zmgwwk9c973qhp3c") + (mozilla-patch "icecat-bug-1343642.patch" "6172686bf59c" "0iwihvx11am28cbmgg68llf3mr4ghrclimr51vms1nq9ji767wdb") + (mozilla-patch "icecat-bug-1349340.patch" "260b50fb6d39" "0lq08bkj1ihhwmf0yhxcnvngzym222q3n66ql9fbda4n7prlfhzl") + (mozilla-patch "icecat-bug-1353088.patch" "44a90ca714b9" "1rb27bnrm9a5nnwrsxx7z36yhhz8x6lv0df98jv1128zvd373blp") + (mozilla-patch "icecat-bug-1347617.patch" "e40b00161221" "0nm6jqbkb6rdahzd39gnhmy1gwawa5jbd7i80c7g1igj3x8ab50y") + (mozilla-patch "icecat-bug-1278157.patch" "a7803c36d797" "10l8jbqlmfkvi4jj0vhkl0a9vdsh3niy5rjr26br3633nyyr4747") + (mozilla-patch "icecat-bug-1348941.patch" "4fe9b979b84d" "069rzn60vn90gcck2wakr6m83q0cy32x5r54ccia9nc26a01p6p5") + (mozilla-patch "icecat-bug-1347075.patch" "a017569d3535" "1j7q02q2ybpfx9cr6dn9x27jva1d6dzs4pdxx2a1xmk5va03lrmq") + (mozilla-patch "icecat-bug-1333858.patch" "413dc18f25c8" "0g1q1y22m5gds8p07nq5c8f84jc152x4sac40b17gawj1005n5v9"))) (modules '((guix build utils))) (snippet '(begin From 098bb004beabf561182ff2f6b6980467a79756d0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Apr 2017 22:04:32 -0400 Subject: [PATCH 268/301] gnu: isc-dhcp: Update bundled bind to 9.9.9-P8 [security fixes]. Fixes CVE-2017-{3136,3137,3138}. * gnu/packages/admin.scm (isc-dhcp): Update bundled bind to 9.9.9-P8. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bff480b204..7404e5bd15 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -480,7 +480,7 @@ (define-public isc-dhcp (bind-minor-version "9") (bind-patch-version "9") (bind-release-type "-P") ; for patch release, use "-P" - (bind-release-version "6") ; for patch release, e.g. "6" + (bind-release-version "8") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version "." bind-minor-version @@ -596,7 +596,7 @@ (define-public isc-dhcp "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "1qf9j0nyqx0qy871mj22xh4dg0n1pqlv94lpiijb8vr7n7m3svhr")))) + "1f5i64f6y4rmy61y63r5if1lifw8dw8r8dh6ns3x4002hanzrpgz")))) ;; When cross-compiling, we need the cross Coreutils and sed. ;; Otherwise just use those from %FINAL-INPUTS. From efc95e7bc6bfd97425b9f2fdb5eebac6b99aac6b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Apr 2017 22:28:09 -0400 Subject: [PATCH 269/301] gnu: libsamplerate: Update to 0.1.9 [fixes CVE-2017-7697]. * gnu/packages/pulseaudio.scm (libsamplerate)[replacement]: New field. (libsamplerate-0.1.9): New variable. --- gnu/packages/pulseaudio.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index a12f8d8494..e306bdf3ad 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2017 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,6 +76,7 @@ (define-public libsndfile (define-public libsamplerate (package (name "libsamplerate") ; aka. Secret Rabbit Code (SRC) + (replacement libsamplerate-0.1.9) (version "0.1.8") (source (origin (method url-fetch) @@ -110,6 +112,19 @@ (define-public libsamplerate rates.") (license l:gpl2+))) +(define libsamplerate-0.1.9 + (package + (inherit libsamplerate) + (version "0.1.9") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.mega-nerd.com/SRC/libsamplerate-" + version ".tar.gz")) + (sha256 + (base32 + "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha")))))) + (define-public pulseaudio (package (name "pulseaudio") From 2e3744730777dc4e988675be369692d2be6fa1e2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Apr 2017 22:37:23 -0400 Subject: [PATCH 270/301] gnu: libsndfile: Update to 1.0.28 [fixes CVE-2017-{7585,7586,7741,7742}]. * gnu/packages/pulseaudio.scm (libsndfile)[replacement]: New field. (libsndfile-1.0.28): New variable. --- gnu/packages/pulseaudio.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index e306bdf3ad..71fcc3f827 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -43,6 +43,7 @@ (define-module (gnu packages pulseaudio) (define-public libsndfile (package (name "libsndfile") + (replacement libsndfile-1.0.28) (version "1.0.27") (source (origin (method url-fetch) @@ -73,6 +74,19 @@ (define-public libsndfile for reading and writing new sound file formats.") (license l:gpl2+))) +(define libsndfile-1.0.28 + (package + (inherit libsndfile) + (version "1.0.28") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.mega-nerd.com/libsndfile/files/libsndfile-" + version ".tar.gz")) + (sha256 + (base32 + "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz")))))) + (define-public libsamplerate (package (name "libsamplerate") ; aka. Secret Rabbit Code (SRC) From 9dae0a761142fd3f4aeb054729c6720c0bea5163 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 13 Apr 2017 04:14:41 -0400 Subject: [PATCH 271/301] gnu: linux-libre@4.4: Update to 4.4.61. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.61. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 800f07b1c5..d8f885bc13 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -368,8 +368,8 @@ (define-public linux-libre-4.9 #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.60" - "0rahii7nxfhn3zh289x4xpx4fk3nbij0jnrbvfpa59p15iamwyi2" + (make-linux-libre "4.4.61" + "12555h3yxymxgfgq3g33sy78g7rj6l8dpqr29z98kr9ybs93q7vj" %intel-compatible-systems #:configuration-file kernel-config)) From c8d6d510f63ba737dc521e7c69faa9d788506172 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 13 Apr 2017 04:15:38 -0400 Subject: [PATCH 272/301] gnu: linux-libre@4.9: Update to 4.9.22. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.22. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d8f885bc13..9a9b2c49e3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -362,8 +362,8 @@ (define-public linux-libre #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.21" - "0zmn3261rf5asd4r64qiv1h4ka93pb1aagj7rmw6lyi36yqxc19b" + (make-linux-libre "4.9.22" + "1dvsbqkw7wvg40nmzdyiyvb0i54j5w6d9dvsvv7z87d2id56lqm0" %intel-compatible-systems #:configuration-file kernel-config)) From 44fd83898787ba27edf2b47503382ba65a53e238 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 13 Apr 2017 04:16:26 -0400 Subject: [PATCH 273/301] gnu: linux-libre: Update to 4.10.10. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.10.10. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9a9b2c49e3..e1ae84e3a7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,8 +352,8 @@ (define* (make-linux-libre version hash supported-systems (define %intel-compatible-systems '("x86_64-linux" "i686-linux")) -(define %linux-libre-version "4.10.9") -(define %linux-libre-hash "1id2nx0k70akmwx9l4ga4i2p8wjpxx5jdmgckrfxqgprw19jkn6p") +(define %linux-libre-version "4.10.10") +(define %linux-libre-hash "1py6hzv39hbyafkvz69pmcidwxbd7psp9jzmnm4dg4jj7j92m6b7") (define-public linux-libre (make-linux-libre %linux-libre-version From 0da0f434c61d35739ab7f3741a34daf1e82133e7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 12 Apr 2017 11:30:35 +0200 Subject: [PATCH 274/301] gnu: Add freeglut-2.8. * gnu/packages/gl.scm (freeglut-2.8): New variable. --- gnu/packages/gl.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index db708308d5..bb2eb768ea 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -124,6 +124,21 @@ (define-public freeglut the X-Consortium license.") (license license:x11))) +;; Needed for "kiki". +(define-public freeglut-2.8 + (package (inherit freeglut) + (name "freeglut") + (version "2.8.1") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/freeglut/freeglut/" + version "/freeglut-" version ".tar.gz")) + (sha256 + (base32 + "16lrxxxd9ps9l69y3zsw6iy0drwjsp6m26d1937xj71alqk6dr6x")))) + (build-system gnu-build-system))) + (define-public ftgl (package (name "ftgl") From bd71525b7ad1bb4f6896793ca7f6283e178b3a06 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 12 Apr 2017 11:28:01 +0200 Subject: [PATCH 275/301] gnu: Add kiki. * gnu/packages/games.scm (kiki): New variable. * gnu/packages/patches/kiki-level-selection-crash.patch, gnu/packages/patches/kiki-makefile.patch, gnu/packages/patches/kiki-missing-includes.patch, gnu/packages/patches/kiki-portability-64bit.patch: New patches. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 4 + gnu/packages/games.scm | 97 ++++++ .../patches/kiki-level-selection-crash.patch | 19 + gnu/packages/patches/kiki-makefile.patch | 57 +++ .../patches/kiki-missing-includes.patch | 55 +++ .../patches/kiki-portability-64bit.patch | 328 ++++++++++++++++++ 6 files changed, 560 insertions(+) create mode 100644 gnu/packages/patches/kiki-level-selection-crash.patch create mode 100644 gnu/packages/patches/kiki-makefile.patch create mode 100644 gnu/packages/patches/kiki-missing-includes.patch create mode 100644 gnu/packages/patches/kiki-portability-64bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0f3b4bd7a8..9385b3df94 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -666,6 +666,10 @@ dist_patch_DATA = \ %D%/packages/patches/jq-CVE-2015-8863.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/khmer-use-libraries.patch \ + %D%/packages/patches/kiki-level-selection-crash.patch \ + %D%/packages/patches/kiki-makefile.patch \ + %D%/packages/patches/kiki-missing-includes.patch \ + %D%/packages/patches/kiki-portability-64bit.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 71f35e2fef..710b2746c9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -89,6 +89,7 @@ (define-module (gnu packages games) #:use-module (gnu packages pkg-config) #:use-module (gnu packages databases) #:use-module (gnu packages sdl) + #:use-module (gnu packages swig) #:use-module (gnu packages texinfo) #:use-module (gnu packages check) #:use-module (gnu packages fonts) @@ -3552,3 +3553,99 @@ (define-public cdogs-sdl license:cc0 license:cc-by3.0 license:cc-by-sa3.0)))) + +(define-public kiki + (package + (name "kiki") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/kiki/kiki-src/" + version "/kiki-" version "-src.tgz")) + (sha256 + (base32 + "0ihjdsxbn8z3cz0gpcprafiipcqaiskgdnh1rhmw4qff8dszalbn")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file (find-files "." "\\.dll$")) + #t)) + (patches + (search-patches "kiki-level-selection-crash.patch" + "kiki-makefile.patch" + "kiki-missing-includes.patch" + "kiki-portability-64bit.patch")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:make-flags '("CXX=g++") + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (setenv "CPLUS_INCLUDE_PATH" + (string-append (assoc-ref inputs "sdl-union") + "/include/SDL:" + (assoc-ref inputs "python") + "/include/python2.7:" + (getenv "CPLUS_INCLUDE_PATH"))) + (substitute* "src/main/main.cpp" + (("#include " line) + (string-append line " +#define K_INCLUDE_GLUT +#include \"KIncludeTools.h\"")) + (("// initialize SDL" line) + (string-append "glutInit(&argc,argv);\n" line))) + (substitute* "src/main/KikiController.cpp" + (("getenv\\(\"KIKI_HOME\"\\)") + (string-append "\"" (assoc-ref outputs "out") "/share/kiki/\""))) + (substitute* "linux/Makefile" + (("CXXOPTS =" line) + (string-append line " -fpermissive")) + (("PYTHON_VERSION=.*") "PYTHON_VERSION=2.7") + (("PYTHONHOME =.*") + (string-append "PYTHONHOME = " + (assoc-ref inputs "python") + "/lib/python2.7/")) + (("\\$\\(GLLIBS\\)" line) + (string-append line " -lm -lpython2.7"))) + (substitute* "src/main/KikiPythonWidget.h" + (("#define __KikiPythonWidget" line) + (string-append line "\n#include \"KikiPython.h\""))) + #t)) + (add-before 'build 'build-kodilib + (lambda* (#:key make-flags #:allow-other-keys) + (with-directory-excursion "kodilib/linux" + (zero? (apply system* "make" make-flags))))) + (add-after 'build-kodilib 'chdir + (lambda _ (chdir "linux") #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share/kiki"))) + (mkdir-p bin) + (mkdir-p share) + (install-file "kiki" bin) + (copy-recursively "../py" (string-append share "/py")) + (copy-recursively "../sound" (string-append share "/sound")) + #t)))))) + (inputs + `(("glu" ,glu) + ;; Kiki builds fine with freeglut 3.0.0 but segfaults on start. + ("freeglut" ,freeglut-2.8) + ("sdl-union" ,(sdl-union (list sdl + sdl-mixer + sdl-image))) + ("python" ,python-2))) + (native-inputs + `(("swig" ,swig))) + (home-page "http://kiki.sourceforge.net/") + (synopsis "3D puzzle game") + (description "Kiki the nano bot is a 3D puzzle game. It is basically a +mixture of the games Sokoban and Kula-World. Your task is to help Kiki, a +small robot living in the nano world, repair its maker.") + ;; See + ;; for a statement from the author. + (license license:public-domain))) diff --git a/gnu/packages/patches/kiki-level-selection-crash.patch b/gnu/packages/patches/kiki-level-selection-crash.patch new file mode 100644 index 0000000000..8cc6478509 --- /dev/null +++ b/gnu/packages/patches/kiki-level-selection-crash.patch @@ -0,0 +1,19 @@ +Downloaded from https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/kiki-the-nano-bot/debian/patches/level-selection-with-no-levels-solved.patch?revision=8291&view=co + +Kiki crashes if the user tries to use the level selection menu before +finishing any level. + +Peter De Wachter (pdewacht@gmail.com) +placed in the public domain + +--- a/py/levelselection.py ++++ b/py/levelselection.py +@@ -25,6 +25,8 @@ + # ............................................................................................................ + + last_level = highscore.getLastAvailableLevel() ++ if last_level < 0: ++ last_level = 0 + current_level = (level_index >= 0) and level_index or last_level + + world.max_level_index = last_level diff --git a/gnu/packages/patches/kiki-makefile.patch b/gnu/packages/patches/kiki-makefile.patch new file mode 100644 index 0000000000..7329301f2c --- /dev/null +++ b/gnu/packages/patches/kiki-makefile.patch @@ -0,0 +1,57 @@ +Downloaded from https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/kiki-the-nano-bot/debian/patches/Makefile.patch?revision=15681&view=co + +Makefile fixes: + - Make CXXFLAGS, CPPFLAGS, LDFLAGS available for user-specified flags. + - run SWIG before compiling + +Peter De Wachter (pdewacht@gmail.com) +placed in the public domain + +--- a/kodilib/linux/Makefile ++++ b/kodilib/linux/Makefile +@@ -21,7 +21,7 @@ + + INCLUDES = $(KODI_INCLUDES) $(X11_INCLUDES) $(SDL_INCLUDES) + +-CXXFLAGS = $(INCLUDES) $(SDL_CFLAGS) ++CXXOPTS = -Wall $(INCLUDES) $(SDL_CFLAGS) $(CPPFLAGS) $(CXXFLAGS) + + src = \ + $(KODISRCDIR)/handler/KEventHandler.cpp \ +@@ -95,4 +95,4 @@ + $(RM) -f $(obj) libkodi.a + + %.o: %.cpp +- $(CXX) -c $(CXXFLAGS) -o $@ $< ++ $(CXX) -c $(CXXOPTS) -o $@ $< +--- a/linux/Makefile ++++ b/linux/Makefile +@@ -46,7 +46,7 @@ + + INCLUDES = $(KIKI_INCLUDES) $(X11_INCLUDES) $(PYTHON_INCLUDES) + +-CXXFLAGS = $(INCLUDES) $(SDLCFLAGS) ++CXXOPTS = -Wall $(INCLUDES) $(SDLCFLAGS) $(CPPFLAGS) $(CXXFLAGS) + + src = \ + $(KIKISRC)/base/KikiAction.cpp \ +@@ -105,8 +105,10 @@ + obj = $(src:.cpp=.o) + + kiki: $(KIKISRC)/../SWIG/KikiPy_wrap.cpp $(obj) +- -(cd ../SWIG; swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i; cp kiki.py ../py) +- $(CXX) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS) ++ $(CXX) $(LDFLAGS) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS) ++ ++$(KIKISRC)/../SWIG/KikiPy_wrap.cpp: $(wildcard ../SWIG/*.i) ++ (cd ../SWIG && swig -c++ -python -globals kiki -DSWIG_PYTHON_LEGACY_BOOL -o KikiPy_wrap.cpp KikiPy.i && cp kiki.py ../py) + + obj-clean: + $(RM) -f $(obj) +@@ -115,5 +117,5 @@ + $(RM) -f $(obj) kiki + + %.o: %.cpp +- $(CXX) -c $(CXXFLAGS) -o $@ $< ++ $(CXX) -c $(CXXOPTS) -o $@ $< + diff --git a/gnu/packages/patches/kiki-missing-includes.patch b/gnu/packages/patches/kiki-missing-includes.patch new file mode 100644 index 0000000000..e5ee74f3ee --- /dev/null +++ b/gnu/packages/patches/kiki-missing-includes.patch @@ -0,0 +1,55 @@ +Downloaded from https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/kiki-the-nano-bot/debian/patches/missing-includes.patch?revision=7984&view=co + +Status: in upstream CVS + +--- a/kodilib/src/handler/KPickable.h ++++ b/kodilib/src/handler/KPickable.h +@@ -8,6 +8,7 @@ + + #include "KIntrospection.h" + #include ++#include + + #define DEBUG_PICKING false + +--- a/kodilib/src/tools/KIntrospection.h ++++ b/kodilib/src/tools/KIntrospection.h +@@ -11,6 +11,7 @@ + #endif + + #include ++#include + + // -------------------------------------------------------------------------------------------------------- + class KClassInfo +--- a/kodilib/src/tools/KStringTools.cpp ++++ b/kodilib/src/tools/KStringTools.cpp +@@ -6,7 +6,7 @@ + #include "KStringTools.h" + #include "KVector.h" + +-#include // INT_MAX ++#include // INT_MAX + #include + + // -------------------------------------------------------------------------------------------------------- +--- a/kodilib/src/tools/KStringTools.h ++++ b/kodilib/src/tools/KStringTools.h +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + // -------------------------------------------------------------------------------------------------------- + +--- a/kodilib/src/tools/KXMLTools.cpp ++++ b/kodilib/src/tools/KXMLTools.cpp +@@ -7,6 +7,7 @@ + #include "KConsole.h" + #include "KSeparatedMatrix.h" + #include ++#include + + // -------------------------------------------------------------------------------------------------------- + std::string kXMLTag ( const std::string & name, const std::string & attributes, int depth ) diff --git a/gnu/packages/patches/kiki-portability-64bit.patch b/gnu/packages/patches/kiki-portability-64bit.patch new file mode 100644 index 0000000000..456c008915 --- /dev/null +++ b/gnu/packages/patches/kiki-portability-64bit.patch @@ -0,0 +1,328 @@ +This patch was downloaded from Debian: +https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/kiki-the-nano-bot/debian/patches/portability-64bit.patch?revision=7984&view=co + +Make 64-bit clean (string positions don't fit in an int on 64-bit machines) + +Peter De Wachter (pdewacht@gmail.com) +placed in the public domain + +Status: in upstream CVS + +--- a/kodilib/src/tools/KFileTools.cpp ++++ b/kodilib/src/tools/KFileTools.cpp +@@ -214,8 +214,8 @@ + // -------------------------------------------------------------------------------------------------------- + string kFileSuffix ( const string & path ) + { +- unsigned int lastDotPos = path.rfind("."); +- unsigned int lastSlashPos = path.rfind(kPathSep); ++ std::string::size_type lastDotPos = path.rfind("."); ++ std::string::size_type lastSlashPos = path.rfind(kPathSep); + + if (lastDotPos < path.size() - 1 && (lastDotPos > lastSlashPos || lastSlashPos == string::npos)) + { +@@ -228,7 +228,7 @@ + string kFileDirName ( const string & path ) + { + string native = kFileNativePath(path); +- unsigned int lastSlashPos = native.rfind(kPathSep); ++ std::string::size_type lastSlashPos = native.rfind(kPathSep); + if (lastSlashPos < native.size()) + { + return native.substr(0, lastSlashPos+1); +@@ -241,7 +241,7 @@ + { + string native = kFileNativePath(path); + string baseName = native; +- unsigned int lastSlashPos = native.rfind(kPathSep); ++ std::string::size_type lastSlashPos = native.rfind(kPathSep); + if (lastSlashPos < native.size() - 1) + { + baseName = native.substr(lastSlashPos+1); +--- a/kodilib/src/tools/KKeyTools.cpp ++++ b/kodilib/src/tools/KKeyTools.cpp +@@ -170,7 +170,7 @@ + // -------------------------------------------------------------------------------------------------------- + int kKeyGetDisplayWidthForKey ( const std::string & keyName ) + { +- unsigned int keyPos = keyName.find('_', 0); ++ std::string::size_type keyPos = keyName.find('_', 0); + if (keyPos == std::string::npos) + { + return kKeyGetDisplayWidthForPureKey(keyName) + KDL_MOD_KEY_SPACING; +@@ -313,7 +313,7 @@ + int kKeyDisplayKey ( const std::string & keyName, const KPosition & pos ) + { + KPosition start = pos; +- unsigned int keyPos = keyName.find('_', 0); ++ std::string::size_type keyPos = keyName.find('_', 0); + if (keyPos == std::string::npos) + { + return start.x + kKeyDisplayPureKey(keyName, start) + KDL_MOD_KEY_SPACING; +@@ -380,7 +380,7 @@ + // -------------------------------------------------------------------------------------------------------- + SDL_keysym kKeyGetKeysymForKeyName ( const std::string & keyName ) + { +- unsigned int pos = keyName.find('_'); ++ std::string::size_type pos = keyName.find('_'); + + std::string modString; + std::string symString = keyName; +--- a/kodilib/src/tools/KStringTools.cpp ++++ b/kodilib/src/tools/KStringTools.cpp +@@ -13,7 +13,7 @@ + void kStringInsertStringBehindTags ( std::string & str, const std::string & insertString, + const std::string & tag ) + { +- unsigned int oldPos = 0; ++ std::string::size_type oldPos = 0; + while ((oldPos = str.find(tag, oldPos)) != std::string::npos) + { + oldPos += tag.size(); +@@ -34,8 +34,8 @@ + { + std::vector components; + +- unsigned int dividerLength = divider.size(); +- unsigned int oldpos = 0, pos; ++ std::string::size_type dividerLength = divider.size(); ++ std::string::size_type oldpos = 0, pos; + + while ((pos = str.find(divider, oldpos)) != std::string::npos) + { +@@ -50,7 +50,7 @@ + // -------------------------------------------------------------------------------------------------------- + void kStringReplace ( std::string & str, const std::string & toReplace, const std::string & replacement ) + { +- unsigned int pos = 0, chars = toReplace.size(); ++ std::string::size_type pos = 0, chars = toReplace.size(); + while ((pos = str.find(toReplace, pos)) != std::string::npos) + { + str.replace(pos, chars, replacement); +@@ -60,11 +60,11 @@ + // -------------------------------------------------------------------------------------------------------- + void kStringReplaceTabs ( std::string & str, unsigned int tabWidth ) + { +- unsigned int tabPos; ++ std::string::size_type tabPos; + while ((tabPos = str.find('\t')) != std::string::npos) + { +- unsigned int lastNewlinePos = str.rfind('\n', tabPos-1); +- unsigned int relPos = (lastNewlinePos == std::string::npos) ? tabPos : tabPos - lastNewlinePos; ++ std::string::size_type lastNewlinePos = str.rfind('\n', tabPos-1); ++ std::string::size_type relPos = (lastNewlinePos == std::string::npos) ? tabPos : tabPos - lastNewlinePos; + str.replace(tabPos, 1, std::string(tabWidth-(relPos % tabWidth), ' ')); + } + } +@@ -114,7 +114,7 @@ + // -------------------------------------------------------------------------------------------------------- + unsigned int kStringNthCharPos ( const std::string & str, unsigned int n, char c ) + { +- unsigned int loc = n, oloc = 0; ++ std::string::size_type loc = n, oloc = 0; + while (n > 0 && (loc = str.find(c, oloc)) != std::string::npos) + { + n--; +@@ -138,7 +138,7 @@ + // -------------------------------------------------------------------------------------------------------- + void kStringCropCols ( std::string & str, unsigned int columns ) + { +- unsigned int oloc = 0, nloc = 0; ++ std::string::size_type oloc = 0, nloc = 0; + while ((nloc = str.find('\n', oloc)) != std::string::npos) + { + if ((nloc - oloc) > columns) +@@ -160,10 +160,10 @@ + unsigned int kStringCols ( const std::string & str ) + { + if (str.size() == 0) return 0; +- int oloc = 0, nloc; ++ long oloc = 0, nloc; + std::string substring; + int maxlength = 0, length; +- while ((nloc = str.find('\n', oloc)) != (int)std::string::npos) ++ while ((nloc = str.find('\n', oloc)) != (long)std::string::npos) + { + substring = str.substr(oloc, nloc - oloc); + length = substring.size(); +@@ -181,7 +181,7 @@ + unsigned int kStringRows ( const std::string & str ) + { + if (str.size() == 0) return 1; +- unsigned int loc = 0, lines = 0; ++ std::string::size_type loc = 0, lines = 0; + while ((loc = str.find('\n', loc)) != std::string::npos) { lines++; loc++; } + if (str[str.size()-1] == '\n') return lines; + return lines+1; +@@ -204,8 +204,8 @@ + { + static char str[256]; + std::string format(fmt), subformat, text; +- unsigned int oloc = 0; +- unsigned int nloc = 0; ++ std::string::size_type oloc = 0; ++ std::string::size_type nloc = 0; + + kStringReplaceTabs(format); + +@@ -260,7 +260,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kStringHasSuffix ( const std::string & str, const std::string & suffix ) + { +- unsigned int result = str.rfind(suffix); ++ std::string::size_type result = str.rfind(suffix); + if (result == std::string::npos) return false; + return (result == str.size()-suffix.size()); + } +--- a/kodilib/src/tools/KXMLTools.cpp ++++ b/kodilib/src/tools/KXMLTools.cpp +@@ -58,11 +58,11 @@ + std::string kXMLParseToTagsInVector ( std::string & xml, const std::vector & tags ) + { + std::string open("<"); +- unsigned int minLoc = std::string::npos; ++ std::string::size_type minLoc = std::string::npos; + std::vector::const_iterator iter = tags.begin(); + while (iter != tags.end()) + { +- unsigned int loc = xml.find(open+(*iter)); ++ std::string::size_type loc = xml.find(open+(*iter)); + if (loc < minLoc) minLoc = loc; + iter++; + } +@@ -77,7 +77,7 @@ + std::string value; + std::string nameStr(name); + nameStr += "='"; +- unsigned int loc = xml.find(nameStr); ++ std::string::size_type loc = xml.find(nameStr); + if (loc != std::string::npos) + { + loc += nameStr.size(); +@@ -90,7 +90,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kXMLParseNamedCloseTag ( std::string & xml, const std::string & name, bool printError ) + { +- unsigned int loc = xml.find('<'); ++ std::string::size_type loc = xml.find('<'); + if (loc == std::string::npos) + { + if (printError) KConsole::printError(kStringPrintf("invalid XML:\nmissing close tag '%s'", +@@ -117,7 +117,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kXMLReadNamedOpenTag ( const std::string & xml, const std::string & name, std::string * attributes ) + { +- unsigned int loc = xml.find('<'), endloc; ++ std::string::size_type loc = xml.find('<'), endloc; + + if (loc == std::string::npos || xml[loc+1] == '/') return false; + +@@ -140,7 +140,7 @@ + // -------------------------------------------------------------------------------------------------------- + std::string kXMLParseNamedOpenTag ( std::string & xml, const std::string & name, std::string * attributes, bool printError ) + { +- unsigned int loc = xml.find('<'); ++ std::string::size_type loc = xml.find('<'); + if (loc == std::string::npos || xml[loc+1] == '/') + { + if (printError) KConsole::printError(kStringPrintf("invalid XML:\nmissing tag '%s'", name.c_str())); +@@ -191,7 +191,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kXMLParseOpenTag ( std::string & xml, std::string & name, std::string * attributes, bool printError ) + { +- unsigned int loc = xml.find('<'); ++ std::string::size_type loc = xml.find('<'); + if (loc == std::string::npos || xml[loc+1] == '/') + { + if (printError) KConsole::printError("invalid XML:\nmissing open tag"); +@@ -295,7 +295,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kXMLParseValue( std::string & xml, const std::string & name, int type, void * value, bool printError ) + { +- unsigned int loc = xml.find('<'); ++ std::string::size_type loc = xml.find('<'); + if (loc == std::string::npos || xml[loc+1] == '/') + { + if (printError) KConsole::printError(kStringPrintf("invalid XML:\nmissing value '%s'", name.c_str())); +@@ -379,8 +379,8 @@ + } + else if (typeString == "string") + { +- unsigned int first = substring.find("\"")+1; +- unsigned int last = substring.rfind("\"", std::string::npos); ++ std::string::size_type first = substring.find("\"")+1; ++ std::string::size_type last = substring.rfind("\"", std::string::npos); + *((std::string*)value) = substring.substr(first, last-first); + } + +--- a/kodilib/src/types/KKey.cpp ++++ b/kodilib/src/types/KKey.cpp +@@ -31,7 +31,7 @@ + // -------------------------------------------------------------------------------------------------------- + std::string KKey::getUnmodifiedName () const + { +- unsigned int keyPos = name.find('_', 0); ++ std::string::size_type keyPos = name.find('_', 0); + if (keyPos == std::string::npos) + { + return name; +@@ -42,7 +42,7 @@ + // -------------------------------------------------------------------------------------------------------- + std::string KKey::getModifierName () const + { +- unsigned int keyPos = name.find('_', 0); ++ std::string::size_type keyPos = name.find('_', 0); + if (keyPos == std::string::npos) + { + return ""; +--- a/kodilib/src/widgets/KFileNameField.cpp ++++ b/kodilib/src/widgets/KFileNameField.cpp +@@ -41,7 +41,7 @@ + std::string restPath; // path behind cursor + + // map cropped path to current directory and rest path to file prefix +- unsigned int lastSlashPos = croppedPath.rfind("/"); ++ std::string::size_type lastSlashPos = croppedPath.rfind("/"); + if (lastSlashPos < croppedPath.size()-1) + { + restPath = croppedPath.substr(lastSlashPos+1); +@@ -88,7 +88,7 @@ + } + + // ............................collect list of entries in searchDir that match prefix restPath +- unsigned int restLength = restPath.size(); ++ std::string::size_type restLength = restPath.size(); + std::vector matchingEntries; + std::vector::iterator iter = dir_entries.begin(); + while (iter != dir_entries.end()) +@@ -223,7 +223,7 @@ + // -------------------------------------------------------------------------------------------------------- + void KFileNameField::selectLastPathComponent () + { +- unsigned int lastSlashPos = text.rfind("/"); ++ std::string::size_type lastSlashPos = text.rfind("/"); + if (lastSlashPos == text.size()-1) lastSlashPos = text.rfind("/", lastSlashPos-1); + if (lastSlashPos < text.size()) cursor_pos = lastSlashPos+1; + else cursor_pos = 0; +--- a/src/gui/KikiMenu.cpp ++++ b/src/gui/KikiMenu.cpp +@@ -54,7 +54,7 @@ + { + std::string item_text (itemText); + std::string event_name (itemText); +- unsigned int pos; ++ std::string::size_type pos; + float scale_factor = 1.0; + + KikiMenuItem * menu_item = new KikiMenuItem (); +--- a/src/gui/KikiTextLine.cpp ++++ b/src/gui/KikiTextLine.cpp +@@ -46,7 +46,7 @@ + void KikiTextLine::setText ( const std::string & str ) + { + text = str; +- unsigned int pos; ++ std::string::size_type pos; + + if ((pos = text.find ("$scale(")) != std::string::npos) + { From ca8f3f9a510705a99f5f4a6b66c24c9e44a98d7d Mon Sep 17 00:00:00 2001 From: Catonano Date: Mon, 10 Apr 2017 09:11:33 +0200 Subject: [PATCH 276/301] gnu: Add libxls. * gnu/packages/xml.scm (libxls): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/xml.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 283d5112ae..7460b5d85f 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -39,6 +39,7 @@ (define-module (gnu packages xml) #:use-module (gnu packages python) #:use-module (gnu packages tls) #:use-module (gnu packages web) + #:use-module (gnu packages zip) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -1089,3 +1090,35 @@ (define-public python-defusedxml (define-public python2-defusedxml (package-with-python2 python-defusedxml)) + +(define-public libxls + (package + (name "libxls") + (version "1.4.0") + (source (origin + (method url-fetch) + (uri (string-append "https://sourceforge.net/projects/" + name "/files/" name "-" + version ".zip")) + (sha256 + (base32 + "1g8ds7wbhsa4hdcn77xc2c0l3vvz5bx2hx9ng9c9n7aii92ymfnk")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Bootstrapping is required in order to fix the test driver script. + (add-after 'unpack 'bootstrap + (lambda _ + (zero? (system* "bash" "bootstrap"))))))) + (native-inputs + `(("unzip" ,unzip) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (home-page "http://libxls.sourceforge.net/") + (synopsis "Read Excel files") + (description + "libxls is a C library which can read Excel (xls) files since Excel 97 (the BIFF8 format). +libxls cannot write Excel files.") + (license license:bsd-2))) From 1262a2abcab616851947a88689b977c3132659e4 Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu Date: Thu, 13 Apr 2017 13:50:15 +0200 Subject: [PATCH 277/301] gnu: emacs-company: Update to 0.9.3. * gnu/packages/emacs.scm (emacs-company): Update to 0.9.3. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 65a491302c..a8b0ea9ad3 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2077,7 +2077,7 @@ (define-public butler (define-public emacs-company (package (name "emacs-company") - (version "0.8.12") + (version "0.9.3") (source (origin (method url-fetch) @@ -2086,7 +2086,7 @@ (define-public emacs-company (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vwmbqm7h4lrszv2qxy6fqzznm9raigi84cadx982c9m7shp0zzz")))) + "1fyrpchpdmvszssy1qmsw41aqpv6q5rybvs1bw00nv9xdhiaq4vh")))) (build-system emacs-build-system) (home-page "http://company-mode.github.io/") (synopsis "Modular text completion framework") From f8d69be0082131450653bef9c0afa336328e3c80 Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu Date: Thu, 13 Apr 2017 13:57:25 +0200 Subject: [PATCH 278/301] gnu: emacs-clojure-mode: Update to 5.4.0. * gnu/packages/emacs.scm (emacs-clojure-mode): Update to 5.4.0. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a8b0ea9ad3..95ffd95308 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2811,7 +2811,7 @@ (define-public emacs-lispy (define-public emacs-clojure-mode (package (name "emacs-clojure-mode") - (version "5.3.0") + (version "5.4.0") (source (origin (method url-fetch) (uri (string-append @@ -2820,7 +2820,7 @@ (define-public emacs-clojure-mode (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0gi8ra3ap5m3mz4qh1yxp2cldn7z9xcxvypznr6rrlc6a9l8s5a6")))) + "117mvjqh4nm8mvmwmmvy4qmkdg23ldlzk08y91g8b8ac8kxwqg81")))) (build-system emacs-build-system) (home-page "https://github.com/clojure-emacs/clojure-mode") (synopsis "Major mode for Clojure code") From 50edf7fc43659d1955d441c257ce8a01cb4b92bf Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu Date: Thu, 13 Apr 2017 14:10:07 +0200 Subject: [PATCH 279/301] gnu: emacs-flycheck: Update to 30. * gnu/packages/emacs.scm (emacs-flycheck): Update to 30. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 95ffd95308..3f335b16cb 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -730,7 +730,7 @@ (define-public let-alist (define-public flycheck (package (name "emacs-flycheck") - (version "28") + (version "30") (source (origin (method url-fetch) (uri (string-append @@ -738,7 +738,7 @@ (define-public flycheck version "/flycheck-" version ".tar")) (sha256 (base32 - "1yjxivk11d7w39zfhj2xr4h6xhwx1aj6yhyzd63rjrad7xpjfl86")))) + "1rxzkaqsj48z3nska5wsgwafvwkam014dzqd32baycmxjl0jxvy7")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) From 07716c68420af2ac257a9a3320525272e6e3d519 Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu Date: Thu, 13 Apr 2017 14:19:29 +0200 Subject: [PATCH 280/301] gnu: emacs-zenburn-theme: Update to 2.5. * gnu/packages/emacs.scm (emacs-zenburn-theme): Update to 2.5. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3f335b16cb..c3375d9f9f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2461,7 +2461,7 @@ (define-public emacs-org-trello (define-public emacs-zenburn-theme (package (name "emacs-zenburn-theme") - (version "2.4") + (version "2.5") (source (origin (method url-fetch) (uri (string-append @@ -2470,7 +2470,7 @@ (define-public emacs-zenburn-theme (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0lyi84bm8sa7vj40n6zg6rlbsmi53mi1y9xn6gkjj29s5zbcnlg7")))) + "03kfhzgbbbl8ivpzzky6qxw4j9mmp452m1sk7wikxmcalfnix0gn")))) (build-system emacs-build-system) (home-page "https://github.com/bbatsov/zenburn-emacs") (synopsis "Low contrast color theme for Emacs") From b9d38ad1bc29222b6b0ed8711b6cab6492e8de78 Mon Sep 17 00:00:00 2001 From: Vasile Dumitrascu Date: Thu, 13 Apr 2017 15:03:13 +0200 Subject: [PATCH 281/301] gnu: postgresql: Update to 9.6.2. * gnu/packages/databases.scm (postgresql): Update to 9.6.2. Signed-off-by: Arun Isaac --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index db15a5afa5..778996049e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -438,14 +438,14 @@ (define-public mariadb (define-public postgresql (package (name "postgresql") - (version "9.5.6") + (version "9.6.2") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0bz1b9r249ffjfvldaiah2g78ccwq30ddh8hdvlq61z26inmz7mv")))) + "1jahzqqw5inyvmacic2ihhj5f8z50lapci2fwws91h719ccbb1q1")))) (build-system gnu-build-system) (arguments `(#:phases From 83f9aa5e914d952c32db35681f6762f5d4225ed5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 13 Apr 2017 15:16:26 +0200 Subject: [PATCH 282/301] gnu: php: Update to 7.1.4. * gnu/packages/php.scm (php): Update to 7.1.4. Signed-off-by: Arun Isaac --- gnu/packages/php.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 071820ecb3..a40568eacc 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -53,7 +53,7 @@ (define-module (gnu packages php) (define-public php (package (name "php") - (version "7.1.3") + (version "7.1.4") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -61,7 +61,7 @@ (define-public php name "-" version ".tar.xz")) (sha256 (base32 - "1c0brdq5aqh4i127pq1g904dfb6klz2gbg9gjvykg3kp6hk7r274")) + "02rh1lcfj2hakyls73gwn6w00yblnfh4883w13gn7sgkmn346lbi")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" From 4264db22095882b7706ae2b9680bde2d355987b3 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 13 Apr 2017 16:50:22 +0530 Subject: [PATCH 283/301] gnu: password-store: Update to 1.7.1. * gnu/packages/password-utils.scm (password-store): Update to 1.7.1. [source]: Remove "password-store-gnupg-compat.patch". * gnu/packages/patches/password-store-gnupg-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/password-utils.scm | 5 +- .../patches/password-store-gnupg-compat.patch | 53 ------------------- 3 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 gnu/packages/patches/password-store-gnupg-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9385b3df94..c97a0ed3b6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -827,7 +827,6 @@ dist_patch_DATA = \ %D%/packages/patches/ots-no-include-missing-file.patch \ %D%/packages/patches/p7zip-CVE-2016-9296.patch \ %D%/packages/patches/p7zip-remove-unused-code.patch \ - %D%/packages/patches/password-store-gnupg-compat.patch \ %D%/packages/patches/patchelf-page-size.patch \ %D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchutils-xfail-gendiff-tests.patch \ diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 66d5f8cf88..9daacd871e 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -284,7 +284,7 @@ (define-public assword (define-public password-store (package (name "password-store") - (version "1.7") + (version "1.7.1") (source (origin (method url-fetch) (uri @@ -292,8 +292,7 @@ (define-public password-store name "-" version ".tar.xz")) (sha256 (base32 - "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn")) - (patches (search-patches "password-store-gnupg-compat.patch")))) + "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/password-store-gnupg-compat.patch b/gnu/packages/patches/password-store-gnupg-compat.patch deleted file mode 100644 index c314ba6647..0000000000 --- a/gnu/packages/patches/password-store-gnupg-compat.patch +++ /dev/null @@ -1,53 +0,0 @@ -Copied from upstream mailing list: -https://lists.zx2c4.com/pipermail/password-store/2017-March/002844.html. - -The patch actually restores compatibility with GnuPG 2.1.19, the '2.2.19' in -the commit message is a typo. - -From 8723d8e8192683891904aff321446b0fac37d1ad Mon Sep 17 00:00:00 2001 -From: Andreas Stieger -Date: Fri, 10 Mar 2017 15:43:26 +0100 -Subject: [PATCH] Fix compatibility with GnuPG 2.2.19 - -GnuPG 2.2.19 added a warning when no command was given. - -* src/password-store.sh (reencrypt_path): Add --decrypt to --list-only -* tests/t0300-reencryption.sh (gpg_keys_from_encrypted_file): same - -https://bugs.gnupg.org/gnupg/msg9873 -http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=810adfd47801fc01e45fb71af9f05c91f7890cdb -https://bugzilla.suse.com/show_bug.cgi?id=1028867 ---- - src/password-store.sh | 2 +- - tests/t0300-reencryption.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/password-store.sh b/src/password-store.sh -index 1ab6fb5..bad8d4f 100755 ---- a/src/password-store.sh -+++ b/src/password-store.sh -@@ -125,7 +125,7 @@ reencrypt_path() { - done - gpg_keys="$($GPG $PASSWORD_STORE_GPG_OPTS --list-keys --with-colons "${GPG_RECIPIENTS[@]}" | sed -n 's/sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u)" - fi -- current_keys="$($GPG $PASSWORD_STORE_GPG_OPTS -v --no-secmem-warning --no-permission-warning --list-only --keyid-format long "$passfile" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u)" -+ current_keys="$($GPG $PASSWORD_STORE_GPG_OPTS -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$passfile" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u)" - - if [[ $gpg_keys != "$current_keys" ]]; then - echo "$passfile_display: reencrypting to ${gpg_keys//$'\n'/ }" -diff --git a/tests/t0300-reencryption.sh b/tests/t0300-reencryption.sh -index 9d46580..6d5811d 100755 ---- a/tests/t0300-reencryption.sh -+++ b/tests/t0300-reencryption.sh -@@ -10,7 +10,7 @@ canonicalize_gpg_keys() { - $GPG --list-keys --with-colons "$@" | sed -n 's/sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u - } - gpg_keys_from_encrypted_file() { -- $GPG -v --no-secmem-warning --no-permission-warning --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u -+ $GPG -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u - } - gpg_keys_from_group() { - local output="$($GPG --list-config --with-colons | sed -n "s/^cfg:group:$1:\\(.*\\)/\\1/p" | head -n 1)" --- -2.12.0 - From 33f79a74b8f97fc39587ca66d38f0d82548bfe28 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 12 Apr 2017 22:28:40 +0200 Subject: [PATCH 284/301] gnu: Add bam. * gnu/packages/build-tools.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/build-tools.scm | 64 ++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 gnu/packages/build-tools.scm diff --git a/gnu/local.mk b/gnu/local.mk index c97a0ed3b6..779cb0dfd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -70,6 +70,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/boost.scm \ %D%/packages/bootloaders.scm \ %D%/packages/bootstrap.scm \ + %D%/packages/build-tools.scm \ %D%/packages/busybox.scm \ %D%/packages/c.scm \ %D%/packages/calcurse.scm \ diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm new file mode 100644 index 0000000000..8901a46576 --- /dev/null +++ b/gnu/packages/build-tools.scm @@ -0,0 +1,64 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017 Ricardo Wurmus +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages build-tools) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (gnu packages) + #:use-module (gnu packages python) + #:use-module (guix build-system gnu)) + +(define-public bam + (package + (name "bam") + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (string-append "http://github.com/downloads/matricks/" + "bam/bam-" version ".tar.bz2")) + (sha256 + (base32 + "0z90wvyd4nfl7mybdrv9dsd4caaikc6fxw801b72gqi1m9q0c0sn")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (zero? (system* "bash" "make_unix.sh")))) + (replace 'check + (lambda _ + (zero? (system* "python" "scripts/test.py")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (mkdir-p bin) + (install-file "bam" bin) + #t)))))) + (native-inputs + `(("python" ,python-2))) + (home-page "https://matricks.github.io/bam/") + (synopsis "Fast and flexible build system") + (description "Bam is a fast and flexible build system. Bam uses Lua to +describe the build process. It takes its inspiration for the script files +from scons. While scons focuses on being 100% correct when building, bam +makes a few sacrifices to acquire fast full and incremental build times.") + (license license:bsd-3))) From b77e3a1c4eabbd6010083a6cb9aad7cf5a9a4d45 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 12 Apr 2017 22:27:16 +0200 Subject: [PATCH 285/301] gnu: Add teeworlds. * gnu/packages/games.scm (teeworlds): New variable. * gnu/packages/patches/teeworlds-use-latest-wavpack.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. --- gnu/local.mk | 1 + gnu/packages/games.scm | 89 +++++++++++++++++++ .../teeworlds-use-latest-wavpack.patch | 84 +++++++++++++++++ 3 files changed, 174 insertions(+) create mode 100644 gnu/packages/patches/teeworlds-use-latest-wavpack.patch diff --git a/gnu/local.mk b/gnu/local.mk index 779cb0dfd5..45df0eba8a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -957,6 +957,7 @@ dist_patch_DATA = \ %D%/packages/patches/tcsh-fix-autotest.patch \ %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \ %D%/packages/patches/teensy-loader-cli-help.patch \ + %D%/packages/patches/teeworlds-use-latest-wavpack.patch \ %D%/packages/patches/texlive-texmf-CVE-2016-10243.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 710b2746c9..a956f0ca44 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -56,6 +56,7 @@ (define-module (gnu packages games) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) + #:use-module (gnu packages build-tools) #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages avahi) @@ -3649,3 +3650,91 @@ (define-public kiki ;; kiki-the-nano-bot/kiki-the-nano-bot_1.0.2+dfsg1-4_copyright> ;; for a statement from the author. (license license:public-domain))) + +(define-public teeworlds + (package + (name "teeworlds") + (version "0.6.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/teeworlds/teeworlds/" + "archive/" version "-release.tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1mqhp6xjl75l49050cid36wxyjn1qr0vjx1c709dfg1lkvmgs6l3")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file-recursively + '("src/engine/external/wavpack/" + "src/engine/external/zlib/")) + #t)) + (patches + (search-patches "teeworlds-use-latest-wavpack.patch")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests included + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; Embed path to assets. + (substitute* "src/engine/shared/storage.cpp" + (("#define DATA_DIR.*") + (string-append "#define DATA_DIR \"" + (assoc-ref outputs "out") + "/share/teeworlds/data" + "\""))) + + ;; Bam expects all files to have a recent time stamp. + (for-each (lambda (file) + (utime file 1 1)) + (find-files ".")) + + ;; Do not use bundled libraries. + (substitute* "bam.lua" + (("if config.zlib.value == 1 then") + "if true then") + (("wavpack = .*") + "wavpack = {} +settings.link.libs:Add(\"wavpack\")\n")) + (substitute* "src/engine/client/sound.cpp" + (("#include ") + "#include ")) + #t)) + (replace 'build + (lambda _ + (zero? (system* "bam" "-a" "-v" "release")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (data (string-append out "/share/teeworlds/data"))) + (mkdir-p bin) + (mkdir-p data) + (for-each (lambda (file) + (install-file file bin)) + '("teeworlds" "teeworlds_srv")) + (copy-recursively "data" data) + #t)))))) + ;; FIXME: teeworlds bundles the sources of "pnglite", a two-file PNG + ;; library without a build system. + (inputs + `(("freetype" ,freetype) + ("glu" ,glu) + ("mesa" ,mesa) + ("sdl-union" ,(sdl-union (list sdl + sdl-mixer + sdl-image))) + ("wavpack" ,wavpack) + ("zlib" ,zlib))) + (native-inputs + `(("bam" ,bam) + ("python" ,python-2))) + (home-page "https://www.teeworlds.com") + (synopsis "2D retro multiplayer shooter game") + (description "Teeworlds is an online multiplayer game. Battle with up to +16 players in a variety of game modes, including Team Deathmatch and Capture +The Flag. You can even design your own maps!") + (license license:bsd-3))) diff --git a/gnu/packages/patches/teeworlds-use-latest-wavpack.patch b/gnu/packages/patches/teeworlds-use-latest-wavpack.patch new file mode 100644 index 0000000000..e9fd991087 --- /dev/null +++ b/gnu/packages/patches/teeworlds-use-latest-wavpack.patch @@ -0,0 +1,84 @@ +Downloaded from https://anonscm.debian.org/cgit/pkg-games/teeworlds.git/plain/debian/patches/new-wavpack.patch. + +This patch lets us build teeworlds with wavpack 5.1.0. + +--- a/src/engine/client/sound.cpp ++++ b/src/engine/client/sound.cpp +@@ -328,17 +328,14 @@ void CSound::RateConvert(int SampleID) + pSample->m_NumFrames = NumFrames; + } + +-int CSound::ReadData(void *pBuffer, int Size) +-{ +- return io_read(ms_File, pBuffer, Size); +-} +- + int CSound::LoadWV(const char *pFilename) + { + CSample *pSample; + int SampleID = -1; + char aError[100]; + WavpackContext *pContext; ++ char aWholePath[1024]; ++ IOHANDLE File; + + // don't waste memory on sound when we are stress testing + if(g_Config.m_DbgStress) +@@ -351,19 +348,23 @@ int CSound::LoadWV(const char *pFilename + if(!m_pStorage) + return -1; + +- ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL); +- if(!ms_File) ++ File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL, aWholePath, sizeof(aWholePath)); ++ if(!File) + { + dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename); + return -1; + } ++ else ++ { ++ io_close(File); ++ } + + SampleID = AllocID(); + if(SampleID < 0) + return -1; + pSample = &m_aSamples[SampleID]; + +- pContext = WavpackOpenFileInput(ReadData, aError); ++ pContext = WavpackOpenFileInput(aWholePath, aError, OPEN_2CH_MAX, 0); + if (pContext) + { + int m_aSamples = WavpackGetNumSamples(pContext); +@@ -419,9 +420,6 @@ int CSound::LoadWV(const char *pFilename + dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError); + } + +- io_close(ms_File); +- ms_File = NULL; +- + if(g_Config.m_Debug) + dbg_msg("sound/wv", "loaded %s", pFilename); + +@@ -527,7 +525,5 @@ void CSound::StopAll() + lock_unlock(m_SoundLock); + } + +-IOHANDLE CSound::ms_File = 0; +- + IEngineSound *CreateEngineSound() { return new CSound; } + +--- a/src/engine/client/sound.h ++++ b/src/engine/client/sound.h +@@ -21,10 +21,6 @@ public: + + static void RateConvert(int SampleID); + +- // TODO: Refactor: clean this mess up +- static IOHANDLE ms_File; +- static int ReadData(void *pBuffer, int Size); +- + virtual bool IsSoundEnabled() { return m_SoundEnabled != 0; } + + virtual int LoadWV(const char *pFilename); From e02f16636461985199b729f975ca6d57ac3cdd53 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 13 Apr 2017 09:10:57 +0200 Subject: [PATCH 286/301] gnu: Add fillets-ng. * gnu/packages/games.scm (fillets-ng): New variable. --- gnu/packages/games.scm | 69 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a956f0ca44..c712785091 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3738,3 +3738,72 @@ (define-public teeworlds 16 players in a variety of game modes, including Team Deathmatch and Capture The Flag. You can even design your own maps!") (license license:bsd-3))) + +(define-public fillets-ng + (package + (name "fillets-ng") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/fillets/" + "Fish%20Fillets%20-%20Next%20Generation/" + version "/fillets-ng-" version ".tar.gz")) + (sha256 + (base32 + "1nljp75aqqb35qq3x7abhs2kp69vjcj0h1vxcpdyn2yn2nalv6ij")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "--with-lua=" + (assoc-ref %build-inputs "lua"))) + #:make-flags + (list (string-append "CFLAGS=-I" + (assoc-ref %build-inputs "sdl-union") + "/include/SDL") + (string-append "CXXFLAGS=-I" + (assoc-ref %build-inputs "sdl-union") + "/include/SDL")) + #:phases + (modify-phases %standard-phases + ;; Lua 5.1 does not provide it. + (add-after 'unpack 'do-not-link-with-lualib + (lambda _ + (substitute* "configure" + (("-llualib") "")) + #t)) + (add-after 'install 'install-data + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((data (string-append (assoc-ref outputs "out") + "/share/games/fillets-ng"))) + (mkdir-p data) + (zero? (system* "tar" "-xvf" + (assoc-ref inputs "fillets-ng-data") + "--strip-components=1" + "-C" data)))))))) + (inputs + `(("sdl-union" ,(sdl-union (list sdl + sdl-mixer + sdl-image + sdl-ttf))) + ("fribidi" ,fribidi) + ("libx11" ,libx11) + ("lua" ,lua-5.1))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("fillets-ng-data" + ,(origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/fillets/" + "Fish%20Fillets%20-%20Next%20Generation/" + version "/fillets-ng-data-" version ".tar.gz")) + (sha256 + (base32 + "169p0yqh2gxvhdilvjc2ld8aap7lv2nhkhkg4i1hlmgc6pxpkjgh")))))) + (home-page "http://fillets.sourceforge.net/") + (synopsis "Puzzle game") + (description "Fish Fillets NG is strictly a puzzle game. The goal in +every of the seventy levels is always the same: find a safe way out. The fish +utter witty remarks about their surroundings, the various inhabitants of their +underwater realm quarrel among themselves or comment on the efforts of your +fish. The whole game is accompanied by quiet, comforting music.") + (license license:gpl2+))) From 88eb119f9585e6293c0c6609981037b58d058107 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 14 Apr 2017 15:07:47 +1000 Subject: [PATCH 287/301] gnu: mafft: Update to 7.310. * gnu/packages/bioinformatics.scm (mafft): Update to 7.310. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8f0913fcbd..c71e70bc63 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3196,7 +3196,7 @@ (define-public macs (define-public mafft (package (name "mafft") - (version "7.305") + (version "7.310") (source (origin (method url-fetch) (uri (string-append @@ -3205,7 +3205,7 @@ (define-public mafft (file-name (string-append name "-" version ".tgz")) (sha256 (base32 - "0ziim7g58n3z8gppsa713f5fxprl60ldj3xck186z0n9dpp06i8r")))) + "0gbsaz6z2qa307kd7wfb06c3y4ikmv1hsdvlns11f6zq4w1z9pwc")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no automated tests, though there are tests in the read me From 8d50a9906dff294fe2a18172afa6376cc66a51d5 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 13 Apr 2017 15:16:21 +0530 Subject: [PATCH 288/301] gnu: Add emacs-cdlatex. * gnu/packages/emacs.scm (emacs-cdlatex): New variable. --- gnu/packages/emacs.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c3375d9f9f..71058136a6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4323,3 +4323,28 @@ (define-public emacs-xmlgen (description "@code{emacs-xmlgen} provides S-expression to XML conversion for Emacs Lisp.") (license license:gpl2+))) + +(define-public emacs-cdlatex + (package + (name "emacs-cdlatex") + (version "4.7") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/cdominik/cdlatex/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pivapphmykc6vhvpx7hdyl55ls37vc4jcrxpvs4yk7jzcmwa9xp")))) + (build-system emacs-build-system) + (home-page "https://github.com/cdominik/cdlatex") + (synopsis "Fast Emacs input methods for LaTeX environments and +math") + (description "CDLaTeX is an Emacs minor mode supporting fast +insertion of environment templates and math in LaTeX. Similar +commands are also offered as part of the AUCTeX package, but it is not +the same - CDLaTeX focuses on speediness for inserting LaTeX +constructs.") + (license license:gpl3+))) From 116b29bffbd09b26d03dff4997c87ffc8c77c2d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 14 Apr 2017 11:02:21 +0200 Subject: [PATCH 289/301] gnu: julia: Update to 0.5.1. * gnu/packages/julia.scm (julia): Update to 0.5.1. --- gnu/packages/julia.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index a6664a54c2..722e3ed138 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -83,7 +83,7 @@ (define libunwind-for-julia (define-public julia (package (name "julia") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (string-append @@ -91,7 +91,7 @@ (define-public julia version "/julia-" version ".tar.gz")) (sha256 (base32 - "0bhickil88lalp9jdj1kmf4is70zinhx8ha9rng0g3z50r4a2qmv")))) + "1a9m7hzzrwk71gvwwrd1p45s64yid61i41n95gm5pzbry6p9fpl0")))) (build-system gnu-build-system) (arguments `(#:test-target "test" From f252d6df8b630fc93c700d51a03be417ee734128 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 14 Apr 2017 10:27:43 +0200 Subject: [PATCH 290/301] gnu: Add guile-syntax-highlight. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile.scm (guile-syntax-highlight): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/guile.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d2e832aae5..ff7cf40811 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2016 Amirouche ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Andy Wingo +;;; Copyright © 2017 David Thompson ;;; ;;; This file is part of GNU Guix. ;;; @@ -1732,4 +1733,39 @@ (define-public guile-git manipulate repositories of the Git version control system.") (license license:gpl3+)))) +(define-public guile-syntax-highlight + (let ((commit "a047675e66861b647426372aa2ba7820f749616d") + (revision "0")) + (package + (name "guile-syntax-highlight") + (version (string-append "0.0." revision "." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://dthompson.us/guile-syntax-highlight.git") + (commit commit))) + (sha256 + (base32 + "1zjr6sg3n7xbdsliy45i39dqanxvcms58ayx36wxrz72zpq58vq3")))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ + (zero? (system* "sh" "bootstrap"))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-2.2))) + (synopsis "General-purpose syntax highlighter for GNU Guile") + (description "Guile-syntax-highlight is a general-purpose syntax +highlighting library for GNU Guile. It can parse code written in various +programming languages into a simple s-expression that can be converted to +HTML (via SXML) or any other format for rendering.") + (home-page "http://dthompson.us/software/guile-syntax-highlight") + (license license:lgpl3+)))) + ;;; guile.scm ends here From 11e2087e250150ccedd5309afd1e056295d77c46 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 14 Apr 2017 11:26:07 +0200 Subject: [PATCH 291/301] build: Remove build-aux/hydra/demo-os.scm from EXTRA_DIST. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Makefile.am (EXTRA_DIST): Remove build-aux/hydra/demo-os.scm. The file was removed of guix in this commit a3a27745013f3e5a287de3bf0187b2f72beb6965. Signed-off-by: Ludovic Courtès --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index c16a1cf6e4..99b4556056 100644 --- a/Makefile.am +++ b/Makefile.am @@ -398,7 +398,6 @@ EXTRA_DIST = \ build-aux/compile-all.scm \ build-aux/hydra/evaluate.scm \ build-aux/hydra/gnu-system.scm \ - build-aux/hydra/demo-os.scm \ build-aux/hydra/guix.scm \ build-aux/check-available-binaries.scm \ build-aux/check-final-inputs-self-contained.scm \ From e60ee79040c8fd46796d7f6ad2e07c95dc9dcadb Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 14 Apr 2017 12:12:56 +0200 Subject: [PATCH 292/301] build-system/cargo: Remove store reference. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build/cargo-build-system.scm (generate-checksums): Remove store reference from comment. This comment was matching assert-no-store-file-names regexp in Makefile.am. Also, edit procedure docstring to precise that DIR-NAME is a store directory. Signed-off-by: Ludovic Courtès --- guix/build/cargo-build-system.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index f11d858749..139b40321f 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Craven +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -116,12 +117,12 @@ (define (file-sha256 file-name) (close-pipe port) result))) -;; Example dir-name: "/gnu/store/hwlr49riz3la33m6in2n898ly045ylld-rust-rand-0.3.15". (define (generate-checksums dir-name src-name) - "Given DIR-NAME, checksum all the files in it one by one and put the - result into the file \".cargo-checksum.json\" in the same directory. - Also includes the checksum of an extra file SRC-NAME as if it was - part of the directory DIR-NAME with name \"package\"." + "Given DIR-NAME, a store directory, checksum all the files in it one +by one and put the result into the file \".cargo-checksum.json\" in +the same directory. Also includes the checksum of an extra file +SRC-NAME as if it was part of the directory DIR-NAME with name +\"package\"." (let* ((file-names (find-files dir-name ".")) (dir-prefix-name (string-append dir-name "/")) (dir-prefix-name-len (string-length dir-prefix-name)) From 960887b2974ff5c3e63f58a1d89cd8d0dcb5e045 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 14 Apr 2017 12:14:51 +0200 Subject: [PATCH 293/301] build: Stop building gnu/build/svg.scm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Makefile.am (EXTRA_DIST): Add gnu/build/svg.scm. * gnu/local.mk (GNU_SYSTEM_MODULES): Remove gnu/build/svg.scm. It fixes the following build warnings: gnu/build/svg.scm:36:12: warning: possibly unbound variable `cairo-create' gnu/build/svg.scm:36:26: warning: possibly unbound variable `cairo-image-surface-create' gnu/build/svg.scm:38:4: warning: possibly unbound variable `cairo-scale' gnu/build/svg.scm:39:4: warning: possibly unbound variable `cairo-set-source-surface' Signed-off-by: Ludovic Courtès --- Makefile.am | 2 ++ gnu/local.mk | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 99b4556056..c9671e2d14 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,7 @@ # Copyright © 2015, 2017 Alex Kost # Copyright © 2016 Mathieu Lirzin # Copyright © 2016, 2017 Mark H Weaver +# Copyright © 2017 Mathieu Othacehe # # This file is part of GNU Guix. # @@ -394,6 +395,7 @@ EXTRA_DIST = \ TODO \ CODE-OF-CONDUCT \ .dir-locals.el \ + gnu/build/svg.scm \ build-aux/build-self.scm \ build-aux/compile-all.scm \ build-aux/hydra/evaluate.scm \ diff --git a/gnu/local.mk b/gnu/local.mk index 45df0eba8a..82e94171b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -460,7 +460,6 @@ GNU_SYSTEM_MODULES = \ %D%/build/linux-modules.scm \ %D%/build/marionette.scm \ %D%/build/shepherd.scm \ - %D%/build/svg.scm \ %D%/build/vm.scm \ \ %D%/tests.scm \ From 4e644ab8a6b67d1e9db459c31d8f23ee14276140 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 14 Apr 2017 13:44:02 +0530 Subject: [PATCH 294/301] gnu: emacs-company: Enable tests. * gnu/packages/emacs.scm (emacs-company)[arguments]: Add a 'check' phase. --- gnu/packages/emacs.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 71058136a6..976ea31e00 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2088,6 +2088,18 @@ (define-public emacs-company (base32 "1fyrpchpdmvszssy1qmsw41aqpv6q5rybvs1bw00nv9xdhiaq4vh")))) (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'check + (lambda _ + ;; The company-files-candidates-normal-root test looks + ;; for the /bin directory, but the build environment has + ;; no /bin directory. Modify the test to look for the + ;; /tmp directory. + (substitute* "test/files-tests.el" + (("/bin/") "/tmp/")) + (zero? (system* "make" "test-batch"))))))) (home-page "http://company-mode.github.io/") (synopsis "Modular text completion framework") (description From b31b0155ea2421821cd9293702cbb2d196943dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 14 Apr 2017 18:16:32 +0200 Subject: [PATCH 295/301] build: Download aarch64 bootstrap binaries from alpha.gnu.org. * build-aux/download.scm (file-name->uri): Remove flashner.co.il URL. * gnu/packages/package-management.scm (boot-guile-uri): Likewise. --- build-aux/download.scm | 20 +++++++++----------- gnu/packages/package-management.scm | 5 ++--- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/build-aux/download.scm b/build-aux/download.scm index 0e98bef55b..8dfa914603 100644 --- a/build-aux/download.scm +++ b/build-aux/download.scm @@ -42,17 +42,15 @@ (define (file-name->uri file) (match (string-tokenize file (char-set-complement (char-set #\/))) ((_ ... system basename) (string->uri - (match system - ("aarch64-linux" - (string-append "http://flashner.co.il/guix/bootstrap/aarch64-linux" - "/20170217/" basename)) - (_ (string-append %url-base "/" system - (match system - ("armhf-linux" - "/20150101/") - (_ - "/20131110/")) - basename))))))) + (string-append %url-base "/" system + (match system + ("aarch64-linux" + "/20170217/") + ("armhf-linux" + "/20150101/") + (_ + "/20131110/")) + basename))))) (match (command-line) ((_ file expected-hash) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2760d4d2fb..82132d587a 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -61,9 +61,8 @@ (define (boot-guile-uri arch) arch "-linux" "/20150101/guile-2.0.11.tar.xz")) ((string=? "aarch64" arch) - (let ((suffix "/bootstrap/aarch64-linux/20170217/guile-2.0.14.tar.xz")) - (list (string-append "http://alpha.gnu.org/gnu/guix" suffix) - (string-append "http://flashner.co.il/guix" suffix)))) + (string-append "http://alpha.gnu.org/gnu/guix/bootstrap/" + arch "-linux/20170217/guile-2.0.14.tar.xz")) (else (string-append "http://alpha.gnu.org/gnu/guix/bootstrap/" arch "-linux" From 27a5c60465afc8f8875f41b5e6830d3c0757eb2b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Apr 2017 18:55:55 +0200 Subject: [PATCH 296/301] gnu: dub: Flesh out synopsis & description. * gnu/packages/ldc.scm (dub)[synopsis, description]: Actually explain what dub is and does. --- gnu/packages/ldc.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm index 42e6c04a84..59036a5315 100644 --- a/gnu/packages/ldc.scm +++ b/gnu/packages/ldc.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Pjotr Prins ;;; Copyright © 2017 Frederick Muriithi ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -308,6 +309,12 @@ (define-public dub (native-inputs `(("ldc" ,ldc))) (home-page "https://code.dlang.org/getting_started") - (synopsis "DUB package manager") - (description "This package provides the D package manager.") + (synopsis "Package and build manager for D projects") + (description + "DUB is a package and build manager for applications and libraries written +in the D programming language. It can automatically retrieve a project's +dependencies and integrate them in the build process. + +The design emphasis is on maximum simplicity for simple projects, while +providing the opportunity to customize things when needed. ") (license license:expat))) From 2ff7703b0dfd8ea5b3b989e236c1436d5a5ddbaa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 13 Apr 2017 22:30:00 +0200 Subject: [PATCH 297/301] gnu: youtube-dl: Update to 2017.04.14. * gnu/packages/video.scm (youtube-dl): Update to 2017.04.14. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 3478d92026..6599a326e4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -985,7 +985,7 @@ (define-public libvpx (define-public youtube-dl (package (name "youtube-dl") - (version "2017.04.11") + (version "2017.04.14") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -993,7 +993,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "0jf1zpywx9b5113wkapfrrjv0nb7vb3f13f59mz3macr65mszxad")))) + "1rjc4ilafzrig02znrlxwjyzk5rpcc3li55n8rw2c4dmjmvjppkh")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion From ab71ea93a4395538c530f57bcacf248079ec9b12 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 14 Apr 2017 10:39:08 -0400 Subject: [PATCH 298/301] gnu: mysql: Update to 5.7.18. * gnu/packages/databases.scm (mysql): Update to 5.7.18. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 778996049e..794c775901 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -290,7 +290,7 @@ (define-public leveldb (define-public mysql (package (name "mysql") - (version "5.7.17") + (version "5.7.18") (source (origin (method url-fetch) (uri (list (string-append @@ -302,7 +302,7 @@ (define-public mysql name "-" version ".tar.gz"))) (sha256 (base32 - "0lcn9cm36n14g22bcppq5vf4nxbrl3khvlsp9hsixqdfb3l27gyf")))) + "18m1mr55k9zmvnyqs0wr50csqsz3scs09fykh60wsml6c3np2p8b")))) (build-system cmake-build-system) (arguments `(#:configure-flags From ed8a6c13847d3d942e6f7083f60f87a7daa21331 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 14 Apr 2017 11:11:14 -0400 Subject: [PATCH 299/301] gnu: libmpdclient: Update to 2.11. * gnu/packages/mpd.scm (libmpdclient): Update to 2.11. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index db37814463..501639c66c 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -54,7 +54,7 @@ (define-module (gnu packages mpd) (define-public libmpdclient (package (name "libmpdclient") - (version "2.10") + (version "2.11") (source (origin (method url-fetch) (uri @@ -63,7 +63,7 @@ (define-public libmpdclient "/libmpdclient-" version ".tar.xz")) (sha256 (base32 - "10pzs9z815a8hgbbbiliapyiw82bnplsccj5irgqjw5f5plcs22g")))) + "1xms8q44g6zc7sc212qpcihq6ch3pmph3i1m9hzymmy0jcw6kzhm")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen))) (synopsis "Music Player Daemon client library") From 2f64f4444a81e9b2d75b2de3f1fc4c71e099b214 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 14 Apr 2017 11:11:30 -0400 Subject: [PATCH 300/301] gnu: ncmpc: Update to 0.27. * gnu/packages/mpd.scm (ncmpc): Update to 0.27. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 501639c66c..1ed8e967ef 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -172,7 +172,7 @@ (define-public mpd-mpc (define-public ncmpc (package (name "ncmpc") - (version "0.25") + (version "0.27") (source (origin (method url-fetch) (uri @@ -181,7 +181,7 @@ (define-public ncmpc "/ncmpc-" version ".tar.xz")) (sha256 (base32 - "196f9s0qmc4srr10n4vk3amvqy5f52y9kvgwqpkfjsnhf75qlckf")))) + "1n8m7syhpgx24hfipixv66h2izn229jkxsmh2q5dzkv9r0znm8pr")))) (build-system gnu-build-system) (inputs `(("glib" ,glib) ("libmpdclient" ,libmpdclient) From 8439c9c05eab5c98d889fb1de56bc78f62a8058f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 14 Apr 2017 11:16:46 -0400 Subject: [PATCH 301/301] gnu: gpgme: Update to 1.9.0. * gnu/packages/gnupg.scm (gpgme): Update to 1.9.0. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 0c20f9ae54..3edb157704 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -370,7 +370,7 @@ (define-public gnupg-1 (define-public gpgme (package (name "gpgme") - (version "1.8.0") + (version "1.9.0") (source (origin (method url-fetch) @@ -378,7 +378,7 @@ (define-public gpgme ".tar.bz2")) (sha256 (base32 - "0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r")))) + "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v")))) (build-system gnu-build-system) (propagated-inputs ;; Needs to be propagated because gpgme.h includes gpg-error.h.