From 55e51b6615230b90f292d6b09b739e4fadbeef3e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Jan 2020 20:58:19 +0100 Subject: gnu: python-pyopenssl: Fix test failure. * gnu/packages/python-crypto.scm (python-pyopenssl)[native-inputs]: Add LIBFAKETIME. [arguments]: Use it to run tests with a fixed date. (cherry picked from commit 84f1e12b8b84acca1b3be7d41daacce28feb391d) --- gnu/packages/python-crypto.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 71172701ac..f35540686c 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari -;;; Copyright © 2016, 2017 Marius Bakke +;;; Copyright © 2016, 2017, 2020 Marius Bakke ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2015 Cyril Roelandt @@ -488,7 +488,10 @@ (define-public python-pyopenssl (add-after 'install 'check (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) - (invoke "py.test" "-v" "-k" + ;; PyOpenSSL runs tests against a certificate with a fixed + ;; expiry time. To ensure successful builds in the future, + ;; set the time to roughly the release date. + (invoke "faketime" "2019-01-01" "py.test" "-v" "-k" (string-append ;; This test tries to look up certificates from ;; the compiled-in default path in OpenSSL, which @@ -503,7 +506,8 @@ (define-public python-pyopenssl (inputs `(("openssl" ,openssl))) (native-inputs - `(("python-flaky" ,python-flaky) + `(("libfaketime" ,libfaketime) + ("python-flaky" ,python-flaky) ("python-pretend" ,python-pretend) ("python-pytest" ,python-pytest))) (home-page "https://github.com/pyca/pyopenssl") -- cgit v1.2.3 From 7b83cd720fa1b460ab79753869441be272251ded Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:20:29 +0100 Subject: gnu: eudev: Do not build the static libraries. * gnu/packages/linux.scm (eudev)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/linux.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d1ce205194..e68c1fb6cb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2746,7 +2746,8 @@ (define-public eudev (let ((out (assoc-ref outputs "out"))) (invoke (string-append out "/bin/udevadm") "hwdb" "--update"))))) - #:configure-flags (list "--enable-manpages"))) + #:configure-flags (list "--enable-manpages" + "--disable-static"))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From e4db21bcf634ac6bf8acc63659760659c44c8aeb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:33:50 +0100 Subject: gnu: nss: Remove obsolete patch. * gnu/packages/patches/nss-freebl-stubs.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/nss.scm (nss)[source](patches): Remove 'nss-freebl-stubs.patch'. --- gnu/local.mk | 1 - gnu/packages/nss.scm | 1 - gnu/packages/patches/nss-freebl-stubs.patch | 20 -------------------- 3 files changed, 22 deletions(-) delete mode 100644 gnu/packages/patches/nss-freebl-stubs.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 9a316f6edb..f54a457e24 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1212,7 +1212,6 @@ dist_patch_DATA = \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/nm-plugin-path.patch \ %D%/packages/patches/nsis-env-passthru.patch \ - %D%/packages/patches/nss-freebl-stubs.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \ diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 294891734d..28ca76df55 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -84,7 +84,6 @@ (define-public nss "0vh23g16ldvnsrn2dnvdl2i133kizi660r7ilb00vfq2kvj45anr")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" - "nss-freebl-stubs.patch" "nss-increase-test-timeout.patch")))) (build-system gnu-build-system) (outputs '("out" "bin")) diff --git a/gnu/packages/patches/nss-freebl-stubs.patch b/gnu/packages/patches/nss-freebl-stubs.patch deleted file mode 100644 index 3f7b47b029..0000000000 --- a/gnu/packages/patches/nss-freebl-stubs.patch +++ /dev/null @@ -1,20 +0,0 @@ -This patch is required for Makefile-based builds of NSS 3.45 on armhf-linux. - -Taken from upstream bug tracker: -https://bugzilla.mozilla.org/show_bug.cgi?id=1571316 - -diff --git a/nss/lib/freebl/ecl/curve25519_32.c b/nss/lib/freebl/ecl/curve25519_32.c ---- a/nss/lib/freebl/ecl/curve25519_32.c -+++ b/nss/lib/freebl/ecl/curve25519_32.c -@@ -29,6 +29,10 @@ - * 1. Convert custom integer types to stdint.h types - */ - -+#ifdef FREEBL_NO_DEPEND -+#include "../stubs.h" -+#endif -+ - #include "ecl-priv.h" - - /* fe means field element. Here the field is \Z/(2^255-19). An element t, - -- cgit v1.2.3 From ceb4b1d71595b65feb14e939ac6cbdc6b62e7223 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:35:50 +0100 Subject: gnu: nspr: Do not build the static library. * gnu/packages/nss.scm (nspr)[arguments]: Add "--disable-static" in #:configure-flags. --- gnu/packages/nss.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 28ca76df55..865c0855ad 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -48,7 +48,8 @@ (define-public nspr `(("perl" ,perl))) (arguments `(#:tests? #f ; no check target - #:configure-flags (list "--enable-64bit" + #:configure-flags (list "--disable-static" + "--enable-64bit" (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) -- cgit v1.2.3 From 2fabf398c1ff52ec98676d1434267c5e3727cac5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:39:43 +0100 Subject: gnu: libaio: Update to 0.3.112. * gnu/packages/linux.scm (libaio): Update to 0.3.112. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e68c1fb6cb..0dba6a3aa1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3811,7 +3811,7 @@ (define-public multipath-tools (define-public libaio (package (name "libaio") - (version "0.3.111") + (version "0.3.112") (source (origin (method url-fetch) (uri (list @@ -3819,7 +3819,7 @@ (define-public libaio name "-" version ".tar.gz"))) (sha256 (base32 - "0ajhzbqjwsmz51gwccfyw6w9k4j4gmxcl2ph30sfn2gxv0d8gkv2")))) + "14mlqdapjqq1dhpkdgy5z83mvsaz36fcxca7a4z6hinmr7r6415b")))) (build-system gnu-build-system) (arguments '(#:make-flags -- cgit v1.2.3 From d60458d77c53f2894d7c1f0649bf24e3f048db8b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:44:04 +0100 Subject: gnu: libaio: Do not install the static library. * gnu/packages/linux.scm (libaio)[arguments]: Add phase 'delete-static-library'. --- gnu/packages/linux.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0dba6a3aa1..ef04a428d0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3826,7 +3826,13 @@ (define-public libaio (list "CC=gcc" (string-append "prefix=" %output)) #:test-target "partcheck" ; need root for a full 'check' #:phases - (modify-phases %standard-phases (delete 'configure)))) ; no configure script + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-after 'install 'delete-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (delete-file (string-append out "/lib/libaio.a")) + #t)))))) (home-page "https://pagure.io/libaio") (synopsis "Linux-native asynchronous I/O access library") (description -- cgit v1.2.3 From ac906f14bcd683c7da2f94bbbbd7ee3469f1368f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:46:54 +0100 Subject: gnu: libffcall: Do not build the static libraries. * gnu/packages/libffcall.scm (libffcall)[arguments]: Add #:configure-flags. --- gnu/packages/libffcall.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libffcall.scm b/gnu/packages/libffcall.scm index 3a231f30a0..908c24a8f9 100644 --- a/gnu/packages/libffcall.scm +++ b/gnu/packages/libffcall.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Joshua S. Grant ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017, 2018 Efraim Flashner +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,7 +38,9 @@ (define-public libffcall (base32 "0iwcad6w78jp84vd6xaz5fwqm84n3cb42bdf5m5cj5xzpa5zp4d0")))) (build-system gnu-build-system) - (arguments `(#:parallel-build? #f)) + (arguments + '(#:parallel-build? #f + #:configure-flags '("--disable-static"))) (synopsis "Foreign function calls from interpreters") (description "GNU Libffcall is a collection of libraries that can be used to build -- cgit v1.2.3 From caf43fd31ef5840abc76dd3e08d13628d681d1e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:48:36 +0100 Subject: gnu: libffcall: Update to 2.2. * gnu/packages/libffcall.scm (libffcall): Update to 2.2. --- gnu/packages/libffcall.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libffcall.scm b/gnu/packages/libffcall.scm index 908c24a8f9..0b27f88cfc 100644 --- a/gnu/packages/libffcall.scm +++ b/gnu/packages/libffcall.scm @@ -28,7 +28,7 @@ (define-module (gnu packages libffcall) (define-public libffcall (package (name "libffcall") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) @@ -36,7 +36,7 @@ (define-public libffcall "mirror://gnu/libffcall/libffcall-" version ".tar.gz")) (sha256 (base32 - "0iwcad6w78jp84vd6xaz5fwqm84n3cb42bdf5m5cj5xzpa5zp4d0")))) + "0ixp7kbr7y8s34nsrsdfh77ig5c2zkwr6cfg9v1gm53cggwkgypb")))) (build-system gnu-build-system) (arguments '(#:parallel-build? #f -- cgit v1.2.3 From ac9cc329fcfba3316af3b40e61608b2a09d19768 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:52:07 +0100 Subject: gnu: libevdev: Do not build the static library. * gnu/packages/xorg.scm (libevdev)[arguments]: Add #:configure-flags. --- gnu/packages/xorg.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index cd6c3218a8..2232be3df0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2386,7 +2386,8 @@ (define-public libevdev "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1")))) (build-system gnu-build-system) (arguments - `(#:phases (modify-phases %standard-phases + `(#:configure-flags '("--disable-static") + #:phases (modify-phases %standard-phases (add-before 'configure 'pedantry (lambda _ ;; XXX: libevdev includes kernel headers, which causes this -- cgit v1.2.3 From b82464b36112ef2ce29bf050b2ff2c89eefbcae1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:52:28 +0100 Subject: gnu: libevdev: Update to 1.8.0. * gnu/packages/xorg.scm (libevdev): Update to 1.8.0. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2232be3df0..a2847bac6b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2375,7 +2375,7 @@ (define-public xextproto (define-public libevdev (package (name "libevdev") - (version "1.5.9") + (version "1.8.0") (source (origin (method url-fetch) @@ -2383,7 +2383,7 @@ (define-public libevdev name "-" version ".tar.xz")) (sha256 (base32 - "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1")))) + "04a2klvii0in9ln8r85mk2cm73jq8ry2m3yzmf2z8xyjxzjcmlr0")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static") -- cgit v1.2.3 From 768164437ada8e9c05bb8a9116fb2d4e54089b58 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:54:55 +0100 Subject: gnu: libtirpc: Update to 1.2.5. * gnu/packages/onc-rpc.scm (libtirpc): Update to 1.2.5. --- gnu/packages/onc-rpc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 7e424dd185..5849b8deb4 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -35,7 +35,7 @@ (define-module (gnu packages onc-rpc) (define-public libtirpc (package (name "libtirpc") - (version "1.1.4") + (version "1.2.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libtirpc/libtirpc/" @@ -43,7 +43,7 @@ (define-public libtirpc version ".tar.bz2")) (sha256 (base32 - "07anqypf7c719x9y683qz65cxllmzlgmlab2hlahrqcj4bq2k99c")))) + "1jl6a5kkw2vrp4gb6pmvf72rqimywvwfb9f7iz2xjg4wgq63bdpk")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static") -- cgit v1.2.3 From bc2b7fe2cd3a8d292463fd79b55f8ad4d6898077 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 16:59:15 +0100 Subject: gnu: perl-test-simple: Update to 1.302171. * gnu/packages/perl-check.scm (perl-test-simple): Update to 1.302171. --- gnu/packages/perl-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 9944c31305..fa42171b27 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1239,14 +1239,14 @@ (define-public perl-test-sharedfork (define-public perl-test-simple (package (name "perl-test-simple") - (version "1.302169") + (version "1.302171") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/EX/EXODIST/" "Test-Simple-" version ".tar.gz")) (sha256 (base32 - "08y7b817045w9bc1k9y01l5shl162q9fdc2g5qf7ny0gdxvh85s1")))) + "12in730hr51h42dwd3c5k7ysyp0xyk17583mfvx6zg56nb990zz2")))) (build-system perl-build-system) (synopsis "Basic utilities for writing tests") (description -- cgit v1.2.3 From 631d4dd44b42c36fd8adb2cdc2fdf72e62923d3f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:00:53 +0100 Subject: gnu: perl-lwp-mediatypes: Update to 6.04. * gnu/packages/web.scm (perl-lwp-mediatypes): Update to 6.0.4. [source](uri): Adjust accordingly. [native-inputs]: Add PERL-TEST-FATAL. --- gnu/packages/web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2b9836ecc4..320826ebe2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3543,16 +3543,18 @@ (define-public perl-lwp-online (define-public perl-lwp-mediatypes (package (name "perl-lwp-mediatypes") - (version "6.02") + (version "6.04") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/G/GA/GAAS/LWP-MediaTypes-" + "mirror://cpan/authors/id/O/OA/OALDERS/LWP-MediaTypes-" version ".tar.gz")) (sha256 (base32 - "0xmnblp962qy02akah30sji8bxrqcyqlff2w95l199ghql60ny8q")))) + "1n8rg6csv3dsvymg06cmxipimr6cb1g9r903ghm1qsmiv89cl6wg")))) (build-system perl-build-system) + (native-inputs + `(("perl-test-fatal" ,perl-test-fatal))) (license license:perl-license) (synopsis "Perl module to guess the media type for a file or a URL") (description -- cgit v1.2.3 From 80b26d6c83e41367fc7a6798817a8b572df82006 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:01:56 +0100 Subject: gnu: perl-http-date: Update to 6.05. * gnu/packages/web.scm (perl-http-date): Update to 6.05. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 320826ebe2..3881722ad8 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3176,15 +3176,15 @@ (define-public perl-http-daemon (define-public perl-http-date (package (name "perl-http-date") - (version "6.02") + (version "6.05") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/G/GA/GAAS/HTTP-Date-" + "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Date-" version ".tar.gz")) (sha256 (base32 - "0cz357kafhhzw7w59iyi0wvhw7rlh5g1lh38230ckw7rl0fr9fg8")))) + "0awjdbz7x0jd5pna55dwxhs3k6xp3sw6b2zg3p2yndxxvya64p9n")))) (build-system perl-build-system) (license license:perl-license) (synopsis "Perl date conversion routines") -- cgit v1.2.3 From 871a2c2f676efa950f32f68a205b12503c829f4e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:02:54 +0100 Subject: gnu: perl-term-readkey: Update to 2.38. * gnu/packages/perl.scm (perl-term-readkey): Update to 2.38. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f513a78f76..2b2c960586 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8495,7 +8495,7 @@ (define-public perl-term-progressbar-simple (define-public perl-term-readkey (package (name "perl-term-readkey") - (version "2.37") + (version "2.38") (source (origin (method url-fetch) @@ -8503,7 +8503,7 @@ (define-public perl-term-readkey "TermReadKey-" version ".tar.gz")) (sha256 (base32 - "0hdj5mldpj3pyprd4hbbalfx9yjgi5p59gg2ixk9808f5v7q74sa")))) + "143jlibah1g14bym7sj3gphvqkpj1w4vn7sqc4vc62jpviw5hr2s")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/TermReadKey") (synopsis "Simple terminal control") -- cgit v1.2.3 From bec7e21fa06dd462d44c5730ecd25a0d5aae5524 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:03:26 +0100 Subject: gnu: perl-cgi: Update to 4.46. * gnu/packages/web.scm (perl-cgi): Update to 4.46. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3881722ad8..96e188a600 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2553,7 +2553,7 @@ (define-public perl-catalystx-script-server-starman (define-public perl-cgi (package (name "perl-cgi") - (version "4.44") + (version "4.46") (source (origin (method url-fetch) @@ -2561,7 +2561,7 @@ (define-public perl-cgi "CGI-" version ".tar.gz")) (sha256 (base32 - "020jrygslqixrxd2nzc2l8ac39ynqzsy83nnnr3mqn6kxfvmyhqj")))) + "16225vmdsfa2y7i1ydv7634nd0qxxb0ccwnfszjq58rwqgfri2bq")))) (build-system perl-build-system) (native-inputs `(("perl-test-deep" ,perl-test-deep) -- cgit v1.2.3 From 22534556fefd466ace9510c62536b50d6a10f037 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:04:07 +0100 Subject: gnu: perl-ipc-system-simple: Update to 1.26. * gnu/packages/perl.scm (perl-ipc-system-simple): Update to 1.26. --- gnu/packages/perl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 2b2c960586..7459bd1802 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4635,15 +4635,15 @@ (define-public perl-ipc-sharelite (define-public perl-ipc-system-simple (package (name "perl-ipc-system-simple") - (version "1.25") + (version "1.26") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/P/PJ/PJF/IPC-System-Simple-" + "mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-" version ".tar.gz")) (sha256 (base32 - "0fsdb81shjj4hifyyzvj7vpkhq5jrfhlcpw2xbjfi1mqz8fsmdpi")))) + "1zb5ni8ikaq6s60amwdsq69nz8gxl484yiga6ax5nqp8v0hpy5sp")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/IPC-System-Simple") (synopsis "Run commands simply, with detailed diagnostics") -- cgit v1.2.3 From 62d46da10e69c136270e4a41d71fea93cc8f6a75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:09:27 +0100 Subject: gnu: perl-test-cleannamespaces: Remove obsolete input. * gnu/packages/perl-check.scm (perl-test-cleannamespaces)[native-inputs]: Remove PERL-TEST-TESTER. --- gnu/packages/perl-check.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index fa42171b27..79f2ef4c73 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -243,7 +243,6 @@ (define-public perl-test-cleannamespaces ("perl-test-requires" ,perl-test-requires) ("perl-test-deep" ,perl-test-deep) ("perl-test-warnings" ,perl-test-warnings) - ("perl-test-tester" ,perl-test-tester) ("perl-test-needs" ,perl-test-needs))) (propagated-inputs `(("perl-namespace-clean" ,perl-namespace-clean) -- cgit v1.2.3 From 009b4b4341288a3a8eb89989074bcfc6412603a3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:10:01 +0100 Subject: gnu: perl-test-deep: Remove obsolete input. * gnu/packages/perl-check.scm (perl-test-deep)[inputs]: Remove PERL-TEST-TESTER. --- gnu/packages/perl-check.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 79f2ef4c73..3b049e29f9 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -348,8 +348,7 @@ (define-public perl-test-deep (base32 "1kdy06r0yg7zwarqglc9163vbfb0sfc4s6ld4pw5q7i9f7mghzi0")))) (build-system perl-build-system) - (inputs `(("perl-test-tester" ,perl-test-tester) - ("perl-test-nowarnings" ,perl-test-nowarnings))) + (inputs `(("perl-test-nowarnings" ,perl-test-nowarnings))) (synopsis "Flexible deep comparison for the Test::Builder framework") (description "Test::Deep compares two structures by going through each level, ensuring -- cgit v1.2.3 From 17aa4699b97d118859a4aef68e4bc5d8bceec9ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:10:23 +0100 Subject: gnu: perl-test-nowarnings: Remove obsolete input. * gnu/packages/perl-check.scm (perl-test-nowarnings)[inputs]: Remove. --- gnu/packages/perl-check.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 3b049e29f9..280565e903 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -995,7 +995,6 @@ (define-public perl-test-nowarnings (base32 "0v385ch0hzz9naqwdw2az3zdqi15gka76pmiwlgsy6diiijmg2k3")))) (build-system perl-build-system) - (inputs `(("perl-test-tester" ,perl-test-tester))) (synopsis "Ensure no warnings are produced while testing") (description "This modules causes any warnings during testing to be captured and -- cgit v1.2.3 From 1f676329b69c6317b0c4a37f82ced1b668230f31 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:10:51 +0100 Subject: gnu: perl-test-output: Remove obsolete input. * gnu/packages/perl-check.scm (perl-test-output)[propagated-inputs]: Remove PERL-TEST-TESTER. --- gnu/packages/perl-check.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 280565e903..4a4be09313 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1042,7 +1042,6 @@ (define-public perl-test-output (build-system perl-build-system) (propagated-inputs `(("perl-capture-tiny" ,perl-capture-tiny) - ("perl-test-tester" ,perl-test-tester) ("perl-sub-exporter" ,perl-sub-exporter))) (synopsis "Utilities to test STDOUT and STDERR messages") (description -- cgit v1.2.3 From 43f0cfcd0fcbd4ebd64217d9a9660d8062a1bbfa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:11:20 +0100 Subject: gnu: perl-test-trap: Remove obsolete input. * gnu/packages/perl-check.scm (perl-test-trap)[propagated-inputs]: Remove PERL-TEST-TESTER. --- gnu/packages/perl-check.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 4a4be09313..75e858609f 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1337,8 +1337,7 @@ (define-public perl-test-trap `(("perl-module-build" ,perl-module-build) ("perl-test-simple" ,perl-test-simple))) (propagated-inputs - `(("perl-test-tester" ,perl-test-tester) - ("perl-data-dump" ,perl-data-dump))) + `(("perl-data-dump" ,perl-data-dump))) (home-page "https://metacpan.org/release/Test-Trap") (synopsis "Trap exit codes, exceptions, output, and so on") (description "This module is primarily (but not exclusively) for use in -- cgit v1.2.3 From 986dce4f8537a1c63c8cc38d800e4699f7eb0733 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:30:26 +0100 Subject: gnu: lz4: Do not install liblz4.a. * gnu/packages/compression.scm (lz4)[arguments]: Add phase 'delete-static-library'. --- gnu/packages/compression.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 98af41760f..30db84e167 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2019 Kei Kebreau -;;; Copyright © 2016, 2018, 2019 Marius Bakke +;;; Copyright © 2016, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017 Theodoros Foradis @@ -764,7 +764,12 @@ (define-public lz4 (substitute* "tests/Makefile" (("^test: (.*) test-install" _ targets) (string-append "test: " targets))) - #t))))) + #t)) + (add-after 'install 'delete-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (delete-file (string-append out "/lib/liblz4.a")) + #t)))))) (home-page "https://www.lz4.org") (synopsis "Compression algorithm focused on speed") (description "LZ4 is a lossless compression algorithm, providing -- cgit v1.2.3 From 6ecb8846831ef09312114e977b3393faabe6b18e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:37:26 +0100 Subject: gnu: ImageMagick: Update to 6.9.10-92. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-92. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 1ea4b5bd6a..2ee382bb29 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -48,14 +48,14 @@ (define-public imagemagick ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.10-87") + (version "6.9.10-92") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "09m0nx7y6j5cq13r583kp3lbsc357cc3q0kcvzbya54r5lx20a5p")))) + "1klbpshsxgidzssz78z7z77lcmgxrbsg20dx5bk8i5zpqabxj3h8")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") -- cgit v1.2.3 From cf99239ceea4a02154b5b869ce2135082718e2d8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:40:31 +0100 Subject: gnu: check: Update to 0.14.0. * gnu/packages/check.scm (check): Update to 0.14.0. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index fa6575173f..f283f9eec3 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -78,7 +78,7 @@ (define-module (gnu packages check) (define-public check (package (name "check") - (version "0.13.0") + (version "0.14.0") (source (origin (method url-fetch) @@ -86,7 +86,7 @@ (define-public check version "/check-" version ".tar.gz")) (sha256 (base32 - "02crar51gniijrrl9p8f9maibnwc33n76kw5cqr7xk3s8hqnncy4")))) + "02zkfiyklckmivrfvdsrlzvzphkdsgjrz3igncw05dv5pshhq3xx")))) (build-system gnu-build-system) (home-page "https://libcheck.github.io/check/") (synopsis "Unit test framework for C") -- cgit v1.2.3 From e313327ee8cf864bd8e1e26df28634dc6eff9e5e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:40:49 +0100 Subject: gnu: MariaDB: Update to 10.1.44. * gnu/packages/databases.scm (mariadb): Update to 10.1.44. [arguments]: Add substitution for hard coded file name. Disable test that depends on the existence of 'root@hostname' user. --- gnu/packages/databases.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 587d993918..16b12d5e85 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -689,7 +689,7 @@ (define-public mysql (define-public mariadb (package (name "mariadb") - (version "10.1.43") + (version "10.1.44") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.com/MariaDB" @@ -697,7 +697,7 @@ (define-public mariadb version ".tar.gz")) (sha256 (base32 - "1pxyq37q4p7515by7k8hs3l3css68f3bm3akx99vw4m1rxwwbm63")) + "0fah6d50hldq0farxwr8mj3jnniwdz0d1wsha07nx37fc79h7wi1")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet @@ -789,6 +789,7 @@ (define-public mariadb ;; See . "main.join_cache" "main.explain_non_select" + "main.stat_tables" "main.stat_tables_innodb" "roles.acl_statistics" @@ -824,6 +825,10 @@ (define-public mariadb (("latin1_swedish_ci") "utf8_general_ci") (("\tlatin1") "\tutf8")) + (substitute* "mysql-test/suite/binlog/t/binlog_mysqlbinlog_stop_never.test" + (("/bin/bash") + (which "bash"))) + (substitute* "mysql-test/mysql-test-run.pl" (("/bin/ls") (which "ls")) (("/bin/sh") (which "sh"))) -- cgit v1.2.3 From 03bed9090f05b481fc7feea954fc6f3322991014 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:42:06 +0100 Subject: gnu: cups-filters: Update to 1.27.0. * gnu/packages/cups.scm (cups-filters): Update to 1.27.0. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 232e61c86d..180c70dddd 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -58,7 +58,7 @@ (define-module (gnu packages cups) (define-public cups-filters (package (name "cups-filters") - (version "1.26.2") + (version "1.27.0") (source(origin (method url-fetch) (uri @@ -66,7 +66,7 @@ (define-public cups-filters "cups-filters-" version ".tar.xz")) (sha256 (base32 - "1a8x6zgw3m4717gw3842gsrgjl05q92xygy4rp5vwr1d1xjmyxp1")) + "011lyr2b2w3q25cil5hz1rwy5r9awj9l70w3smrsihda5crcpqsa")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output -- cgit v1.2.3 From 4d3c2cb79f5451323deee4964d1d848cfb0950a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 17:56:12 +0100 Subject: gnu: python-mako: Update to 1.1.1. * gnu/packages/python-xyz.scm (python-mako): Update to 1.1.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ca559ca00a..4c01debed8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8967,14 +8967,14 @@ (define-public python2-xdo (define-public python-mako (package (name "python-mako") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (pypi-uri "Mako" version)) (sha256 (base32 - "0jqa3qfpykyn4fmkn0kh6043sfls7br8i2bsdbccazcvk9cijsd3")))) + "193mds7lv91pphnvn6c1n55rhjkgq94asdzgrsb2fiqx7rrsd119")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From d7bede8bf1c3269fdb8f8aeebcfdd6d854fc2bb3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 18:58:30 +0100 Subject: gnu: qpdf: Update to 9.1.1. * gnu/packages/pdf.scm (qpdf): Update to 9.1.1. [source](modules, snippet): Remove. --- gnu/packages/pdf.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 13cc384204..5f16f2027b 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -676,26 +676,14 @@ (define-public mupdf (define-public qpdf (package (name "qpdf") - (version "9.1.0") + (version "9.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version "/qpdf-" version ".tar.gz")) (sha256 (base32 - "0ygd80wxcmh613n04x2kmf8wlsl0drxyd5wwdcrm1rzj0xwvpfrs")) - (modules '((guix build utils))) - (snippet - ;; Replace shebang with the bi-lingual shell/Perl trick to remove - ;; dependency on Perl. - '(begin - (substitute* "qpdf/fix-qdf" - (("#!/usr/bin/env perl") - "\ -eval '(exit $?0)' && eval 'exec perl -wS \"$0\" ${1+\"$@\"}' - & eval 'exec perl -wS \"$0\" $argv:q' - if 0;\n")) - #t)))) + "0dj27wb9xg6pg95phbflfvy9rwxn1gh3kc4n175g0pf41r0zrim2")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,perl) -- cgit v1.2.3 From 964a556dc5229c115f1ec06ec9444cc4e3b9daa3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 19:31:11 +0100 Subject: gnu: mtdev: Update to 1.1.6. * gnu/packages/xdisorg.scm (mtdev): Update to 1.1.6. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index da84f0f4b8..6ad24d96cc 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -513,7 +513,7 @@ (define-public libdrm (define-public mtdev (package (name "mtdev") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) @@ -522,7 +522,7 @@ (define-public mtdev version ".tar.bz2")) (sha256 (base32 - "0zxs7shzgbalkvlaiibi25bd902rbmkv9n1lww6q8j3ri9qdaxv6")))) + "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm")))) (build-system gnu-build-system) (home-page "http://bitmath.org/code/mtdev/") (synopsis "Multitouch protocol translation library") -- cgit v1.2.3 From 34e9aa73328431361f128fe684b364ba11ee66e5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 19:31:43 +0100 Subject: gnu: mtdev: Do not build the static library. * gnu/packages/xdisorg.scm (mtdev)[arguments]: New field. --- gnu/packages/xdisorg.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 6ad24d96cc..b34d5d08f2 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -524,6 +524,7 @@ (define-public mtdev (base32 "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm")))) (build-system gnu-build-system) + (arguments '(#:configure-flags '("--disable-static"))) (home-page "http://bitmath.org/code/mtdev/") (synopsis "Multitouch protocol translation library") (description "Mtdev is a stand-alone library which transforms all -- cgit v1.2.3 From 3220e44f1611c7a514e3bbcfef3b02157f4748fe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 19:33:50 +0100 Subject: gnu: python-cython: Update to 0.29.15. * gnu/packages/python-xyz.scm (python-cython): Update to 0.29.15. [arguments]: Remove obsolete phase. --- gnu/packages/python-xyz.scm | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4c01debed8..ddd877fc80 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3280,14 +3280,14 @@ (define-public mallard-ducktype (define-public python-cython (package (name "python-cython") - (version "0.29.13") + (version "0.29.15") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 (base32 - "13k37lrcgagwwnzr5bzririsscb793vndj234d475x1h9ad0d7f2")))) + "0c5cjyxfvba6c0vih1fvhywp8bpz30vwvbjqdm1q1k55xzhmkn30")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so @@ -3299,24 +3299,6 @@ (define-public python-cython (add-before 'check 'set-HOME ;; some tests require access to "$HOME/.cython" (lambda _ (setenv "HOME" "/tmp") #t)) - - ;; FIXME: These tests started failing on armhf after the 0.28 update - ;; (commit c69d11c5930), both with an error such as this: - ;; compiling (cpp) and running dictcomp ... - ;; === C/C++ compiler error output: === - ;; ‘ - ;; dictcomp.cpp:5221: confused by earlier errors, bailing out - ;; See for logs. - ,@(if (target-arm32?) - `((add-before 'check 'disable-failing-tests - (lambda _ - (let ((disabled-tests (open-file "tests/bugs.txt" "a"))) - (for-each (lambda (test) - (format disabled-tests "~a\n" test)) - '("memslice" "dictcomp")) - (close-port disabled-tests))))) - '()) - (replace 'check (lambda _ ;; Disable compiler optimizations to greatly reduce the running -- cgit v1.2.3 From dab3c841b3f0dbca40543b32cf0260a8b5f34845 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 20:03:43 +0100 Subject: gnu: python-babel: Update to 2.8.0. * gnu/packages/python-xyz.scm (python-babel): Update to 2.8.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ddd877fc80..3ebfb86a01 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -325,14 +325,14 @@ (define-public python2-clyent (define-public python-babel (package (name "python-babel") - (version "2.7.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (pypi-uri "Babel" version)) (sha256 (base32 - "0a7wawx8vsg7igvz6p3x909fskhg4b2y1910xk4f4c8y22p3aqg8")))) + "0f0f2vvs1mpdpz2c0mg1mnc3sih8bizmc1h9m67kdsnqs3i2mb0s")))) (build-system python-build-system) (native-inputs `(("python-freezegun" ,python-freezegun) -- cgit v1.2.3 From 9b54d319e1ffc4f582816eaad6ee9c8827ef23ce Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 20:04:55 +0100 Subject: gnu: python-snowballstemmer: Update to 2.0.0. * gnu/packages/python-xyz.scm (python-snowballstemmer): Update to 2.0.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3ebfb86a01..a5829ffebc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11580,13 +11580,13 @@ (define-public python-nautilus (define-public python-snowballstemmer (package (name "python-snowballstemmer") - (version "1.2.1") + (version "2.0.0") (source (origin (method url-fetch) (uri (pypi-uri "snowballstemmer" version)) (sha256 (base32 - "0a0idq4y5frv7qsg2x62jd7rd272749xk4x99misf5rcifk2d7wi")))) + "0ligk61idlz8kkgd5hpip5whm172riwglb6xydii7h62yhysqfyz")))) (build-system python-build-system) (arguments `(;; No tests exist -- cgit v1.2.3 From da8e8dc6441afaeee1a57ee6c8a610f1525e7ab9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 20:08:12 +0100 Subject: gnu: python-docutils: Update to 0.16. * gnu/packages/python-xyz.scm (python-docutils): Update to 0.16. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a5829ffebc..97fbea5bd6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2635,14 +2635,14 @@ (define-public python-anytree (define-public python-docutils (package (name "python-docutils") - (version "0.14") + (version "0.16") (source (origin (method url-fetch) (uri (pypi-uri "docutils" version)) (sha256 (base32 - "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji")))) + "1z3qliszqca9m719q3qhdkh0ghh90g500avzdgi7pl77x5h3mpn2")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; no setup.py test command -- cgit v1.2.3 From 8cf5c9fabf8ad179fd4da1d99e044c93d2d89bde Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 20:09:54 +0100 Subject: gnu: python-docutils: Run the tests. * gnu/packages/python-xyz.scm (python-docutils)[arguments]: Remove #:tests?. Add #:phases. --- gnu/packages/python-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 97fbea5bd6..975198ed34 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2645,7 +2645,13 @@ (define-public python-docutils "1z3qliszqca9m719q3qhdkh0ghh90g500avzdgi7pl77x5h3mpn2")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; no setup.py test command + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "python" "test/alltests.py") + (format #t "test suite not run~%")) + #t))))) (home-page "http://docutils.sourceforge.net/") (synopsis "Python Documentation Utilities") (description -- cgit v1.2.3 From 3c8ad0876c9245ce7f712d52ace287bb29d4ad4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 20:12:24 +0100 Subject: gnu: python-jinja2: Update to 2.11.1. * gnu/packages/python-xyz.scm (python-jinja2): Update to 2.11.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 975198ed34..0457fa9ea7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2450,14 +2450,14 @@ (define-public python2-markupsafe (define-public python-jinja2 (package (name "python-jinja2") - (version "2.10.1") + (version "2.11.1") (source (origin (method url-fetch) (uri (pypi-uri "Jinja2" version)) (sha256 (base32 - "04shqrs56aj04ipyqykj512rw2l0zfammvj9krawzxz7xc14yp06")))) + "0l72c11n959yzb8d3ankckb6yhjhm6x729zm7rkpk040qzxpy64k")))) (build-system python-build-system) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) -- cgit v1.2.3 From dce9b8b52c0726805e4e8f223e7cc9839d7bf7cf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 20:13:40 +0100 Subject: gnu: python-jinja2: Run the tests. * gnu/packages/python-xyz.scm (python-jinja2)[native-inputs]: Add PYTHON-PYTEST. [arguments]: New field. --- gnu/packages/python-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0457fa9ea7..63d6f4bf9b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2459,6 +2459,20 @@ (define-public python-jinja2 (base32 "0l72c11n959yzb8d3ankckb6yhjhm6x729zm7rkpk040qzxpy64k")))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "PYTHONPATH" + (string-append "./build/lib:" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv")) + (format #t "test suite not run~%")) + #t))))) + (native-inputs + `(("python-pytest" ,python-pytest))) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) (home-page "http://jinja.pocoo.org/") -- cgit v1.2.3 From 318c6a5aa932f1276b29c09ec5104fd9f0841b53 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Feb 2020 20:19:11 +0100 Subject: gnu: python-imagesize: Update to 1.2.0. * gnu/packages/python-xyz.scm (python-imagesize): Update to 1.2.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 63d6f4bf9b..251b74ee75 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11791,14 +11791,14 @@ (define-public python2-pyev (define-public python-imagesize (package (name "python-imagesize") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (pypi-uri "imagesize" version)) (sha256 (base32 - "1dg3wn7qpwmhgqc0r9na2ding1wif9q5spz3j9zn2riwphc2k0zk")))) + "1cd24x0vqbd6c8ym1n21qc0aj54mfb7rzdqglmwk9xxixajbbxmi")))) (build-system python-build-system) (home-page "https://github.com/shibukawa/imagesize_py") (synopsis "Gets image size of files in various formats in Python") -- cgit v1.2.3 From 759883ab5101443c0b0ece6bea6d02c60fb7287d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Feb 2020 17:56:28 +0100 Subject: gnu: Remove gdb@8.3. * gnu/packages/gdb.scm (gdb-8.3): Rename to ... (gdb-9.1): ... this. Update to 9.1. [properties]: Remove. [inputs]: Add SOURCE-HIGHLIGHT. [arguments]: Add #:out-of-source?. (gdb-8.2): Inherit from GDB-9.1. (gdb): Set to GDB-9.1. --- gnu/packages/gdb.scm | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 310bb6c320..01f93f6def 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -37,25 +37,24 @@ (define-module (gnu packages gdb) #:use-module (guix build-system gnu) #:use-module (srfi srfi-1)) -(define-public gdb-8.3 +(define-public gdb-9.1 (package (name "gdb") - (version "8.3.1") + (version "9.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz")) (sha256 (base32 - "1i2pjwaafrlz7wqm40b4znr77ai32rjsxkpl2az38yyarpbv8m8y")))) - - ;; Hide this package so that end users get 'gdb/next' below. - (properties '((hidden? . #t))) + "0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; FIXME "make check" fails on single-processor systems. + #:out-of-source? #t + #:modules ((srfi srfi-1) ,@%gnu-build-system-modules) @@ -96,6 +95,7 @@ (define-public gdb-8.3 ("python" ,python) ("python-wrapper" ,python-wrapper) ("dejagnu" ,dejagnu) + ("source-highlight" ,source-highlight) ;; Allow use of XML-formatted syscall information. This enables 'catch ;; syscall' and similar commands. @@ -117,7 +117,7 @@ (define-public gdb-8.3 ;; . (define-public gdb-8.2 (package/inherit - gdb-8.3 + gdb-9.1 (version "8.2.1") (source (origin (method url-fetch) @@ -127,26 +127,7 @@ (define-public gdb-8.2 (base32 "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha")))))) -;; The "next" version of GDB, to be merged with 'gdb' in the next rebuild cycle. -(define-public gdb/next - (package/inherit - gdb-8.3 - (version "9.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz")) - (sha256 - (base32 - "0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9")))) - (arguments - `(#:out-of-source? #t - ,@(package-arguments gdb-8.3))) - (inputs - `(("source-highlight" ,source-highlight) - ,@(package-inputs gdb-8.3))) - (properties (alist-delete 'hidden? (package-properties gdb-8.3))))) - (define-public gdb ;; This is the fixed version that packages depend on. Update it rarely ;; enough to avoid massive rebuilds. - gdb-8.3) + gdb-9.1) -- cgit v1.2.3 From dabd2fc3d5280dc1566e3d30ecccfd3b37eb635e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Feb 2020 19:37:57 +0100 Subject: gnu: nspr: Update to 4.25. * gnu/packages/nss.scm (nspr): Update to 4.25. --- gnu/packages/nss.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 865c0855ad..f307d6a3b2 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -34,7 +34,7 @@ (define-module (gnu packages nss) (define-public nspr (package (name "nspr") - (version "4.24") + (version "4.25") (source (origin (method url-fetch) (uri (string-append @@ -42,7 +42,7 @@ (define-public nspr version "/src/nspr-" version ".tar.gz")) (sha256 (base32 - "1l0ksiny032jijgk0g76wf0kiq673i01izj7jrs2h5d1yq6rm9ch")))) + "0mjjk2b7ika3v4y99cnaqz3z1iq1a50r1psn9i3s87gr46z0khqb")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From 8ff645f338f7825549f03d9c1b36c2e8ee433d02 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Feb 2020 19:38:18 +0100 Subject: gnu: nss, nss-certs: Update to 3.50. * gnu/packages/nss.scm (nss): Update to 3.50. * gnu/packages/certs.scm (nss-certs): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/nss.scm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 864fe5def1..9f1acb8837 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define certdata2pem (define-public nss-certs (package (name "nss-certs") - (version "3.49.1") + (version "3.50") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ (define-public nss-certs "nss-" version ".tar.gz"))) (sha256 (base32 - "0vh23g16ldvnsrn2dnvdl2i133kizi660r7ilb00vfq2kvj45anr")))) + "19rv0vp9nmvn6dy29qsv8f4v7wn5kizrpm59vbszahsjfwcz6p8q")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index f307d6a3b2..fe51fc2332 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -71,7 +71,7 @@ (define-public nspr (define-public nss (package (name "nss") - (version "3.49.1") + (version "3.50") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -82,7 +82,7 @@ (define-public nss "nss-" version ".tar.gz"))) (sha256 (base32 - "0vh23g16ldvnsrn2dnvdl2i133kizi660r7ilb00vfq2kvj45anr")) + "19rv0vp9nmvn6dy29qsv8f4v7wn5kizrpm59vbszahsjfwcz6p8q")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) @@ -130,7 +130,7 @@ (define-public nss ;; leading to test failures: ;; . To ;; work around that, set the time to roughly the release date. - (invoke "faketime" "2020-01-01" "./nss/tests/all.sh"))) + (invoke "faketime" "2020-02-01" "./nss/tests/all.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 21d0b64494ab7b6288d9d0289090ea28ec95f720 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Feb 2020 19:54:41 +0100 Subject: gnu: nss: Delete bundled SQLite and Zlib. * gnu/packages/nss.scm (nss)[source](modules, snippet): New fields. --- gnu/packages/nss.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index fe51fc2332..6d28f35915 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -85,7 +85,13 @@ (define-public nss "19rv0vp9nmvn6dy29qsv8f4v7wn5kizrpm59vbszahsjfwcz6p8q")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" - "nss-increase-test-timeout.patch")))) + "nss-increase-test-timeout.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "nss/lib/zlib") + (delete-file-recursively "nss/lib/sqlite") + #t)))) (build-system gnu-build-system) (outputs '("out" "bin")) (arguments -- cgit v1.2.3 From b280b9c3f2e1042cda23cfb831b07ae6b1660129 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Feb 2020 19:40:21 +0100 Subject: gnu: postgresql@10: Update to 10.12. * gnu/packages/databases.scm (postgresql): Update to 10.12. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 16b12d5e85..4a4710c27c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -955,14 +955,14 @@ (define-public mariadb-connector-c (define-public postgresql (package (name "postgresql") - (version "10.11") + (version "10.12") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "02fcmvbh0mhplj3s2jd24s642ysx7bggnf0h8bs5amh7dgzi8p8d")) + "1rsab4zf4rx7pvvhlwhb04kb95aiad9cwazc4ksbvg2gij47z3rq")) (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 7f8c5111fc5d6c1f27e7aaf4a1c2369e77f5f50d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Feb 2020 16:09:39 +0100 Subject: gnu: xkeyboard-config: Update to 2.29. * gnu/packages/xorg.scm (xkeyboard-config): Update to 2.29. [inputs]: Move GETTEXT-MINIMAL ... [native-inputs]: ... here. Add PERL and PYTHON. Remove INTLTOOL. --- gnu/packages/xorg.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a2847bac6b..2954ab5323 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3838,7 +3838,7 @@ (define-public xkbutils (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.28") + (version "2.29") (source (origin (method url-fetch) @@ -3848,15 +3848,16 @@ (define-public xkeyboard-config ".tar.bz2")) (sha256 (base32 - "1kmxc8hdw4qpvdlzp4ag8ygl34lqhs6sn3pcz1sl0kn61xdv5bb9")))) + "00hqc8nykvy8c09b8vab64dcd0ij3n5klxjn6rl00q7hickpah8x")))) (build-system gnu-build-system) (inputs - `(("gettext" ,gettext-minimal) - ("libx11" ,libx11) + `(("libx11" ,libx11) ("xkbcomp-intermediate" ,xkbcomp-intermediate))) (native-inputs - `(("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + `(("gettext" ,gettext-minimal) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg XKB configuration files") (description -- cgit v1.2.3 From 5edad6c75ae86a1e57010d7b4dce253f72ab3860 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Feb 2020 17:42:41 +0100 Subject: gnu: mesa: Update to 19.3.4. * gnu/packages/gl.scm (mesa): Update to 19.3.4. (mesa-19.3.3): Remove variable. * gnu/packages/graphics.scm (opensubdiv)[inputs]: Remove MESA-19.3.3. --- gnu/packages/gl.scm | 22 ++-------------------- gnu/packages/graphics.scm | 5 +---- 2 files changed, 3 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index e610fe1dd7..119440580a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -232,7 +232,7 @@ (define libva-without-mesa (define-public mesa (package (name "mesa") - (version "19.3.2") + (version "19.3.4") (source (origin (method url-fetch) @@ -244,7 +244,7 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1hg1gvcwvayksrdh9z8rfz66h3z1ffspmm2qgyy2nd8n8qrfwfjf")) + "1r4giqq7q7zqbn23lbw7v5vswagxx8qj6ij2w8bsb697mvk6g90x")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) @@ -423,24 +423,6 @@ (define-public mesa from software emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) -;; Mesa 19.3.2 causes a test failure in some packages, so add this newer -;; version separately until the next rebuild cycle. -(define-public mesa-19.3.3 - (package/inherit - mesa - (version "19.3.3") - (source (origin - (inherit (package-source mesa)) - (uri (list (string-append "https://mesa.freedesktop.org/archive/" - "mesa-" version ".tar.xz") - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - "mesa-" version ".tar.xz") - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" - version "/mesa-" version ".tar.xz"))) - (sha256 - (base32 - "02czqdqf64i3az5p1allnxycyjad3x35cj0hz0017mi5pc84ikl1")))))) - (define-public mesa-opencl (package (inherit mesa) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index a7ea6192fb..c49ba69475 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1061,10 +1061,7 @@ (define-public opensubdiv (native-inputs `(("xorg-server" ,xorg-server-for-tests))) (inputs - `(;; The test suite fails when using Mesa 19.3.2, so we provide this newer - ;; version. Remove this input when the 'mesa' package is updated. - ("mesa" ,mesa-19.3.3) - ("glew" ,glew) + `(("glew" ,glew) ("libxrandr" ,libxrandr) ("libxcursor" ,libxcursor) ("libxinerama" ,libxinerama) -- cgit v1.2.3 From 71949dac8babb80efd6d010c1c4b99c6534e5e0f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 19:54:18 +0100 Subject: gnu: nss: Add comment about deleted libraries. * gnu/packages/nss.scm (source)[snippet]: Add comment. While at it, add missing copyright information for Marius Bakke. --- gnu/packages/nss.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 6d28f35915..9112206c81 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,6 +90,7 @@ (define-public nss (modules '((guix build utils))) (snippet '(begin + ;; Delete the bundled copy of these libraries. (delete-file-recursively "nss/lib/zlib") (delete-file-recursively "nss/lib/sqlite") #t)))) -- cgit v1.2.3 From 21bdf383d7de83d523997d1689b8a2f6a5b858ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 20:14:52 +0100 Subject: Revert "gnu: libaio: Do not install the static library." This change breaks 'lvm2-static' which cannot easily be made to work with a separate libaio.a due to missing symbols. This reverts commit d60458d77c53f2894d7c1f0649bf24e3f048db8b. --- gnu/packages/linux.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ef04a428d0..0dba6a3aa1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3826,13 +3826,7 @@ (define-public libaio (list "CC=gcc" (string-append "prefix=" %output)) #:test-target "partcheck" ; need root for a full 'check' #:phases - (modify-phases %standard-phases - (delete 'configure) ;no configure script - (add-after 'install 'delete-static-library - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (delete-file (string-append out "/lib/libaio.a")) - #t)))))) + (modify-phases %standard-phases (delete 'configure)))) ; no configure script (home-page "https://pagure.io/libaio") (synopsis "Linux-native asynchronous I/O access library") (description -- cgit v1.2.3 From d85f8e46dbc5a978fe7359c89cbb3167fb9c2029 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Feb 2020 20:24:26 +0100 Subject: gnu: eudev: Build and install the static library. 'lvm2-static' requires the static libudev.a. This is a follow-up to commit 7b83cd720fa1b460ab79753869441be272251ded. * gnu/packages/linux.scm (eudev)[arguments]: Remove "--disable-static" from #:configure-flags. Add phase 'move-static-library. [outputs]: New field. (lvm2-static)[inputs]: Remove. [propagated-inputs]: Remove EUDEV and add EUDEV:STATIC. --- gnu/packages/linux.scm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0dba6a3aa1..9deb9c3904 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2739,6 +2739,21 @@ (define-public eudev (string-append (assoc-ref inputs "xsltproc") "/bin/xsltproc"))) #t)) + (add-after 'install 'move-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static")) + (source (string-append out "/lib/libudev.a")) + (target (string-append static "/lib/libudev.a"))) + (mkdir-p (dirname target)) + (link source target) + (delete-file source) + ;; Remove reference to the static library from the .la file + ;; such that Libtool looks for it in the usual places. + (substitute* (string-append out "/lib/libudev.la") + (("old_library=.*") + "old_library=''\n")) + #t))) (add-after 'install 'build-hwdb (lambda* (#:key outputs #:allow-other-keys) ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and @@ -2746,8 +2761,7 @@ (define-public eudev (let ((out (assoc-ref outputs "out"))) (invoke (string-append out "/bin/udevadm") "hwdb" "--update"))))) - #:configure-flags (list "--enable-manpages" - "--disable-static"))) + #:configure-flags (list "--enable-manpages"))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -2768,6 +2782,7 @@ (define-public eudev ;; which contains the rules to do that. `(("util-linux" ,util-linux) ;for blkid ("kmod" ,kmod))) + (outputs '("out" "static")) (home-page "https://wiki.gentoo.org/wiki/Project:Eudev") (synopsis "Userspace device management") (description "Udev is a daemon which dynamically creates and removes @@ -2860,8 +2875,7 @@ (define-public lvm2-static (name "lvm2-static") ;; Propagate udev because libdevmapper.a depends on libudev. - (inputs (alist-delete "udev" (package-inputs lvm2))) - (propagated-inputs `(("udev" ,eudev))) + (propagated-inputs `(("udev:static" ,eudev "static"))) (arguments (substitute-keyword-arguments (package-arguments lvm2) -- cgit v1.2.3 From cf4fdbcb0bf8ef4639dc162e09d152666fc6b89e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 24 Feb 2020 19:37:45 +0100 Subject: gnu: mesa: Build with LLVM 9. * gnu/packages/gl.scm (mesa)[inputs]: Change from LLVM-8 to LLVM-9. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 629902c85f..b863283606 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -268,7 +268,7 @@ (define-public mesa ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - `(("llvm" ,llvm-8))) + `(("llvm" ,llvm-9))) (_ `())) ("makedepend" ,makedepend) -- cgit v1.2.3 From 132c1915a5988375e5747db6e8376e7f63ba4803 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 24 Feb 2020 19:39:17 +0100 Subject: gnu: qtbase: Remove custom 'qtbase-patched' variant. * gnu/packages/qt.scm (qtbase)[source](patches): Add 'qtbase-QTBUG-81715.patch. (qtbase-patched): Remove variable. * gnu/packages/engineering.scm (freecad)[inputs]: Change from QTBASE-PATCHED to QTBASE. --- gnu/packages/engineering.scm | 2 +- gnu/packages/qt.scm | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 33c12215e3..f3fa9e2597 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2283,7 +2283,7 @@ (define-public freecad ("python-pyside-2-tools" ,python-pyside-2-tools) ("python-shiboken-2" ,python-shiboken-2) ("python-wrapper" ,python-wrapper) - ("qtbase" ,qtbase-patched) + ("qtbase" ,qtbase) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("qtxmlpatterns" ,qtxmlpatterns) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 7aa9d0f0f9..6642ed6e77 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -351,7 +351,8 @@ (define-public qtbase (base32 "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di")) ;; Use TZDIR to avoid depending on package "tzdata". - (patches (search-patches "qtbase-use-TZDIR.patch")) + (patches (search-patches "qtbase-use-TZDIR.patch" + "qtbase-QTBUG-81715.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 @@ -598,24 +599,9 @@ (define-public qtbase developers using C++ or QML, a CSS & JavaScript like language.") (license (list license:lgpl2.1 license:lgpl3)))) -;; This variant fixes a problem with the CMake macros shipped by qtbase. See -;; discussion at . -(define-public qtbase-patched - (let ((src (package-source qtbase))) - (hidden-package - (package - (inherit qtbase) - (source - (origin - (inherit src) - (patches - (append (search-patches "qtbase-QTBUG-81715.patch") - (origin-patches src))))))))) - ;; qt used to refer to the monolithic Qt 5.x package (define-deprecated qt qtbase) - (define-public qtsvg (package (inherit qtbase) (name "qtsvg") -- cgit v1.2.3 From c494e899db5180bb09626f4c94b99c919838369a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Feb 2020 21:04:55 +0100 Subject: gnu: ALSA: Update to 1.2.2. * gnu/packages/linux.scm (alsa-lib, alsa-utils, alsa-plugins): Update to 1.2.2. --- gnu/packages/linux.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4d24fcbd26..a4f0f56981 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1662,7 +1662,7 @@ (define-public ltrace (define-public alsa-lib (package (name "alsa-lib") - (version "1.2.1.2") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append @@ -1670,7 +1670,7 @@ (define-public alsa-lib version ".tar.bz2")) (sha256 (base32 - "0hvrx0ipzqbcx4y1cmr9bgm9niifzkrhsb1ddgzzdwbk6q72d3lm")))) + "1v5kb8jyvrpkvvq7dq8hfbmcj68lml97i4s0prxpfx2mh3c57s6q")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" @@ -1686,14 +1686,14 @@ (define-public alsa-lib (define-public alsa-utils (package (name "alsa-utils") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/utils/" name "-" version ".tar.bz2")) (sha256 (base32 - "039c19b7091is0czl9jlrfczp7pp1jpdri0vvc4k07gl3skhn48b")))) + "1wz460by17rmxrcydn583rd4lhj6wlvqs6x1j5pdzxn5g3app024")))) (build-system gnu-build-system) (arguments ;; XXX: Disable man page creation until we have DocBook. @@ -1740,14 +1740,14 @@ (define-public alsa-utils (define-public alsa-plugins (package (name "alsa-plugins") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/" name "-" version ".tar.bz2")) (sha256 (base32 - "1nj8cpbi05rb62yzs01c1k7lymdn1ch229b599hbhd0psixdx52d")))) + "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw")))) (build-system gnu-build-system) ;; TODO: Split libavcodec and speex if possible. It looks like they can not ;; be split, there are references to both in files. -- cgit v1.2.3 From e86620d76df9a855d99480ada9790cf4d5e7ba3f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Feb 2020 21:06:50 +0100 Subject: gnu: libinput: Update to 1.15.2. * gnu/packages/freedesktop.scm (libinput): Update to 1.15.2. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9d10f51257..ad35fb30f6 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -181,14 +181,14 @@ (define-public xdg-utils (define-public libinput (package (name "libinput") - (version "1.15.0") + (version "1.15.2") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" "libinput-" version ".tar.xz")) (sha256 (base32 - "1qa3b2fd4pv8ysf0mgwnyhqv9v48zgy3sy0q3a3vxcmwcvpizgxz")))) + "0ivpb4sghl80cs7jg3xrs53kckif6wy81cny3a8mry94nszky74p")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false") -- cgit v1.2.3 From 690160f648dae135c64b071779aefe9adb3cb19a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Feb 2020 21:07:49 +0100 Subject: gnu: ImageMagick: Update to 6.9.10-95. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-95. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 2ee382bb29..064d1b6c40 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -48,14 +48,14 @@ (define-public imagemagick ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.10-92") + (version "6.9.10-95") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "1klbpshsxgidzssz78z7z77lcmgxrbsg20dx5bk8i5zpqabxj3h8")))) + "0fcbcad95wn0q0pdfl0qgycm30f3a7xhskc0r5icldq6v6l4b3is")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") -- cgit v1.2.3 From bb618a0f78b02ca8604dfdb5d60935de38c4fce5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Feb 2020 21:09:21 +0100 Subject: gnu: gtk+: Update to 3.24.14. * gnu/packages/gtk.scm (gtk+): Update to 3.24.14. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 16852650ea..292a2836cc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -723,7 +723,7 @@ (define-public gtk+-2 (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") - (version "3.24.13") + (version "3.24.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -731,7 +731,7 @@ (define-public gtk+ name "-" version ".tar.xz")) (sha256 (base32 - "1a9hi7k59q0kqx0n3xhsk1ly23w9g9ncllnay1756g0yrww5qxsc")) + "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) -- cgit v1.2.3 From 06eb5e43220eddd34d7a1c17d347467b2dad57ab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Feb 2020 21:13:14 +0100 Subject: gnu: cups-filters: Update to 1.27.1. * gnu/packages/cups.scm (cups-filters): Update to 1.27.1. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 180c70dddd..7d53bd4160 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -58,7 +58,7 @@ (define-module (gnu packages cups) (define-public cups-filters (package (name "cups-filters") - (version "1.27.0") + (version "1.27.1") (source(origin (method url-fetch) (uri @@ -66,7 +66,7 @@ (define-public cups-filters "cups-filters-" version ".tar.xz")) (sha256 (base32 - "011lyr2b2w3q25cil5hz1rwy5r9awj9l70w3smrsihda5crcpqsa")) + "0dpn4rkmrdprkhlnpih5dzrn4fxzj20k42d516kx4qx0g5l74lrm")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output -- cgit v1.2.3 From 30ea79c65541e548e8d7489fd974bda586ad5642 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Feb 2020 21:15:42 +0100 Subject: gnu: pciutils: Update to 3.6.4. * gnu/packages/pciutils.scm (pciutils): Update to 3.6.4. --- gnu/packages/pciutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index f8b79cf907..dbec76715d 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -31,7 +31,7 @@ (define-module (gnu packages pciutils) (define-public pciutils (package (name "pciutils") - (version "3.6.2") + (version "3.6.4") (source (origin (method url-fetch) (uri (string-append @@ -39,7 +39,7 @@ (define-public pciutils version ".tar.xz")) (sha256 (base32 - "1wwkpglvvr1sdj2gxz9khq507y02c4px48njy25divzdhv4jwifv")))) + "0mb0f2phdcmp4kfiqsszn2k6nlln0w160ffzrjjv4bbfjwrgfzzn")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 9844848b23860136da54193b725b6653b4e9d8ee Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 20 Feb 2020 15:58:53 +0100 Subject: gnu: bluez: Update to 5.53. * gnu/packages/linux.scm (bluez): Update to 5.53. Signed-off-by: Marius Bakke --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a4f0f56981..10e27dc247 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2019, 2020 Maxim Cournoyer ;;; Copyright © 2019 Stefan Stefanović ;;; Copyright © 2019 Pierre Langlois -;;; Copyright © 2019 Brice Waegeneire +;;; Copyright © 2019, 2020 Brice Waegeneire ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2020 Oleg Pykhalov ;;; @@ -3947,7 +3947,7 @@ (define-public sbc (define-public bluez (package (name "bluez") - (version "5.52") + (version "5.53") (source (origin (method url-fetch) (uri (string-append @@ -3955,7 +3955,7 @@ (define-public bluez version ".tar.xz")) (sha256 (base32 - "02jng21lp6fb3c2bh6vf9y7cj4gaxwk29dfc32ncy0lj0gi4q57p")))) + "1g1qg6dz6hl3csrmz75ixr12lwv836hq3ckb259svvrg62l2vaiq")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 4510aeb91ce6267a14c9cead768869553b3a2279 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 17:46:04 +0100 Subject: gnu: python2-sphinx: Build with python-docutils@0.14. * gnu/packages/python-xyz.scm (python2-docutils-0.14): New public variable. * gnu/packages/sphinx.scm (python2-sphinx)[propagated-inputs]: Change from PYTHON2-DOCUTILS to PYTHON2-DOCUTILS-0.14. --- gnu/packages/python-xyz.scm | 12 ++++++++++++ gnu/packages/sphinx.scm | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8576b1ecf9..94eff2c85b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2703,6 +2703,18 @@ (define-public python-docutils (define-public python2-docutils (package-with-python2 python-docutils)) +;; python2-sphinx fails its test suite with newer versions. +(define-public python2-docutils-0.14 + (package + (inherit python2-docutils) + (version "0.14") + (source (origin + (method url-fetch) + (uri (pypi-uri "docutils" version)) + (sha256 + (base32 + "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji")))))) + (define-public python-pygments (package (name "python-pygments") diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 323d5b4457..ff5d8e5de7 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -137,7 +137,7 @@ (define-public python2-sphinx ,python2-sphinx-alabaster-theme) ("python2-babel" ,python2-babel-2.6) ("python2-snowballstemmer" ,python2-snowballstemmer) - ("python2-docutils" ,python2-docutils) + ("python2-docutils" ,python2-docutils-0.14) ("python2-jinja2" ,python2-jinja2) ("python2-packaging" ,python2-packaging) ("python2-pygments" ,python2-pygments) -- cgit v1.2.3