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(-) 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 @@ message digests and key derivation functions.") (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 @@ message digests and key derivation functions.") (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(-) 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 @@ to the in-kernel OOM killer.") (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 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 @@ in the Mozilla clients.") "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(-) 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 @@ `(("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(-) 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 @@ Linux Device Mapper multipathing driver: (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 @@ Linux Device Mapper multipathing driver: 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(-) 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 @@ Linux Device Mapper multipathing driver: (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(-) 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 @@ (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(-) 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-public libffcall (package (name "libffcall") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) @@ -36,7 +36,7 @@ "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(-) 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 @@ XC-APPGROUP, XTEST.") "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(-) 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 @@ XC-APPGROUP, XTEST.") (define-public libevdev (package (name "libevdev") - (version "1.5.9") + (version "1.8.0") (source (origin (method url-fetch) @@ -2383,7 +2383,7 @@ XC-APPGROUP, XTEST.") 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(-) 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-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 @@ 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(-) 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 @@ makes fork(2) safe to use in test cases.") (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(-) 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 @@ not have DNS. We might not have a network card at all!") (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(-) 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 @@ IO::Socket::INET, so you can perform socket operations directly on it too.") (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(-) 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 @@ done, how much is left to do, and estimate how long it will take.") (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 @@ done, how much is left to do, and estimate how long it will take.") "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(-) 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 @@ development server with Starman.") (define-public perl-cgi (package (name "perl-cgi") - (version "4.44") + (version "4.46") (source (origin (method url-fetch) @@ -2561,7 +2561,7 @@ development server with Starman.") "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(-) 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 @@ allowing data to be efficiently communicated between processes.") (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(-) 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 @@ using @code{Test::Class}.") ("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(-) 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 @@ specification.") (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(-) 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 @@ code.") (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(-) 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 @@ usually called epsilon. This module provides such a function for use with (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(-) 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 @@ cause a test fail unless it is exactly as @code{perltidy} would like it to be.") `(("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(-) 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 @@ decompression of some loosely related file formats used by Microsoft.") (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(-) 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 @@ ;; 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(-) 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-public check (package (name "check") - (version "0.13.0") + (version "0.14.0") (source (origin (method url-fetch) @@ -86,7 +86,7 @@ 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(-) 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 @@ Language.") (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 @@ Language.") version ".tar.gz")) (sha256 (base32 - "1pxyq37q4p7515by7k8hs3l3css68f3bm3akx99vw4m1rxwwbm63")) + "0fah6d50hldq0farxwr8mj3jnniwdz0d1wsha07nx37fc79h7wi1")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet @@ -789,6 +789,7 @@ Language.") ;; See . "main.join_cache" "main.explain_non_select" + "main.stat_tables" "main.stat_tables_innodb" "roles.acl_statistics" @@ -824,6 +825,10 @@ Language.") (("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(-) 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-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 @@ "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(-) 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 @@ python-xdo for newer bindings.)") (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(-) 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 @@ line tools for batch rendering @command{pdfdraw}, rewriting files (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(-) 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 @@ and Matrox.") (define-public mtdev (package (name "mtdev") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) @@ -522,7 +522,7 @@ and Matrox.") 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(+) 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 @@ and Matrox.") (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(-) 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 @@ provides additional functionality on the produced Mallard documents.") (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 @@ provides additional functionality on the produced Mallard documents.") (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(-) 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 @@ by @code{binstar}, @code{binstar-build} and @code{chalmers}.") (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(-) 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 @@ focus on building massively scalable web applications.") (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(-) 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 @@ structure for Python.") (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(-) 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 @@ structure for Python.") "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(-) 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 @@ for Python.") (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(+) 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 @@ for Python.") (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(-) 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 @@ Record Format (DWARF).") (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(-) 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 @@ #: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 @@ ("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 @@ written in C, C++, Ada, Objective-C, Pascal and more.") ;; . (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 @@ written in C, C++, Ada, Objective-C, Pascal and more.") (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(-) 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-public nspr (package (name "nspr") - (version "4.24") + (version "4.25") (source (origin (method url-fetch) (uri (string-append @@ -42,7 +42,7 @@ 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(-) 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-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 @@ "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 @@ in the Mozilla clients.") (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 @@ in the Mozilla clients.") "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 @@ in the Mozilla clients.") ;; 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(-) 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 @@ in the Mozilla clients.") "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(-) 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 @@ developed in C/C++ to MariaDB and MySQL databases.") (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(-) 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 @@ extension to the X11 protocol. It includes: (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.28") + (version "2.29") (source (origin (method url-fetch) @@ -3848,15 +3848,16 @@ extension to the X11 protocol. It includes: ".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(-) 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 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "19.3.2") + (version "19.3.4") (source (origin (method url-fetch) @@ -244,7 +244,7 @@ also known as DXTn or DXTC) for 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 @@ device drivers allows Mesa to be used in many different environments ranging 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 @@ requirements.") (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(+) 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 @@ in the Mozilla clients.") (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(-) 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 @@ Linux Device Mapper multipathing driver: (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(-) 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 @@ to the in-kernel OOM killer.") (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 @@ to the in-kernel OOM killer.") (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 @@ to the in-kernel OOM killer.") ;; 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 @@ mapper. Kernel components are part of Linux-libre.") (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(-) 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 @@ also known as DXTn or DXTC) for 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(-) 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 @@ full programmatic control over your models.") ("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 @@ developers using C++ or QML, a CSS & JavaScript like language.") (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 @@ developers using C++ or QML, a CSS & JavaScript like language.") 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(-) 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 @@ intercept and print the system calls executed by the program.") (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 @@ intercept and print the system calls executed by the program.") 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 @@ MIDI functionality to the Linux-based operating system.") (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 @@ MIDI functionality to the Linux-based operating system.") (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(-) 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 @@ freedesktop.org project.") (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(-) 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 @@ ;; 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(-) 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 @@ application suites.") (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 @@ application suites.") 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(-) 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-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 @@ "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(-) 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-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 @@ 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(-) 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 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (version "5.52") + (version "5.53") (source (origin (method url-fetch) (uri (string-append @@ -3955,7 +3955,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "02jng21lp6fb3c2bh6vf9y7cj4gaxwk29dfc32ncy0lj0gi4q57p")))) + "1g1qg6dz6hl3csrmz75ixr12lwv836hq3ckb259svvrg62l2vaiq")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 90799c35bd9cadaf7c28be5ea6e41ec692d5b4a4 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Tue, 10 Mar 2020 15:19:42 -0400 Subject: gnu: bitcoin-core: Update to 0.19.1. * gnu/packages/finance.scm (bitcoin-core): Update to 0.19.1. Co-Authored-By: fanquake --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 5143b500ee..89a7ffe956 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -97,7 +97,7 @@ (define-public bitcoin-core (package (name "bitcoin-core") - (version "0.19.0.1") + (version "0.19.1") (source (origin (method url-fetch) (uri @@ -105,7 +105,7 @@ version "/bitcoin-" version ".tar.gz")) (sha256 (base32 - "1172dl4b8h2a80ilk9sfgbl8yi55k6hs4b1m07nic2ls4irgkjbs")))) + "1h3w7brc18145np920vy7j5ms5hym59hvr40swdjx34fbdaisngj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From c3945380d9953dd99dc444c90fdba47988ebe9a0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 10 Mar 2020 22:01:00 +0100 Subject: gnu: asymptote: Update to 2.64. * gnu/packages/plotutils.scm (asymptote): Update to 2.64. --- gnu/packages/plotutils.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index f71e2824f1..7a7f30e255 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -194,14 +194,14 @@ colors, styles, options and details.") (define-public asymptote (package (name "asymptote") - (version "2.62") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/asymptote/" - version "/asymptote-" version ".src.tgz")) - (sha256 - (base32 - "0510vnlpfyrvshsxr5lh3klwyhmn2cf4ba1ja476mbv5dcqqbc30")))) + (version "2.64") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/asymptote/" + version "/asymptote-" version ".src.tgz")) + (sha256 + (base32 "1x4nmzklzd2xfmm03mgnpg0345dwrwr5czk9gkfl5sx7x1cgx4c0")))) (build-system gnu-build-system) ;; Note: The 'asy' binary retains a reference to docdir for use with its ;; "help" command in interactive mode, so adding a "doc" output is not -- cgit v1.2.3 From 9dd7082c48c3b3a3f90db974a36dafcac95c5be2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 20:08:40 +0100 Subject: gnu: openmpi: Update to 4.0.3. * gnu/packages/mpi.scm (openmpi): Update to 4.0.3. --- gnu/packages/mpi.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index fc4950f519..91545f5296 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Dave Love ;;; Copyright © 2017 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Paul Garlick ;;; Copyright © 2019 Ricardo Wurmus ;;; @@ -169,7 +169,7 @@ bind processes, and much more.") (define-public openmpi (package (name "openmpi") - (version "4.0.2") + (version "4.0.3") (source (origin (method url-fetch) @@ -177,7 +177,7 @@ bind processes, and much more.") (version-major+minor version) "/downloads/openmpi-" version ".tar.bz2")) (sha256 - (base32 "0ms0zvyxyy3pnx9qwib6zaljyp2b3ixny64xvq3czv3jpr8zf2wh")) + (base32 "00zxcw99gr5n693cmcmn4f6a47vx1ywna895p0x7p163v37gw0hl")) (patches (search-patches "openmpi-mtl-priorities.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From f9a69e9baed0e9fd5cbf4ed34c63d655a8a530bb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:14:45 +0100 Subject: gnu: openmpi: Use HTTPS home page. * gnu/packages/mpi.scm (openmpi)[home-page]: Use HTTPS. --- gnu/packages/mpi.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 91545f5296..ec0684168e 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -264,7 +264,7 @@ bind processes, and much more.") (let ((out (assoc-ref outputs "out"))) (for-each delete-file (find-files out "config.log")) #t)))))) - (home-page "http://www.open-mpi.org") + (home-page "https://www.open-mpi.org") (synopsis "MPI-3 implementation") (description "The Open MPI Project is an MPI-3 implementation that is developed and -- cgit v1.2.3 From 6048241f10210c79925ca40b75c8697d2b2a5848 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 21:47:38 +0100 Subject: gnu: hplip: Update source hash. The tarball was modified in-place. See . * gnu/packages/cups.scm (hplip)[source]: Update tarball hash. Reported-by: Mark H Weaver --- gnu/packages/cups.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 953b9a9577..66f7085741 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -427,7 +427,7 @@ should only be used as part of the Guix cups-pk-helper service.") "/hplip-" version ".tar.gz")) (sha256 (base32 - "1hkiyj29vzmz14cy68g94i617ymxinzvjvcsfdd78kcbd1s9vi4h")) + "00vcbpnp478l2v61mlxb4kr6q3gzkxspm4lwfky39f6ck72pqxb7")) (modules '((guix build utils))) (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet -- cgit v1.2.3 From e4c60dcfb2cbd3988a0c31e68004a91c0d09210d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:39:45 +0100 Subject: gnu: tlp: Use HTTPS home page. * gnu/packages/linux.scm (tlp)[home-page]: Use HTTPS. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 489cd55e6e..b6048a8cfb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5420,7 +5420,7 @@ interface in sysfs, which can be accomplished with the included udev rules.") "wireless-tools")))))) bin-files) #t)))))) - (home-page "http://linrunner.de/en/tlp/tlp.html") + (home-page "https://linrunner.de/en/tlp/tlp.html") (synopsis "Power management tool for Linux") (description "TLP is a power management tool for Linux. It comes with a default configuration already optimized for battery life. Nevertheless, -- cgit v1.2.3 From a8a8a3df304143b7f5f369b5ce2202649e7a80d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:40:33 +0100 Subject: gnu: bash-tap: Use HTTPS home page. * gnu/packages/bash.scm (bash-tap)[home-page]: Use HTTPS. --- gnu/packages/bash.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 3af13a612a..3256a356d4 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -341,7 +341,7 @@ completion for many common commands.") (install-file "bash-tap" bin) (install-file "bash-tap-bootstrap" bin) (install-file "bash-tap-mock" bin))))))) - (home-page "http://www.illusori.co.uk/projects/bash-tap/") + (home-page "https://www.illusori.co.uk/projects/bash-tap/") (synopsis "Bash port of a Test::More/Test::Builder-style TAP-compliant test library") (description "Bash TAP is a TAP-compliant Test::More-style testing library -- cgit v1.2.3 From 1e4ae5511a6c1a0f2af5db9ced320521c294e3f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:44:30 +0100 Subject: gnu: java-asm: Use HTTPS home page. * gnu/packages/java.scm (java-asm)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ee1bbfbce4..c2ccbf80e3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4322,7 +4322,7 @@ on the XPP3 API (XML Pull Parser)."))) (install-jars "dist"))))) (native-inputs `(("java-junit" ,java-junit))) - (home-page "http://asm.ow2.org/") + (home-page "https://asm.ow2.io/") (synopsis "Very small and fast Java bytecode manipulation framework") (description "ASM is an all purpose Java bytecode manipulation and analysis framework. It can be used to modify existing classes or dynamically -- cgit v1.2.3 From 2bc8143f6c09af2768be76d12eafc89a4b6cd142 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:46:20 +0100 Subject: gnu: python-wxpython: Use HTTPS home page. * gnu/packages/wxwidgets.scm (python-wxpython)[home-page]: Use HTTPS. --- gnu/packages/wxwidgets.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 6d5c2b3921..5a2ea1c88e 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -225,7 +225,7 @@ and many other languages.") `(("python-numpy" ,python-numpy) ("python-pillow" ,python-pillow) ("python-six" ,python-six))) - (home-page "http://wxPython.org/") + (home-page "https://wxpython.org/") (synopsis "Cross platform GUI toolkit for Python") (description "wxPython is a cross-platform GUI toolkit for the Python programming language. It is implemented as a set of Python extension modules -- cgit v1.2.3 From 8e486e808c3b73bddc27877fdbec13c435759666 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:46:44 +0100 Subject: gnu: ruby-minitest-rg: Use HTTPS home page. * gnu/packages/ruby.scm (ruby-minitest-rg)[home-page]: Use HTTPS. --- gnu/packages/ruby.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7028a1b69f..5b6d79c3b7 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3335,7 +3335,7 @@ reporter.") (synopsis "Coloured output for Minitest") (description "@code{minitest-rg} changes the colour of the output from Minitest.") - (home-page "http://blowmage.com/minitest-rg") + (home-page "https://blowmage.com/minitest-rg/") (license license:expat))) (define-public ruby-minitest-hooks -- cgit v1.2.3 From f613a338d0a73b5d4e7e6b91561383732b22e91c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 22:17:43 +0100 Subject: gnu: hplip: Update to 3.20.3. * gnu/packages/cups.scm (hplip): Update to 3.20.3. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 66f7085741..cdedc4b592 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -420,14 +420,14 @@ should only be used as part of the Guix cups-pk-helper service.") (define-public hplip (package (name "hplip") - (version "3.20.2") + (version "3.20.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "00vcbpnp478l2v61mlxb4kr6q3gzkxspm4lwfky39f6ck72pqxb7")) + "0sh6cg7yjc11x1cm4477iaslj9n8ksghs85hqwgfbk7m5b2pw2a1")) (modules '((guix build utils))) (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet -- cgit v1.2.3 From 4c87770442605c8e0a342a99f49a76480582ef3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 9 Mar 2020 22:23:58 +0100 Subject: gnu: java-jtransforms: Update source URI. * gnu/packages/algebra.scm (java-jtransforms)[source]: Update URI. --- gnu/packages/algebra.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index c0eaa72996..add29b7718 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Eric Bavier +;;; Copyright © 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -884,8 +885,8 @@ that can store up to 263 elements.") (version "3.1") (source (origin (method url-fetch) - (uri (string-append "http://search.maven.org/remotecontent?" - "filepath=com/github/wendykierp/JTransforms/" + (uri (string-append "https://repo1.maven.org/maven2/" + "com/github/wendykierp/JTransforms/" version "/JTransforms-" version "-sources.jar")) (sha256 (base32 -- cgit v1.2.3 From 9f5eeb879f0f8b2c8c526558263c0b19ab85906f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 9 Mar 2020 22:52:27 +0100 Subject: gnu: java-jlargearrays: Update source URI. * gnu/packages/algebra.scm (java-jlargearrays)[source]: Update URI. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index add29b7718..50cb3001cb 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -858,8 +858,8 @@ the la4j library are: (version "1.6") (source (origin (method url-fetch) - (uri (string-append "http://search.maven.org/remotecontent?" - "filepath=pl/edu/icm/JLargeArrays/" + (uri (string-append "https://repo1.maven.org/maven2/" + "pl/edu/icm/JLargeArrays/" version "/JLargeArrays-" version "-sources.jar")) (file-name (string-append name "-" version ".jar")) -- cgit v1.2.3 From ec11dcfe69adbacce2a30cb55cc2948d4e637f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 9 Mar 2020 23:01:14 +0100 Subject: gnu: java-forester-1.005: Update source URI. * gnu/packages/bioinformatics.scm (java-forester-1.005)[source]: Update URI. [native-inputs]: Wrap long line. --- gnu/packages/bioinformatics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 035a7bb808..54b85341a6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -12140,8 +12141,8 @@ reading, writing, and exporting phylogenetic trees.") (version "1.005") (source (origin (method url-fetch) - (uri (string-append "http://search.maven.org/remotecontent?" - "filepath=org/biojava/thirdparty/forester/" + (uri (string-append "https://repo1.maven.org/maven2/" + "org/biojava/thirdparty/forester/" version "/forester-" version "-sources.jar")) (file-name (string-append name "-" version ".jar")) (sha256 @@ -12217,7 +12218,8 @@ reading, writing, and exporting phylogenetic trees.") (method url-fetch) (uri (string-append "https://raw.githubusercontent.com/cmzmasek/forester/" "29e04321615da6b35c1e15c60e52caf3f21d8e6a/" - "forester/java/classes/resources/synth_look_and_feel_1.xml")) + "forester/java/classes/resources/" + "synth_look_and_feel_1.xml")) (file-name (string-append name "-synth-look-and-feel-" version ".xml")) (sha256 (base32 -- cgit v1.2.3 From 60f5ab0bb64b484b48f594b5360c81eeb95ee821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Mon, 9 Mar 2020 23:24:46 +0100 Subject: gnu: java-osgi-namespace-contract: Update source URI. * gnu/packages/java.scm (java-osgi-namespace-contract)[source]: Update URI. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c2ccbf80e3..da0f3bfa5b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2018, 2019 Gábor Boskovits ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018, 2019 Efraim Flashner -;;; Copyright © 2019 Björn Höfling +;;; Copyright © 2019, 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -7476,7 +7476,7 @@ the definition of common types in osgi packages.") (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.namespace.contract/" version "/org.osgi.namespace.contract-" version "-sources.jar")) -- cgit v1.2.3 From 7cfcc38f4117709e26879dfff58e902255438e5c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 10 Mar 2020 15:42:11 -0400 Subject: gnu: Certbot, python-acme: Update to 1.3.0. * gnu/packages/tls.scm (certbot, python-acme): Update to 1.3.0. --- gnu/packages/tls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d6e4f52229..b8adf23d44 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -553,13 +553,13 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "1ar6mjax7cyvq3zgh64yrg485l02dy6zqddxjxg99nlvsi0cfc06")))) + "03fjmg0fgfy7xfn3i8rzn9i0i4amajmijkash84qb8mlphgrxpn0")))) (build-system python-build-system) (arguments `(#:phases @@ -610,7 +610,7 @@ netcat implementation that supports TLS.") (uri (pypi-uri "certbot" version)) (sha256 (base32 - "0g1p4nkaid6davjm5qz8lsln92dhjhlv3rrg8hcfpr7qhphbmp4m")))) + "1n5i0k6kwmd6wvivshfl3k4djwcpwx390c39xmr2hhrgpk5r285w")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) -- cgit v1.2.3 From 92a4f18f07a6fc32479d7fab31b0765d31f57a50 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:02:23 +0100 Subject: gnu: s6-dns: Update to 2.3.2.0. * gnu/packages/skarnet.scm (s6-dns): Update to 2.3.2.0. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 829af9d000..4a5b54ddeb 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -150,14 +150,14 @@ functionality with a very small amount of code."))) (define-public s6-dns (package (name "s6-dns") - (version "2.3.1.1") + (version "2.3.2.0") (source (origin (method url-fetch) (uri (string-append "http://skarnet.org/software/s6-dns/s6-dns-" version ".tar.gz")) (sha256 - (base32 "0clib10dk3r9rcxv1yfr6gdvqqrx0arzivjpmhz9p8xaif53wpj1")))) + (base32 "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit v1.2.3 From b486bf7811fc9f0f15d3136674ef3314d68b1da9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:06:28 +0100 Subject: gnu: skalibs: Update to 2.9.2.0. * gnu/packages/skarnet.scm (skalibs): Update to 2.9.2.0. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 4a5b54ddeb..167e7ae817 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -30,14 +30,14 @@ (define-public skalibs (package (name "skalibs") - (version "2.9.1.0") + (version "2.9.2.0") (source (origin (method url-fetch) (uri (string-append "http://skarnet.org/software/skalibs/skalibs-" version ".tar.gz")) (sha256 - (base32 "19c6s3f7vxi96l2yqzjk9x9i4xkfg4fdzxhn1jg6bfb2qjph9cnk")))) + (base32 "1i9d7w031kh338aq6xdsf8vl5amxbwxbny8lnrxlzydqvn8nxhz4")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests exist -- cgit v1.2.3 From c9cd6d2fb2c68197439d121bf0bdea0f43809332 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:08:14 +0100 Subject: gnu: Use HTTPS for skarnet.org sources. * gnu/packages/skarnet.scm (skalibs, execline, s6, s6-dns) (s6-networking, s6-rc, s6-portable-utils, s6-linux-init, s6-linux-utils) [source]: Use HTTPS. --- gnu/packages/skarnet.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 167e7ae817..938867b9f6 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -34,7 +34,7 @@ (source (origin (method url-fetch) - (uri (string-append "http://skarnet.org/software/skalibs/skalibs-" + (uri (string-append "https://skarnet.org/software/skalibs/skalibs-" version ".tar.gz")) (sha256 (base32 "1i9d7w031kh338aq6xdsf8vl5amxbwxbny8lnrxlzydqvn8nxhz4")))) @@ -66,7 +66,7 @@ and file system operations. It is used by all skarnet.org software.") (source (origin (method url-fetch) - (uri (string-append "http://skarnet.org/software/execline/execline-" + (uri (string-append "https://skarnet.org/software/execline/execline-" version ".tar.gz")) (sha256 (base32 "0xr6yb50wm6amj1wc7jmxyv7hvlx2ypbnww1vc288j275625d9xi")))) @@ -108,7 +108,7 @@ complexity."))) (source (origin (method url-fetch) - (uri (string-append "http://skarnet.org/software/s6/s6-" + (uri (string-append "https://skarnet.org/software/s6/s6-" version ".tar.gz")) (sha256 (base32 "0mvcjrz8nlj9p2zclmcv22b4y6bqzd2iz38arhgc989vdvrbmkg0")))) @@ -154,7 +154,7 @@ functionality with a very small amount of code."))) (source (origin (method url-fetch) - (uri (string-append "http://skarnet.org/software/s6-dns/s6-dns-" + (uri (string-append "https://skarnet.org/software/s6-dns/s6-dns-" version ".tar.gz")) (sha256 (base32 "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7")))) @@ -183,7 +183,7 @@ as an alternative to the BIND, djbdns or other DNS clients."))) (source (origin (method url-fetch) - (uri (string-append "http://skarnet.org/software/s6-networking/s6-networking-" + (uri (string-append "https://skarnet.org/software/s6-networking/s6-networking-" version ".tar.gz")) (sha256 (base32 "1029bgwfmv903y5ji93j75m7p2jgchdxya1khxzb42q2z7yxnlyr")))) @@ -226,7 +226,7 @@ clock synchronization."))) (source (origin (method url-fetch) - (uri (string-append "http://skarnet.org/software/s6-rc/s6-rc-" + (uri (string-append "https://skarnet.org/software/s6-rc/s6-rc-" version ".tar.gz")) (sha256 (base32 "18m8jsx3bkj566p6xwwnsvdckk10n8wqnhp0na2k88i295h4rnjp")))) @@ -268,7 +268,7 @@ environment."))) (origin (method url-fetch) (uri (string-append - "http://skarnet.org/software/s6-portable-utils/s6-portable-utils-" + "https://skarnet.org/software/s6-portable-utils/s6-portable-utils-" version ".tar.gz")) (sha256 (base32 "1k3la37q46n93vjwk9wm9ym4w87z6lqzv43f03qd0vqj9k94mpv3")))) @@ -300,7 +300,7 @@ systems and other constrained environments, but they work everywhere."))) (origin (method url-fetch) (uri (string-append - "http://skarnet.org/software/s6-linux-init/s6-linux-init-" + "https://skarnet.org/software/s6-linux-init/s6-linux-init-" version ".tar.gz")) (sha256 (base32 "176mgkqxlp6gb6my66dv73xsp7adfxbjp5hjyh35sykqkr4kfyfy")))) @@ -345,7 +345,7 @@ all the details."))) (origin (method url-fetch) (uri (string-append - "http://skarnet.org/software/s6-linux-utils/s6-linux-utils-" + "https://skarnet.org/software/s6-linux-utils/s6-linux-utils-" version ".tar.gz")) (sha256 (base32 "0w4jms9qyb5kx9zcyd3gzri60rrii2rbmh08s59ckg4awy27py86")))) -- cgit v1.2.3 From 19153f2915dadc1f2a5c507cb8cf42ec1b1ffe1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:10:08 +0100 Subject: gnu: xfce4-statusnotifier-plugin: Update to 0.2.2. * gnu/packages/xfce.scm (xfce4-statusnotifier-plugin): Update to 0.2.2. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 0650235365..e3c01e1f0a 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1763,7 +1763,7 @@ favorite search engine or bug tracker right from the Xfce panel.") (define-public xfce4-statusnotifier-plugin (package (name "xfce4-statusnotifier-plugin") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/panel-plugins/" @@ -1772,7 +1772,7 @@ favorite search engine or bug tracker right from the Xfce panel.") "/xfce4-statusnotifier-plugin-" version ".tar.bz2")) (sha256 (base32 - "154b0q9pmlbjh30vvx4c48msdfxp4pq8x4mbn71mk7pibk018hsj")))) + "1yic99jx7013pywpd0k31pxab8s8lv3wcq364iha99qhsm25k42c")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From d518851710abeb0e8bd4374c9836ac7ad7752186 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:15:07 +0100 Subject: gnu: Use HTTPS for archive.xfce.org sources. * gnu/packages/xfce.scm (gtk-xfce-engine, xfce4-xkb-plugin) (xfce4-settings, thunar, ristretto, orage, xfburn, mousepad) (xfce4-screenshooter, xfce4-screensaver, xfce4-cpugraph-plugin) (xfce4-eyes-plugin, xfce4-equake-plugin, xfce4-datetime-plugin) (xfce4-calculator-plugin, xfce4-cpufreq-plugin, xfce4-diskperf-plugin) (xfce4-embed-plugin, xfce4-fsguard-plugin, xfce4-genmon-plugin) (xfce4-kbdleds-plugin, xfce4-mailwatch-plugin, xfce4-mpc-plugin) (xfce4-mount-plugin, xfce4-netload-plugin, xfce4-places-plugin) (xfce4-smartbookmark-plugin, xfce4-statusnotifier-plugin) (xfce4-stopwatch-plugin, xfce4-systemload-plugin) (xfce4-time-out-plugin, xfce4-timer-plugin, xfce4-verve-plugin) (xfce4-wavelan-plugin, xfce4-weather-plugin))[source]: Use HTTPS. --- gnu/packages/xfce.scm | 70 +++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index e3c01e1f0a..70806255d9 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -72,7 +72,7 @@ (version "2.10.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/xfce/" + (uri (string-append "https://archive.xfce.org/src/xfce/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 @@ -499,7 +499,7 @@ applications, and includes a search bar to search for applications.") (version "0.8.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 @@ -609,7 +609,7 @@ allows you to shutdown the computer from Xfce.") (version "4.14.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/xfce/" + (uri (string-append "https://archive.xfce.org/src/xfce/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 @@ -648,7 +648,7 @@ like appearance, display, keyboard and mouse settings.") (version "1.8.12") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/xfce/" + (uri (string-append "https://archive.xfce.org/src/xfce/" "thunar/" (version-major+minor version) "/" "thunar-" version ".tar.bz2")) (sha256 @@ -917,7 +917,7 @@ inhibit interface which allows applications to prevent automatic sleep.") (version "0.10.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/ristretto/" + (uri (string-append "https://archive.xfce.org/src/apps/ristretto/" (version-major+minor version) "/" "ristretto-" version ".tar.bz2")) (sha256 @@ -979,7 +979,7 @@ memory usage graphically, and it can display processes as a tree.") (version "4.12.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/" + (uri (string-append "https://archive.xfce.org/src/apps/" name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 @@ -1050,7 +1050,7 @@ sending standard messages over D-Bus using the (version "0.6.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/xfburn/" + (uri (string-append "https://archive.xfce.org/src/apps/xfburn/" (version-major+minor version) "/" "xfburn-" version ".tar.bz2")) (sha256 @@ -1086,7 +1086,7 @@ of data to either CD/DVD/BD.") (version "0.4.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/mousepad/" + (uri (string-append "https://archive.xfce.org/src/apps/mousepad/" (version-major+minor version) "/mousepad-" version ".tar.bz2")) (sha256 @@ -1128,7 +1128,7 @@ of data to either CD/DVD/BD.") (version "1.9.7") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/" + (uri (string-append "https://archive.xfce.org/src/apps/" "xfce4-screenshooter/" (version-major+minor version) "/xfce4-screenshooter-" @@ -1161,7 +1161,7 @@ A plugin for the Xfce panel is also available.") (version "0.1.8") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/apps/" + (uri (string-append "https://archive.xfce.org/src/apps/" "xfce4-screensaver/" (version-major+minor version) "/xfce4-screensaver-" @@ -1237,7 +1237,7 @@ A plugin for the Xfce panel is also available.") (version "1.1.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-cpugraph-plugin/" (version-major+minor version) "/xfce4-cpugraph-plugin-" version ".tar.bz2")) @@ -1270,7 +1270,7 @@ core or CPU.") (version "4.5.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-eyes-plugin/" (version-major+minor version) "/xfce4-eyes-plugin-" version ".tar.bz2")) @@ -1297,7 +1297,7 @@ watch your every step.") (version "1.3.8") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-equake-plugin/" (version-major+minor version) "/xfce4-equake-plugin-" version ".tar.bz2")) @@ -1326,7 +1326,7 @@ each time a new earthquake occurs.") (version "0.8.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-datetime-plugin/" (version-major+minor version) "/xfce4-datetime-plugin-" version ".tar.bz2")) @@ -1353,7 +1353,7 @@ and a calendar appears when you left-click on it.") (version "0.7.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-calculator-plugin/" (version-major+minor version) "/xfce4-calculator-plugin-" version ".tar.bz2")) @@ -1381,7 +1381,7 @@ precedence rules, and the following functions and common constants.") (version "1.2.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-cpufreq-plugin/" (version-major+minor version) "/xfce4-cpufreq-plugin-" version ".tar.bz2")) @@ -1408,7 +1408,7 @@ governor and frequencies supported and used by your system.") (version "2.6.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-diskperf-plugin/" (version-major+minor version) "/xfce4-diskperf-plugin-" version ".tar.bz2")) @@ -1435,7 +1435,7 @@ performance (bytes transferred per second).") (version "1.6.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-embed-plugin/" (version-major+minor version) "/xfce4-embed-plugin-" version ".tar.bz2")) @@ -1470,7 +1470,7 @@ this very convenient.") (version "1.1.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-fsguard-plugin/" (version-major+minor version) "/xfce4-fsguard-plugin-" version ".tar.bz2")) @@ -1500,7 +1500,7 @@ be clicked to open the chosen mount point.") (version "4.0.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-genmon-plugin/" (version-major+minor version) "/xfce4-genmon-plugin-" version ".tar.bz2")) @@ -1531,7 +1531,7 @@ button and a personalized tooltip.") (version "0.0.6") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-kbdleds-plugin/" (version-major+minor version) "/xfce4-kbdleds-plugin-" version ".tar.bz2")) @@ -1559,7 +1559,7 @@ Caps, Scroll and Num Lock in Xfce panel.") (version "1.2.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-mailwatch-plugin/" (version-major+minor version) "/xfce4-mailwatch-plugin-" version ".tar.bz2")) @@ -1597,7 +1597,7 @@ multi-mailbox mail watcher. Currently, the protocols supported are: (version "0.5.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-mpc-plugin/" (version-major+minor version) "/xfce4-mpc-plugin-" version ".tar.bz2")) @@ -1640,7 +1640,7 @@ right-click menu (version "1.1.3") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-mount-plugin/" (version-major+minor version) "/xfce4-mount-plugin-" version ".tar.bz2")) @@ -1669,7 +1669,7 @@ mounted or when unmounting fails.") (version "1.3.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-netload-plugin/" (version-major+minor version) "/xfce4-netload-plugin-" version ".tar.bz2")) @@ -1696,7 +1696,7 @@ interfaces of your choice in the panel.") (version "1.8.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-places-plugin/" (version-major+minor version) "/xfce4-places-plugin-" version ".tar.bz2")) @@ -1738,7 +1738,7 @@ opens up a menu with the following: (version "0.5.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-smartbookmark-plugin/" (version-major+minor version) "/xfce4-smartbookmark-plugin-" version ".tar.bz2")) @@ -1766,7 +1766,7 @@ favorite search engine or bug tracker right from the Xfce panel.") (version "0.2.2") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-statusnotifier-plugin/" (version-major+minor version) "/xfce4-statusnotifier-plugin-" version ".tar.bz2")) @@ -1798,7 +1798,7 @@ freedesktop.org specification.") (version "0.3.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-stopwatch-plugin/" (version-major+minor version) "/xfce4-stopwatch-plugin-" version ".tar.bz2")) @@ -1827,7 +1827,7 @@ freedesktop.org specification.") (version "1.2.3") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-systemload-plugin/" (version-major+minor version) "/xfce4-systemload-plugin-" version ".tar.bz2")) @@ -1855,7 +1855,7 @@ swap space and the system uptime in the Xfce4 panel.") (version "1.1.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-time-out-plugin/" (version-major+minor version) "/xfce4-time-out-plugin-" version ".tar.bz2")) @@ -1885,7 +1885,7 @@ time.") (version "1.7.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-timer-plugin/" (version-major+minor version) "/xfce4-timer-plugin-" version ".tar.bz2")) @@ -1913,7 +1913,7 @@ period.") (version "2.0.0") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-verve-plugin/" (version-major+minor version) "/xfce4-verve-plugin-" version ".tar.bz2")) @@ -1947,7 +1947,7 @@ for the Xfce panel. It supports several features, such as: (version "0.6.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-wavelan-plugin/" (version-major+minor version) "/xfce4-wavelan-plugin-" version ".tar.bz2")) @@ -1974,7 +1974,7 @@ lan interface (signal state, signal quality, network name (SSID)).") (version "0.10.1") (source (origin (method url-fetch) - (uri (string-append "http://archive.xfce.org/src/panel-plugins/" + (uri (string-append "https://archive.xfce.org/src/panel-plugins/" "xfce4-weather-plugin/" (version-major+minor version) "/xfce4-weather-plugin-" version ".tar.bz2")) -- cgit v1.2.3 From 8173e7a02ab950997a4ea641528a1a988c6bda58 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:10:57 +0100 Subject: gnu: git-flow: Use HTTPS home page. * gnu/packages/version-control.scm (git-flow)[home-page]: Use HTTPS. --- 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 c289e43d94..52626f8076 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1066,7 +1066,7 @@ will work.") "gitflow-shFlags"))))) (delete 'configure) (delete 'build)))) - (home-page "http://nvie.com/posts/a-successful-git-branching-model/") + (home-page "https://nvie.com/posts/a-successful-git-branching-model/") (synopsis "Git extensions for Vincent Driessen's branching model") (description "Vincent Driessen's branching model is a git branching and release -- cgit v1.2.3 From aeca60707aed05dde427a5a944cd308d7dcdf082 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:29:26 +0100 Subject: gnu: freealut: Use HTTPS home page. * gnu/packages/audio.scm (freealut)[home-page]: Use HTTPS. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6056ded2fb..63227b89ea 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2112,7 +2112,7 @@ buffers, and audio capture.") `(("openal" ,openal))) (synopsis "Free implementation of OpenAL's ALUT standard") (description "freealut is the OpenAL Utility Toolkit.") - (home-page "http://kcat.strangesoft.net/openal.html") + (home-page "https://kcat.strangesoft.net/openal.html") (license license:lgpl2.0))) (define-public patchage -- cgit v1.2.3 From 1fc2a81ef9a2477b8b961042b30ff94ecad6c6d0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:24:21 +0100 Subject: gnu: execline: Update to 2.6.0.0. * gnu/packages/skarnet.scm (execline): Update to 2.6.0.0. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 938867b9f6..6323169ee6 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -62,14 +62,14 @@ and file system operations. It is used by all skarnet.org software.") (define-public execline (package (name "execline") - (version "2.5.1.0") + (version "2.6.0.0") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/execline/execline-" version ".tar.gz")) (sha256 - (base32 "0xr6yb50wm6amj1wc7jmxyv7hvlx2ypbnww1vc288j275625d9xi")))) + (base32 "1m6pvawxqaqjr49456vyjyl8dnqwvr19v77sjj7dnglfijwza5al")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit v1.2.3 From 519dc88c751b3101e824862e650087741881a327 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:47:10 +0100 Subject: gnu: signify: Update to 29. * gnu/packages/crypto.scm (signify): Update to 29. --- gnu/packages/crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 5ca3ec5b51..b808211b2d 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -133,7 +133,7 @@ communication, encryption, decryption, signatures, etc.") (define-public signify (package (name "signify") - (version "28") + (version "29") (home-page "https://github.com/aperezdc/signify") (source (origin (method url-fetch) @@ -141,7 +141,7 @@ communication, encryption, decryption, signatures, etc.") "/download/v" version "/signify-" version ".tar.xz")) (sha256 (base32 - "05v970glhpaxv0m4cnidfxsdnsjp12nf2crzrdq4ml7g5a3g6hdq")))) + "1bzcax5kb4lr0rmpmrdpq5q0iq6b2dxzpl56li8aanbkck1c7hd9")))) (build-system gnu-build-system) ;; TODO Build with libwaive (described in README.md), to implement something ;; like OpenBSD's pledge(). -- cgit v1.2.3 From 806b0c2c6e59b76f264a772b7c205822744dbb7c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:46:49 +0100 Subject: gnu: graphene: Use HTTPS home page. * gnu/packages/gtk.scm (graphene)[home-page]: Use HTTPS. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f28a3b04ba..7a364d4b35 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1732,7 +1732,7 @@ Parcellite and adds bugfixes and features.") ("python-2" ,python-2) ("glib" ,glib) ("gobject-introspection" ,gobject-introspection))) - (home-page "http://ebassi.github.io/graphene") + (home-page "https://ebassi.github.io/graphene/") (synopsis "Thin layer of graphic data types") (description "This library provides graphic types and their relative API; it does not deal with windowing system surfaces, drawing, scene graphs, or -- cgit v1.2.3 From 9d9da65f153d5a9809a13dfe113391ba5c7c3fec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:49:21 +0100 Subject: gnu: nethack: Update to 3.6.6. * gnu/packages/games.scm (nethack): Update to 3.6.6. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index fa802c79fe..04591df818 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1118,7 +1118,7 @@ watch your CPU playing while enjoying a cup of tea!") (define-public nethack (package (name "nethack") - (version "3.6.5") + (version "3.6.6") (source (origin (method url-fetch) @@ -1126,7 +1126,7 @@ watch your CPU playing while enjoying a cup of tea!") (string-append "https://www.nethack.org/download/" version "/nethack-" (string-join (string-split version #\.) "") "-src.tgz")) (sha256 - (base32 "0xifs8pqfffnmkbpmrcd1xf14yakcj06nl2bbhy4dyacg8myysmv")))) + (base32 "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng")))) (inputs `(("ncurses" ,ncurses) ("bison" ,bison) -- cgit v1.2.3 From d64d8abb5bb50b5da5961301012f4ae8ec66b736 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2020 23:56:12 +0100 Subject: gnu: gx: Update to 0.14.3. * gnu/packages/ipfs.scm (gx): Update to 0.14.3. --- gnu/packages/ipfs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 9fa3f144de..7ef7108c1f 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre Neidhardt -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,7 +104,7 @@ that are shared between @command{go-ipfs/commands} and its rewrite (define-public gx (package (name "gx") - (version "0.14.2") + (version "0.14.3") (source (origin (method git-fetch) @@ -113,7 +113,7 @@ that are shared between @command{go-ipfs/commands} and its rewrite (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "048bx6khzcwxnvz3lf7kgp6fkg8mxqcqchxh0jxm9fg2iwizsi0k")))) + (base32 "1sk20kv3rfsnizgwmcmmr69jb1b2iwzqh9wwwd6wg6x0pnqm8swc")))) (build-system go-build-system) (arguments '(#:import-path "github.com/whyrusleeping/gx")) -- cgit v1.2.3 From 06271fe3ce2866b70d792c5f389f71c92a75cec7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 00:07:56 +0100 Subject: gnu: armagetronad: Update to 0.2.8.3.5. * gnu/packages/games.scm (armagetronad): Update to 0.2.8.3.5. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 04591df818..340e758a95 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -301,14 +301,14 @@ The game includes a built-in editor so you can design and share your own maps.") (define-public armagetronad (package (name "armagetronad") - (version "0.2.8.3.4") + (version "0.2.8.3.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/armagetronad/stable/" version "/armagetronad-" version ".src.tar.gz")) (sha256 (base32 - "1pgy0r80z702qdv94aw3ywdn4ynnr4cdi86ml558pljfc5ygasj4")))) + "1z266haq22n5b0733h7qsg1rpzhz8lvm82f7wd06r008iiar7jdl")))) (build-system gnu-build-system) (inputs `(("libxml2" ,libxml2) -- cgit v1.2.3 From b3ca0ee1bba28a9166b78e6dfbf9bff975a2c759 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 00:11:38 +0100 Subject: gnu: gegl: Update to 0.4.22. * gnu/packages/gimp.scm (gegl): Update to 0.4.22. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index ef256ee525..c4319d9a7c 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -89,7 +89,7 @@ provided, as well as a framework to add new color models and data types.") (define-public gegl (package (name "gegl") - (version "0.4.20") + (version "0.4.22") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/gegl/" @@ -103,7 +103,7 @@ provided, as well as a framework to add new color models and data types.") "/gegl-" version ".tar.xz"))) (sha256 (base32 - "1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93")))) + "0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 57f85eef462d0ce33d4ebfa3faaea1ff90dad65a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 00:11:44 +0100 Subject: gnu: gimp: Update to 2.10.18. * gnu/packages/gimp.scm (gimp): Update to 2.10.18. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index c4319d9a7c..fcf613423c 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -134,7 +134,7 @@ buffers.") (define-public gimp (package (name "gimp") - (version "2.10.14") + (version "2.10.18") (source (origin (method url-fetch) (uri (string-append "https://download.gimp.org/pub/gimp/v" @@ -142,7 +142,7 @@ buffers.") "/gimp-" version ".tar.bz2")) (sha256 (base32 - "0m6wdnfvsxyhimdd4v3351g4r1fklllnbipbwcfym3h7q88hz6yz")))) + "05np26g61fyr72s7qjfrcck8v57r0yswq5ihvqyzvgzfx08y3gv5")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML -- cgit v1.2.3 From 73fbe04107d38f4561636c74d28d7a4935cbb1ef Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 28 Jan 2020 18:38:57 +0100 Subject: Add system start-up files for guix-daemon. * etc/init.d/guix-daemon.in: New file. * nix/local.mk (etc/init.d/guix-daemon): New rule. (nodist_sysvinitservice_DATA): Add etc/init.d/guix-daemon.in . (CLEANFILES): Add etc/init.d/guix-daemon . * .gitignore: Add etc/init.d/guix-daemon . --- .gitignore | 1 + etc/init.d/guix-daemon.in | 78 +++++++++++++++++++++++++++++++++++++++++++++++ nix/local.mk | 16 ++++++++-- 3 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 etc/init.d/guix-daemon.in diff --git a/.gitignore b/.gitignore index df59a9176e..de058dda5e 100644 --- a/.gitignore +++ b/.gitignore @@ -71,6 +71,7 @@ /etc/guix-daemon.service /etc/guix-publish.conf /etc/guix-publish.service +/etc/init.d/guix-daemon /guix-daemon /guix/config.scm /libformat.a diff --git a/etc/init.d/guix-daemon.in b/etc/init.d/guix-daemon.in new file mode 100644 index 0000000000..1cc49fed89 --- /dev/null +++ b/etc/init.d/guix-daemon.in @@ -0,0 +1,78 @@ +#!/bin/bash +### BEGIN INIT INFO +# Provides: guix-daemon +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Guix build daemon +# Description: Provides a daemon that does builds for Guix +### END INIT INFO + +set -e +mkdir -p "/var/run" +if [ ! -f "@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon" ] +then + exit 5 +fi + +case "$1" in +start) + if [ -f "/var/run/guix-daemon.pid" ] + then + if pgrep -F "/var/run/guix-daemon.pid" guix-daemon + then + exit 0 + else + echo "guix-daemon has a stale pid file" >&2 + exit 1 + fi + else + daemonize \ + -a \ + -e "/var/log/guix-daemon-stderr.log" \ + -o "/var/log/guix-daemon-stdout.log" \ + -E GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale \ + -E LC_ALL=en_US.utf8 \ + -p "/var/run/guix-daemon.pid" \ + @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \ + --build-users-group=guixbuild + fi + ;; +stop) + if [ -f "/var/run/guix-daemon.pid" ] + then + pkill -F "/var/run/guix-daemon.pid" guix-daemon || { + exit 1 + } + rm -f "/var/run/guix-daemon.pid" + exit 0 + else + exit 0 + fi + ;; +status) + if [ -f "/var/run/guix-daemon.pid" ] + then + if pgrep -F "/var/run/guix-daemon.pid" guix-daemon + then + echo "guix-daemon is running" + exit 0 + else + echo "guix-daemon has a stale pid file" + exit 1 + fi + else + echo "guix-daemon is not running" + exit 3 + fi + ;; +restart|force-reload) + "$0" stop + "$0" start + ;; +*) + echo "Usage: $0 (start|stop|status|restart|force-reload)" + exit 3 + ;; +esac diff --git a/nix/local.mk b/nix/local.mk index dc5a8398b2..a64bdd2137 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -164,6 +164,16 @@ etc/guix-%.service: etc/guix-%.service.in \ "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" +sysvinitservicedir = $(sysconfdir)/init.d +nodist_sysvinitservice_DATA = etc/init.d/guix-daemon + +etc/init.d/guix-daemon: etc/init.d/guix-daemon.in \ + $(top_builddir)/config.status + $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ + $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ + "$<" > "$@.tmp"; \ + mv "$@.tmp" "$@" + # The '.conf' jobs for Upstart. upstartjobdir = $(libdir)/upstart/system nodist_upstartjob_DATA = etc/guix-daemon.conf etc/guix-publish.conf @@ -177,7 +187,8 @@ etc/guix-%.conf: etc/guix-%.conf.in \ CLEANFILES += \ $(nodist_systemdservice_DATA) \ - $(nodist_upstartjob_DATA) + $(nodist_upstartjob_DATA) \ + $(nodist_sysvinitservice_DATA) EXTRA_DIST += \ %D%/AUTHORS \ @@ -185,7 +196,8 @@ EXTRA_DIST += \ etc/guix-daemon.service.in \ etc/guix-daemon.conf.in \ etc/guix-publish.service.in \ - etc/guix-publish.conf.in + etc/guix-publish.conf.in \ + etc/init.d/guix-daemon.in if CAN_RUN_TESTS -- cgit v1.2.3 From fe60ef998f537e0e71bbb3377d5886ad297821d0 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 28 Jan 2020 18:38:58 +0100 Subject: guix-install.sh: Install SysV init script. * etc/guix-install.sh (sys_enable_guix_daemon): Install SysV init script. --- etc/guix-install.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index bfd3842933..e7f4d2cd59 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -361,6 +361,17 @@ sys_enable_guix_daemon() systemctl enable guix-daemon; } && _msg "${PAS}enabled Guix daemon via systemd" ;; + sysv-init) + { mkdir -p /etc/init.d; + cp "${ROOT_HOME}/.config/guix/current/etc/init.d/guix-daemon" \ + /etc/init.d/guix-daemon; + chmod 775 /etc/init.d/guix-daemon; + + update-rc.d guix-daemon defaults && + update-rc.d guix-daemon enable && + service guix-daemon start; } && + _msg "${PAS}enabled Guix daemon via sysv" + ;; NA|*) _msg "${ERR}unsupported init system; run the daemon manually:" echo " ${ROOT_HOME}/.config/guix/current/bin/guix-daemon --build-users-group=guixbuild" -- cgit v1.2.3 From 49bb3a56e4caea411bef485e2474051ea134eb7e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 02:08:28 +0100 Subject: gnu: batctl: Update to 2020.0. * gnu/packages/networking.scm (batctl): Update to 2020.0. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 1840f1c0f2..7f4009df9b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2713,14 +2713,14 @@ maximum extent possible.") (define-public batctl (package (name "batctl") - (version "2019.5") + (version "2020.0") (source (origin (method url-fetch) (uri (string-append "https://downloads.open-mesh.org/batman/releases/batman-adv-" version "/batctl-" version ".tar.gz")) (sha256 - (base32 "1b9w4636dq8m38nzr8j0v0j3b0vdsw84c58c2isc33h66dx8brgz")))) + (base32 "01414ywhlb2b9ng9d5kd5rr1s7wzvi234j8hj6ra2spn92qykvv0")))) (inputs `(("libnl" ,libnl))) (native-inputs -- cgit v1.2.3 From 3437fe1fb7ba1535f5f09d8d6ccefe033152a9a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 02:43:41 +0100 Subject: gnu: gpxsee: Update to 7.25. * gnu/packages/gps.scm (gpxsee): Update to 7.25. --- gnu/packages/gps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index ac8deddad5..718ca42454 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -178,7 +178,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (define-public gpxsee (package (name "gpxsee") - (version "7.16") + (version "7.25") (source (origin (method git-fetch) (uri (git-reference @@ -187,7 +187,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (file-name (git-file-name name version)) (sha256 (base32 - "1mkfhb2c9qafjpva600nyn6yik49l4q1k6id1xvrci37wsn6ijav")))) + "0lml3hz2zxljl9j5wnh7bn9bj8k9v3wf6bk3g77x9nnarsmw0fcx")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From cebfc269863a40f3c5b0c7fc321da7c3cf338873 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 02:44:10 +0100 Subject: gnu: gpxsee: Extend description. * gnu/packages/gps.scm (gpxsee)[description]: Extend. --- gnu/packages/gps.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 718ca42454..936c3aeda0 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -208,8 +208,10 @@ coordinates as well as partial support for adjustments in global coordinate syst (home-page "https://www.gpxsee.org") (synopsis "GPS log file viewer and analyzer") (description - "GPXSee is a Qt-based GPS log file viewer and analyzer that supports -all common GPS log file formats.") + "GPXSee is a Qt-based GPS log file viewer and analyzer that supports all +common GPS log file formats. It can display multiple tracks on various on- +and off-line maps. You can easily add more maps and graph other captured data +such as elevation, speed, heart rate, power, temperature, and gear shifts.") (license license:gpl3))) (define-public gpsd -- cgit v1.2.3 From f4b6ce2155a0c31aafada2c64ee940f0f5c5c607 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 02:52:09 +0100 Subject: gnu: python-tomlkit: Update to 0.5.11. * gnu/packages/python-xyz.scm (python-tomlkit): Update to 0.5.11. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9b4c9a1722..711f6338c8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10703,14 +10703,13 @@ docstring and colored output.") (define-public python-tomlkit (package (name "python-tomlkit") - (version "0.5.8") + (version "0.5.11") (source (origin (method url-fetch) (uri (pypi-uri "tomlkit" version)) (sha256 - (base32 - "0sf2a4q61kf344hjbw8kb6za1hlccl89j9lzqw0l2zpddp0hrh9j")))) + (base32 "1kq1663iqxgwrmb883n55ypi5axnixla2hrby9g2x227asifsi7h")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From 2d3da18613d91476b264ad1ff4700ca8a52a6fb3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 02:53:13 +0100 Subject: gnu: python-tomlkit: Fix typos in descriptions. * gnu/packages/python-xyz.scm (python-tomlkit)[synopsis, description]: Fix typos. --- gnu/packages/python-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 711f6338c8..55a8046488 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10713,15 +10713,14 @@ docstring and colored output.") (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page - "https://github.com/sdispater/tomlkit") - (synopsis "Style preserving TOML library") + (home-page "https://github.com/sdispater/tomlkit") + (synopsis "Style-preserving TOML library") (description "TOML Kit is a 0.5.0-compliant TOML library. It includes a parser that preserves all comments, indentations, whitespace and internal element ordering, and makes them accessible and editable via an intuitive API. It can also create new TOML documents from scratch using the provided helpers. Part of the -implementation as been adapted, improved and fixed from Molten.") +implementation has been adapted, improved, and fixed from Molten.") (license license:expat))) (define-public python-shellingham -- cgit v1.2.3 From 44184f33562f483c32c9ec78db5cef26b3386cfd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:06:55 +0100 Subject: gnu: gd: Use HTTPS home page. * gnu/packages/gd.scm (gd)[home-page]: Use HTTPS. --- gnu/packages/gd.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 5b3f8509f8..2d3ee4200d 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -83,7 +83,7 @@ (propagated-inputs `(("fontconfig" ,fontconfig) ("libjpeg" ,libjpeg))) - (home-page "http://www.libgd.org/") + (home-page "https://www.libgd.org/") (synopsis "Library for the dynamic creation of images by programmers") (description "GD is a library for the dynamic creation of images by programmers. GD -- cgit v1.2.3 From e42399e80e41cec0d017b6967b949df4c3feec25 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:51:59 +0100 Subject: gnu: soundconverter: Use HTTPS home page. * gnu/packages/gnome.scm (soundconverter)[home-page]: Use HTTPS. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 336d10c923..05d3125bd8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9254,7 +9254,7 @@ mp3, Ogg Vorbis and FLAC") ("python-pygobject" ,python-pygobject) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base))) - (home-page "http://soundconverter.org/") + (home-page "https://soundconverter.org/") (synopsis "Convert between audio formats with a graphical interface") (description "SoundConverter supports converting between many audio formats including -- cgit v1.2.3 From 0087a2506fcc78b5bdd6197a841ae04826e34ebd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:44:41 +0100 Subject: gnu: rocksdb: Use HTTPS home page. * gnu/packages/databases.scm (rocksdb)[home-page]: Use HTTPS. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c8d12f43b5..9d42ba75fa 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1220,7 +1220,7 @@ including field and record folding."))) ("lz4" ,lz4) ("snappy" ,snappy) ("zlib" ,zlib))) - (home-page "http://rocksdb.org/") + (home-page "https://rocksdb.org/") (synopsis "Persistent key-value store for fast storage") (description "RocksDB is a library that forms the core building block for a fast -- cgit v1.2.3 From 68ad2a785e7bc11f7a9fcffbfa1b4a3c4ac7192f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:46:11 +0100 Subject: gnu: dfu-programmer: Use HTTPS home page. * gnu/packages/flashing-tools.scm (dfu-programmer)[home-page]: Use HTTPS. --- gnu/packages/flashing-tools.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index f993912838..8e36da22ed 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -169,7 +169,7 @@ programming} technique.") `(("pkg-config" ,pkg-config))) (inputs `(("libusb" ,libusb))) - (home-page "http://dfu-programmer.github.io/") + (home-page "https://dfu-programmer.github.io/") (synopsis "Device firmware update programmer for Atmel chips") (description "Dfu-programmer is a multi-platform command-line programmer for -- cgit v1.2.3 From 76dc85e48c582deeb885e1120c45e9f8a981b4e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:24:52 +0100 Subject: gnu: emulation-station: Use HTTPS home page. * gnu/packages/emulators.scm (emulation-station)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7b82c91a58..7e4c98fbc7 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -308,7 +308,7 @@ older games.") number of video game console emulators. It features an interface that is usable with any game controller that has at least 4 buttons, theming support, and a game metadata scraper.") - (home-page "http://www.emulationstation.org") + (home-page "https://emulationstation.org") (license license:expat)))) ;; Note: higan v107 has been released, but as explained by the dialog that -- cgit v1.2.3 From 6c82576e6da2e3e73a9a3a58ab11c9629cbf8cf9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:10:37 +0100 Subject: gnu: grue-hunter: Use HTTPS home page. * gnu/packages/games.scm (grue-hunter)[home-page]: Use HTTPS. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 340e758a95..b9ba8829a0 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3486,7 +3486,7 @@ Red Eclipse provides fast paced and accessible gameplay.") ("tar" ,tar) ("gzip" ,gzip) ("tarball" ,source))) - (home-page "http://jxself.org/grue-hunter.shtml") + (home-page "https://jxself.org/grue-hunter.shtml") (synopsis "Text adventure game") (description "Grue Hunter is a text adventure game written in Perl. You must make -- cgit v1.2.3 From 6ef143ef6ea7a6f7009d3d33e03d49e439877cc4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:18:28 +0100 Subject: gnu: fortune-mod: Use HTTPS home page. * gnu/packages/games.scm (fortune-mod)[home-page]: Use HTTPS. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b9ba8829a0..9b4ff4df9a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6094,7 +6094,7 @@ original.") ("perl-test-runvalgrind" ,perl-test-runvalgrind) ("cmake-rules" ,shlomif-cmake-modules) ("rinutils" ,rinutils))) - (home-page "http://www.shlomifish.org/open-source/projects/fortune-mod/") + (home-page "https://www.shlomifish.org/open-source/projects/fortune-mod/") (synopsis "The Fortune Cookie program from BSD games") (description "Fortune is a command-line utility which displays a random quotation from a collection of quotes.") -- cgit v1.2.3 From ec63b5a4c7a593986437c7677f844506f422c852 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 03:23:50 +0100 Subject: gnu: you-get: Update to 0.4.1410. * gnu/packages/video.scm (you-get): Update to 0.4.1410. --- 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 c54b5ec64c..41e6835baf 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1687,7 +1687,7 @@ other site that youtube-dl supports.") (define-public you-get (package (name "you-get") - (version "0.4.1403") + (version "0.4.1410") (source (origin (method git-fetch) (uri (git-reference @@ -1696,7 +1696,7 @@ other site that youtube-dl supports.") (file-name (git-file-name name version)) (sha256 (base32 - "04viy19x4g9dngml82nf9j94ys3p47bs62c2q2cn1barkybaa3as")))) + "1v4lfldcijgngg0s4q5w4ixa0k8k75dwmkhf57pgb31bqlrr8h0s")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos -- cgit v1.2.3 From d4c09245ec4c1ecc744a38ac156e37276eabcb92 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 03:51:34 +0100 Subject: gnu: desktop-file-utils: Don't use NAME in source URI. * gnu/packages/freedesktop.scm (desktop-file-utils)[source]: Hard-code NAME. --- gnu/packages/freedesktop.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 63bfdf8a97..46b6877d5f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1389,8 +1389,9 @@ to applications simultaneously competing for fingerprint readers.") (version "0.23") (source (origin (method url-fetch) - (uri (string-append "https://www.freedesktop.org/software/" name - "/releases/" name "-" version ".tar.xz")) + (uri (string-append "https://www.freedesktop.org/software/" + "desktop-file-utils/releases/" + "desktop-file-utils-" version ".tar.xz")) (sha256 (base32 "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc")))) -- cgit v1.2.3 From 8b6d893d1783684f7516094fc87108430856ea4c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Mar 2020 03:51:39 +0100 Subject: gnu: desktop-file-utils: Update to 0.24. * gnu/packages/freedesktop.scm (desktop-file-utils): Update to 0.24. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 46b6877d5f..02adf8eedd 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1386,7 +1386,7 @@ to applications simultaneously competing for fingerprint readers.") (define-public desktop-file-utils (package (name "desktop-file-utils") - (version "0.23") + (version "0.24") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -1394,7 +1394,7 @@ to applications simultaneously competing for fingerprint readers.") "desktop-file-utils-" version ".tar.xz")) (sha256 (base32 - "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc")))) + "1nc3bwjdrpcrkbdmzvhckq0yngbcxspwj2n1r7jr3gmx1jk5vpm1")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From d716a4742a3c8e3e7add8bb335fd27cd7053d971 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:21:49 +0100 Subject: gnu: t1lib: Use HTTPS home page. * gnu/packages/fontutils.scm (t1lib)[home-page]: Use HTTPS. --- gnu/packages/fontutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 3daa5187b9..7455d3381a 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -383,7 +383,7 @@ describe character bitmaps. It contains the bitmap data as well as some metric information. But t1lib is in itself entirely independent of the X11-system or any other graphical user interface.") (license license:gpl2) - (home-page "http://www.t1lib.org/"))) + (home-page "https://www.t1lib.org/"))) (define-public teckit (package -- cgit v1.2.3 From e4b5bdf7993590fefeb7182ae71beec4a9f69e3f Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Wed, 11 Mar 2020 09:31:26 +0100 Subject: gnu: r-ggsignif: Fix build. * gnu/packages/cran.scm (r-ggsignif): Add knitr to native-inputs in order to build the vignette. --- gnu/packages/cran.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f6be0d387b..8cc904612d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5843,6 +5843,8 @@ movies, and TV shows.") (base32 "17j9hg967k1wp9xw3x84mqss58jkb8pvlrnlchz4i1hklgykxqbg")))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (propagated-inputs `(("r-ggplot2" ,r-ggplot2))) (home-page "https://github.com/const-ae/ggsignif") -- cgit v1.2.3 From f255a193bef98ba9d41f2d83a379f5e17f72df62 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 11 Mar 2020 12:07:19 +0100 Subject: gnu: docker: Update to 19.03.7. * gnu/packages/docker.scm (docker): Update to 19.03.7. (docker-cli): Update to 19.03.7. --- gnu/packages/docker.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b23e067888..7524a0dc1b 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -46,7 +46,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) -(define %docker-version "19.03.5") +(define %docker-version "19.03.7") (define-public python-docker-py (package @@ -315,7 +315,7 @@ built-in registry server of Docker.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dlknwn0fh82nbzdzxdk6pfhqwph9vcw3vs3111wfr19y5hwncq9")) + (base32 "1sik109lxmiwgrsnvfip1nnal1xkh8z1mlvys6aknjyh29ll1iq8")) (patches (search-patches "docker-fix-tests.patch")))) (build-system gnu-build-system) @@ -588,7 +588,7 @@ provisioning etc.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07ldz46y74b3la4ah65v5bzbfx09yy6kncvxrr0zfx0s1214ar3m")))) + (base32 "164l33npy8acdbbrz8vcyiwx18vi55wwwikkasg0w43b5bdhz8sx")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" -- cgit v1.2.3 From 2bc5d5d57e47079873d2683edef9e7ce9249b83f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Mar 2020 15:07:27 +0200 Subject: gnu: python-ipython: Declare python2 variant. * gnu/packages/python-xyz.scm (python-ipython)[properties]: Declare python2-ipython as the python2- variant. --- gnu/packages/python-xyz.scm | 127 ++++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 55a8046488..b50946d5fa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5562,69 +5562,6 @@ you're careful. The @code{backcall} package provides a way of specifying the callback signature using a prototype function.") (license license:bsd-3))) -;; This is the latest release of the LTS version of ipython with support for -;; Python 2.7 and Python 3.x. Later non-LTS versions starting from 6.0 have -;; dropped support for Python 2.7. -(define-public python2-ipython - (package - (name "python2-ipython") - (version "5.8.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "ipython" version ".tar.gz")) - (sha256 - (base32 "01l93i4hspf0lvhmycvc8j378bslm9rw30mwfspsl6v1ayc69b2b")))) - (build-system python-build-system) - (propagated-inputs - `(("python2-backports-shutil-get-terminal-size" - ,python2-backports-shutil-get-terminal-size) - ("python2-pathlib2" ,python2-pathlib2) - ("python2-pyzmq" ,python2-pyzmq) - ("python2-prompt-toolkit" ,python2-prompt-toolkit-1) - ("python2-terminado" ,python2-terminado) - ("python2-matplotlib" ,python2-matplotlib) - ("python2-numpy" ,python2-numpy) - ("python2-numpydoc" ,python2-numpydoc) - ("python2-jinja2" ,python2-jinja2) - ("python2-mistune" ,python2-mistune) - ("python2-pexpect" ,python2-pexpect) - ("python2-pickleshare" ,python2-pickleshare) - ("python2-simplegeneric" ,python2-simplegeneric) - ("python2-jsonschema" ,python2-jsonschema) - ("python2-traitlets" ,python2-traitlets) - ("python2-nbformat" ,python2-nbformat) - ("python2-pygments" ,python2-pygments))) - (inputs - `(("readline" ,readline) - ("which" ,which))) - (native-inputs - `(("graphviz" ,graphviz) - ("pkg-config" ,pkg-config) - ("python2-requests" ,python2-requests) ;; for tests - ("python2-testpath" ,python2-testpath) - ("python2-mock" ,python2-mock) - ("python2-nose" ,python2-nose))) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-before 'check 'delete-broken-tests - (lambda* (#:key inputs #:allow-other-keys) - ;; These tests throw errors for unknown reasons. - (delete-file "IPython/core/tests/test_profile.py") - (delete-file "IPython/core/tests/test_interactiveshell.py") - (delete-file "IPython/core/tests/test_magic.py") - #t))))) - (home-page "https://ipython.org") - (synopsis "IPython is a tool for interactive computing in Python") - (description - "IPython provides a rich architecture for interactive computing with: -Powerful interactive shells, a browser-based notebook, support for interactive -data visualization, embeddable interpreters and tools for parallel -computing.") - (license license:bsd-3))) - (define-public python-ipython (package (name "python-ipython") @@ -5707,6 +5644,70 @@ computing.") "IPython provides a rich architecture for interactive computing with: Powerful interactive shells, a browser-based notebook, support for interactive data visualization, embeddable interpreters and tools for parallel +computing.") + (properties `((python2-variant . ,(delay python2-ipython)))) + (license license:bsd-3))) + +;; This is the latest release of the LTS version of ipython with support for +;; Python 2.7 and Python 3.x. Later non-LTS versions starting from 6.0 have +;; dropped support for Python 2.7. +(define-public python2-ipython + (package + (name "python2-ipython") + (version "5.8.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ipython" version ".tar.gz")) + (sha256 + (base32 "01l93i4hspf0lvhmycvc8j378bslm9rw30mwfspsl6v1ayc69b2b")))) + (build-system python-build-system) + (propagated-inputs + `(("python2-backports-shutil-get-terminal-size" + ,python2-backports-shutil-get-terminal-size) + ("python2-pathlib2" ,python2-pathlib2) + ("python2-pyzmq" ,python2-pyzmq) + ("python2-prompt-toolkit" ,python2-prompt-toolkit-1) + ("python2-terminado" ,python2-terminado) + ("python2-matplotlib" ,python2-matplotlib) + ("python2-numpy" ,python2-numpy) + ("python2-numpydoc" ,python2-numpydoc) + ("python2-jinja2" ,python2-jinja2) + ("python2-mistune" ,python2-mistune) + ("python2-pexpect" ,python2-pexpect) + ("python2-pickleshare" ,python2-pickleshare) + ("python2-simplegeneric" ,python2-simplegeneric) + ("python2-jsonschema" ,python2-jsonschema) + ("python2-traitlets" ,python2-traitlets) + ("python2-nbformat" ,python2-nbformat) + ("python2-pygments" ,python2-pygments))) + (inputs + `(("readline" ,readline) + ("which" ,which))) + (native-inputs + `(("graphviz" ,graphviz) + ("pkg-config" ,pkg-config) + ("python2-requests" ,python2-requests) ;; for tests + ("python2-testpath" ,python2-testpath) + ("python2-mock" ,python2-mock) + ("python2-nose" ,python2-nose))) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (add-before 'check 'delete-broken-tests + (lambda* (#:key inputs #:allow-other-keys) + ;; These tests throw errors for unknown reasons. + (delete-file "IPython/core/tests/test_profile.py") + (delete-file "IPython/core/tests/test_interactiveshell.py") + (delete-file "IPython/core/tests/test_magic.py") + #t))))) + (home-page "https://ipython.org") + (synopsis "IPython is a tool for interactive computing in Python") + (description + "IPython provides a rich architecture for interactive computing with: +Powerful interactive shells, a browser-based notebook, support for interactive +data visualization, embeddable interpreters and tools for parallel computing.") (license license:bsd-3))) -- cgit v1.2.3 From 578e4cf465ffc2d235c8de1e847b51ad8c65715c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Mar 2020 15:19:29 +0200 Subject: gnu: python2-ipykernel: Downgrade to 4.10.1. This is the last version actually supported by ipykernel. * gnu/packages/python-xyz.scm (python2-ipython): Downgrade to 4.10.1. [arguments]: Remove custom 'check phase. [propagated-inputs]: Add python2-tornado, python2-traitlets. [native-inputs]: Add python2-mock, python2-pytest-cov. (python-ipykernel)[properties): Declare python2-ipykernel as the python2- variant. --- gnu/packages/python-xyz.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b50946d5fa..823e524192 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5479,36 +5479,34 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (synopsis "IPython Kernel for Jupyter") (description "This package provides the IPython kernel for Jupyter.") + (properties `((python2-variant . ,(delay python2-ipykernel)))) (license license:bsd-3))) -;; Version 5.1.1 and above no longer support Python 2. +;; Version 5.x and above no longer support Python 2. (define-public python2-ipykernel (package (name "python2-ipykernel") - (version "5.1.0") + (version "4.10.1") (source (origin (method url-fetch) (uri (pypi-uri "ipykernel" version)) (sha256 - (base32 "0br95qhrd5k65g10djngiy27hs0642301hlf2q142i8djabvzh0g")))) + (base32 "1yzmdiy1djsszqp54jzd8ym8h4hpl67zjq83j2kxbkp0rwmlpdzf")))) (build-system python-build-system) (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (setenv "HOME" "/tmp") - (invoke "pytest" "-v") - #t))))) + `(#:python ,python-2)) (propagated-inputs `(("python2-ipython" ,python2-ipython) ;; imported at runtime during connect - ("python2-jupyter-client" ,python2-jupyter-client))) + ("python2-jupyter-client" ,python2-jupyter-client) + ("python2-tornado" ,python2-tornado) + ("python2-traitlets" ,python2-traitlets))) (native-inputs - `(("python2-pytest" ,python2-pytest) - ("python2-nose" ,python2-nose))) + `(("python2-mock" ,python2-mock) + ("python2-nose" ,python2-nose) + ("python2-pytest" ,python2-pytest) + ("python2-pytest-cov" ,python2-pytest-cov))) (home-page "https://ipython.org") (synopsis "IPython Kernel for Jupyter") (description -- cgit v1.2.3 From ea2822d7d6bb7837e49dcf2a2c02396d8df4580c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Mar 2020 15:43:50 +0200 Subject: gnu: Add python2-pyfaidx. * gnu/packages/bioinformatics.scm (python2-pyfaidx): New variable. --- gnu/packages/bioinformatics.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 54b85341a6..5c78f33005 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13529,6 +13529,9 @@ bgzipped text file that contains a pair of genomic coordinates per line.") fasta subsequences.") (license license:bsd-3))) +(define-public python2-pyfaidx + (package-with-python2 python-pyfaidx)) + (define-public python-cooler (package (name "python-cooler") -- cgit v1.2.3 From 173053790c27a7d67c712aa382620f933d0a0e60 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Mar 2020 15:45:33 +0200 Subject: gnu: python-pyfaidx: Update to 0.5.8. * gnu/packages/bioinformatics.scm (python-pyfaidx): Update to 0.5.8. --- 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 5c78f33005..830fd7433a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13511,14 +13511,14 @@ bgzipped text file that contains a pair of genomic coordinates per line.") (define-public python-pyfaidx (package (name "python-pyfaidx") - (version "0.5.7") + (version "0.5.8") (source (origin (method url-fetch) (uri (pypi-uri "pyfaidx" version)) (sha256 (base32 - "02jvdx3ksy6w5gd29i1d0g0zsabbz7c14qg482ff7pza6sdl0b2i")))) + "038xi3a6zvrxbyyfpp64ka8pcjgsdq4fgw9cl5lpxbvmm1bzzw2q")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six))) -- cgit v1.2.3 From afb877847bd01edbbe0b0d7b5c4e765fc8068040 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Mar 2020 16:23:52 +0200 Subject: gnu: Add python2-pygraphviz. * gnu/packages/graphviz.scm (python2-pygraphviz): New variable. --- gnu/packages/graphviz.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index c4f88caa88..06216418fe 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Ludovic Courtès -;;; Copyright © 2015 Efraim Flashner +;;; Copyright © 2015, 2020 Efraim Flashner ;;; Copyright © 2016 Theodoros Foradis ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -236,6 +236,9 @@ write, and draw graphs using Python to access the Graphviz graph data structure and layout algorithms.") (license license:bsd-3))) +(define-public python2-pygraphviz + (package-with-python2 python-pygraphviz)) + (define-public gts (package (name "gts") -- cgit v1.2.3 From d9a2a255f9918c07f89dbe9ae62ba063fa70ffef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Mar 2020 16:31:33 +0200 Subject: gnu: python-pybedtools: Update to 0.8.1. * gnu/packages/bioinformatics.scm (python-pybedtools): Update to 0.8.1. [arguments]: Add another test to the 'disable-broken-tests phase. (python2-pybedtools)[native-inputs]: Add python2-pathlib. --- gnu/packages/bioinformatics.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 830fd7433a..d95b58b0bb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -785,13 +785,13 @@ intended to behave exactly the same as the original BWK awk.") (define-public python-pybedtools (package (name "python-pybedtools") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (pypi-uri "pybedtools" version)) (sha256 (base32 - "1xl454ijvd4dzfvqgfahad49b49j7qy710fq9xh1rvk42z6x5ssf")))) + "14w5i40gi25clrr7h4wa2pcpnyipya8hrqi7nq77553zc5wf0df0")))) (build-system python-build-system) (arguments `(#:modules ((ice-9 ftw) @@ -818,6 +818,10 @@ intended to behave exactly the same as the original BWK awk.") ;; (see: https://github.com/daler/pybedtools/issues/192). (("def test_getting_example_beds") "def _do_not_test_getting_example_beds")) + ;; This issue still occurs on python2 + (substitute* "pybedtools/test/test_issues.py" + (("def test_issue_303") + "def _test_issue_303")) #t)) ;; TODO: Remove phase after it's part of PYTHON-BUILD-SYSTEM. ;; build system. @@ -886,7 +890,12 @@ Python.") (license license:gpl2+))) (define-public python2-pybedtools - (package-with-python2 python-pybedtools)) + (let ((pybedtools (package-with-python2 python-pybedtools))) + (package + (inherit pybedtools) + (native-inputs + `(("python2-pathlib" ,python2-pathlib) + ,@(package-native-inputs pybedtools)))))) (define-public python-biom-format (package -- cgit v1.2.3 From e05ce17dbc96f5cc9edecccf4587867a16b1489a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 10 Mar 2020 21:57:35 +0000 Subject: gnu: Add phodav. * gnu/packages/gnome.scm (phodav): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 05d3125bd8..86d0b8881c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -246,6 +246,35 @@ Desktop. It is designed to be as simple as possible and has some unique features to enable users to create their discs easily and quickly.") (license license:gpl2+))) +(define-public phodav + (package + (name "phodav") + (version "2.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1hxq8c5qfah3w7mxcyy3yhzdgswplll31a69p5mqdl04bsvw5pbx")))) + (build-system meson-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config))) + (inputs + `(("avahi" ,avahi) + ("libgudev" ,libgudev) + ("libsoup" ,libsoup))) + (synopsis "WebDav server implementation using libsoup") + (description "PhoDav was initially developed as a file-sharing mechanism for Spice, +but it is generic enough to be reused in other projects, +in particular in the GNOME desktop.") + (home-page "https://wiki.gnome.org/phodav") + (license license:lgpl2.1+))) + (define-public gnome-color-manager (package (name "gnome-color-manager") -- cgit v1.2.3 From cdf00cf75d2e3ef68d016c3dc145bf9d12475023 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Wed, 11 Mar 2020 11:11:34 -0400 Subject: gnu: nsis: Update to 3.05. * gnu/packages/installers.scm (nsis): Update to 3.05. --- gnu/packages/installers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index 9229359fdf..a8a5c36a18 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -34,14 +34,14 @@ (xgcc (cross-gcc triplet #:libc xlibc))) (package (name (string-append "nsis-" machine)) - (version "3.04") + (version "3.05") (source (origin (method url-fetch) (uri (string-append "http://prdownloads.sourceforge.net/nsis/nsis-" version "-src.tar.bz2")) (sha256 (base32 - "1xgllk2mk36ll2509hd31mfq6blgncmdzmwxj3ymrwshdh23d5b0")) + "1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn")) (patches (search-patches "nsis-env-passthru.patch")))) (build-system scons-build-system) (native-inputs `(("xgcc" ,xgcc) -- cgit v1.2.3 From e8df88003d47d50e93f5d23d250e1ec279f37525 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 17:44:06 +0100 Subject: gnu: gnutls@3.6.10: Add dependency on datefudge and util-linux. * gnu/packages/tls.scm (gnutls-3.6.10)[native-inputs]: New field. --- gnu/packages/tls.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index b8adf23d44..c8eea9c928 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017, 2018 ng0 ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Clément Lassieur @@ -276,7 +276,14 @@ required structures.") "/gnutls-" version ".tar.xz")) (sha256 (base32 - "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi")))))) + "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi")))) + (native-inputs + `(,@(package-native-inputs gnutls) + + ;; Datefudge is used to fuzz time for tests, and its presence + ;; enables a test that uses 'setsid' from util-linux. + ("datefudge" ,datefudge) + ("util-linux" ,util-linux))))) (define-public guile3.0-gnutls (package -- 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(-) 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 @@ reStructuredText.") (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 @@ sources.") ,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 From 10c2ca9e4ab1925e7a6791627dd60e843aff28ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C4=83d=C4=83lin=20Ionel=20Patra=C8=99cu?= Date: Wed, 11 Mar 2020 17:53:17 +0100 Subject: gnu: Add r-hrbrthemes. * gnu/packages/cran.scm (r-hrbrthemes): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8cc904612d..4ef2f922ec 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2018 Sandeep Subramanian ;;; Copyright © 2018 Charlie Ritter ;;; Copyright © 2018 Konrad Hinsen -;;; Copyright © 2018 Mădălin Ionel Patrașcu +;;; Copyright © 2018, 2020 Mădălin Ionel Patrașcu ;;; Copyright © 2018 Laura Lazzati ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Marius Bakke @@ -20752,3 +20752,34 @@ containing elevation data.") calculate the higher-order partial and semi-partial correlations but also with statistics and p-values of the correlation coefficients.") (license license:gpl2))) + +(define-public r-hrbrthemes + (package + (name "r-hrbrthemes") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "hrbrthemes" version)) + (sha256 + (base32 "057h60b5p53dcyjyfwlgjc1ry968s9s64dw78p443w8717zk7zpc")))) + (properties `((upstream-name . "hrbrthemes"))) + (build-system r-build-system) + (propagated-inputs + `(("r-extrafont" ,r-extrafont) + ("r-gdtools" ,r-gdtools) + ("r-ggplot2" ,r-ggplot2) + ("r-htmltools" ,r-htmltools) + ("r-knitr" ,r-knitr) + ("r-magrittr" ,r-magrittr) + ("r-rmarkdown" ,r-rmarkdown) + ("r-scales" ,r-scales))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/hrbrmstr/hrbrthemes/") + (synopsis "Additional themes, theme components and utilities for @code{ggplot2}") + (description + "This package provides a compilation of extra @code{ggplot2} themes, +scales and utilities, including a spell check function for plot label fields +and an overall emphasis on typography.") + (license license:expat))) -- cgit v1.2.3 From 3c1ea8dcef3342dba9fb1456effb31eb106a189a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 11 Mar 2020 16:07:04 +0100 Subject: ui: Restore line wrapping for 'package->recutils'. Fixes a regression introduced when switching to Guile 3.0.0 whereby monkey-patching 'wrap*' wouldn't have any effects due to inlining. * guix/ui.scm (%text-width): Define in terms of the '*line-width*' fluid when it's defined. : Set (@@ (texinfo plain-text) wrap*) only when '*line-width*' is undefined. --- guix/ui.scm | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index fbe2b70485..6f1ca9c0b2 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1218,16 +1218,23 @@ converted to a space; sequences of more than one line break are preserved." ;;; (define %text-width - (make-parameter (terminal-columns))) - -(set! (@@ (texinfo plain-text) wrap*) - ;; XXX: Monkey patch this private procedure to let 'package->recutils' - ;; parameterize the fill of description field correctly. - (lambda strings - (let ((indent (fluid-ref (@@ (texinfo plain-text) *indent*)))) - (fill-string (string-concatenate strings) - #:line-width (%text-width) #:initial-indent indent - #:subsequent-indent indent)))) + ;; '*line-width*' was introduced in Guile 2.2.7/3.0.1. On older versions of + ;; Guile, monkey-patch 'wrap*' below. + (if (defined? '*line-width*) + (let ((parameter (fluid->parameter *line-width*))) + (parameter (terminal-columns)) + parameter) + (make-parameter (terminal-columns)))) + +(unless (defined? '*line-width*) ;Guile < 2.2.7 + (set! (@@ (texinfo plain-text) wrap*) + ;; XXX: Monkey patch this private procedure to let 'package->recutils' + ;; parameterize the fill of description field correctly. + (lambda strings + (let ((indent (fluid-ref (@@ (texinfo plain-text) *indent*)))) + (fill-string (string-concatenate strings) + #:line-width (%text-width) #:initial-indent indent + #:subsequent-indent indent))))) (define (texi->plain-text str) "Return a plain-text representation of texinfo fragment STR." -- cgit v1.2.3 From e688c2df3924423b67892cc9939ca099c729d1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 11 Mar 2020 16:13:03 +0100 Subject: build: Require Guile 2.2.3 or later. * configure.ac: For 2.2.x, require 2.2.3 or later. --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 06e86c209f..6a6a020585 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,11 @@ dnl 'GUILE_EFFECTIVE_VERSION'. GUILE_PKG([3.0 2.2]) GUILE_PROGS if test "x$GUILD" = "x"; then - AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.]) + AC_MSG_ERROR(['guild' binary not found; please check your Guile installation.]) +fi + +if test "x$GUILE_EFFECTIVE_VERSION" = "x2.2"; then + PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.3]) fi dnl Installation directories for .scm and .go files. -- cgit v1.2.3 From d8a822f4620857bb31b24d71ff80840442ec694b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 11 Mar 2020 16:19:38 +0100 Subject: download: Remove (web http) workarounds no longer relevant. * guix/build/download.scm : Remove workarounds for and for . --- guix/build/download.scm | 129 ------------------------------------------------ 1 file changed, 129 deletions(-) diff --git a/guix/build/download.scm b/guix/build/download.scm index 0f2d5f402a..c647d00f6b 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -457,135 +457,6 @@ VERIFY-CERTIFICATE? is true, verify HTTPS server certificates." 'set-port-encoding! (lambda (p e) #f)) -;; XXX: Work around , fixed in Guile commit -;; 16050431f29d56f80c4a8253506fc851b8441840. Guile's date validation -;; procedure rejects dates in which the hour is not padded with a zero but -;; with whitespace. -(begin - (define-syntax string-match? - (lambda (x) - (syntax-case x () - ((_ str pat) (string? (syntax->datum #'pat)) - (let ((p (syntax->datum #'pat))) - #`(let ((s str)) - (and - (= (string-length s) #,(string-length p)) - #,@(let lp ((i 0) (tests '())) - (if (< i (string-length p)) - (let ((c (string-ref p i))) - (lp (1+ i) - (case c - ((#\.) ; Whatever. - tests) - ((#\d) ; Digit. - (cons #`(char-numeric? (string-ref s #,i)) - tests)) - ((#\a) ; Alphabetic. - (cons #`(char-alphabetic? (string-ref s #,i)) - tests)) - (else ; Literal. - (cons #`(eqv? (string-ref s #,i) #,c) - tests))))) - tests))))))))) - - (define (parse-rfc-822-date str space zone-offset) - (let ((parse-non-negative-integer (@@ (web http) parse-non-negative-integer)) - (parse-month (@@ (web http) parse-month)) - (bad-header (@@ (web http) bad-header))) - ;; We could verify the day of the week but we don't. - (cond ((string-match? (substring str 0 space) "aaa, dd aaa dddd dd:dd:dd") - (let ((date (parse-non-negative-integer str 5 7)) - (month (parse-month str 8 11)) - (year (parse-non-negative-integer str 12 16)) - (hour (parse-non-negative-integer str 17 19)) - (minute (parse-non-negative-integer str 20 22)) - (second (parse-non-negative-integer str 23 25))) - (make-date 0 second minute hour date month year zone-offset))) - ((string-match? (substring str 0 space) "aaa, d aaa dddd dd:dd:dd") - (let ((date (parse-non-negative-integer str 5 6)) - (month (parse-month str 7 10)) - (year (parse-non-negative-integer str 11 15)) - (hour (parse-non-negative-integer str 16 18)) - (minute (parse-non-negative-integer str 19 21)) - (second (parse-non-negative-integer str 22 24))) - (make-date 0 second minute hour date month year zone-offset))) - - ;; The next two clauses match dates that have a space instead of - ;; a leading zero for hours, like " 8:49:37". - ((string-match? (substring str 0 space) "aaa, dd aaa dddd d:dd:dd") - (let ((date (parse-non-negative-integer str 5 7)) - (month (parse-month str 8 11)) - (year (parse-non-negative-integer str 12 16)) - (hour (parse-non-negative-integer str 18 19)) - (minute (parse-non-negative-integer str 20 22)) - (second (parse-non-negative-integer str 23 25))) - (make-date 0 second minute hour date month year zone-offset))) - ((string-match? (substring str 0 space) "aaa, d aaa dddd d:dd:dd") - (let ((date (parse-non-negative-integer str 5 6)) - (month (parse-month str 7 10)) - (year (parse-non-negative-integer str 11 15)) - (hour (parse-non-negative-integer str 17 18)) - (minute (parse-non-negative-integer str 19 21)) - (second (parse-non-negative-integer str 22 24))) - (make-date 0 second minute hour date month year zone-offset))) - - (else - (bad-header 'date str) ; prevent tail call - #f)))) - (module-set! (resolve-module '(web http)) - 'parse-rfc-822-date parse-rfc-822-date)) - -;; XXX: Work around broken proxy handling on Guile 2.2 <= 2.2.2, fixed in -;; Guile commits 7d0d9e2c25c1e872cfc7d14ab5139915f1813d56 and -;; 6ad28ae3bc6a6d9e95ab7d70510d12c97673a143. See bug report at -;; . -(cond-expand - (guile-2.2 - (when (<= (string->number (micro-version)) 2) - (let () - (define put-symbol (@@ (web http) put-symbol)) - (define put-non-negative-integer - (@@ (web http) put-non-negative-integer)) - (define write-http-version - (@@ (web http) write-http-version)) - - (define (write-request-line method uri version port) - "Write the first line of an HTTP request to PORT." - (put-symbol port method) - (put-char port #\space) - (when (http-proxy-port? port) - (let ((scheme (uri-scheme uri)) - (host (uri-host uri)) - (host-port (uri-port uri))) - (when (and scheme host) - (put-symbol port scheme) - (put-string port "://") - (cond - ((string-index host #\:) ;<---- The fix is here! - (put-char port #\[) ;<---- And here! - (put-string port host) - (put-char port #\])) - (else - (put-string port host))) - (unless ((@@ (web uri) default-port?) scheme host-port) - (put-char port #\:) - (put-non-negative-integer port host-port))))) - (let ((path (uri-path uri)) - (query (uri-query uri))) - (if (string-null? path) - (put-string port "/") - (put-string port path)) - (when query - (put-string port "?") - (put-string port query))) - (put-char port #\space) - (write-http-version version port) - (put-string port "\r\n")) - - (module-set! (resolve-module '(web http)) 'write-request-line - write-request-line)))) - (else #t)) - (define (resolve-uri-reference ref base) "Resolve the URI reference REF, interpreted relative to the BASE URI, into a target URI, according to the algorithm specified in RFC 3986 section 5.2.2. -- cgit v1.2.3 From 51f187bee54d84c4a5000feaf25452bc339b660b Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 4 Mar 2020 16:31:51 +0100 Subject: gnu: Add clipnotify. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (clipnotify): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/xdisorg.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f46ba6714c..5d1a259bad 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2020 David Wilson ;;; Copyright © 2020 Ivan Vilata i Balaguer ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Damien Cassou ;;; ;;; This file is part of GNU Guix. ;;; @@ -2116,3 +2117,50 @@ font and theme settings when a complete desktop environment (GNOME, KDE) is not running. With a simple @file{.xsettingsd} configuration file one can avoid configuring visual settings in different UI toolkits separately.") (license license:bsd-3))) + +(define-public clipnotify + (package + (name "clipnotify") + (version "1.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cdown/clipnotify.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1v3ydm5ljy8z1savmdxrjyx7a5bm5013rzw80frp3qbbjaci0wbg")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append %output "/share/doc/" ,name "-" ,version))) + (install-file "clipnotify" bin) + (install-file "README.md" doc) + #t)))) + #:make-flags (list "CC=gcc") + #:tests? #f)) + (inputs + `(("libx11" ,libx11) + ("libXfixes" ,libxfixes))) + (home-page "https://github.com/cdown/clipnotify") + (synopsis "Notify on new X clipboard events") + (description "@command{clipnotify} is a simple program that, using the +XFIXES extension to X11, waits until a new selection is available and then +exits. + +It was primarily designed for clipmenu, to avoid polling for new selections. + +@command{clipnotify} doesn't try to print anything about the contents of the +selection, it just exits when it changes. This is intentional -- X11's +selection API is verging on the insane, and there are plenty of others who +have already lost their sanity to bring us xclip/xsel/etc. Use one of those +tools to complement clipnotify.") + (license license:public-domain))) -- cgit v1.2.3 From ad2c0f5b090e5c267c826778094527b0dda707fc Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 5 Mar 2020 08:26:23 +0100 Subject: gnu: Add clipmenu. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (clipmenu): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/xdisorg.scm | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5d1a259bad..bc36de565e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2164,3 +2164,68 @@ selection API is verging on the insane, and there are plenty of others who have already lost their sanity to bring us xclip/xsel/etc. Use one of those tools to complement clipnotify.") (license license:public-domain))) + +(define-public clipmenu + (let ((commit "a495bcc7a4ab125182a661c5808364f66938a87c") + (revision "1")) + (package + (name "clipmenu") + (version (string-append "5.6.0-" + revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cdown/clipnotify.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12vvircdhl4psqi51cnfd6bqy85v2vwfcmdq1mimjgng727nwzys")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-hardcoded-paths + (lambda _ + (substitute* "clipmenud" + (("has_clipnotify=0") + "has_clipnotify=1") + (("command -v clipnotify >/dev/null 2>&1 && has_clipnotify=1") + "") + (("clipnotify \\|\\| .*") + (string-append (which "clipnotify") "\n")) + (("xsel --logfile") + (string-append (which "xsel") " --logfile"))) + (substitute* "clipmenu" + (("xsel --logfile") + (string-append (which "xsel") " --logfile"))) + #t)) + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append %output "/share/doc/" + ,name "-" ,version))) + (install-file "clipdel" bin) + (install-file "clipmenu" bin) + (install-file "clipmenud" bin) + (install-file "README.md" doc) + #t)))) + #:tests? #f)) + (inputs + `(("clipnotify" ,clipnotify) + ("xsel" ,xsel))) + (home-page "https://github.com/cdown/clipmenu") + (synopsis "Simple clipboard manager using dmenu or rofi and xsel") + (description "Start @command{clipmenud}, then run @command{clipmenu} to +select something to put on the clipboard. + +When @command{clipmenud} detects changes to the clipboard contents, it writes +them out to the cache directory. @command{clipmenu} reads the cache directory +to find all available clips and launches @command{dmenu} (or @command{rofi}, +depending on the value of @code{CM_LAUNCHER}) to let the user select a clip. +After selection, the clip is put onto the PRIMARY and CLIPBOARD X selections.") + (license license:public-domain)))) -- cgit v1.2.3 From 1ed3b845f7cc7ead43332b61c750b8ec0dee6960 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 18:56:46 +0100 Subject: gnu: python-multidict: Update to 4.7.5. * gnu/packages/python-xyz.scm (python-multidict): Update to 4.7.5. [arguments]: New field. [native-inputs]: Remove PYTHON-PYTEST-RUNNER. Add PYTHON-PYTEST-COV. --- gnu/packages/python-xyz.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 823e524192..15b5dcaa74 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4388,18 +4388,37 @@ Python code against some of the style conventions in (define-public python-multidict (package (name "python-multidict") - (version "4.2.0") + (version "4.7.5") (source (origin (method url-fetch) (uri (pypi-uri "multidict" version)) (sha256 (base32 - "1vf5bq8hn5a9rvhr5v4fwbmarfsp35hhr8gs74kqfijy34j2f194")))) + "07ikq2c72kd263hpldw55y0px2l3g34hjk66ml9lryh1jv287qmf")))) (build-system python-build-system) + (arguments + '(#:modules ((ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26) + (guix build utils) + (guix build python-build-system)) + #:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (let ((libdir (find (cut string-prefix? "lib." <>) + (scandir "build")))) + (setenv "PYTHONPATH" + (string-append "./build/" libdir ":" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv"))) + (format #t "test suite not run~%")) + #t))))) (native-inputs `(("python-pytest" ,python-pytest) - ("python-pytest-runner" ,python-pytest-runner))) + ("python-pytest-cov" ,python-pytest-cov))) (home-page "https://github.com/aio-libs/multidict/") (synopsis "Multidict implementation") (description "Multidict is dict-like collection of key-value pairs -- cgit v1.2.3 From 805ac43c94da049284bdc9981a897a89770cf86b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 18:58:48 +0100 Subject: gnu: zile: Fix cross-compilation. * gnu/packages/zile.scm (zile)[native-inputs]: Add THIS-PACKAGE when cross-compiling. [arguments]: Add phase when cross-compiling. --- gnu/packages/zile.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm index eea0dba272..2718232e27 100644 --- a/gnu/packages/zile.scm +++ b/gnu/packages/zile.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,7 +52,7 @@ "0x3byaddms8l3g7igx6njycqsq98wgapysdb5c7lhcnajlkp8y3s")))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (add-before 'configure 'patch-/bin/sh (lambda* (#:key inputs #:allow-other-keys) @@ -60,7 +61,18 @@ (substitute* '("lib/spawni.c" "src/funcs.c") (("/bin/sh") (string-append bash "/bin/sh"))) - #t)))))) + #t))) + ;; Zile generates its manual pages by calling the built Zile + ;; with the --help argument. That does not work when cross- + ;; compiling; use the native Zile added below in that case. + ,@(if (%current-target-system) + '((add-before 'build 'use-native-zile-for-documentation + (lambda _ + (substitute* "build-aux/zile-help2man-wrapper" + (("src/zile") + (which "zile"))) + #t))) + '())))) (inputs `(("boehm-gc" ,libgc) ("ncurses" ,ncurses) @@ -68,6 +80,11 @@ (native-inputs `(("perl" ,perl) ("help2man" ,help2man) + ;; When cross-compiling, Zile needs a native version of itself to + ;; generate the manual pages (see the related phase above). + ,@(if (%current-target-system) + `(("self" ,this-package)) + '()) ("pkg-config" ,pkg-config))) (home-page "https://www.gnu.org/software/zile/") (synopsis "Lightweight Emacs clone") -- cgit v1.2.3 From f8cbe98e65c9cabcad420f98c855aa20ac1a25a0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 19:02:46 +0100 Subject: gnu: isc-dhcp: Fix cross-compilation. * gnu/packages/admin.scm (isc-dhcp)[arguments]: Set BUILD_CC in 'fix-bind-cross-compilation' phase. While at it, make the phase conditional on %CURRENT-TARGET-SYSTEM. --- gnu/packages/admin.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 51a74302e4..0f27e6370b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2017 Ethan R. Jones ;;; Copyright © 2017 Christopher Allan Webber -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2018, 2019 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Rutger Helling @@ -809,12 +809,17 @@ connection alive.") (("^RELEASEVER=.*") (format #f "RELEASEVER=~a\n" ,bind-release-version))) #t)) - (add-before 'configure 'fix-bind-cross-compilation - (lambda _ - (substitute* "configure" - (("--host=\\$host") - "--host=$host_alias")) - #t)) + ,@(if (%current-target-system) + '((add-before 'configure 'fix-bind-cross-compilation + (lambda _ + (substitute* "configure" + (("--host=\\$host") + "--host=$host_alias")) + ;; BIND needs a native compiler because the DHCP + ;; build system uses the built 'gen' executable. + (setenv "BUILD_CC" "gcc") + #t))) + '()) (add-after 'configure 'post-configure (lambda* (#:key outputs #:allow-other-keys) ;; Point to the right client script, which will be -- cgit v1.2.3 From f7f67495ba0c2f08b0372e925725b4d196e037b6 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 11 Mar 2020 19:33:25 +0100 Subject: gnu: spatialite-gui: Fix GUI not showing up. * gnu/packages/geo.scm (spatialite-gui)[arguments]: Add 'fix-gui' phase. --- gnu/packages/geo.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 1346ebeb5f..05d177c3b1 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -561,6 +561,14 @@ development.") ("sqlite" ,sqlite) ("wxwidgets" ,wxwidgets-2) ("zlib" ,zlib))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-gui + (lambda _ + ;; Fix for the GUI not showing up. + (substitute* "Main.cpp" + (("Hide\\(\\);") "")) + #t))))) (synopsis "Graphical user interface for SpatiaLite") (description "Spatialite-gui provides a visual interface for viewing and maintaining a spatialite database. You can easily see the structure of the -- cgit v1.2.3 From dfe15d9919ba74b28ec8adca8a88cc02ef8c43af Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Wed, 11 Mar 2020 11:14:59 -0400 Subject: gnu: Add xa. * gnu/packages/assembly.scm (xa): New variable. --- gnu/packages/assembly.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 0fdddc88e9..0a24220e18 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2019 Andy Tai ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Christopher Lemmer Webber ;;; ;;; This file is part of GNU Guix. ;;; @@ -342,3 +343,31 @@ Supported architectures are: @item spc700 @end itemize") (license license:gpl2))) + +(define-public xa + (package + (name "xa") + (version "2.3.10") + (source (origin + (method url-fetch) + (uri (string-append "https://www.floodgap.com/retrotech/xa" + "/dists/xa-" version ".tar.gz")) + (sha256 + (base32 + "0y5sd247g11jfk5msxy91hz2nhpy7smj125dzfyfhjsjnqk5nyw6")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; TODO: custom test harness, not sure how it works + #:phases + (modify-phases %standard-phases + (delete 'configure)) ; no "configure" script + #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))))) + (native-inputs `(("perl" ,perl))) + (home-page "https://www.floodgap.com/retrotech/xa/") + (synopsis "Two-pass portable cross-assembler") + (description + "xa is a high-speed, two-pass portable cross-assembler. +It understands mnemonics and generates code for NMOS 6502s (such +as 6502A, 6504, 6507, 6510, 7501, 8500, 8501, 8502 ...), + CMOS 6502s (65C02 and Rockwell R65C02) and the 65816.") + (license license:gpl2))) -- cgit v1.2.3 From c03fc422b933c97da088bbcb76236b119f29587c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Mar 2020 15:26:48 -0400 Subject: gnu: lpd8editor: Remove package. This package has not built successfully in several months. * gnu/packages/music.scm (lpd8editor): Remove variable. --- gnu/packages/music.scm | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 8914db3b0e..3690af83d7 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4615,42 +4615,6 @@ discard bad quality ones. @end itemize\n") (license license:expat)))) -(define-public lpd8editor - (package - (name "lpd8editor") - (version "0.0.13") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/charlesfleche/lpd8editor.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0lsz3v493ilq2zr016m7kvymrplxd0n3pqv1pjglpq1h7sjw9764")))) - (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'setenv - (lambda _ - (setenv "INSTALL_PREFIX" - (assoc-ref %outputs "out")))) - (delete 'configure) ; no configure script - (add-before 'build 'qmake - (lambda _ (invoke "qmake")))))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("alsa" ,alsa-lib) - ("qtbase" ,qtbase) - ("qtsvg" ,qtsvg))) - (synopsis "Graphical editor for the Akai LPD8 MIDI controller") - (description "lpd8editor is a graphical patch editor for the Akai LPD8 MIDI -controller.") - (home-page "https://github.com/charlesfleche/lpd8editor") - (license license:expat))) - (define-public fmit (package (name "fmit") -- cgit v1.2.3 From ebd4c251780c29c6d0190e56b99462f93bf85c4b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 21:49:00 +0100 Subject: gnu: python-contextlib2: Update to 0.6.0.post1. * gnu/packages/python-xyz.scm (python-contextlib2): Update to 0.6.0.post1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 15b5dcaa74..d14d60693a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8500,14 +8500,14 @@ be set via config files and/or environment variables.") (define-public python-contextlib2 (package (name "python-contextlib2") - (version "0.5.5") + (version "0.6.0.post1") (source (origin (method url-fetch) (uri (pypi-uri "contextlib2" version)) (sha256 (base32 - "0j6ad6lwwyc9kv71skj098v5l7x5biyj2hs4lc5x1kcixqcr97sh")))) + "0bhnr2ac7wy5l85ji909gyljyk85n92w8pdvslmrvc8qih4r1x01")))) (build-system python-build-system) (home-page "https://contextlib2.readthedocs.org/") (synopsis "Tools for decorators and context managers") -- cgit v1.2.3 From 7815afc9580f8a1bcadc064d0a62db2ad176e1e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 21:49:38 +0100 Subject: gnu: python2-virtualenv: Fix build. * gnu/packages/python-xyz.scm (python-virtualenv)[properties]: New field. (python2-virtualenv)[propagated-inputs]: Add PYTHON2-CONTEXTLIB2. [arguments]: New field. --- gnu/packages/python-xyz.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d14d60693a..af2bb43169 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2426,10 +2426,39 @@ e.g. filters, callbacks and errbacks can all be promises.") (synopsis "Virtual Python environment builder") (description "Virtualenv is a tool to create isolated Python environments.") + (properties `((python2-variant . ,(delay python2-virtualenv)))) (license license:expat))) (define-public python2-virtualenv - (package-with-python2 python-virtualenv)) + (let ((base (package-with-python2 (strip-python2-variant python-virtualenv)))) + (package + (inherit base) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (add-after 'set-paths 'adjust-PYTHONPATH + (lambda* (#:key inputs #:allow-other-keys) + (let* ((python (assoc-ref inputs "python")) + (python-sitedir (string-append python "/lib/python2.7" + "/site-packages"))) + ;; XXX: 'python2' always comes first on PYTHONPATH + ;; and shadows the 'setuptools' input. Move python2 + ;; last: this should be fixed in python-build-system + ;; in a future rebuild cycle. + (setenv "PYTHONPATH" + (string-append (string-join (delete python-sitedir + (string-split + (getenv "PYTHONPATH") + #\:)) + ":") + ":" python-sitedir)) + (format #t "environment variable `PYTHONPATH' changed to `~a'~%" + (getenv "PYTHONPATH")) + #t)))))) + (propagated-inputs + `(("python-contextlib2" ,python2-contextlib2) + ,@(package-propagated-inputs base)))))) (define-public python-markupsafe (package -- cgit v1.2.3 From 6006727974c8adfe6eea198a0191c313b3089e4f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 21:51:13 +0100 Subject: gnu: python-virtualenv: Update to 20.0.10. * gnu/packages/python-xyz.scm (python-virtualenv): Update to 20.0.10. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index af2bb43169..58d09ced57 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2398,14 +2398,14 @@ e.g. filters, callbacks and errbacks can all be promises.") (define-public python-virtualenv (package (name "python-virtualenv") - (version "20.0.8") + (version "20.0.10") (source (origin (method url-fetch) (uri (pypi-uri "virtualenv" version)) (sha256 (base32 - "096r7g5cv85vxymg9iqbn5z749613snlvd6p3rf1nxnrd386j0qz")))) + "0y6x41l3ja891993i4adylbbyly0r4m52n2d0a0y9y4h3lzyh4l5")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) -- cgit v1.2.3 From 6bd7d4cb7488d345187090b9f393728c2865257e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 22:24:38 +0100 Subject: gnu: python2-radon: Fix build. * gnu/packages/python-xyz.scm (python-radon)[properties]: New field. * gnu/packages/python-xyz.scm (python2-radon)[propagated-inputs]: Add PYTHON2-CONFIGPARSER and PYTHON2-FUTURE. --- gnu/packages/python-xyz.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 58d09ced57..eb40abe619 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13459,10 +13459,17 @@ Supported metrics are: @item Halstead metrics (all of them) @item the Maintainability Index (a Visual Studio metric) @end itemize") + (properties `((python2-variant . ,(delay python2-radon)))) (license license:expat))) (define-public python2-radon - (package-with-python2 python-radon)) + (let ((base (package-with-python2 (strip-python2-variant python-radon)))) + (package + (inherit base) + (propagated-inputs + `(("python-configparser" ,python2-configparser) + ("python-future" ,python2-future) + ,@(package-propagated-inputs base)))))) (define-public python-sure (package -- cgit v1.2.3 From cb18f2bf3191dccc94af43371218acbc65da7b85 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 22:36:02 +0100 Subject: gnu: python-cookies: Use the correct version of pytest. * gnu/packages/python-web.scm (python-cookies)[native-inputs]: Change PYTHON2-PYTEST to PYTHON-PYTEST. --- gnu/packages/python-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d294e43d45..07c1ceb2db 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1834,7 +1834,7 @@ for overriding static files.") `(;; test are broken: https://gitlab.com/sashahart/cookies/issues/3 #:tests? #f)) (native-inputs - `(("python-pytest" ,python2-pytest))) + `(("python-pytest" ,python-pytest))) (synopsis "HTTP cookie parser and renderer") (description "A RFC 6265-compliant HTTP cookie parser and renderer in Python.") -- cgit v1.2.3 From 0a8655e6dc956a3f1f116112d09ebcdd472e28a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 22:56:27 +0100 Subject: gnu: Remove duplicate copyright line. * gnu/packages/python-xyz.scm: Remove duplicate copyright. --- gnu/packages/python-xyz.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eb40abe619..3be2fd4623 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28,7 +28,6 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör -;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017, 2019 Alex Vong ;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2016, 2017, 2018, 2020 Julien Lepiller -- cgit v1.2.3 From 58363ee50096fd02743ff6d62ee1125fc440625f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Mar 2020 22:56:51 +0100 Subject: gnu: Remove year range from copyright header. * gnu/packages/python-xyz.scm: List years explicitly instead of range in copyright line. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3be2fd4623..8e8790b29a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2015, 2016 Chris Marusich ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016 Lukas Gradl -;;; Copyright © 2016, 2018-2019 Hartmut Goebel +;;; Copyright © 2016, 2018, 2019 Hartmut Goebel ;;; Copyright © 2016 Daniel Pimentel ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2016, 2017 Troy Sankey -- cgit v1.2.3 From 4b5a0c0540fb1008daa6834f05aa94c85803e620 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Mar 2020 21:24:50 -0400 Subject: gnu: xxHash: Update to 0.7.3. * gnu/packages/digest.scm (xxhash): Update to 0.7.3. --- gnu/packages/digest.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm index f76cbabcf8..1a9d58c0d3 100644 --- a/gnu/packages/digest.scm +++ b/gnu/packages/digest.scm @@ -25,7 +25,7 @@ (define-public xxhash (package (name "xxhash") - (version "0.7.2") + (version "0.7.3") (source (origin (method git-fetch) @@ -34,7 +34,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1f9gl0cymmi92ihsfan0p4zmyf2hxwx4arjimpbmbp719nbcvdsx")))) + (base32 "0bin0jch6lbzl4f8y052a7azfgq2n7iwqihzgqmcccv5vq4vcx5a")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From d7af0202a4db74b4c466fc96e12114df76b21706 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Mar 2020 21:27:36 -0400 Subject: gnu: Borg: Update to 1.1.11. * gnu/packages/backup.scm (borg): Update to 1.1.11. --- gnu/packages/backup.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 9d8d984cb2..b18dbf30f0 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -520,13 +520,14 @@ detection, and lossless compression.") (define-public borg (package (name "borg") - (version "1.1.10") + (version "1.1.11") (source (origin (method url-fetch) (uri (pypi-uri "borgbackup" version)) (sha256 - (base32 "1pp70p4n5kamvcbl4d8021ggrxhyykmg9isjg4yd3wags8b19d7g")) + (base32 + "190gjzx83b6p64nqj840x382dgz9gfv0gm7wj585lnkrpa90j29n")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From ca0fe294d65aff8bd1b11d0c81e968870c0f1084 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Mar 2020 03:58:46 +0100 Subject: gnu: java-snappy: Update to 1.1.7.3. * gnu/packages/java-compression.scm (java-snappy): Update to 1.1.7.3. --- gnu/packages/java-compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 3102c70d88..1c246f6a72 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017, 2018 Julien Lepiller ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Mark H Weaver -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,7 +35,7 @@ (define-public java-snappy (package (name "java-snappy") - (version "1.1.7.2") + (version "1.1.7.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/xerial/snappy-java/archive/" @@ -43,7 +43,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1p557vdv006ysgxbpp83krmq0066k46108vyiyka69w8i4i8rbbm")))) + "0v7mrc62v2wyr5l3c5xx11rn0k5bcl1l05cwr79xyw7zqr8k71qh")))) (build-system ant-build-system) (arguments `(#:jar-name "snappy.jar" -- cgit v1.2.3 From 0308944ab06a103791c853743c88280a2abc114f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Mar 2020 04:54:32 +0100 Subject: gnu: java-snappy: Don't use unstable tarball. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/java-compression.scm (java-snappy)[source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Add ‘make-git-checkout-writable’ phase. --- gnu/packages/java-compression.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 1c246f6a72..3a9082641c 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -25,6 +25,7 @@ #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system ant) #:use-module (gnu packages) #:use-module (gnu packages compression) @@ -36,20 +37,25 @@ (package (name "java-snappy") (version "1.1.7.3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/xerial/snappy-java/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0v7mrc62v2wyr5l3c5xx11rn0k5bcl1l05cwr79xyw7zqr8k71qh")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xerial/snappy-java") + (commit version))) + (sha256 + (base32 "07c145w1kv8g7dbwpy5xss142il7zr0qq78p2ih76azgl97n5cba")) + (file-name (git-file-name name version)))) (build-system ant-build-system) (arguments `(#:jar-name "snappy.jar" #:source-dir "src/main/java" #:phases (modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) (add-before 'build 'remove-binaries (lambda _ (delete-file "lib/org/xerial/snappy/OSInfo.class") -- cgit v1.2.3 From dd8cf0097e899d0285756429cc29706ebf4211e7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:28:54 +0100 Subject: gnu: picprog: Use HTTPS home page. * gnu/packages/embedded.scm (picprog)[home-page]: Use HTTPS. --- gnu/packages/embedded.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 136add4e82..46c7a03104 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1125,7 +1125,7 @@ SPI, I2C, JTAG.") (delete 'configure)))) (synopsis "Programs Microchip's PIC microcontrollers") (description "This program programs Microchip's PIC microcontrollers.") - (home-page "http://hyvatti.iki.fi/~jaakko/pic/picprog.html") + (home-page "https://hyvatti.iki.fi/~jaakko/pic/picprog.html") (license license:gpl3+))) (define-public fc-host-tools -- cgit v1.2.3 From fe6cfa99439b2cb13adbbe0370442c0bb655ceb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Mar 2020 03:38:34 +0100 Subject: gnu: simple-scan: Update to 3.36.0. * gnu/packages/gnome.scm (simple-scan): Update to 3.36.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 86d0b8881c..a08cd00d72 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5384,7 +5384,7 @@ USB transfers with your high-level application or system daemon.") (define-public simple-scan (package (name "simple-scan") - (version "3.34.4") + (version "3.36.0") (source (origin (method url-fetch) @@ -5392,7 +5392,7 @@ USB transfers with your high-level application or system daemon.") (version-major+minor version) "/" "simple-scan-" version ".tar.xz")) (sha256 - (base32 "0xvy672zyl6jsdlnxma8nc2aqsx9k92jhp6wfxs0msj9ppp1nd3z")))) + (base32 "198l3yhqhb2wzfdcgi8fzbwycr0njn44583dazz6wy1gqbiqnzgm")))) (build-system meson-build-system) ;; TODO: Fix icons in home screen, About dialogue, and scan menu. (arguments -- cgit v1.2.3 From 32df41beef12af9a64f079788ac77a167fb3e5ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Mar 2020 03:45:37 +0100 Subject: gnu: s6: Update to 2.9.1.0. * gnu/packages/skarnet.scm (s6): Update to 2.9.1.0. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 6323169ee6..31768c814e 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -104,14 +104,14 @@ complexity."))) (define-public s6 (package (name "s6") - (version "2.9.0.1") + (version "2.9.1.0") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/s6/s6-" version ".tar.gz")) (sha256 - (base32 "0mvcjrz8nlj9p2zclmcv22b4y6bqzd2iz38arhgc989vdvrbmkg0")))) + (base32 "1xqzl2wnvcmcyhppk7mc10h1ac7fkik3i6gpyliwpf3d5i9mkqh5")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline))) -- cgit v1.2.3 From 7247b841954f941df47d482a8c39f2c9851a6c2d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:02:03 +0100 Subject: gnu: ephoto: Update source and home page URIs. * gnu/packages/enlightenment.scm (ephoto)[source]: Remove dead URI. [home-page]: Follow (HTTPS) redirection. --- gnu/packages/enlightenment.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index d79ca949f2..4a65c55af9 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -515,15 +515,12 @@ and in creating applications based on the Enlightenment Foundation Library suite (name "ephoto") (version "1.5") (source - (origin - (method url-fetch) - (uri (list (string-append "http://www.smhouston.us/stuff/ephoto-" - version ".tar.xz") - (string-append "https://download.enlightenment.org/rel/" - "apps/ephoto/ephoto-" version ".tar.xz"))) - (sha256 - (base32 - "1q7v9abjp9jrs08xc7pqaac64yzax24dk1snjb9rciarzzh3mlzy")))) + (origin + (method url-fetch) + (uri (string-append "https://download.enlightenment.org/rel/" + "apps/ephoto/ephoto-" version ".tar.xz")) + (sha256 + (base32 "1q7v9abjp9jrs08xc7pqaac64yzax24dk1snjb9rciarzzh3mlzy")))) (build-system gnu-build-system) (arguments '(#:phases @@ -536,7 +533,7 @@ and in creating applications based on the Enlightenment Foundation Library suite ("pkg-config" ,pkg-config))) (inputs `(("efl" ,efl))) - (home-page "http://smhouston.us/ephoto/") + (home-page "https://smhouston.us/projects/ephoto/") (synopsis "EFL image viewer/editor/manipulator/slideshow creator") (description "Ephoto is an image viewer and editor written using the @dfn{Enlightenment Foundation Libraries} (EFL). It focuses on simplicity and -- cgit v1.2.3 From 094afc97c6e2315410427abd78e599768f2d6a40 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:51:27 +0100 Subject: gnu: gptfdisk: Use HTTPS home page. * gnu/packages/disk.scm (gptfdisk)[home-page]: Use HTTPS. --- gnu/packages/disk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 534b64ef95..f42f2900ec 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -199,7 +199,7 @@ tables, and it understands a variety of different formats.") (install-file "fixparts.8" man) (install-file "gdisk.8" man) (install-file "sgdisk.8" man))))))) - (home-page "http://www.rodsbooks.com/gdisk/") + (home-page "https://www.rodsbooks.com/gdisk/") (synopsis "Low-level GPT disk partitioning and formatting") (description "GPT fdisk (aka gdisk) is a text-mode partitioning tool that works on Globally Unique Identifier (@dfn{GUID}) Partition Table (@dfn{GPT}) -- cgit v1.2.3 From b5d32fb9dd9eeb9240507e7c7fa5da5a871a6644 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Mar 2020 03:52:24 +0100 Subject: gnu: xmobar: Update to 0.33. * gnu/packages/wm.scm (xmobar): Update to 0.33. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f9b6ef9880..f5b9e62afe 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -691,14 +691,14 @@ tiled on several screens.") (define-public xmobar (package (name "xmobar") - (version "0.32") + (version "0.33") (source (origin (method url-fetch) (uri (string-append "mirror://hackage/package/xmobar/" "xmobar-" version ".tar.gz")) (sha256 (base32 - "0x2ki3v0pmhl4bva3qi1xx21axayc4sx1nkzhmk2ap4l0cj52jrd")))) + "1hr3qqykc5givcpcwrr9f2y920jmiinmxm5mcy6qgpgymgwqb618")))) (build-system haskell-build-system) (native-inputs `(("ghc-hspec" ,ghc-hspec) -- cgit v1.2.3 From dd42a2f3912d1aabf65b27d3f62c74a4039c9d62 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Mar 2020 03:54:50 +0100 Subject: gnu: libgme: Update to 0.6.3. * gnu/packages/music.scm (libgme): Update to 0.6.3. --- 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 3690af83d7..f6585f60d4 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -864,7 +864,7 @@ interface. It is implemented as a frontend to @code{klick}.") (define-public libgme (package (name "libgme") - (version "0.6.2") + (version "0.6.3") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/mpyne/game-music-emu/" @@ -872,10 +872,10 @@ interface. It is implemented as a frontend to @code{klick}.") ".tar.xz")) (sha256 (base32 - "0hkkmxbaas2sirlb5i4r10mgbbiaapjx8pazifabwba23m3wnijh")))) + "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb")))) (build-system cmake-build-system) (arguments - '(#:tests? #f)) ; no check target + '(#:tests? #f)) ; no check target (home-page "https://bitbucket.org/mpyne/game-music-emu") (synopsis "Video game music file playback library") (description -- cgit v1.2.3 From 286ab9d3f54da3f9c5196f4071686aa08059e0a0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:31:22 +0100 Subject: gnu: rsound: Use HTTPS home page. * gnu/packages/audio.scm (rsound)[home-page]: Use HTTPS. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 63227b89ea..ea65b4efb1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2992,7 +2992,7 @@ synthesizer written in C++.") (string-append "--prefix=" (assoc-ref outputs "out")))))) ;; No 'check' target. #:tests? #f)) - (home-page "http://themaister.net/rsound.html") + (home-page "https://themaister.net/rsound.html") (synopsis "Networked audio system") (description "RSound allows you to send audio from an application and transfer it -- cgit v1.2.3 From 62f6f9d99fdef05086251e8e10554990092c9844 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:01:50 +0100 Subject: gnu: faust: Use HTTPS home page. * gnu/packages/audio.scm (faust)[home-page]: Use HTTPS. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index ea65b4efb1..b6e0a436c3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1306,7 +1306,7 @@ PS, and DAB+.") #t))))) (native-inputs `(("unzip" ,unzip))) - (home-page "http://faust.grame.fr/") + (home-page "https://faust.grame.fr/") (synopsis "Signal processing language") (description "Faust is a programming language for realtime audio signal processing.") -- cgit v1.2.3 From f930814afae8e20125dab58b060a691ea8398e26 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Mar 2020 01:53:57 +0100 Subject: gnu: Add gitless. * gnu/packages/version-control.scm (gitless): New public variable. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/version-control.scm | 70 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 52626f8076..5d0fa267a9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 John D. Boy ;;; ;;; This file is part of GNU Guix. ;;; @@ -531,6 +532,75 @@ everything from small to very large projects with speed and efficiency.") ("zlib" ,zlib) ("bash-for-tests" ,bash))))) +(define-public gitless + (package + (name "gitless") + (version "0.8.8") + (source + (origin + ;; The PyPI package lacks a test suite. Build directly from git. + (method git-fetch) + (uri (git-reference + (url "https://github.com/gitless-vcs/gitless") + (commit (string-append "v" version)))) + (sha256 + (base32 "048kl27zjr68hgs70g3l98ci9765wxva6azzrhcdys7nsdd493n6")) + (file-name (git-file-name name version)))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'loosen-requirements + (lambda _ + (substitute* "setup.py" + ;; Using Guix's python-pygit2 1.1.0 appears to work fine… + (("pygit2==") "pygit2>=")) + #t)) + (add-before 'check 'prepare-for-tests + (lambda _ + ;; Find the 'gl' command. + (rename-file "gl.py" "gl") + (setenv "PATH" (string-append (getcwd) ":" (getenv "PATH"))) + + ;; The tests try to run git as if it were already set up. + (setenv "HOME" (getcwd)) + (invoke "git" "config" "--global" "user.email" "git@example.com") + (invoke "git" "config" "--global" "user.name" "Guix"))) + (replace 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (git (assoc-ref inputs "git"))) + (wrap-program (string-append out "/bin/gl") + `("PATH" ":" prefix (,(string-append git "/bin"))) + `("PYTHONPATH" ":" = + (,(string-append out "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages:") + ,(getenv "PYTHONPATH")))) + #t)))))) + (native-inputs + `(("git-for-tests" ,git-minimal))) + (inputs + `(("git" ,git-minimal) + ("python-clint" ,python-clint) + ("python-pygit2" ,python-pygit2) + ("python-sh" ,python-sh))) + (home-page "https://gitless.com") + (synopsis "Simple version control system built on top of Git") + (description + "Gitless is a Git-compatible version control system that aims to be easy to +learn and use. It simplifies the common workflow by committing changes to +tracked files by default and saving any uncommitted changes as part of a branch. + +The friendly @command{gl} command-line interface gives feedback and helps you +figure out what to do next. + +Gitless is implemented on top of Git and its commits and repositories are +indistinguishable from Git's. You (or other contributors) can always fall back +on @command{git}, and use any regular Git hosting service.") + (license license:expat))) + (define-public libgit2 (package (name "libgit2") -- cgit v1.2.3 From a30f20d49cd1503841182d9da3ea148aaa329df6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:28:57 +0100 Subject: gnu: dosbox: Use HTTPS home page. * gnu/packages/emulators.scm (dosbox)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7e4c98fbc7..a46ae910cd 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -266,7 +266,7 @@ turbo speed, networked multiplayer, and graphical enhancements.") ("alsa-lib" ,alsa-lib) ("glu" ,glu) ("mesa" ,mesa))) - (home-page "http://www.dosbox.com") + (home-page "https://www.dosbox.com") (synopsis "X86 emulator with CGA/EGA/VGA/etc. graphics and sound") (description "DOSBox is a DOS-emulator that uses the SDL library. DOSBox also emulates CPU:286/386 realmode/protected mode, Directory -- cgit v1.2.3 From cf580e5ebf0ad7734bf9c1efabff994d5d69f6e9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:08:56 +0100 Subject: gnu: mame: Use HTTPS home page. * gnu/packages/emulators.scm (mame)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index a46ae910cd..3591b1740c 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1453,7 +1453,7 @@ play them on systems for which they were never designed!") ("sqlite" ,sqlite) ("utf8proc" ,utf8proc) ("zlib" ,zlib))) - (home-page "http://mamedev.org/") + (home-page "https://www.mamedev.org") (synopsis "Multi-purpose emulation framework") (description "MAME's purpose is to preserve decades of software history. As electronic technology continues to rush forward, MAME -- cgit v1.2.3 From 81166ee48872bd0b705a505e0c9cd6ff256aae0e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:15:16 +0100 Subject: gnu: xlockmore: Use HTTPS home page. * gnu/packages/xdisorg.scm (xlockmore)[home-page]: Use HTTPS. --- gnu/packages/xdisorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index bc36de565e..f8f410a415 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -840,7 +840,7 @@ shows it again when the mouse cursor moves or a mouse button is pressed.") ("libXext" ,libxext) ("libXt" ,libxt) ("linux-pam" ,linux-pam))) - (home-page "http://sillycycle.com/xlockmore.html") + (home-page "https://sillycycle.com/xlockmore.html") (synopsis "Screen locker for the X Window System") (description "XLockMore is a classic screen locker and screen saver for the -- cgit v1.2.3 From bf8ee1c5046c7011d641e10277984c9bb7dc7c2f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Mar 2020 05:09:44 +0100 Subject: gnu: xlockmore: Update to 5.62. * gnu/packages/xdisorg.scm (xlockmore): Update to 5.62. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f8f410a415..92c958b963 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -817,7 +817,7 @@ shows it again when the mouse cursor moves or a mouse button is pressed.") (define-public xlockmore (package (name "xlockmore") - (version "5.59") + (version "5.62") (source (origin (method url-fetch) (uri (list (string-append "http://sillycycle.com/xlock/" @@ -828,7 +828,7 @@ shows it again when the mouse cursor moves or a mouse button is pressed.") "xlockmore-" version ".tar.xz"))) (sha256 (base32 - "0lajc5a4lki33b9mzfsi74q4hbivbmhwysp7mib4ivnyxianhaid")))) + "0b05wgj4mpssy4hd7km5c48i454dfg45p11mfmsr7xjd2gnz5gqi")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--enable-appdefaultdir=" -- cgit v1.2.3 From d8ba1135eb3cc0a01f84675bec4979d58301f8f5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Mar 2020 10:25:42 +0200 Subject: gnu: python2-ipython: Fix build. * gnu/packages/python-xyz.scm (python2-ipython)[arguments]: Adjust skipped tests. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8e8790b29a..8c3c0d2d69 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5743,9 +5743,9 @@ computing.") (add-before 'check 'delete-broken-tests (lambda* (#:key inputs #:allow-other-keys) ;; These tests throw errors for unknown reasons. + (delete-file "IPython/core/tests/test_displayhook.py") + (delete-file "IPython/core/tests/test_magic_terminal.py") (delete-file "IPython/core/tests/test_profile.py") - (delete-file "IPython/core/tests/test_interactiveshell.py") - (delete-file "IPython/core/tests/test_magic.py") #t))))) (home-page "https://ipython.org") (synopsis "IPython is a tool for interactive computing in Python") -- cgit v1.2.3 From 04b4c43232d114d7bc4a415e3c6138c52d33a800 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 12 Mar 2020 09:54:11 +0100 Subject: doc: Fix description for "guix package -A". * doc/guix.texi (Invoking guix package): Fix description for "guix package -A". --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index eb6eb99361..dd32b65fe0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3122,7 +3122,7 @@ the store. @itemx -A [@var{regexp}] List packages currently available in the distribution for this system (@pxref{GNU Distribution}). When @var{regexp} is specified, list only -installed packages whose name matches @var{regexp}. +available packages whose name matches @var{regexp}. For each package, print the following items separated by tabs: its name, its version string, the parts of the package (@pxref{Packages with -- cgit v1.2.3 From 0aedcf4bc3e36071609d5b1f8a52fd449ec05118 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 12 Mar 2020 09:33:47 +0100 Subject: gnu: txr: Update to 233. * gnu/packages/lisp.scm (txr): Update to 233. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index b5d8fd30f3..2af0d78da3 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -797,7 +797,7 @@ enough to play the original mainframe Zork all the way through.") (define-public txr (package (name "txr") - (version "232") + (version "233") (source (origin (method git-fetch) @@ -808,7 +808,7 @@ enough to play the original mainframe Zork all the way through.") (patches (search-patches "txr-shell.patch")) (sha256 (base32 - "1vcnask4a1rxrljp4rcbkfihrndkv25l256l125vv39gjhf315xp")))) + "14dwjgx9lbfajk3q539m3v3b9j047q83ldnqb4cagbs8ampvhfbv")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("cc=gcc") -- cgit v1.2.3 From 034d9544e276600dc2d8434b47a240e38a178852 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 12 Mar 2020 09:38:00 +0100 Subject: gnu: udiskie: Update to 2.1.0. * gnu/packages/freedesktop.scm (udiskie): Update to 2.1.0. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 02adf8eedd..5dbbcbd1fa 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1593,14 +1593,14 @@ encoding names are iconv-compatible.") (define-public udiskie (package (name "udiskie") - (version "2.0.4") + (version "2.1.0") (source (origin (method url-fetch) (uri (pypi-uri "udiskie" version)) (sha256 (base32 - "0gjjzz0k8dlsk03fl2882lbl88hbv031ww72qj02gr65yph0jqgc")) + "0smib8vbs9q37n7ynhzyw97q16fgdkcdw7fw69lci0xvyq00v1dz")) ;; Remove support for the libappindicator library of the ;; Unity desktop environment which is not in Guix. (patches (search-patches "udiskie-no-appindicator.patch")))) -- cgit v1.2.3 From 69b03ecd954a251a4ef7ef33dd95656114360272 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 12 Mar 2020 09:43:26 +0100 Subject: gnu: jgmenu: Update to 4.1.0. * gnu/packages/xdisorg.scm (jgmenu): Update to 4.1.0. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 92c958b963..0a58755815 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1971,7 +1971,7 @@ The cutbuffer and clipboard selection are always synchronized.") (define-public jgmenu (package (name "jgmenu") - (version "4.0.1") + (version "4.1.0") (source (origin (method git-fetch) @@ -1981,7 +1981,7 @@ The cutbuffer and clipboard selection are always synchronized.") (file-name (git-file-name name version)) (sha256 (base32 - "1q0rpg2d96sn3rrdi8m7bngnxxqyxilpjxi7skiw4gvpiv1akxjp")))) + "1wsh37rapb1bszlq36hvwxqvfds39hbvbl152m8as4zlh93wfvvk")))) (build-system gnu-build-system) (native-inputs `(("cppcheck" ,cppcheck) -- cgit v1.2.3 From ec73c90ee35a404b04b030b260c386011c0cbe94 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 12 Mar 2020 10:05:28 +0100 Subject: gnu: Add virtualpg. * gnu/packages/geo.scm (virtualpg): New variable. --- gnu/packages/geo.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 05d177c3b1..7fd04f25c3 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1523,3 +1523,29 @@ input file (in @code{.osm} or @code{.osm.pbf} format).") tools supporting SpatiaLite.") (home-page "https://www.gaia-gis.it/fossil/spatialite-tools/index") (license license:gpl3+))) + +(define-public virtualpg + (package + (name "virtualpg") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.gaia-gis.it/gaia-sins/" + "virtualpg-" version ".tar.gz")) + (sha256 + (base32 "0kjipcd08vvn188xmwbs7sw41xcs06x47n2hbqshpjcr51mxbarp")))) + (build-system gnu-build-system) + (inputs + `(("postgresql" ,postgresql) + ("sqlite" ,sqlite))) + (synopsis "Allow SQLite/SpatiaLite to access PostgreSQL/PostGIS tables") + (description + "VirtualPG is a dynamic extension for the SQLite DBMS. It implements +the VirtualPostgres driver, allowing to directly exchange data between SQLite +and PostgreSQL; if SpatiaLite is available even PostGIS geometries can be +exchanged form one Spatial DBMS and the other.") + (home-page "https://www.gaia-gis.it/fossil/virtualpg/index") + (license (list license:gpl2+ + license:lgpl2.1+ + license:mpl1.1)))) -- cgit v1.2.3 From a20cfe71e9cd9450e9cfbe9e4bc478a0c726a2af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 11 Mar 2020 23:53:19 +0100 Subject: gnu: guile-next: Enable JIT on ARMv7. JIT support on ARMv7 is fixed by "guile-3.0-crash.patch". * gnu/packages/guile.scm (guile-3.0)[arguments]: Remove. --- gnu/packages/guile.scm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 1d9d93d774..80ac9ea706 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -303,15 +303,6 @@ without requiring the source code to be rewritten.") (patches (append (search-patches "guile-3.0-crash.patch") (origin-patches (package-source guile-2.2)))))) - - (arguments - (substitute-keyword-arguments (package-arguments guile-2.2) - ;; XXX: On ARMv7, work around by disabling - ;; JIT. - ((#:configure-flags flags '()) - (if (target-arm32?) - `(cons "--disable-jit" ,flags) - flags)))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") -- cgit v1.2.3 From 7657e61d6b33fe758fd69355ed53efbd5310743c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 12 Mar 2020 11:04:00 +0100 Subject: import: pypi: Rewrite to use 'define-json-mapping'. * guix/import/pypi.scm (non-empty-string-or-false): New procedure. (, , ): New record types. (pypi-fetch): Call 'json->pypi-project'. (latest-source-release, latest-wheel-release): Use the new record accessors instead of 'assoc-ref*'. (pypi->guix-package, latest-release): Likewise. * tests/pypi.scm (test-json): Add mandatory fields. --- guix/import/pypi.scm | 121 +++++++++++++++++++++++++++++++++++++++------------ tests/pypi.scm | 3 ++ 2 files changed, 95 insertions(+), 29 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 10450155a0..f93fa8831f 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 David Thompson ;;; Copyright © 2015 Cyril Roelandt -;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Maxim Cournoyer @@ -43,6 +43,7 @@ #:use-module (guix import utils) #:use-module ((guix download) #:prefix download:) #:use-module (guix import json) + #:use-module (guix json) #:use-module (guix packages) #:use-module (guix upstream) #:use-module ((guix licenses) #:prefix license:) @@ -55,10 +56,67 @@ pypi->guix-package %pypi-updater)) +;; The PyPI API (notice the rhyme) is "documented" at: +;; . + +(define non-empty-string-or-false + (match-lambda + ("" #f) + ((? string? str) str) + ((or #nil #f) #f))) + +;; PyPI project. +(define-json-mapping make-pypi-project pypi-project? + json->pypi-project + (info pypi-project-info "info" json->project-info) ; + (last-serial pypi-project-last-serial "last_serial") ;integer + (releases pypi-project-releases "releases" ;string/* pairs + (match-lambda + (((versions . dictionaries) ...) + (map (lambda (version vector) + (cons version + (map json->distribution + (vector->list vector)))) + versions dictionaries)))) + (distributions pypi-project-distributions "urls" ;* + (lambda (vector) + (map json->distribution (vector->list vector))))) + +;; Project metadata. +(define-json-mapping make-project-info project-info? + json->project-info + (name project-info-name) ;string + (author project-info-author) ;string + (maintainer project-info-maintainer) ;string + (classifiers project-info-classifiers ;list of strings + "classifiers" vector->list) + (description project-info-description) ;string + (summary project-info-summary) ;string + (keywords project-info-keywords) ;string + (license project-info-license) ;string + (download-url project-info-download-url ;string | #f + "download_url" non-empty-string-or-false) + (home-page project-info-home-page ;string + "home_page") + (url project-info-url "project_url") ;string + (release-url project-info-release-url "release_url") ;string + (version project-info-version)) ;string + +;; Distribution: a URL along with cryptographic hashes and metadata. +(define-json-mapping make-distribution distribution? + json->distribution + (url distribution-url) ;string + (digests distribution-digests) ;list of string pairs + (file-name distribution-file-name "filename") ;string + (has-signature? distribution-has-signature? "hash_sig") ;Boolean + (package-type distribution-package-type "packagetype") ;"bdist_wheel" | ... + (python-version distribution-package-python-version + "python_version")) + (define (pypi-fetch name) - "Return an alist representation of the PyPI metadata for the package NAME, -or #f on failure." - (json-fetch (string-append "https://pypi.org/pypi/" name "/json"))) + "Return a record for package NAME, or #f on failure." + (and=> (json-fetch (string-append "https://pypi.org/pypi/" name "/json")) + json->pypi-project)) ;; For packages found on PyPI that lack a source distribution. (define-condition-type &missing-source-error &error @@ -67,22 +125,24 @@ or #f on failure." (define (latest-source-release pypi-package) "Return the latest source release for PYPI-PACKAGE." - (let ((releases (assoc-ref* pypi-package "releases" - (assoc-ref* pypi-package "info" "version")))) + (let ((releases (assoc-ref (pypi-project-releases pypi-package) + (project-info-version + (pypi-project-info pypi-package))))) (or (find (lambda (release) - (string=? "sdist" (assoc-ref release "packagetype"))) - (vector->list releases)) + (string=? "sdist" (distribution-package-type release))) + releases) (raise (condition (&missing-source-error (package pypi-package))))))) (define (latest-wheel-release pypi-package) "Return the url of the wheel for the latest release of pypi-package, or #f if there isn't any." - (let ((releases (assoc-ref* pypi-package "releases" - (assoc-ref* pypi-package "info" "version")))) + (let ((releases (assoc-ref (pypi-project-releases pypi-package) + (project-info-version + (pypi-project-info pypi-package))))) (or (find (lambda (release) - (string=? "bdist_wheel" (assoc-ref release "packagetype"))) - (vector->list releases)) + (string=? "bdist_wheel" (distribution-package-type release))) + releases) #f))) (define (python->package-name name) @@ -411,23 +471,25 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." (lambda* (package-name) "Fetch the metadata for PACKAGE-NAME from pypi.org, and return the `package' s-expression corresponding to that package, or #f on failure." - (let ((package (pypi-fetch package-name))) - (and package + (let* ((project (pypi-fetch package-name)) + (info (and project (pypi-project-info project)))) + (and project (guard (c ((missing-source-error? c) (let ((package (missing-source-error-package c))) (leave (G_ "no source release for pypi package ~a ~a~%") - (assoc-ref* package "info" "name") - (assoc-ref* package "info" "version"))))) - (let ((name (assoc-ref* package "info" "name")) - (version (assoc-ref* package "info" "version")) - (release (assoc-ref (latest-source-release package) "url")) - (wheel (assoc-ref (latest-wheel-release package) "url")) - (synopsis (assoc-ref* package "info" "summary")) - (description (assoc-ref* package "info" "summary")) - (home-page (assoc-ref* package "info" "home_page")) - (license (string->license (assoc-ref* package "info" "license")))) - (make-pypi-sexp name version release wheel home-page synopsis - description license)))))))) + (project-info-name info) + (project-info-version info))))) + (make-pypi-sexp (project-info-name info) + (project-info-version info) + (and=> (latest-source-release project) + distribution-url) + (and=> (latest-wheel-release project) + distribution-url) + (project-info-home-page info) + (project-info-summary info) + (project-info-summary info) + (string->license + (project-info-license info))))))))) (define (pypi-recursive-import package-name) (recursive-import package-name #f @@ -472,9 +534,10 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." (pypi-package (pypi-fetch pypi-name))) (and pypi-package (guard (c ((missing-source-error? c) #f)) - (let* ((metadata pypi-package) - (version (assoc-ref* metadata "info" "version")) - (url (assoc-ref (latest-source-release metadata) "url"))) + (let* ((info (pypi-project-info pypi-package)) + (version (project-info-version info)) + (url (distribution-url + (latest-source-release pypi-package)))) (upstream-source (package (package-name package)) (version version) diff --git a/tests/pypi.scm b/tests/pypi.scm index 43d45f1dd8..19af6e61fb 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -38,7 +38,10 @@ \"license\": \"GNU LGPL\", \"summary\": \"summary\", \"home_page\": \"http://example.com\", + \"classifiers\": [], + \"download_url\": \"\" }, + \"urls\": [], \"releases\": { \"1.0.0\": [ { -- cgit v1.2.3 From 2d0409a4a2cedb76ab7a96173e19304bb54b8701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 12 Mar 2020 11:13:33 +0100 Subject: import: utils: Remove 'assoc-ref*'. * guix/import/utils.scm (assoc-ref*): Remove. --- guix/import/utils.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index d17d400ddf..94c8cb040b 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2016 Jelle Licht ;;; Copyright © 2016 David Craven ;;; Copyright © 2017, 2019 Ricardo Wurmus @@ -47,7 +47,6 @@ #:export (factorize-uri flatten - assoc-ref* url-fetch guix-hash-url @@ -110,13 +109,6 @@ of the string VERSION is replaced by the symbol 'version." (cons elem memo))) '() lst)) -(define (assoc-ref* alist key . rest) - "Return the value for KEY from ALIST. For each additional key specified, -recursively apply the procedure to the sub-list." - (if (null? rest) - (assoc-ref alist key) - (apply assoc-ref* (assoc-ref alist key) rest))) - (define (url-fetch url file-name) "Save the contents of URL to FILE-NAME. Return #f on failure." (parameterize ((current-output-port (current-error-port))) -- cgit v1.2.3 From c00ae79cca7f4b1c95669c5857c0e55e1b253f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 12 Mar 2020 11:18:40 +0100 Subject: import: cpan: Gracefully handle missing projects. * guix/import/cpan.scm (cpan-fetch): Check whether 'json-fetch' returns #f. --- guix/import/cpan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 7a97c7f8e8..6bcd2ce9eb 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -181,9 +181,9 @@ return \"Test-Simple\"" or #f on failure. MODULE should be the distribution name, such as \"Test-Script\" for the \"Test::Script\" module." ;; This API always returns the latest release of the module. - (json->cpan-release - (json-fetch (string-append (%metacpan-base-url) "/release/" - name)))) + (and=> (json-fetch (string-append (%metacpan-base-url) "/release/" + name)) + json->cpan-release)) (define (cpan-home name) (string-append "https://metacpan.org/release/" name)) -- cgit v1.2.3 From f7537e30b892cef09d91902547c00e5fa9b66f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 10 Mar 2020 16:45:57 +0100 Subject: inferior: Distinguish inferior exceptions. This avoids ambiguities when looking at a backtrace where the exception was actually thrown by an inferior in a very different context. * guix/inferior.scm (&inferior-exception): New condition type. (read-repl-response): Add optional 'inferior' parameter. Raise '&inferior-exception' instead of rethrowing to KEY when receiving an 'exception' message. (read-inferior-response): Pass INFERIOR to 'read-repl-response'. * tests/inferior.scm ("&inferior-exception"): New test. --- guix/inferior.scm | 21 +++++++++++++++++---- tests/inferior.scm | 13 ++++++++++++- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index 0236fb61ad..6b685ece30 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -63,6 +63,9 @@ inferior-eval inferior-eval-with-store inferior-object? + inferior-exception? + inferior-exception-arguments + inferior-exception-inferior read-repl-response inferior-packages @@ -195,8 +198,15 @@ equivalent. Return #f if the inferior could not be launched." (set-record-type-printer! write-inferior-object) -(define (read-repl-response port) - "Read a (guix repl) response from PORT and return it as a Scheme object." +;; Reified exception thrown by an inferior. +(define-condition-type &inferior-exception &error + inferior-exception? + (arguments inferior-exception-arguments) ;key + arguments + (inferior inferior-exception-inferior)) ; | #f + +(define* (read-repl-response port #:optional inferior) + "Read a (guix repl) response from PORT and return it as a Scheme object. +Raise '&inferior-exception' when an exception is read from PORT." (define sexp->object (match-lambda (('value value) @@ -208,10 +218,13 @@ equivalent. Return #f if the inferior could not be launched." (('values objects ...) (apply values (map sexp->object objects))) (('exception key objects ...) - (apply throw key (map sexp->object objects))))) + (raise (condition (&inferior-exception + (arguments (cons key (map sexp->object objects))) + (inferior inferior))))))) (define (read-inferior-response inferior) - (read-repl-response (inferior-socket inferior))) + (read-repl-response (inferior-socket inferior) + inferior)) (define (send-inferior-request exp inferior) (write exp (inferior-socket inferior)) diff --git a/tests/inferior.scm b/tests/inferior.scm index f54b6d6037..b4417d8629 100644 --- a/tests/inferior.scm +++ b/tests/inferior.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018, 2019 Ludovic Courtès +;;; Copyright © 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +61,17 @@ (close-inferior inferior) (list a (inferior-object? b)))))) +(test-equal "&inferior-exception" + '(a b c d) + (let ((inferior (open-inferior %top-builddir + #:command "scripts/guix"))) + (guard (c ((inferior-exception? c) + (close-inferior inferior) + (and (eq? inferior (inferior-exception-inferior c)) + (inferior-exception-arguments c)))) + (inferior-eval '(throw 'a 'b 'c 'd) inferior) + 'badness))) + (test-equal "inferior-packages" (take (sort (fold-packages (lambda (package lst) (cons (list (package-name package) -- cgit v1.2.3 From a669f6e27b5c078fdd7f4592cd5dc688a979a864 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Tue, 10 Mar 2020 20:29:05 +0100 Subject: gnu: dune-*: set up MPI for tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (dune-common, dune-grid, dune-istl, dune-alugrid): [arguments]: correctly set up MPI instead of disabling tests that require MPI. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 110 +++++-------------------------------------------- 1 file changed, 10 insertions(+), 100 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 263f80f246..4235d5a0ad 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4593,36 +4593,8 @@ linear algebra primitives specifically targeting graph analytics.") (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags))) - ;; These tests fail because they require a fully functional MPI - ;; environment. - (add-after 'unpack 'disable-failing-tests - (lambda _ - (setenv "ARGS" - (string-append "--exclude-regex '(" - (string-join - (list - "remoteindicestest" - "remoteindicestest-mpi-2" - "syncertest" - "syncertest-mpi-2" - "variablesizecommunicatortest" - "variablesizecommunicatortest-mpi-2" - "arithmetictestsuitetest" - "assertandreturntest" - "assertandreturntest_ndebug" - "concept" - "debugaligntest" - "mpicollectivecommunication" - "mpicollectivecommunication-mpi-2" - "mpiguardtest" - "mpiguardtest-mpi-2" - "mpihelpertest" - "mpihelpertest-mpi-2" - "mpihelpertest2" - "mpihelpertest2-mpi-2") - "|") - ")'")) - #t))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (inputs `(("gmp" ,gmp) ("metis" ,metis) @@ -4703,54 +4675,8 @@ This package contains the basic DUNE geometry classes.") (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags))) - ;; These tests fail because they require a fully functional MPI - ;; environment. - (add-after 'unpack 'disable-failing-tests - (lambda _ - (setenv "ARGS" - (string-append "--exclude-regex '(" - (string-join - (list - "scsgmappertest" - "conformvolumevtktest" - "gnuplottest" - "nonconformboundaryvtktest" - "subsamplingvtktest" - "vtktest" - "vtktest-mpi-2" - "vtksequencetest" - "gmshtest-onedgrid" - "test-dgf-yasp" - "test-dgf-yasp-offset" - "test-dgf-oned" - "test-geogrid-yaspgrid" - "test-gridinfo" - "test-identitygrid" - "testiteratorranges" - "test-hierarchicsearch" - "test-parallel-ug-mpi-2" - "test-yaspgrid-backuprestore-equidistant" - "test-yaspgrid-backuprestore-equidistant-mpi-2" - "test-yaspgrid-backuprestore-equidistantoffset" - "test-yaspgrid-backuprestore-equidistantoffset-mpi-2" - "test-yaspgrid-backuprestore-tensor" - "test-yaspgrid-backuprestore-tensor-mpi-2" - "test-yaspgrid-tensorgridfactory" - "test-yaspgrid-tensorgridfactory-mpi-2" - "test-yaspgrid-yaspfactory-1d" - "test-yaspgrid-yaspfactory-1d-mpi-2" - "test-yaspgrid-yaspfactory-2d" - "test-yaspgrid-yaspfactory-2d-mpi-2" - "test-yaspgrid-yaspfactory-3d" - "test-yaspgrid-yaspfactory-3d-mpi-2" - "globalindexsettest" - "persistentcontainertest" - "structuredgridfactorytest" - "tensorgridfactorytest" - "vertexordertest") - "|") - ")'")) - #t))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry) @@ -4793,24 +4719,8 @@ This package contains the basic DUNE grid classes.") (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags))) - ;; These tests fail because they require a fully functional MPI - ;; environment. - (add-after 'unpack 'disable-failing-tests - (lambda _ - (setenv "ARGS" - (string-append "--exclude-regex '(" - (string-join - (list - "galerkintest" - "hierarchytest" - "pamgtest" - "pamg_comm_repart_test" - "matrixredisttest" - "vectorcommtest" - "matrixmarkettest") - "|") - ")'")) - #t))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (inputs `(("dune-common" ,dune-common) ("openmpi" ,openmpi) @@ -4896,9 +4806,7 @@ assemble global function spaces on finite-element grids.") "1l9adgyjpra8mvwm445s0lpjshnb63jag85fb2hisbjn6bm320yj")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; 7 of 8 tests fail because they need a full MPI - ; environment - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-include (lambda _ @@ -4910,7 +4818,9 @@ assemble global function spaces on finite-element grids.") (lambda* (#:key inputs make-flags #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "dune-grid") "/share")) - (apply invoke "make" "build_tests" make-flags)))))) + (apply invoke "make" "build_tests" make-flags))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry) -- cgit v1.2.3 From 07ebb75d175e0285dc3a5f525f111e3a7c544ba0 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Tue, 10 Mar 2020 20:29:06 +0100 Subject: gnu: Add dune-uggrid. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (dune-uggrid): New variable. (dune-grid)[propagated-inputs]: Add dune-uggrid dependency, so that the UGGrid class in dune-grid can be used by packages that have dune-grid as input. (dune-functions)[arguments]: Enable tests that previously weren't built as they require dune-uggrid. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4235d5a0ad..ab1532cd05 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4656,6 +4656,42 @@ This package contains the basic DUNE geometry classes.") ;; GPL version 2 with "runtime exception" (license license:gpl2))) +(define-public dune-uggrid + (package + (name "dune-uggrid") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://dune-project.org/download/" + version "/dune-uggrid-" version ".tar.gz")) + (sha256 + (base32 + "05l7a1gb78mny49anyxk6rjvn66rhgm30y72v5cjg0m5kfgr1a1f")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-tests + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "build_tests" make-flags)))))) + (inputs + `(("dune-common" ,dune-common) + ("openmpi" ,openmpi))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") + (description "DUNE, the Distributed and Unified Numerics Environment is a +modular toolbox for solving @dfn{partial differential equations} (PDEs) with +grid-based methods. It supports the easy implementation of methods like +@dfn{Finite Elements} (FE), @dfn{Finite Volumes} (FV), and also @dfn{Finite +Differences} (FD). + +This package contains the DUNE UG grid classes.") + (license license:lgpl2.1))) + (define-public dune-grid (package (name "dune-grid") @@ -4685,6 +4721,8 @@ This package contains the basic DUNE geometry classes.") ("openblas" ,openblas) ("openmpi" ,openmpi) ("python" ,python))) + (propagated-inputs + `(("dune-uggrid" ,dune-uggrid))) (native-inputs `(("gfortran" ,gfortran) ("pkg-config" ,pkg-config))) @@ -4898,7 +4936,20 @@ operating on statically typed trees of objects.") (base32 "1an8gb477n8j0kzpbrv7nr1snh8pxip0gsxq6w63jc83gg3dj200")))) (build-system cmake-build-system) - (arguments `(#:tests? #f)) ; FIXME: tests require dune-uugrid + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (setenv "ARGS" + ;; unable to load GMSH file in this test + "--exclude-regex gridviewfunctionspacebasistest") + #t)) + (add-after 'build 'build-tests + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "build_tests" make-flags))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (inputs `(("dune-common" ,dune-common) ("dune-istl" ,dune-istl) -- cgit v1.2.3 From f1f9466e3326d2df8e6e266a7cdced09116b2492 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Tue, 10 Mar 2020 20:29:07 +0100 Subject: gnu: Add dune-subgrid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (dune-subgrid): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ab1532cd05..808fe3084f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4881,6 +4881,49 @@ implementation of the DUNE grid interface supporting either simplices or cubes.") (license license:gpl2+))) +(define-public dune-subgrid + (package + (name "dune-subgrid") + (version "2.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.imp.fu-berlin.de/agnumpde/dune-subgrid") + (commit "releases/2.6-1"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gcv35rx3knqd54r4pp9rzd639db4j8w2r2ibq43w1mgwdcqhs64")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-tests + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "build_tests" make-flags))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) + (inputs + `(("dune-common" ,dune-common) + ("dune-geometry" ,dune-geometry) + ("dune-grid" ,dune-grid) + ("openmpi" ,openmpi) + ;; Optional + ("metis" ,metis) + ("openblas" ,openblas) + ("gmp" ,gmp))) + (native-inputs + `(("gfortran" ,gfortran) + ("pkg-config" ,pkg-config))) + (home-page "http://numerik.mi.fu-berlin.de/dune-subgrid/index.php") + (synopsis "Distributed and Unified Numerics Environment") + (description "The dune-subgrid module allows to mark elements of +another hierarchical dune grid. The set of marked elements can then be +accessed as a hierarchical dune grid in its own right. Dune-Subgrid +provides the full grid interface including adaptive mesh refinement.") + (license license:gpl2+))) + (define-public dune-typetree (package (name "dune-typetree") -- cgit v1.2.3 From 0a703c04866c38ad5f9e0537013837a32b6d188a Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Tue, 10 Mar 2020 20:29:08 +0100 Subject: gnu: dune-istl: Build with suitesparse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (dune-istl)[inputs]: Add suitesparse to build additional solvers in dune-istl. 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 808fe3084f..e694a5b187 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4764,6 +4764,7 @@ This package contains the basic DUNE grid classes.") ("openmpi" ,openmpi) ;; Optional ("metis" ,metis) + ("suitesparse" ,suitesparse) ("superlu" ,superlu) ("openblas" ,openblas) ("gmp" ,gmp) -- cgit v1.2.3 From e4cdadc18d284f77b02d92d19205998596168a23 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 11 Mar 2020 21:25:29 +0100 Subject: gnu: r-cairo: Update to 1.5-11. * gnu/packages/statistics.scm (r-cairo): Update to 1.5-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 547450c78b..5354f39b0c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5392,14 +5392,14 @@ genome-wide association studies can be analyzed efficiently.") (define-public r-cairo (package (name "r-cairo") - (version "1.5-10") + (version "1.5-11") (source (origin (method url-fetch) (uri (cran-uri "Cairo" version)) (sha256 (base32 - "1mdmd5zmjkh1b0x928zizgzh42x8swbajffb88rvnjfdhk1z0dvq")))) + "1k9kpxcg5n4g6x2gydv344f4w0snqbhww14fnbbj1bny0mmv28xg")))) (properties `((upstream-name . "Cairo"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From c107e50a0eec0e805c7578e45998376fea39cff2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 12:18:36 +0100 Subject: gnu: mumi: Update to 0.0.0-7.6653e2d. * gnu/packages/mail.scm (mumi): Update to 0.0.0-7.6653e2d. [inputs]: Add guile-sqlite3. --- gnu/packages/mail.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 0573e70d07..fb5446107c 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Gábor Boskovits -;;; Copyright © 2018, 2019 Ricardo Wurmus +;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2019 Tanguy Le Carrour ;;; ;;; This file is part of GNU Guix. @@ -2960,8 +2960,8 @@ replacement for the @code{urlview} program.") (license gpl2+))) (define-public mumi - (let ((commit "a933a62a4b8528b416319759b9985db80f3fce14") - (revision "6")) + (let ((commit "6653e2d525b945fcd671dbfbf7b42cc588a1cf4b") + (revision "7")) (package (name "mumi") (version (git-version "0.0.0" revision commit)) @@ -2973,7 +2973,7 @@ replacement for the @code{urlview} program.") (file-name (git-file-name name version)) (sha256 (base32 - "0vlda7vjzpd942iz5vb471hj7ypml5gwl9s1am92klv6nk2vnvcx")))) + "0h1q61yl01hm7wygv1bv47ncg7l7gcw7aq8ny61g3hr1acsqysjf")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -3005,6 +3005,7 @@ replacement for the @code{urlview} program.") `(("guile-debbugs" ,guile-debbugs) ("guile-email" ,guile-email) ("guile-json" ,guile-json-3) + ("guile-sqlite3" ,guile-sqlite3) ("guile-syntax-highlight" ,guile-syntax-highlight) ("gnutls" ,gnutls) ;needed to talk to https://debbugs.gnu.org ("guile" ,guile-2.2) -- cgit v1.2.3 From a595399230a7b1acb0b096b3d5a7474100014299 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 12:19:42 +0100 Subject: services: mumi-service-type: Update to latest version of mumi. * gnu/services/web.scm (%mumi-activation): Create /var/mumi/db. (mumi-shepherd-services): Add service for mumi worker. --- gnu/services/web.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 075140816a..d093f60c8d 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2018, 2019 Christopher Baines ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2019 Florian Pelz +;;; Copyright © 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -1670,12 +1671,14 @@ WSGIPassAuthorization On #~(begin (use-modules (guix build utils)) + (mkdir-p "/var/mumi/db") (mkdir-p "/var/mumi/mails") (let* ((pw (getpwnam "mumi")) (uid (passwd:uid pw)) (gid (passwd:gid pw))) (chown "/var/mumi" uid gid) - (chown "/var/mumi/mails" uid gid))))) + (chown "/var/mumi/mails" uid gid) + (chown "/var/mumi/db" uid gid))))) (define %mumi-accounts (list (user-group (name "mumi") (system? #t)) @@ -1696,6 +1699,15 @@ WSGIPassAuthorization On '(#$(file-append mumi "/bin/mumi")) #:user "mumi" #:group "mumi" #:log-file "/var/log/mumi.log")) + (stop #~(make-kill-destructor))) + (shepherd-service + (provision '(mumi-worker)) + (documentation "Mumi bug-tracking web interface.") + (requirement '(networking)) + (start #~(make-forkexec-constructor + '(#$(file-append mumi "/bin/mumi") "--worker") + #:user "mumi" #:group "mumi" + #:log-file "/var/log/mumi.worker.log")) (stop #~(make-kill-destructor))))) (define mumi-service-type -- cgit v1.2.3 From e8588a7847a4669a4e3a4ffca8865d8f1b9a227e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Mar 2020 10:59:39 +0200 Subject: gnu: python-jupyter-console: Specify python2 variant. * gnu/packages/python-xyz.scm (python-jupyter-console)[properties]: New field. Specify python2-jupyter-console as python2 variant. --- gnu/packages/python-xyz.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8c3c0d2d69..2466368512 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8172,6 +8172,7 @@ in the data.") (description "This package provides a terminal-based console frontend for Jupyter kernels. It also allows for console-based interaction with non-Python Jupyter kernels such as IJulia and IRKernel.") + (properties `((python2-variant . ,(delay python2-jupyter-console)))) (license license:bsd-3))) (define-public python2-jupyter-console -- cgit v1.2.3 From b0aa58d8f1d63db2d4444db378e6dd4ee4b9313b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Mar 2020 11:00:41 +0200 Subject: gnu: python2-jupyter-console: Build with python2. * gnu/packages/python-xyz.scm (python2-jupyter-console)[arguments]: Add python keyword, set to python-2. --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2466368512..61b4a8aa98 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8187,8 +8187,9 @@ Jupyter kernels such as IJulia and IRKernel.") (base32 "1kam1qzgwr7srhm5r6aj90di5sws4bq0jmiw15452ddamb9yspal")))) (build-system python-build-system) - ;; Tests only run in an TTY. - (arguments `(#:tests? #f)) + (arguments + `(#:python ,python-2 + #:tests? #f)) ; Tests only run in a TTY. (propagated-inputs `(("python2-ipykernel" ,python2-ipykernel) ("python2-jupyter-client" ,python2-jupyter-client) -- cgit v1.2.3 From d56d3ae704a74e592368a7afc69e1d109ea967f4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Mar 2020 17:30:31 +0200 Subject: gnu: grpc: Build shared libraries. * gnu/packages/machine-learning.scm (grpc)[outputs]: Add static. [arguments]: Copy configure-flags from cmake-build-system. Add custom phases 'configure-shared, 'install-shared-libraries and 'move-static-libs to build shared libs and move static libs to their own output. (tensorflow)[native-inputs]: Add grpc:static. --- gnu/packages/machine-learning.scm | 43 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 50c41dc113..52e639723b 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2020 Efraim Flashner ;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice @@ -1285,6 +1285,7 @@ Python.") (package (name "grpc") (version "1.16.1") + (outputs '("out" "static")) (source (origin (method git-fetch) (uri (git-reference @@ -1301,7 +1302,42 @@ Python.") (list "-DgRPC_ZLIB_PROVIDER=package" "-DgRPC_CARES_PROVIDER=package" "-DgRPC_SSL_PROVIDER=package" - "-DgRPC_PROTOBUF_PROVIDER=package"))) + "-DgRPC_PROTOBUF_PROVIDER=package" + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out")) + "-DCMAKE_INSTALL_LIBDIR=lib" + (string-append "-DCMAKE_INSTALL_RPATH=" + (assoc-ref %outputs "out") "/lib") + "-DCMAKE_VERBOSE_MAKEFILE=ON") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'configure-shared + (lambda* (#:key (configure-flags '()) #:allow-other-keys) + (mkdir "../build-shared") + (with-directory-excursion "../build-shared" + (apply invoke + "cmake" "../source" + "-DBUILD_SHARED_LIBS=ON" + configure-flags) + (apply invoke "make" + `("-j" ,(number->string (parallel-job-count))))))) + (add-after 'install 'install-shared-libraries + (lambda _ + (with-directory-excursion "../build-shared" + (invoke "make" "install")))) + (add-before 'strip 'move-static-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (mkdir-p (string-append static "/lib")) + (with-directory-excursion + (string-append out "/lib") + (for-each + (lambda (file) + (rename-file file + (string-append static "/lib/" file))) + (find-files "." "\\.a$")))) + #t))))) (inputs `(("c-ares" ,c-ares/cmake) ("openssl" ,openssl) @@ -1731,6 +1767,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n"))) (sha256 (base32 "161g9841rjfsy5pn52fcis0s9hdr7rxvb06pad38j5rppfihvign"))))) + ("grpc" ,grpc "static") ("googletest" ,googletest) ("swig" ,swig) ("unzip" ,unzip))) @@ -1752,7 +1789,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n"))) ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("giflib" ,giflib) - ("grpc" ,grpc) + ("grpc:bin" ,grpc) ("jsoncpp" ,jsoncpp-for-tensorflow) ("snappy" ,snappy) ("sqlite" ,sqlite) -- cgit v1.2.3 From 37109658a589285c3d70197adfdca20f1c48c355 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 9 Mar 2020 17:31:25 +0200 Subject: gnu: Add hyperledger-iroha-ed25519. * gnu/packages/hyperledger.scm (hyperledger-iroha-ed25519): New variable. --- gnu/packages/hyperledger.scm | 45 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm index 158a66e898..71194fba38 100644 --- a/gnu/packages/hyperledger.scm +++ b/gnu/packages/hyperledger.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2019, 2020 Pierre Neidhardt ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -93,3 +93,46 @@ solutions, underpinned by a modular architecture focusing on confidentiality and resiliency. It is designed to support pluggable implementations of different components.") (license asl2.0))) + +(define-public hyperledger-iroha-ed25519 + (package + (name "hyperledger-iroha-ed25519") + (version "2.0.2") + (home-page "https://github.com/hyperledger/iroha-ed25519") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0kr1zwah8mhnpfrpk3h6hdafyqdl3ixhs7czdfscqv6vxqfiabc4")))) + (build-system cmake-build-system) + (native-inputs + `(("googletest" ,googletest))) + (arguments + `(#:tests? #f ; Tests don't build because CMake cannot find GTest main. + #:configure-flags '("-DHUNTER_ENABLED=OFF" + "-DBUILD=SHARED" + ;; TODO: x86_64 should use amd64-64-24k-pic but it + ;; fails to link when built as a shared library. + "-DEDIMPL=ref10" + "-DHASH=sha3_brainhub"))) + (synopsis "Ed25519 digital signature algorithm") + (description "This repository aims to provide modularized implementation +of the Ed25519 digital signature algorithm which is is described in +RFC8032 (@url{https://tools.ietf.org/html/rfc8032}). + +Originally Ed25519 consists of three modules: + +@itemize +@item digital signature algorithm itself +@item SHA512 hash function +@item random number generator, to generate keypairs +@end itemize + +This project offers at least two different C implementations for every +module. Every implementation can be replaced with another one at +link-time. New implementations can be added as well.") + (license asl2.0))) -- cgit v1.2.3 From f204d155e3d41e95dbd5e0eda42c74592c7b4262 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 10 Mar 2020 09:47:29 +0200 Subject: gnu: Add boost-1.69. * gnu/packages/boost.scm (boost-1.69): New hidden package. --- gnu/packages/boost.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 11fb8e1201..8bf2002adb 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Maxim Cournoyer -;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2018, 2020 Efraim Flashner ;;; Copyright © 2019 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. @@ -195,6 +195,29 @@ across a broad spectrum of applications.") (symlink "libboost_python27.a" "libboost_python.a")) #t))))))))) +(define-public boost-1.69 + (package + (inherit boost) + (name "boost") + (version "1.69.0") + (source (origin + (method url-fetch) + (uri (let ((version-with-underscores + (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version))) + (list (string-append "mirror://sourceforge/boost/boost/" version + "/boost_" version-with-underscores ".tar.bz2") + (string-append "https://dl.bintray.com/boostorg/release/" + version "/source/boost_" + version-with-underscores ".tar.bz2")))) + (sha256 + (base32 + "01j4n142dz20lcgqji8d8hspp04p1nv7m8i6dz8w5lchfdhx8clg")))) + (arguments + (substitute-keyword-arguments (package-arguments boost) + ((#:make-flags flags) + `(cons* "cxxflags=-std=c++14" ,flags)))) + (properties '((hidden? . #t))))) + (define-public boost-for-mysql ;; Older version for MySQL 5.7.23. (package -- cgit v1.2.3 From 04ff192ec4c815cf9a2e71fc0c796a6c6ce19429 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 10 Mar 2020 09:57:00 +0200 Subject: gnu: Add hyperledger-iroha. This package was co-authored with Efraim Flashner * gnu/packages/hyperledger.scm (hyperledger-iroha): New variable. --- gnu/packages/hyperledger.scm | 81 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm index 71194fba38..f0b33e0deb 100644 --- a/gnu/packages/hyperledger.scm +++ b/gnu/packages/hyperledger.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Pierre Neidhardt ;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,18 +20,28 @@ (define-module (gnu packages hyperledger) #:use-module (ice-9 match) + #:use-module (guix build-system cmake) #:use-module (guix build-system go) - #:use-module (guix build-system trivial) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix licenses) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages curl) + #:use-module (gnu packages databases) #:use-module (gnu packages docker) #:use-module (gnu packages golang) - #:use-module (gnu packages version-control)) + #:use-module (gnu packages logging) + #:use-module (gnu packages machine-learning) + #:use-module (gnu packages popt) + #:use-module (gnu packages pretty-print) + #:use-module (gnu packages protobuf) + #:use-module (gnu packages tbb) + #:use-module (gnu packages version-control) + #:use-module (gnu packages web)) (define-public hyperledger-fabric (package @@ -136,3 +147,69 @@ This project offers at least two different C implementations for every module. Every implementation can be replaced with another one at link-time. New implementations can be added as well.") (license asl2.0))) + +(define-public hyperledger-iroha + (package + (name "hyperledger-iroha") + (version "1.1.1") + (home-page "https://github.com/hyperledger/iroha") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "014mbwq059yxwihw0mq8zgns53fsw8ckczi1lw8q9pz3pk86pa9b")) + (modules '((guix build utils))) + (snippet + '(begin + ;; https://github.com/hyperledger/iroha/commit/4dc710d2e9a067af866771318f673c7392797e48 + ;; Backport unversioned fmt dependency, remove next update: + (substitute* "libs/logger/logger.hpp" + (("fmt::v5") "fmt")) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + '("-DTESTING=OFF" ; The tests fail to link correctly to googletest. + ;; Don't install the shared libraries of the dependencies: + "-DENABLE_LIBS_PACKAGING=OFF") + #:tests? #f + ;; https://iroha.readthedocs.io/en/latest/build/index.html#running-tests-optional + #:test-target ".")) + ;; https://github.com/hyperledger/iroha/blob/master/vcpkg/VCPKG_DEPS_LIST + (native-inputs + `(("fmt" ,fmt) + ("googletest" ,googletest) + ("rapidjson" ,rapidjson) + ("rxcpp" ,rxcpp) + ("spdlog" ,spdlog))) + (inputs + `(("boost" ,boost-1.69) + ("gflags" ,gflags) + ("grpc" ,grpc) + ("hyperledger-iroha-ed25519" ,hyperledger-iroha-ed25519) + ("postgresql" ,postgresql) + ("protobuf" ,protobuf) + ("soci" ,soci) + ("tbb" ,tbb))) + (synopsis "Simple, decentralized ledger") + (description "Iroha is a distributed ledger technology (DLT). Iroha has +essential functionality for your asset, information and identity management +needs, at the same time being a crash fault-tolerant tool. + +Iroha has the following features: + +@itemize +@item Creation and management of custom fungible assets, such as currencies, +kilos of gold, etc. +@item Management of user accounts +@item Taxonomy of accounts based on domains in the system +@item The system of rights and verification of user permissions for the +execution of transactions and queries in the system +@item Validation of business rules for transactions and queries in the system +@item Multisignature transactions +@end itemize\n") + (license asl2.0))) -- cgit v1.2.3 From 0b692ef2c6a1a1c6b8877ad9599b1ba506c1ec4a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:22:42 +0100 Subject: gnu: r-qtl: Update to 1.46-2. * gnu/packages/bioinformatics.scm (r-qtl): Update to 1.46-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 d95b58b0bb..bd9f2b566e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8288,7 +8288,7 @@ throughput genetic sequencing data sets using regression methods.") (define-public r-qtl (package (name "r-qtl") - (version "1.45-11") + (version "1.46-2") (source (origin (method url-fetch) @@ -8296,7 +8296,7 @@ throughput genetic sequencing data sets using regression methods.") version ".tar.gz")) (sha256 (base32 - "1d6qgj602fm6zia3djl4hmca0ri4v57ffp3g93p2yc3cabx2hq90")))) + "0rbwcnvyy96gq1dsgpxx03pv423qya26h6ws5y0blj3blfdmj83a")))) (build-system r-build-system) (home-page "https://rqtl.org/") (synopsis "R package for analyzing QTL experiments in genetics") -- cgit v1.2.3 From e0061f512554f3c7058f7ad528441a22bd72f52e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:22:54 +0100 Subject: gnu: r-mlinterfaces: Update to 1.66.5. * gnu/packages/bioconductor.scm (r-mlinterfaces): Update to 1.66.5. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 167cb00ece..c7892f83f1 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3605,14 +3605,14 @@ profiles (GO and KEGG) of gene and gene clusters.") (define-public r-mlinterfaces (package (name "r-mlinterfaces") - (version "1.66.4") + (version "1.66.5") (source (origin (method url-fetch) (uri (bioconductor-uri "MLInterfaces" version)) (sha256 (base32 - "19hlicdndy2p45y7w91gnwi3wgq5s465a646z3qqk8gmn5sn614q")))) + "05bg7qcrv485m03rkyq3qg5hrr1m3y7zx49bipwaivzqm3s1mbw5")))) (properties `((upstream-name . "MLInterfaces"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 0754fefb7505feca3311df129a8f5f5f25c28712 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:23:03 +0100 Subject: gnu: r-ggcyto: Update to 1.14.1. * gnu/packages/bioconductor.scm (r-ggcyto): Update to 1.14.1. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c7892f83f1..0ddae43481 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5570,14 +5570,14 @@ manipulation of flow cytometry data.") (define-public r-ggcyto (package (name "r-ggcyto") - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ggcyto" version)) (sha256 (base32 - "165qszvy5z176h1l3dnjb5dcm279b6bjl5n5gzz8wfn4xpn8anc8")))) + "16jwdslhmj1nsa28wmaircy15cq7qn8nsyiawinjv711qiqhgw50")))) (properties `((upstream-name . "ggcyto"))) (build-system r-build-system) (propagated-inputs @@ -5591,6 +5591,8 @@ manipulation of flow cytometry data.") ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-rlang" ,r-rlang) ("r-scales" ,r-scales))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/RGLab/ggcyto/issues") (synopsis "Visualize Cytometry data with ggplot") (description -- cgit v1.2.3 From 6bd6097ed58b06544b3ac1ae571b7a175ec729c4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:23:19 +0100 Subject: gnu: r-cicero: Update to 1.4.4. * gnu/packages/bioconductor.scm (r-cicero): Update to 1.4.4. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0ddae43481..4320bc0bb5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6027,14 +6027,14 @@ genes in the gene-set that are ranked above the leading edge).") (define-public r-cicero (package (name "r-cicero") - (version "1.4.2") + (version "1.4.4") (source (origin (method url-fetch) (uri (bioconductor-uri "cicero" version)) (sha256 (base32 - "154djqd32w87814ycfmfz27ikp17bnampvmvw5hzi5p2x9l3h82r")))) + "1ay1g2r0la4grcp1y8vcp211lfwzjf7j819ajzdirsh5dab8whld")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) @@ -6058,6 +6058,8 @@ genes in the gene-set that are ranked above the leading edge).") ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) ("r-vgam" ,r-vgam))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/cicero/") (synopsis "Predict cis-co-accessibility from single-cell data") (description -- cgit v1.2.3 From 117270fb51fc7fda73f5b99c1f92195a1f863a59 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:23:32 +0100 Subject: gnu: r-vctrs: Update to 0.2.4. * gnu/packages/cran.scm (r-vctrs): Update to 0.2.4. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4ef2f922ec..df4664b371 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4066,20 +4066,22 @@ to variables on the left-hand side of the assignment.") (define-public r-vctrs (package (name "r-vctrs") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) (uri (cran-uri "vctrs" version)) (sha256 (base32 - "1pnjnxp1pwsr083qa6xp5akls6q0pnjz8pq2m9d7z3kc1886sw8w")))) + "15sgzs6afvmhssk6jcg41rn3bvmzmbm4sgca6f6x8lfrsazvdj6w")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) ("r-ellipsis" ,r-ellipsis) ("r-glue" ,r-glue) ("r-rlang" ,r-rlang))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/r-lib/vctrs") (synopsis "Vector helpers") (description -- cgit v1.2.3 From f7306e465e98726085b5ce65aecba16646306d77 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:23:43 +0100 Subject: gnu: r-vim: Update to 5.1.1. * gnu/packages/cran.scm (r-vim): Update to 5.1.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index df4664b371..8f829352a3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5170,14 +5170,14 @@ specific S3-method.") (define-public r-vim (package (name "r-vim") - (version "5.1.0") + (version "5.1.1") (source (origin (method url-fetch) (uri (cran-uri "VIM" version)) (sha256 (base32 - "09600piny3qrxrmh8844iwrvgrhwan1c3nlh6irqy1vjha2w4gb3")))) + "0w22ir0gvym7gqd6nw2j7w5ivlb3az1dkfxv33imimkb7c83056a")))) (properties `((upstream-name . "VIM"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From cd26e5dee85cfb2fc8c1b9115d78ce03c0fbb441 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:23:48 +0100 Subject: gnu: r-catdap: Update to 1.3.5. * gnu/packages/cran.scm (r-catdap): Update to 1.3.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8f829352a3..ce6a82e640 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5305,14 +5305,14 @@ contain lags, diffs and missing values.") (define-public r-catdap (package (name "r-catdap") - (version "1.3.4") + (version "1.3.5") (source (origin (method url-fetch) (uri (cran-uri "catdap" version)) (sha256 (base32 - "0i877l61f6c75pczi235rzci67w29zv1d7z5zn5p5ymndclvlpl2")))) + "0fyhl69z2lznymvpzxra9qvcg85ggzkfjy68c6mzdmf1ja44d2k5")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 69a3c4ce514c38ec9e31ac78fe58870dc93a7e17 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:23:58 +0100 Subject: gnu: r-sjplot: Update to 2.8.3. * gnu/packages/cran.scm (r-sjplot): Update to 2.8.3. [propagated-inputs]: Remove r-forcats. [native-inputs]: Remove r-knitr. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ce6a82e640..3ea40713cd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8587,20 +8587,19 @@ conversion of indices such as Cohen's d, r, odds, etc.") (define-public r-sjplot (package (name "r-sjplot") - (version "2.8.2") + (version "2.8.3") (source (origin (method url-fetch) (uri (cran-uri "sjPlot" version)) (sha256 - (base32 "16721a5006q0gv45zjcwnkykxhjkzpq5n35vhik0g0ixgm3a2vci")))) + (base32 "0ip1rkjlhyf3axlc8qqss1qq1f0xrda890c1jmcbhm98wwjw264f")))) (properties `((upstream-name . "sjPlot"))) (build-system r-build-system) (propagated-inputs `(("r-bayestestr" ,r-bayestestr) ("r-dplyr" ,r-dplyr) ("r-effectsize" ,r-effectsize) - ("r-forcats" ,r-forcats) ("r-ggeffects" ,r-ggeffects) ("r-ggplot2" ,r-ggplot2) ("r-insight" ,r-insight) @@ -8615,6 +8614,8 @@ conversion of indices such as Cohen's d, r, odds, etc.") ("r-sjmisc" ,r-sjmisc) ("r-sjstats" ,r-sjstats) ("r-tidyr" ,r-tidyr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://strengejacke.github.io/sjPlot/") (synopsis "Data visualization for statistics in social science") (description -- cgit v1.2.3 From d520e4c94220a821c179f7e16f90018c368c8e48 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:24:16 +0100 Subject: gnu: r-rcppparallel: Update to 5.0.0. * gnu/packages/cran.scm (r-rcppparallel): Update to 5.0.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3ea40713cd..04820020dc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9243,14 +9243,14 @@ package provides a minimal R interface by relying on the Rcpp package.") (define-public r-rcppparallel (package (name "r-rcppparallel") - (version "4.4.4") + (version "5.0.0") (source (origin (method url-fetch) (uri (cran-uri "RcppParallel" version)) (sha256 (base32 - "0p13f2mywjr7gmskf8ri4y8p5yr1bvr4xrpw2w11vdvafwz1vcia")))) + "1mhd6vp47xmfw533h0pkvydv96m57fspvd85g8m7iqb5rcxvhhdb")))) (properties `((upstream-name . "RcppParallel"))) (build-system r-build-system) (home-page "http://rcppcore.github.io/RcppParallel") -- cgit v1.2.3 From dca5a8143f885a35ba2407c19093f893caa81787 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:24:24 +0100 Subject: gnu: r-tidytree: Update to 0.3.2. * gnu/packages/cran.scm (r-tidytree): Update to 0.3.2. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 04820020dc..84b9529cf7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9826,13 +9826,13 @@ maps.") (define-public r-tidytree (package (name "r-tidytree") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (cran-uri "tidytree" version)) (sha256 - (base32 "1bnzs62z2l8ck2h9gabmxvayizv4nfn8dmyzry83fv0cspjbyiv7")))) + (base32 "0dx9jn19mfykn20camsmq1amlgg0w6z5hn5rdqygs1fk1l5aazad")))) (build-system r-build-system) (propagated-inputs `(("r-ape" ,r-ape) @@ -9841,6 +9841,8 @@ maps.") ("r-magrittr" ,r-magrittr) ("r-rlang" ,r-rlang) ("r-tibble" ,r-tibble))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/GuangchuangYu/tidytree") (synopsis "Tidy tool for phylogenetic tree data manipulation") (description -- cgit v1.2.3 From a85aef2d75b681e4f7c9c8539eac9045d1e7b40e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:24:35 +0100 Subject: gnu: r-spatialextremes: Update to 2.0-8. * gnu/packages/cran.scm (r-spatialextremes): Update to 2.0-8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 84b9529cf7..7b346f2f51 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11205,14 +11205,14 @@ covariance functions for large data sets.") (define-public r-spatialextremes (package (name "r-spatialextremes") - (version "2.0-7.2") + (version "2.0-8") (source (origin (method url-fetch) (uri (cran-uri "SpatialExtremes" version)) (sha256 (base32 - "0aqq9ryxi4xsdqjhc1lhb7ai8szs7m2vys6nn0ygps1w3pm4xwj8")))) + "0r2byz5xxc46zqnigdax28q7446ibmzmsmi10lmm2hdks3ml6sl3")))) (properties `((upstream-name . "SpatialExtremes"))) (build-system r-build-system) -- cgit v1.2.3 From f718c28cc6f8f4b338bf9483fd00522bccbf613c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:24:41 +0100 Subject: gnu: r-pegas: Update to 0.13. * gnu/packages/cran.scm (r-pegas): Update to 0.13. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7b346f2f51..2229ba06e5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13250,13 +13250,13 @@ also provided to illustrate various methods.") (define-public r-pegas (package (name "r-pegas") - (version "0.12") + (version "0.13") (source (origin (method url-fetch) (uri (cran-uri "pegas" version)) (sha256 - (base32 "0sb8cmz4d238mcb56hv9fa0cagm00k82r7aj4cj4lxa1flxlpy8p")))) + (base32 "002i7s4g0nhnq0v05gs0yssqiyhpq2f7rw2rhn31hsbgxc86frvy")))) (build-system r-build-system) (propagated-inputs `(("r-adegenet" ,r-adegenet) -- cgit v1.2.3 From 0cc0e7e3701be2bd455829d33a613dc62c99a138 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:24:47 +0100 Subject: gnu: r-ggplotify: Update to 0.0.5. * gnu/packages/cran.scm (r-ggplotify): Update to 0.0.5. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2229ba06e5..e9af6440da 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14082,19 +14082,21 @@ package.") (define-public r-ggplotify (package (name "r-ggplotify") - (version "0.0.4") + (version "0.0.5") (source (origin (method url-fetch) (uri (cran-uri "ggplotify" version)) (sha256 (base32 - "0nv3wdmxnc5ww9m3xlgnb0jp30j45dg33nqc6gg3y36svg8anjcg")))) + "0pfnp4lrissf21z7867kdm6slr979kchyva8iaf83i1302kscph3")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) ("r-gridgraphics" ,r-gridgraphics) ("r-rvcheck" ,r-rvcheck))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/GuangchuangYu/ggplotify") (synopsis "Convert plots to @code{grob} or @code{ggplot} object") (description -- cgit v1.2.3 From 9d3d3d1bd55f34f02643df557ca3875ebf3e68b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:25:03 +0100 Subject: gnu: r-ggfortify: Update to 0.4.9. * gnu/packages/cran.scm (r-ggfortify): Update to 0.4.9. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e9af6440da..0f9053bcfb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15219,14 +15219,14 @@ includes data sets from oceanography.") (define-public r-ggfortify (package (name "r-ggfortify") - (version "0.4.8") + (version "0.4.9") (source (origin (method url-fetch) (uri (cran-uri "ggfortify" version)) (sha256 (base32 - "191q2z7w0l4v7swjlxs2hjgbjngw2838688s7ygnj0kigsm310f3")))) + "1p6knrbyaynaqwd939w09hpf1zz1gn95cb46sfgppl8l98krb2h5")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) @@ -15236,6 +15236,8 @@ includes data sets from oceanography.") ("r-stringr" ,r-stringr) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/sinhrks/ggfortify") (synopsis "Data visualization tools for statistical analysis results") (description -- cgit v1.2.3 From 40ac3dc3949d08210c9b1e6f0e509e488202fa69 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:25:20 +0100 Subject: gnu: r-graphlayouts: Update to 0.6.0. * gnu/packages/cran.scm (r-graphlayouts): Update to 0.6.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0f9053bcfb..c57fadc6d7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15763,14 +15763,14 @@ be used further by e.g. graphic devices.") (define-public r-graphlayouts (package (name "r-graphlayouts") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "graphlayouts" version)) (sha256 (base32 - "03dizbhhdhnzbj2i5zvqgs617kwcv4h2pha4f16adic0fph1rxl3")))) + "1la016m37kp79zk8p1yx9kaha8y6d4w52w39h0mzv1mfsi6d75w0")))) (properties `((upstream-name . "graphlayouts"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ca29e40dac82705bcc87bad7dfa324f7369f7f3d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:25:28 +0100 Subject: gnu: r-parameters: Update to 0.6.0. * gnu/packages/cran.scm (r-parameters): Update to 0.6.0. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c57fadc6d7..f4b72f1102 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15880,19 +15880,21 @@ in pipelines.") (define-public r-parameters (package (name "r-parameters") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "19cblrq079svp5j3wgikw5fsdbsp1w0f2llm7kcf1rg5w1aagjr7")))) + "0zin3ikc013hc713n5zs0dbhc3m4nfw1vhc3924z0mrww8r241xn")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs `(("r-bayestestr" ,r-bayestestr) ("r-insight" ,r-insight))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/parameters") (synopsis "Processing of model parameters") (description -- cgit v1.2.3 From 4dab179de2f7201a8bbb89a3095880f333cd609b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:25:40 +0100 Subject: gnu: r-cdm: Update to 7.5-15. * gnu/packages/cran.scm (r-cdm): Update to 7.5-15. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f4b72f1102..b2b4bab199 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20097,14 +20097,14 @@ translated to input syntax for the R packages @code{sem} and @code{lavaan}.") (define-public r-cdm (package (name "r-cdm") - (version "7.4-19") + (version "7.5-15") (source (origin (method url-fetch) (uri (cran-uri "CDM" version)) (sha256 (base32 - "1ln1r3rk004fmk55iy08bjh3vv4wnkb8zg2wj3r9rq7pi8jn8fv4")))) + "159ny2dz0rf1r3k1mqlfwambffc8rx425sggf5bn51nybpzanq3l")))) (properties `((upstream-name . "CDM"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From defbaab3f8ad3bd241d329e68a1ba563d65ec111 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:25:47 +0100 Subject: gnu: r-tam: Update to 3.4-26. * gnu/packages/cran.scm (r-tam): Update to 3.4-26. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b2b4bab199..406ccc644b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20131,14 +20131,14 @@ well as Ravand and Robitzsch (2015).") (define-public r-tam (package (name "r-tam") - (version "3.3-10") + (version "3.4-26") (source (origin (method url-fetch) (uri (cran-uri "TAM" version)) (sha256 (base32 - "1rkjp5x6wrk1dfspp1imvfals0wvy4w1wb8a5mhfbnilc7vgnlbq")))) + "111d7qkxhwh1lfvldyh9d61pdb5vb6x8lr8n9h95ssvw07vjqvk9")))) (properties `((upstream-name . "TAM"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 09583a0f790a9f45985de260a7ffa405f774a6ab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:26:22 +0100 Subject: gnu: r-xml2: Update to 1.2.5. * gnu/packages/statistics.scm (r-xml2): Update to 1.2.5. [native-inputs]: Add r-knitr. --- 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 5354f39b0c..64156408ac 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1983,20 +1983,21 @@ and environmental data in the framework of Euclidean exploratory methods.") (define-public r-xml2 (package (name "r-xml2") - (version "1.2.2") + (version "1.2.5") (source (origin (method url-fetch) (uri (cran-uri "xml2" version)) (sha256 (base32 - "1x3q3a0xv8j0nx3hs4d3pfjm5g9nvaxmfrapba9f4nrkqi3z2l1h")))) + "0mp61gg8s3zfq10g10vjk0mrcx6d5gm81n4ji8an2my11g61yq94")))) (build-system r-build-system) (inputs `(("libxml2" ,libxml2) ("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("r-knitr" ,r-knitr))) (propagated-inputs `(("r-rcpp" ,r-rcpp))) (home-page "https://github.com/hadley/xml2") -- cgit v1.2.3 From 66f1fead636d22c6a3d72126b5b809d6da165afe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:26:39 +0100 Subject: gnu: r-roxygen2: Update to 7.1.0. * gnu/packages/statistics.scm (r-roxygen2): Update to 7.1.0. [native-inputs]: Move r-knitr from here... [propagated-inputs]: ...to here. --- 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 64156408ac..e4d6723d86 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2264,19 +2264,20 @@ tables, autolinks and strikethrough text.") (define-public r-roxygen2 (package (name "r-roxygen2") - (version "7.0.2") + (version "7.1.0") (source (origin (method url-fetch) (uri (cran-uri "roxygen2" version)) (sha256 (base32 - "162xag27hwwyadfwm5zpyy15nxwhw2vbhwapx3jmi9cfyryr68sq")))) + "00s1wzx5960k8pzgpz4kikjf4k061hyhnd278y65q6n0wzv3d6vy")))) (build-system r-build-system) (propagated-inputs `(("r-brew" ,r-brew) ("r-commonmark" ,r-commonmark) ("r-desc" ,r-desc) ("r-digest" ,r-digest) + ("r-knitr" ,r-knitr) ("r-pkgload" ,r-pkgload) ("r-purrr" ,r-purrr) ("r-r6" ,r-r6) @@ -2285,8 +2286,6 @@ tables, autolinks and strikethrough text.") ("r-stringi" ,r-stringi) ("r-stringr" ,r-stringr) ("r-xml2" ,r-xml2))) - (native-inputs - `(("r-knitr" ,r-knitr))) ; for vignettes (home-page "https://github.com/klutometis/roxygen") (synopsis "In-source documentation system for R") (description -- cgit v1.2.3 From 92d6c94a1687d9b56c59a2afd5172ab6a4d63bbe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:27:02 +0100 Subject: gnu: r-nloptr: Update to 1.2.2.1. * gnu/packages/statistics.scm (r-nloptr): Update to 1.2.2.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 e4d6723d86..cee6dd477a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5101,14 +5101,14 @@ expected shortfall risk are also included.") (define-public r-nloptr (package (name "r-nloptr") - (version "1.2.2") + (version "1.2.2.1") (source (origin (method url-fetch) (uri (cran-uri "nloptr" version)) (sha256 (base32 - "19k7nd3a7cg35k5i1cwj1lhgfs02jb7bc2gwlammpq6j41rh4vr7")))) + "1bhh2v14phzndjhiq7yw9vych6vzn5yy3vk9q35zcp3jhjjbwdyh")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr) ; for building vignettes -- cgit v1.2.3 From 72e76113f7731190881267856d3f91775450f147 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Mar 2020 14:27:12 +0100 Subject: gnu: r-car: Update to 3.0-7. * gnu/packages/statistics.scm (r-car): Update to 3.0-7. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index cee6dd477a..6616780081 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015 Vicente Vera Parra ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2016, 2017, 2019 Efraim Flashner @@ -5204,13 +5204,13 @@ Companion to Applied Regression, Third Edition, Sage.") (define-public r-car (package (name "r-car") - (version "3.0-6") + (version "3.0-7") (source (origin (method url-fetch) (uri (cran-uri "car" version)) (sha256 - (base32 "0yv5mwaa0ymrbis9590mx0zcj3w6j4drhs6ab13zhx4zc3x1b7b6")))) + (base32 "11sfk1l41j27mrfy16g7b02c570n3gy9icvpcrfjh1biykqa565d")))) (build-system r-build-system) (propagated-inputs `(("r-abind" ,r-abind) @@ -5224,6 +5224,8 @@ Companion to Applied Regression, Third Edition, Sage.") ("r-pbkrtest" ,r-pbkrtest) ("r-quantreg" ,r-quantreg) ("r-rio" ,r-rio))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://r-forge.r-project.org/projects/car/") (synopsis "Companion to applied regression") (description -- cgit v1.2.3 From 0c08e4bfa1cb760a8f103b5223f0220617a93025 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Mar 2020 16:39:56 +0200 Subject: gnu: edirect: Update to 13.3.20200128. * gnu/packages/bioinformatics.scm (edirect): Update to 13.3.20200128. [source]: Remove bundled certificate authority tarball. --- gnu/packages/bioinformatics.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bd9f2b566e..4dedee6223 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2755,7 +2755,7 @@ quantitative phenotypes.") (define-public edirect (package (name "edirect") - (version "12.1.20190829") + (version "13.3.20200128") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.ncbi.nlm.nih.gov/entrez/entrezdirect" @@ -2763,7 +2763,10 @@ quantitative phenotypes.") "/edirect-" version ".tar.gz")) (sha256 (base32 - "1xb330z28dgp7slrvp8r7rgncsasv9lpcpqim571yg728dq7xdik")))) + "093zp7klv81ph0y8mm8d78a9hnpfxbv2kdym70gzdf3vz176rw33")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file "Mozilla-CA.tar.gz") #t)))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From be78906592c761aa2a67e979074561e459efdcac Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Thu, 12 Mar 2020 16:25:33 +0530 Subject: gnu: Add guile-torrent. * gnu/packages/guile-xyz.scm (guile-torrent): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/guile-xyz.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b71b0178d6..9f8173657e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 swedebugia -;;; Copyright © 2019 Amar Singh +;;; Copyright © 2019, 2020 Amar Singh ;;; Copyright © 2019 Timothy Sample ;;; ;;; This file is part of GNU Guix. @@ -3144,3 +3144,33 @@ models and also supports a rich set of boolean query operators.") (inputs `(("guile" ,guile-next) ,@(alist-delete "guile" (package-inputs guile-xapian)))))) + +(define-public guile-torrent + (package + (name "guile-torrent") + (version "0.1.3") + (source (origin (method git-fetch) + (uri (git-reference + (url + "https://github.com/o-nly/torrent.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yiagi55ncq1x7s9n7salzywjm4l96y3n7y3s47a9anvz87mrmim")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("guile" ,guile-2.2) + ("texinfo" ,texinfo) + ("perl" ,perl) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("guile-gcrypt" ,guile-gcrypt))) + (home-page "https://github.com/o-nly/torrent") + (synopsis "Torrent library for GNU Guile") + (description "This package provides facilities for working with +@code{.torrent} or metainfo files. Implements a bencode reader and writer +according to Bitorrent BEP003.") + (license license:gpl3+))) -- cgit v1.2.3 From cf2ac04f13d9266c7c8a2ebd2e85ef593231ac9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 6 Mar 2020 11:25:43 +0100 Subject: gexp: Add 'with-parameters'. * guix/gexp.scm (): New record type. (with-parameters): New macro. (compile-parameterized): New gexp compiler. * tests/gexp.scm ("with-parameters for %current-system") ("with-parameters for %current-target-system") ("with-parameters + file-append"): New tests. * doc/guix.texi (G-Expressions): Document it. --- .dir-locals.el | 1 + doc/guix.texi | 19 +++++++++++++++++++ guix/gexp.scm | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/gexp.scm | 38 +++++++++++++++++++++++++++++++++++++ 4 files changed, 117 insertions(+) diff --git a/.dir-locals.el b/.dir-locals.el index 5ce3fbc9a5..1976f7e60d 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -83,6 +83,7 @@ (eval . (put 'wrap-program 'scheme-indent-function 1)) (eval . (put 'with-imported-modules 'scheme-indent-function 1)) (eval . (put 'with-extensions 'scheme-indent-function 1)) + (eval . (put 'with-parameters 'scheme-indent-function 1)) (eval . (put 'with-database 'scheme-indent-function 2)) (eval . (put 'call-with-transaction 'scheme-indent-function 2)) diff --git a/doc/guix.texi b/doc/guix.texi index dd32b65fe0..4f8f7cfb2a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8022,6 +8022,25 @@ the second case, the resulting script contains a @code{(string-append @dots{})} expression to construct the file name @emph{at run time}. @end deffn +@deffn {Scheme Syntax} with-parameters ((@var{parameter} @var{value}) @dots{}) @var{exp} +This macro is similar to the @code{parameterize} form for +dynamically-bound @dfn{parameters} (@pxref{Parameters,,, guile, GNU +Guile Reference Manual}). The key difference is that it takes effect +when the file-like object returned by @var{exp} is lowered to a +derivation or store item. + +A typical use of @code{with-parameters} is to force the system in effect +for a given object: + +@lisp +(with-parameters ((%current-system "i686-linux")) + coreutils) +@end lisp + +The example above returns an object that corresponds to the i686 build +of Coreutils, regardless of the current value of @code{%current-system}. +@end deffn + Of course, in addition to gexps embedded in ``host'' code, there are also modules containing build tools. To make it clear that they are diff --git a/guix/gexp.scm b/guix/gexp.scm index a657921741..133e0f5679 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -82,6 +82,9 @@ raw-derivation-file raw-derivation-file? + with-parameters + parameterized? + load-path-expression gexp-modules @@ -523,6 +526,62 @@ SUFFIX." (base (expand base lowered output))) (string-append base (string-concatenate suffix))))))) +;; Representation of SRFI-39 parameter settings in the dynamic scope of an +;; object lowering. +(define-record-type + (parameterized bindings thunk) + parameterized? + (bindings parameterized-bindings) ;list of parameter/value pairs + (thunk parameterized-thunk)) ;thunk + +(define-syntax-rule (with-parameters ((param value) ...) body ...) + "Bind each PARAM to the corresponding VALUE for the extent during which BODY +is lowered. Consider this example: + + (with-parameters ((%current-system \"x86_64-linux\")) + coreutils) + +It returns a object that ensures %CURRENT-SYSTEM is set to +x86_64-linux when COREUTILS is lowered." + (parameterized (list (list param (lambda () value)) ...) + (lambda () + body ...))) + +(define-gexp-compiler compile-parameterized + compiler => + (lambda (parameterized system target) + (match (parameterized-bindings parameterized) + (((parameters values) ...) + (let ((fluids (map parameter-fluid parameters)) + (thunk (parameterized-thunk parameterized))) + ;; Install the PARAMETERS for the dynamic extent of THUNK. + (with-fluids* fluids + (map (lambda (thunk) (thunk)) values) + (lambda () + ;; Special-case '%current-system' and '%current-target-system' to + ;; make sure we get the desired effect. + (let ((system (if (memq %current-system parameters) + (%current-system) + system)) + (target (if (memq %current-target-system parameters) + (%current-target-system) + target))) + (lower-object (thunk) system #:target target)))))))) + + expander => (lambda (parameterized lowered output) + (match (parameterized-bindings parameterized) + (((parameters values) ...) + (let ((fluids (map parameter-fluid parameters)) + (thunk (parameterized-thunk parameterized))) + ;; Install the PARAMETERS for the dynamic extent of THUNK. + (with-fluids* fluids + (map (lambda (thunk) (thunk)) values) + (lambda () + ;; Delegate to the expander of the wrapped object. + (let* ((base (thunk)) + (expand (lookup-expander base))) + (expand base lowered output))))))))) + ;;; ;;; Inputs & outputs. diff --git a/tests/gexp.scm b/tests/gexp.scm index 9e38816c3d..6a42d3eb57 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -284,6 +284,44 @@ (((thing "out")) (eq? thing file)))))) +(test-assertm "with-parameters for %current-system" + (mlet* %store-monad ((system -> (match (%current-system) + ("aarch64-linux" "x86_64-linux") + (_ "aarch64-linux"))) + (drv (package->derivation coreutils system)) + (obj -> (with-parameters ((%current-system system)) + coreutils)) + (result (lower-object obj))) + (return (string=? (derivation-file-name drv) + (derivation-file-name result))))) + +(test-assertm "with-parameters for %current-target-system" + (mlet* %store-monad ((target -> "riscv64-linux-gnu") + (drv (package->cross-derivation coreutils target)) + (obj -> (with-parameters + ((%current-target-system target)) + coreutils)) + (result (lower-object obj))) + (return (string=? (derivation-file-name drv) + (derivation-file-name result))))) + +(test-assert "with-parameters + file-append" + (let* ((system (match (%current-system) + ("aarch64-linux" "x86_64-linux") + (_ "aarch64-linux"))) + (drv (package-derivation %store coreutils system)) + (param (make-parameter 7)) + (exp #~(here we go #$(with-parameters ((%current-system system) + (param 42)) + (if (= (param) 42) + (file-append coreutils "/bin/touch") + %bootstrap-guile))))) + (match (gexp->sexp* exp) + (('here 'we 'go (? string? result)) + (string=? result + (string-append (derivation->output-path drv) + "/bin/touch")))))) + (test-assert "ungexp + ungexp-native" (let* ((exp (gexp (list (ungexp-native %bootstrap-guile) (ungexp coreutils) -- cgit v1.2.3 From 22464cf32abcd38311eb29001a23b26f8c4c54dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 12 Mar 2020 15:44:26 +0100 Subject: gnu: singularity: Wrap programs so they find Coreutils. * gnu/packages/linux.scm (singularity)[arguments]: Add 'set-PATH' phase. --- gnu/packages/linux.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b6048a8cfb..e864e17800 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3494,7 +3494,19 @@ thanks to the use of namespaces.") (("if ! singularity_which mksquashfs") "if 0") (("if ! mksquashfs") (string-append "if ! " (which "mksquashfs")))) - #t))))) + #t)) + (add-after 'install 'set-PATH + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Have the 'singularity' and 'run-singularity' self-sufficient. + (let ((out (assoc-ref outputs "out")) + (coreutils (assoc-ref inputs "coreutils"))) + (wrap-program (string-append out "/bin/singularity") + `("PATH" ":" = (,(string-append coreutils "/bin")))) + (substitute* (string-append out "/bin/run-singularity") + (("/usr/bin/env singularity") + (string-append (which "env") " " + out "/bin/singularity"))) + #t)))))) (inputs `(("libarchive" ,libarchive) ("python" ,python-wrapper) -- cgit v1.2.3 From e0dbed64c530916ab600f193f5f6f6ad6177f7b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 12 Mar 2020 16:38:44 +0100 Subject: gnu: singularity: Do not use the "errors=remount-ro" squashfs option. This mount option stopped being supported with Linux-libre 5.4.5: http://ci.guix.gnu.org/build/2056359/details * gnu/packages/linux.scm (singularity)[source]: Remove "errors=remount-ro" mount option from source code. --- gnu/packages/linux.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e864e17800..01986222e8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3482,6 +3482,12 @@ thanks to the use of namespaces.") _ program) (string-append "/run/setuid-programs/singularity-" program "-helper"))) + + ;; These squashfs mount options are apparently no longer + ;; supported since Linux-libre 5.4.5. + (substitute* "src/lib/image/squashfs/mount.c" + (("\"errors=remount-ro\"") + "NULL")) #t)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 71bb485541328cdce214ada44be998570571bf36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 12 Mar 2020 18:10:26 +0100 Subject: weather: Add '--display-missing'. * guix/scripts/weather.scm (report-server-coverage): Add #:display-missing? and honor it. (show-help, %options): Add "--display-missing". (guix-weather): Pass #:display-missing? to 'report-server-coverage'. * doc/guix.texi (Invoking guix weather): Document it. --- doc/guix.texi | 3 +++ guix/scripts/weather.scm | 22 ++++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 4f8f7cfb2a..ca21857a31 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10860,6 +10860,9 @@ likewise for @code{qgpgme} and the 46 packages that depend on it. If you are a Guix developer, or if you are taking care of this build farm, you'll probably want to have a closer look at these packages: they may simply fail to build. + +@item --display-missing +Display the list of store items for which substitutes are missing. @end table @node Invoking guix processes diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm index 629844768a..60915d3451 100644 --- a/guix/scripts/weather.scm +++ b/guix/scripts/weather.scm @@ -175,8 +175,10 @@ about the derivations queued, as is the case with Hydra." #f ;no derivation information (lset-intersection string=? queued items))) -(define (report-server-coverage server items) - "Report the subset of ITEMS available as substitutes on SERVER." +(define* (report-server-coverage server items + #:key display-missing?) + "Report the subset of ITEMS available as substitutes on SERVER. +When DISPLAY-MISSING? is true, display the list of missing substitutes." (define MiB (* (expt 2 20) 1.)) (format #t (G_ "looking for ~h store items on ~a...~%") @@ -260,7 +262,12 @@ are queued~%") system (* (throughput builds build-timestamp) 3600.)))) - (histogram build-system cons '() latest))))))) + (histogram build-system cons '() latest)))) + + (when (and display-missing? (not (null? missing))) + (newline) + (format #t (G_ "Substitutes are missing for the following items:~%")) + (format #t "~{ ~a~%~}" missing))))) ;;; @@ -280,6 +287,8 @@ Report the availability of substitutes.\n")) -c, --coverage[=COUNT] show substitute coverage for packages with at least COUNT dependents")) + (display (G_ " + --display-missing display the list of missing substitutes")) (display (G_ " -s, --system=SYSTEM consider substitutes for SYSTEM--e.g., \"i686-linux\"")) (newline) @@ -318,6 +327,9 @@ Report the availability of substitutes.\n")) (alist-cons 'coverage (if arg (string->number* arg) 0) result))) + (option '("display-missing") #f #f + (lambda (opt name arg result) + (alist-cons 'display-missing? #t result))) (option '(#\s "system") #t #f (lambda (opt name arg result) (alist-cons 'system arg result))))) @@ -525,7 +537,9 @@ SERVER. Display information for packages with at least THRESHOLD dependents." (package-outputs packages system)) systems)))))) (for-each (lambda (server) - (report-server-coverage server items) + (report-server-coverage server items + #:display-missing? + (assoc-ref opts 'display-missing?)) (match (assoc-ref opts 'coverage) (#f #f) (threshold -- cgit v1.2.3 From 2843fed0e973145f01fb2004c99aca8e8837b332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 12 Mar 2020 18:30:05 +0100 Subject: weather: Allow for multiple '--manifest' options. * guix/scripts/weather.scm (guix-weather)[package-list]: Account for all the 'manifest entries in OPTS. * doc/guix.texi (Invoking guix weather): Document it. --- doc/guix.texi | 3 +++ guix/scripts/weather.scm | 22 ++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ca21857a31..9a5b5f7fbe 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10830,6 +10830,9 @@ specified in @var{file}. @var{file} must contain a @dfn{manifest}, as with the @code{-m} option of @command{guix package} (@pxref{Invoking guix package}). +This option can be repeated several times, in which case the manifests +are concatenated. + @item --coverage[=@var{count}] @itemx -c [@var{count}] Report on substitute coverage for packages: list packages with at least diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm index 60915d3451..733986be0c 100644 --- a/guix/scripts/weather.scm +++ b/guix/scripts/weather.scm @@ -499,17 +499,19 @@ SERVER. Display information for packages with at least THRESHOLD dependents." (define (guix-weather . args) (define (package-list opts) ;; Return the package list specified by OPTS. - (let ((file (assoc-ref opts 'manifest)) - (base (filter-map (match-lambda - (('argument . spec) - (specification->package spec)) - (_ - #f)) - opts))) - (if (and (not file) (null? base)) + (let ((files (filter-map (match-lambda + (('manifest . file) file) + (_ #f)) + opts)) + (base (filter-map (match-lambda + (('argument . spec) + (specification->package spec)) + (_ + #f)) + opts))) + (if (and (null? files) (null? base)) (all-packages) - (append base - (if file (load-manifest file) '()))))) + (append base (append-map load-manifest files))))) (with-error-handling (parameterize ((current-terminal-columns (terminal-columns)) -- cgit v1.2.3 From b431f6c9ccfa104811dc0697d6fec84bf8b08035 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Thu, 12 Mar 2020 17:14:15 +0200 Subject: gnu: ghc-extra: Update to 1.7.1. * gnu/packages/haskell-xyz.scm (ghc-extra): Update to 1.7.1. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e368082c03..418eb7cc46 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3774,7 +3774,7 @@ versions of GHC (i.e., < 6.10).") (define-public ghc-extra (package (name "ghc-extra") - (version "1.6.18") + (version "1.7.1") (source (origin (method url-fetch) @@ -3784,12 +3784,13 @@ versions of GHC (i.e., < 6.10).") ".tar.gz")) (sha256 (base32 - "0jvd4l0hi8pf5899pxc32yc638y0mrc357w0rph99k3hm277i0cy")))) + "0zshxv9dnd8vksncmb8dj4wvq2wdybzwxyhmy2zp6a81icm4azx4")))) (build-system haskell-build-system) (inputs `(("ghc-clock" ,ghc-clock) ("ghc-semigroups" ,ghc-semigroups) - ("ghc-quickcheck" ,ghc-quickcheck))) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances))) (home-page "https://github.com/ndmitchell/extra") (synopsis "Extra Haskell functions") (description "This library provides extra functions for the standard -- cgit v1.2.3 From 0f864175dcfa23562744630cb3313de583856a66 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Thu, 12 Mar 2020 00:01:20 -0400 Subject: gnu: mingw-w64-*: Update to 7.0.0. * gnu/packages/mingw.scm (make-mingw-w64): Update to 7.0.0. --- gnu/packages/mingw.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index 88c8d41ef8..d0785c5067 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -45,14 +45,14 @@ specified, recurse and return a mingw-w64 with support for winpthreads." (package (name (string-append "mingw-w64" "-" machine (if with-winpthreads? "-winpthreads" ""))) - (version "6.0.0") + (version "7.0.0") (source (origin (method url-fetch) (uri (string-append "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/" "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 - (base32 "1w28mynv500y03h92nh87rgw3fnp82qwnjbxrrzqkmr63q812pl0")) + (base32 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6pzxy85a")) (patches (search-patches "mingw-w64-6.0.0-gcc.patch")))) (native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet))) ("xbinutils" ,(if xbinutils xbinutils (cross-binutils triplet))) -- cgit v1.2.3 From dcd7a97b8c5a68cd82ca91988e371442c6002b20 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 12 Mar 2020 20:49:19 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.216. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.216. (linux-libre-4.4-pristine-source): 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 01986222e8..0f4bc88ceb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -394,10 +394,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.215") +(define-public linux-libre-4.4-version "4.4.216") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "00zy6cxwb16pqziiqs25pz5llryx2v2nbk9vvzpzxa8x43ad7g18"))) + (hash (base32 "1hjgh9brvxzi6ypgfnk07l3j28xsxgz88sdshnz19vj96bn1w70q"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From e0d5a43e516a858a97f046a3f0241a753232fda9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 12 Mar 2020 20:50:24 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.216. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.216. (linux-libre-4.9-pristine-source): 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 0f4bc88ceb..ffb66b3644 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -386,10 +386,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.215") +(define-public linux-libre-4.9-version "4.9.216") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0j4z2al318654z40w4f8zhh73zwpgn8igjr5k4mz401phm3jyvr3"))) + (hash (base32 "0lgv5k8v5xz9z2z4k42566bh0akyk1gr0dx6s1m1rjrzsf9k86l6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 230a59d418f3835b586594b9b8dd9b6939fd4497 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 12 Mar 2020 20:50:52 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.173. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.173. (linux-libre-4.14-pristine-source): 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 ffb66b3644..4f09440ec6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -378,10 +378,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.172") +(define-public linux-libre-4.14-version "4.14.173") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0yi13cky6jdswca7nrjgcrdxk8rnqdbhblhy6mws103mjfms2613"))) + (hash (base32 "0kxp3mgiags8hdax15masab9zr89xraqvl9ri7zwgksx8ixav0m2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 2a2bef35b80ea8507be1c6faf873dd6bfa3e42b9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 12 Mar 2020 20:51:25 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.109. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.109. (linux-libre-4.19-pristine-source): 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 4f09440ec6..e4dc378466 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,10 +370,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.108") +(define-public linux-libre-4.19-version "4.19.109") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "18shyy1z2s8r26qb4rcz7gwl43dnmycjjywp9gss5zlfn2jyrbh9"))) + (hash (base32 "0kwnlv5336vqdf38dzn077ic17zkb4rl5khxmc47syzd9zm4fhnh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From ebbe8adc3faf2420a709177a5eda8e36cf8784dc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 12 Mar 2020 20:51:59 -0400 Subject: gnu: linux-libre: Update to 5.4.25. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.25. (linux-libre-5.4-pristine-source): 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 e4dc378466..7f293a9071 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -362,10 +362,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.24") +(define-public linux-libre-5.4-version "5.4.25") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1cvy3mxwzll4f9j8i3hfmi0i0zq75aiafq1jskp9n4kq9iwar83z"))) + (hash (base32 "09ay0adc3s3m7qk0nj5lkmrp5i0q76a9kax0xix8914d115rgvf0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 8320c72587255ab6649c32ef838762058ae95c5b Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Fri, 10 Jan 2020 13:25:19 -0600 Subject: gnu: go-github-com-sirupsen-logrus: Propagate inputs. * gnu/packages/golang.scm (go-github-com-sirupsen-logrus): Propagate inputs. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 871b1fed2f..3b4e5192e5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright @ 2018, 2019 Katherine Cox-Buday ;;; Copyright @ 2019 Giovanni Biscuolo -;;; Copyright @ 2019 Alex Griffin +;;; Copyright @ 2019, 2020 Alex Griffin ;;; Copyright © 2019 Arun Isaac ;;; Copyright © 2020 Jack Hill ;;; @@ -1166,7 +1166,7 @@ GNU extensions} to the POSIX recommendations for command-line options.") (base32 "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz")))) (build-system go-build-system) - (native-inputs + (propagated-inputs `(("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-github-com-stretchr-testify" -- cgit v1.2.3 From aff95768117381547a60f81f4a58d1d5582afc1a Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Fri, 10 Jan 2020 13:32:32 -0600 Subject: gnu: Add go-github-com-rifflock-lfshook. * gnu/packages/golang.scm (go-github-com-rifflock-lfshook): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3b4e5192e5..470013b052 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1181,6 +1181,31 @@ GNU extensions} to the POSIX recommendations for command-line options.") compatible with the standard library logger.") (license license:expat))) +(define-public go-github-com-rifflock-lfshook + (package + (name "go-github-com-rifflock-lfshook") + (version "2.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rifflock/lfshook.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wxqjcjfg8c0klmdgmbw3ckagby3wg9rkga9ihd4fsf05x5scxrc")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/rifflock/lfshook")) + (propagated-inputs + `(("go-github-com-sirupsen-logrus" ,go-github-com-sirupsen-logrus))) + (home-page "https://github.com/rifflock/lfshook") + (synopsis "Local File System hook for Logrus logger") + (description "This package provides a hook for Logrus to write directly to +a file on the filesystem. The log levels are dynamic at instantiation of the +hook, so it is capable of logging at some or all levels.") + (license license:expat))) + (define-public go-github-com-kardianos-osext (let ((commit "ae77be60afb1dcacde03767a8c37337fad28ac14") (revision "1")) -- cgit v1.2.3 From 42c6503d3777cf1b1c3749efe847dc8025a34b94 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Fri, 10 Jan 2020 13:36:57 -0600 Subject: gnu: Add go-github-com-mattn-go-zglob. * gnu/packages/golang.scm (go-github-com-mattn-go-zglob): New variable. --- gnu/packages/golang.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 470013b052..0d92139311 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3374,3 +3374,25 @@ test results.") data serialization format.") (home-page "https://github.com/golang/protobuf") (license license:bsd-3))) + +(define-public go-github-com-mattn-go-zglob + (package + (name "go-github-com-mattn-go-zglob") + (version "0.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mattn/go-zglob.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/mattn/go-zglob")) + (home-page "https://github.com/mattn/go-zglob") + (synopsis "Glob library that descends into other directories") + (description " A glob library that implements descending into other +directories. It is optimized for filewalking. ") + (license license:expat))) -- cgit v1.2.3 From 63299f2840edcd5d942b3433ffb205fcc1fb6eb4 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Fri, 10 Jan 2020 13:37:30 -0600 Subject: gnu: Add browserpass-native. * gnu/packages/password-utils.scm (browserpass-native): New variable. --- gnu/packages/password-utils.scm | 80 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 06214297f7..333fbfa026 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Jessica Tallon ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2016 Lukas Gradl -;;; Copyright © 2016, 2019 Alex Griffin +;;; Copyright © 2016, 2019, 2020 Alex Griffin ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice @@ -46,6 +46,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) @@ -65,6 +66,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages kerberos) @@ -697,6 +699,82 @@ using password-store through rofi interface: @end enumerate") (license license:gpl3))) +(define-public browserpass-native + (package + (name "browserpass-native") + (version "3.0.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/browserpass/browserpass-native.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q3bsla07zjl6i69nj1axbkg2ia89pvh0jg6nlqgbm2kpzzbn0pz")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/browserpass/browserpass-native" + #:install-source? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'patch-makefile + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; This doesn't go in #:make-flags because the Makefile itself + ;; gets installed. + (substitute* + "src/github.com/browserpass/browserpass-native/Makefile" + (("PREFIX \\?= /usr") + (string-append "PREFIX ?= " out))) + #t))) + (add-before 'build 'configure + (lambda _ + (with-directory-excursion + "src/github.com/browserpass/browserpass-native" + (invoke "make" "configure")) + #t)) + (replace 'build + (lambda _ + (with-directory-excursion + "src/github.com/browserpass/browserpass-native" + (invoke "make")) + #t)) + (replace 'install + (lambda _ + (with-directory-excursion + "src/github.com/browserpass/browserpass-native" + (invoke "make" "install")) + #t)) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gnupg (assoc-ref inputs "gnupg"))) + (wrap-program (string-append out "/bin/browserpass") + `("PATH" ":" prefix + (,(string-append gnupg "/bin")))) + #t)))))) + (native-inputs + `(("which" ,which))) + (inputs + `(("gnupg" ,gnupg) + ("go-github-com-mattn-go-zglob" ,go-github-com-mattn-go-zglob) + ("go-github-com-rifflock-lfshook" ,go-github-com-rifflock-lfshook) + ("go-github-com-sirupsen-logrus" ,go-github-com-sirupsen-logrus) + ("go-golang-org-x-sys" ,go-golang-org-x-sys))) + (home-page "https://github.com/browserpass/browserpass-native") + (synopsis "Browserpass native messaging host") + (description "Browserpass is a browser extension for pass, a +UNIX-based password store manager. It allows you to auto-fill or copy to +clipboard credentials for the current domain, protecting you from phishing +attacks. + +This package only contains the Browserpass native messaging host. You must +also install the browser extension for GNU IceCat or ungoogled-chromium +separately.") + (license license:isc))) + (define-public argon2 (package (name "argon2") -- cgit v1.2.3 From 136070022b0c488a304c7813d3a05b00f8998202 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:13:39 +0100 Subject: gnu: catdoc: Use HTTPS home page. * gnu/packages/textutils.scm (catdoc)[home-page]: Use HTTPS. --- gnu/packages/textutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 1be7c69154..8510c6d1d0 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -561,7 +561,7 @@ runs Word\".") (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (mkdir-p (string-append out "/share/man/man1")))))))) - (home-page "http://www.wagner.pp.ru/~vitus/software/catdoc/") + (home-page "https://www.wagner.pp.ru/~vitus/software/catdoc/") (synopsis "MS-Word to TeX or plain text converter") (description "@command{catdoc} extracts text from MS-Word files, trying to preserve as many special printable characters as possible. It supports -- cgit v1.2.3 From 1bc64532b7a74f337a8dc56e9b7a9b0ff3b79ae9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:57:19 +0100 Subject: gnu: libwebsockets: Use HTTPS home page. * gnu/packages/web.scm (libwebsockets)[home-page]: Use HTTPS. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 236dd1a506..d766d31785 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1129,7 +1129,7 @@ parser written in ANSI C and a small validating JSON generator.") "Libwebsockets is a library that allows C programs to establish client and server WebSockets connections---a protocol layered above HTTP that allows for efficient socket-like bidirectional reliable communication channels.") - (home-page "http://libwebsockets.org/") + (home-page "https://libwebsockets.org") ;; This is LGPLv2.1-only with extra exceptions specified in 'LICENSE'. (license license:lgpl2.1))) -- cgit v1.2.3 From 2eed6813b6a447524fad8c29412a1efc8c135456 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:14:45 +0100 Subject: gnu: autobuild: Use HTTPS home page. * gnu/packages/autotools.scm (autobuild)[home-page]: Use HTTPS. --- gnu/packages/autotools.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 2ba9950981..62e0b9291f 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -243,7 +243,7 @@ Autobuild generates an HTML summary file, containing links to each build log. The summary includes project name, version, build hostname, host type (cross compile aware), date of build, and indication of success or failure. The output is indexed in many ways to simplify browsing.") - (home-page "http://josefsson.org/autobuild/") + (home-page "https://josefsson.org/autobuild/") (license gpl3+))) (define-public automake -- cgit v1.2.3 From e2528a3cc1819d3fe24880c5cfec74f075d5f820 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Mar 2020 02:45:00 +0100 Subject: gnu: java-snappy@1.0: Don't use unstable tarball. * gnu/packages/java-compression.scm (java-snappy-1)[name]: Restate. [source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/java-compression.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 3a9082641c..2dd65da305 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -131,14 +131,17 @@ compressor/decompressor.") (define-public java-snappy-1 (package (inherit java-snappy) + (name "java-snappy") (version "1.0.3-rc3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/xerial/snappy-java/archive/" - "snappy-java-" version ".tar.gz")) - (sha256 - (base32 - "08hsxlqidiqck0q57fshwyv3ynyxy18vmhrai9fyc8mz17m7gsa3")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/xerial/snappy-java")) + (commit (string-append "snappy-java-" version)))) + (sha256 + (base32 "0gbg3xmhniyh5p6w5zqj16fr15fa8j4raswd8pj00l4ixf5qa6m4")) + (file-name (git-file-name name version)))) (arguments `(#:jar-name "snappy.jar" #:source-dir "src/main/java" -- cgit v1.2.3 From 287e3d312440a103e8ca1e14b5b09a0ce0124e5e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Mar 2020 03:18:23 +0100 Subject: gnu: java-iq80-snappy: Don't use unstable tarball. * gnu/packages/java-compression.scm (java-iq80-snappy)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/java-compression.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 2dd65da305..536e1e6530 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -193,13 +193,15 @@ compressor/decompressor.") (package (name "java-iq80-snappy") (version "0.4") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dain/snappy/archive/snappy-" - version ".tar.gz")) - (sha256 - (base32 - "0rb3zhci7w9wzd65lfnk7p3ip0n6gb58a9qpx8n7r0231gahyamf")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dain/snappy") + (commit (string-append "snappy-" version)))) + (sha256 + (base32 "1mswh207065rdzbxk6rxaqlxhbg1ngxa0vjc20knsn31kqbq1bcz")) + (file-name (git-file-name name version)))) (build-system ant-build-system) (arguments `(#:jar-name "iq80-snappy.jar" -- cgit v1.2.3 From 16b84f54bd870b938a1c1ede6fefcfff84a504f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:08:09 +0100 Subject: gnu: bastet: Use HTTPS home page. * gnu/packages/games.scm (bastet)[home-page]: Use HTTPS. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9b4ff4df9a..f9c846d307 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -383,7 +383,7 @@ physics settings to tweak as well.") (inputs `(("boost" ,boost) ("ncurses" ,ncurses))) - (home-page "http://fph.altervista.org/prog/bastet.html") + (home-page "https://fph.altervista.org/prog/bastet.html") (synopsis "Antagonistic Tetris-style falling brick game for text terminals") (description "Bastet (short for Bastard Tetris) is a simple ncurses-based falling brick -- cgit v1.2.3 From b7afc63f0f664adfdfd79aa3cbb11eb270e7a8f6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Mar 2020 05:28:39 +0100 Subject: gnu: sdparm: Update to 1.11. * gnu/packages/disk.scm (sdparm): Update to 1.11. [source]: Hard-code name. --- gnu/packages/disk.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index f42f2900ec..4373d52974 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -293,15 +293,14 @@ and a @command{fsck.vfat} compatibility symlink for use in an initrd.") (define-public sdparm (package (name "sdparm") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) (uri (string-append "http://sg.danny.cz/sg/p/" - name "-" version ".tar.xz")) + "sdparm-" version ".tar.xz")) (sha256 - (base32 - "1jjq3lzgfy4r76rc26q02lv4wm5cb4dx5nh913h489zjrr4f3jbx")))) + (base32 "1nqjc4w2w47zavcbf5xmm53x1zbwgljaw1lpajcdi537cgy32fa8")))) (build-system gnu-build-system) (home-page "http://sg.danny.cz/sg/sdparm.html") (synopsis "Provide access to SCSI device parameters") -- cgit v1.2.3 From f50ef3493e6bdc0519fac57ffd32a5590fcca05d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:56:13 +0100 Subject: gnu: unqlite: Use HTTPS home page. * gnu/packages/databases.scm (unqlite)[home-page]: Use HTTPS. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9d42ba75fa..26b6a55a14 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1852,7 +1852,7 @@ Driver.") "1sbpvhg15gadq0mpcy16q7k3rkg4b4dicpnn5xifpkpn02sqik3s")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ;No check target - (home-page "http://www.unqlite.org") + (home-page "https://www.unqlite.org") (synopsis "In-memory key/value and document store") (description "UnQLite is an in-process software library which implements a -- cgit v1.2.3 From d1548cb09f9294d0c68e2eb54f2f27a594b84fe2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:20:26 +0100 Subject: gnu: fltk: Use HTTPS home page. * gnu/packages/fltk.scm (fltk)[home-page]: Use HTTPS. --- gnu/packages/fltk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm index f09b383ef1..573c0541bb 100644 --- a/gnu/packages/fltk.scm +++ b/gnu/packages/fltk.scm @@ -88,7 +88,7 @@ (("-lpng") (string-append "-L" png "/lib -lpng")) (("-lz") (string-append "-L" zlib "/lib -lz")))) #t))))) - (home-page "http://www.fltk.org") + (home-page "https://www.fltk.org") (synopsis "3D C++ GUI library") (description "FLTK is a C++ GUI toolkit providing modern GUI functionality without the bloat. It supports 3D graphics via OpenGL and its built-in GLUT -- cgit v1.2.3 From acf6168b5dd1d5f03ad22966b27540d4457d2863 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 22 Feb 2020 13:18:17 +0530 Subject: gnu: uim: Do not install elisp files in guix.d. * gnu/packages/xorg.scm (uim)[arguments]: Pass %output/share/emacs to the --with-lispdir configure flag. Add fix-install-path phase after install phase. --- gnu/packages/xorg.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f951e565ff..a7ba6fe9eb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016, 2017 John Darrington ;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2020 Arun Isaac ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2018 Oleg Pykhalov @@ -6137,8 +6137,7 @@ X11 servers, Windows, or macOS.") (guix build emacs-utils)) #:configure-flags (list "--with-anthy-utf8" - (string-append "--with-lispdir=" %output - "/share/emacs/site-lisp/guix.d") + (string-append "--with-lispdir=" %output "/share/emacs") ;; Set proper runpath (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) #:phases @@ -6151,8 +6150,17 @@ X11 servers, Windows, or macOS.") (string-append "\"" (assoc-ref outputs "out") "/bin/" executable "\""))) #t)) + ;; Fix installation path by renaming share/emacs/uim-el to + ;; share/emacs/site-lisp + (add-after 'install 'fix-install-path + (lambda* (#:key outputs #:allow-other-keys) + (let ((share-emacs (string-append (assoc-ref outputs "out") + "/share/emacs"))) + (rename-file (string-append share-emacs "/uim-el") + (string-append share-emacs "/site-lisp"))) + #t)) ;; Generate emacs autoloads for uim.el - (add-after 'install 'make-autoloads + (add-after 'fix-install-path 'make-autoloads (lambda* (#:key outputs #:allow-other-keys) (emacs-generate-autoloads ,name (string-append (assoc-ref outputs "out") -- cgit v1.2.3 From d5b0aa99f8d339b13dbea504bdb9a230e59915a0 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 22 Feb 2020 22:06:06 +0530 Subject: gnu: uim: Use emacs-substitute-variables instead of substitute*. * gnu/packages/xorg.scm (uim)[arguments]: In the configure-uim-el phase, use emacs-substitute-variables instead of substitute*. --- gnu/packages/xorg.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a7ba6fe9eb..2bf920b20d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6145,10 +6145,10 @@ X11 servers, Windows, or macOS.") ;; Set path of uim-el-agent and uim-el-helper-agent executables (add-after 'configure 'configure-uim-el (lambda* (#:key outputs #:allow-other-keys) - (substitute* "emacs/uim-var.el" - (("\"(uim-el-agent|uim-el-helper-agent)\"" _ executable) - (string-append "\"" (assoc-ref outputs "out") - "/bin/" executable "\""))) + (let ((out (assoc-ref outputs "out"))) + (emacs-substitute-variables "emacs/uim-var.el" + ("uim-el-agent" (string-append out "/bin/uim-el-agent")) + ("uim-el-helper-agent" (string-append out "/bin/uim-el-helper-agent")))) #t)) ;; Fix installation path by renaming share/emacs/uim-el to ;; share/emacs/site-lisp -- cgit v1.2.3 From e80d1c1992fb60c492520d61f3a3d1fef65cfdf2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 13 Mar 2020 14:19:44 +0200 Subject: gnu: httrack: Use texi markup in description. * gnu/packages/web.scm (httrack)[description]: Use texi markup. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d766d31785..8867a48849 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7205,7 +7205,7 @@ the Internet to a local directory, building recursively all directories, getting HTML, images, and other files from the server to your computer. HTTrack arranges the original site's relative link-structure. Simply open -a page of the ``mirrored'' website in your browser, and you can browse the +a page of the @code{mirrored} website in your browser, and you can browse the site from link to link, as if you were viewing it online. HTTrack can also update an existing mirrored site, and resume interrupted downloads. -- cgit v1.2.3 From 10b99ddf4596a033eaf348dddf519639e029f9d1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 13 Mar 2020 14:26:22 +0200 Subject: gnu: cadaver: Satisfy 'guix lint'. * gnu/packages/web.scm (cadaver)[home-page]: Follow redirect. [description]: Always use two spaces. --- 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 8867a48849..3d6f2d5dcf 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6087,10 +6087,10 @@ file links.") (inputs `(("expat" ,expat) ("openssl" ,openssl))) - (home-page "http://www.webdav.org/cadaver") + (home-page "http://www.webdav.org/cadaver/") (synopsis "Command-line WebDAV client") (description - "Cadaver is a command-line WebDAV client for Unix. It supports + "Cadaver is a command-line WebDAV client for Unix. It supports file upload, download, on-screen display, namespace operations (move/copy), collection creation and deletion, and locking operations.") (license license:gpl2))) -- cgit v1.2.3 From be764b47ad1079df531f016c1946cbf98ff48c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 13 Mar 2020 10:53:49 +0100 Subject: weather: Exit with non-zero when coverage is below 100%. * guix/scripts/weather.scm (report-server-coverage): Return the coverage ratio. (guix-weather): Exit if and only if each server's coverage is 1. --- doc/guix.texi | 7 +++++-- guix/scripts/weather.scm | 29 +++++++++++++++++++---------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 9a5b5f7fbe..8acae26b9a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10809,8 +10809,11 @@ guix weather @var{options}@dots{} [@var{packages}@dots{}] When @var{packages} is omitted, @command{guix weather} checks the availability of substitutes for @emph{all} the packages, or for those specified with @option{--manifest}; otherwise it only considers the specified packages. It -is also possible to query specific system types with @option{--system}. The -available options are listed below. +is also possible to query specific system types with @option{--system}. +@command{guix weather} exits with a non-zero code when the fraction of +available substitutes is below 100%. + +The available options are listed below. @table @code @item --substitute-urls=@var{urls} diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm index 733986be0c..913c84955e 100644 --- a/guix/scripts/weather.scm +++ b/guix/scripts/weather.scm @@ -178,7 +178,8 @@ about the derivations queued, as is the case with Hydra." (define* (report-server-coverage server items #:key display-missing?) "Report the subset of ITEMS available as substitutes on SERVER. -When DISPLAY-MISSING? is true, display the list of missing substitutes." +When DISPLAY-MISSING? is true, display the list of missing substitutes. +Return the coverage ratio, an exact number between 0 and 1." (define MiB (* (expt 2 20) 1.)) (format #t (G_ "looking for ~h store items on ~a...~%") @@ -267,7 +268,11 @@ are queued~%") (when (and display-missing? (not (null? missing))) (newline) (format #t (G_ "Substitutes are missing for the following items:~%")) - (format #t "~{ ~a~%~}" missing))))) + (format #t "~{ ~a~%~}" missing)) + + ;; Return the coverage ratio. + (let ((total (length items))) + (/ (- total (length missing)) total))))) ;;; @@ -538,16 +543,20 @@ SERVER. Display information for packages with at least THRESHOLD dependents." (lambda (system) (package-outputs packages system)) systems)))))) - (for-each (lambda (server) + (exit + (every (lambda (server) + (define coverage (report-server-coverage server items #:display-missing? - (assoc-ref opts 'display-missing?)) - (match (assoc-ref opts 'coverage) - (#f #f) - (threshold - (report-package-coverage server packages systems - #:threshold threshold)))) - urls))))) + (assoc-ref opts 'display-missing?))) + (match (assoc-ref opts 'coverage) + (#f #f) + (threshold + (report-package-coverage server packages systems + #:threshold threshold))) + + (= 1 coverage)) + urls)))))) ;;; Local Variables: ;;; eval: (put 'let/time 'scheme-indent-function 1) -- cgit v1.2.3 From a0feabdfdb5b0949ac16fc8280bbabe157cbd084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 13 Mar 2020 11:32:35 +0100 Subject: weather: '--coverage' filters out non-package objects. This is a followup to d37b5a1b58824dafbe6f32b1c183661c147c660c. * guix/scripts/weather.scm (guix-weather): Filter PACKAGES passed to 'report-package-coverage'. --- guix/scripts/weather.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm index 913c84955e..a9e0cba92a 100644 --- a/guix/scripts/weather.scm +++ b/guix/scripts/weather.scm @@ -552,7 +552,11 @@ SERVER. Display information for packages with at least THRESHOLD dependents." (match (assoc-ref opts 'coverage) (#f #f) (threshold - (report-package-coverage server packages systems + ;; PACKAGES may include non-package objects coming from a + ;; manifest. Filter them out. + (report-package-coverage server + (filter package? packages) + systems #:threshold threshold))) (= 1 coverage)) -- cgit v1.2.3 From b24ec854519c0e0815b19eeb246c47444aa687c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 13 Mar 2020 12:55:05 +0100 Subject: pack: Factorize 'mksquashfs' invocations. * guix/scripts/pack.scm (squashfs-image)[build](mksquashfs): New procedure. Replace instances of (invoke "mksquashfs" ...) with (mksquashfs ...). --- guix/scripts/pack.scm | 149 +++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 74 deletions(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index c8d8546e29..70239b64de 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -365,6 +365,9 @@ added to the pack." (define database #+database) (define entry-point #$entry-point) + (define (mksquashfs args) + (apply invoke "mksquashfs" args)) + (setenv "PATH" (string-append #$archiver "/bin")) ;; We need an empty file in order to have a valid file argument when @@ -376,92 +379,90 @@ added to the pack." ;; Add all store items. Unfortunately mksquashfs throws away all ;; ancestor directories and only keeps the basename. We fix this ;; in the following invocations of mksquashfs. - (apply invoke "mksquashfs" - `(,@(map store-info-item - (call-with-input-file "profile" - read-reference-graph)) - #$environment - ,#$output - - ;; Do not perform duplicate checking because we - ;; don't have any dupes. - "-no-duplicates" - "-comp" - ,#+(compressor-name compressor))) + (mksquashfs `(,@(map store-info-item + (call-with-input-file "profile" + read-reference-graph)) + #$environment + ,#$output + + ;; Do not perform duplicate checking because we + ;; don't have any dupes. + "-no-duplicates" + "-comp" + ,#+(compressor-name compressor))) ;; Here we reparent the store items. For each sub-directory of ;; the store prefix we need one invocation of "mksquashfs". (for-each (lambda (dir) - (apply invoke "mksquashfs" - `(".empty" - ,#$output - "-root-becomes" ,dir))) + (mksquashfs `(".empty" + ,#$output + "-root-becomes" ,dir))) (reverse (string-tokenize (%store-directory) (char-set-complement (char-set #\/))))) ;; Add symlinks and mount points. - (apply invoke "mksquashfs" - `(".empty" - ,#$output - ;; Create SYMLINKS via pseudo file definitions. - ,@(append-map - (match-lambda - ((source '-> target) - ;; Create relative symlinks to work around a bug in - ;; Singularity 2.x: - ;; https://bugs.gnu.org/34913 - ;; https://github.com/sylabs/singularity/issues/1487 - (let ((target (string-append #$profile "/" target))) - (list "-p" - (string-join - ;; name s mode uid gid symlink - (list source - "s" "777" "0" "0" - (relative-file-name (dirname source) - target))))))) - '#$symlinks*) - - "-p" "/.singularity.d d 555 0 0" - - ;; Create the environment file. - "-p" "/.singularity.d/env d 555 0 0" - "-p" ,(string-append - "/.singularity.d/env/90-environment.sh s 777 0 0 " - (relative-file-name "/.singularity.d/env" - #$environment)) - - ;; Create /.singularity.d/actions, and optionally the 'run' - ;; script, used by 'singularity run'. - "-p" "/.singularity.d/actions d 555 0 0" - - ,@(if entry-point - `(;; This one if for Singularity 2.x. - "-p" - ,(string-append - "/.singularity.d/actions/run s 777 0 0 " - (relative-file-name "/.singularity.d/actions" - (string-append #$profile "/" - entry-point))) - - ;; This one is for Singularity 3.x. - "-p" - ,(string-append - "/.singularity.d/runscript s 777 0 0 " - (relative-file-name "/.singularity.d" - (string-append #$profile "/" - entry-point)))) - '()) - - ;; Create empty mount points. - "-p" "/proc d 555 0 0" - "-p" "/sys d 555 0 0" - "-p" "/dev d 555 0 0" - "-p" "/home d 555 0 0")) + (mksquashfs + `(".empty" + ,#$output + ;; Create SYMLINKS via pseudo file definitions. + ,@(append-map + (match-lambda + ((source '-> target) + ;; Create relative symlinks to work around a bug in + ;; Singularity 2.x: + ;; https://bugs.gnu.org/34913 + ;; https://github.com/sylabs/singularity/issues/1487 + (let ((target (string-append #$profile "/" target))) + (list "-p" + (string-join + ;; name s mode uid gid symlink + (list source + "s" "777" "0" "0" + (relative-file-name (dirname source) + target))))))) + '#$symlinks*) + + "-p" "/.singularity.d d 555 0 0" + + ;; Create the environment file. + "-p" "/.singularity.d/env d 555 0 0" + "-p" ,(string-append + "/.singularity.d/env/90-environment.sh s 777 0 0 " + (relative-file-name "/.singularity.d/env" + #$environment)) + + ;; Create /.singularity.d/actions, and optionally the 'run' + ;; script, used by 'singularity run'. + "-p" "/.singularity.d/actions d 555 0 0" + + ,@(if entry-point + `(;; This one if for Singularity 2.x. + "-p" + ,(string-append + "/.singularity.d/actions/run s 777 0 0 " + (relative-file-name "/.singularity.d/actions" + (string-append #$profile "/" + entry-point))) + + ;; This one is for Singularity 3.x. + "-p" + ,(string-append + "/.singularity.d/runscript s 777 0 0 " + (relative-file-name "/.singularity.d" + (string-append #$profile "/" + entry-point)))) + '()) + + ;; Create empty mount points. + "-p" "/proc d 555 0 0" + "-p" "/sys d 555 0 0" + "-p" "/dev d 555 0 0" + "-p" "/home d 555 0 0")) (when database ;; Initialize /var/guix. (install-database-and-gc-roots "var-etc" database #$profile) - (invoke "mksquashfs" "var-etc" #$output))))) + (mksquashfs `("var-etc" ,#$output)))))) (gexp->derivation (string-append name (compressor-extension compressor) -- cgit v1.2.3 From b829864d747b3b24ef37cafe36e889527b060d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 13 Mar 2020 13:02:01 +0100 Subject: pack: Make bit-reproducible squashfs images. Reported by Josh Marshall . * guix/scripts/pack.scm (squashfs-image)[build](mksquashfs): Always pass "-all-time", "-mkfs-time", "-force-uid", and "-force-gid" to 'mksquashfs'. --- guix/scripts/pack.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 70239b64de..414e2d45f3 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -366,7 +366,15 @@ added to the pack." (define entry-point #$entry-point) (define (mksquashfs args) - (apply invoke "mksquashfs" args)) + (apply invoke "mksquashfs" + `(,@args + + ;; Set file times and the file system creation time to + ;; one second after the Epoch. + "-all-time" "1" "-mkfs-time" "1" + + ;; Reset all UIDs and GIDs. + "-force-uid" "0" "-force-gid" "0"))) (setenv "PATH" (string-append #$archiver "/bin")) -- cgit v1.2.3 From 24fb0dc0ab34ebb49509a3d5b4d84d8488670807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 13 Mar 2020 13:06:59 +0100 Subject: pack: Do not create a squashfs "recovery file". Reported by Josh Marshall . * guix/scripts/pack.scm (squashfs-image)[build](mksquashfs): Always pass "-no-recovery". --- guix/scripts/pack.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 414e2d45f3..652b4c63c4 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -369,6 +369,10 @@ added to the pack." (apply invoke "mksquashfs" `(,@args + ;; Do not create a "recovery file" when appending to the + ;; file system since it's useless in this case. + "-no-recovery" + ;; Set file times and the file system creation time to ;; one second after the Epoch. "-all-time" "1" "-mkfs-time" "1" -- cgit v1.2.3 From f292c5019111f92b6850afdca4b59f4146b9be3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 13 Mar 2020 17:30:15 +0100 Subject: maint: Add 'etc/release-manifest.scm'. * etc/release-manifest.scm: New file. * gnu/ci.scm (%cross-targets): Export. * build-aux/check-available-binaries.scm: Remove. * Makefile.am (EXTRA_DIST): Add 'etc/release-manifest.scm' and remove 'build-aux/check-available-binaries.scm'. (assert-binaries-available): Rewrite using 'guix weather -m'. --- Makefile.am | 7 ++- build-aux/check-available-binaries.scm | 78 ------------------------ etc/release-manifest.scm | 108 +++++++++++++++++++++++++++++++++ gnu/ci.scm | 3 +- 4 files changed, 114 insertions(+), 82 deletions(-) delete mode 100644 build-aux/check-available-binaries.scm create mode 100644 etc/release-manifest.scm diff --git a/Makefile.am b/Makefile.am index 3b951be7f5..d5829f3633 100644 --- a/Makefile.am +++ b/Makefile.am @@ -541,6 +541,7 @@ EXTRA_DIST += \ scripts/guix.in \ etc/guix-install.sh \ etc/news.scm \ + etc/release-manifest.scm \ etc/system-tests.scm \ build-aux/build-self.scm \ build-aux/compile-all.scm \ @@ -551,7 +552,6 @@ EXTRA_DIST += \ build-aux/cuirass/gnu-system.scm \ build-aux/cuirass/guix-modular.scm \ build-aux/cuirass/hydra-to-cuirass.scm \ - build-aux/check-available-binaries.scm \ build-aux/check-final-inputs-self-contained.scm \ build-aux/compile-as-derivation.scm \ build-aux/generate-authors.scm \ @@ -851,8 +851,9 @@ assert-no-store-file-names: # Make sure important substitutes are available. assert-binaries-available: $(GOBJECTS) - $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \ - "$(top_srcdir)/build-aux/check-available-binaries.scm" + $(AM_V_at)$(top_builddir)/pre-inst-env \ + guix weather -m "$(top_srcdir)/etc/release-manifest.scm" \ + --display-missing # Make sure the final inputs don't refer to bootstrap tools. assert-final-inputs-self-contained: $(GOBJECTS) diff --git a/build-aux/check-available-binaries.scm b/build-aux/check-available-binaries.scm deleted file mode 100644 index f39874ab71..0000000000 --- a/build-aux/check-available-binaries.scm +++ /dev/null @@ -1,78 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès -;;; -;;; 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 . - -;;; -;;; Check whether important binaries are available. -;;; - -(use-modules (guix store) - (guix grafts) - (guix packages) - (guix derivations) - (gnu packages) - (gnu packages certs) - (gnu packages emacs) - (gnu packages make-bootstrap) - (gnu packages ssh) - (srfi srfi-1) - (srfi srfi-26) - (ice-9 format)) - -(define (packages-for-system system) - "Return the list of packages to check for SYSTEM." - (let ((base (list %bootstrap-tarballs emacs nss-certs openssh))) - ;; On Intel systems, make sure key packages proposed by the installer are - ;; available. - (if (member system '("x86_64-linux" "i686-linux")) - (append (map specification->package - '("xfce" "gnome" "mate" "enlightenment" - "openbox" "awesome" "i3-wm" "ratpoison" - "network-manager-applet" "xlockmore" - "linux-libre" "grub-hybrid" "xorg-server" - "libreoffice" - ;; FIXME: Add IceCat when Rust is available on i686. - #;"icecat")) - base) - base))) - -(with-store store - (parameterize ((%graft? #f)) - (let* ((native (append-map (lambda (system) - (map (cut package-derivation store <> system) - (packages-for-system system))) - %hydra-supported-systems)) - (cross (map (cut package-cross-derivation store - %bootstrap-tarballs <>) - '("mips64el-linux-gnu" - "arm-linux-gnueabihf"))) - (total (append native cross))) - - (set-build-options store - #:use-substitutes? #t - #:substitute-urls %default-substitute-urls) - (let* ((total (map derivation->output-path total)) - (available (substitutable-paths store total)) - (missing (lset-difference string=? total available))) - (if (null? missing) - (format (current-error-port) - "~a packages found substitutable on~{ ~a~}~%" - (length total) %hydra-supported-systems) - (format (current-error-port) - "~a packages are not substitutable:~%~{ ~a~%~}~%" - (length missing) missing)) - (exit (null? missing)))))) diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm new file mode 100644 index 0000000000..67b92c3921 --- /dev/null +++ b/etc/release-manifest.scm @@ -0,0 +1,108 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ludovic Courtès +;;; +;;; 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 . + +;;; This file returns a manifest containing release-critical bit, for all the +;;; supported architectures and cross-compilation targets. + +(use-modules (gnu packages) + (guix packages) + (guix profiles) + ((gnu ci) #:select (%cross-targets)) + (srfi srfi-1) + (srfi srfi-26)) + +(define* (package->manifest-entry* package system + #:key target) + "Return a manifest entry for PACKAGE on SYSTEM, optionally cross-compiled to +TARGET." + (manifest-entry + (inherit (package->manifest-entry package)) + (name (string-append (package-name package) "." system + (if target + (string-append "." target) + "'"))) + (item (with-parameters ((%current-system system) + (%current-target-system target)) + package)))) + +(define %base-packages + ;; Packages that must be substitutable on all the platforms Guix supports. + (map specification->package + '("bootstrap-tarballs" "gcc-toolchain" "nss-certs" + "openssh" "emacs" "vim" "python" "guile" "guix"))) + +(define %system-packages + ;; Key packages proposed by the Guix System installer. + (map specification->package + '("xorg-server" "xfce" "gnome" "mate" "enlightenment" + "openbox" "awesome" "i3-wm" "ratpoison" + "xlockmore" "slock" "libreoffice" + "connman" "network-manager" "network-manager-applet" + "openssh" "ntp" "tor" + "linux-libre" "grub-hybrid" + ;; FIXME: Add IceCat when Rust is available on i686. + ;;"icecat" + ))) + +(define %packages-to-cross-build + ;; Packages that must be cross-buildable from x86_64-linux. + (cons (@ (gnu packages gcc) gcc) + (map specification->package + '("coreutils" "grep" "sed" "findutils" "diffutils" "patch" + "gawk" "gettext" "gzip" "xz" + "hello" "guile@2.2" "zlib")))) + +(define %cross-bootstrap-targets + ;; Cross-compilation triplets for which 'bootstrap-tarballs' must be + ;; buildable. + '("i586-pc-gnu" + "arm-linux-gnueabihf" + "aarch64-linux-gnu")) + + +;;; +;;; Manifests. +;;; + +(define %base-manifest + (manifest + (append-map (lambda (system) + (map (cut package->manifest-entry* <> system) + %base-packages)) + %hydra-supported-systems))) + +(define %cross-manifest + (manifest + (append-map (lambda (target) + (map (cut package->manifest-entry* <> "x86_64-linux" + #:target target) + %packages-to-cross-build)) + %cross-targets))) + +(define %cross-bootstrap-manifest + (manifest + (map (lambda (target) + (package->manifest-entry* + (specification->package "bootstrap-tarballs") + "x86_64-linux" #:target target)) + %cross-bootstrap-targets))) + +;; Return the union of all three manifests. +(concatenate-manifests (list %base-manifest + %cross-manifest + %cross-bootstrap-manifest)) diff --git a/gnu/ci.scm b/gnu/ci.scm index e024c09ebc..44a6a87e1a 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -55,7 +55,8 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match) - #:export (channel-source->package + #:export (%cross-targets + channel-source->package hydra-jobs)) ;;; Commentary: -- cgit v1.2.3 From 79a48038579361689982a279564e0d4130918de7 Mon Sep 17 00:00:00 2001 From: Alberto Eleuterio Flores Guerrero Date: Fri, 13 Mar 2020 21:31:40 +0100 Subject: gnu: Add barrage. * gnu/packages/games.scm (barrage): New variable. --- gnu/packages/games.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f9c846d307..2791b18dca 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -46,6 +46,7 @@ ;;; Copyright © 2019, 2020 Timotej Lazar ;;; Copyright © 2019 Josh Holland ;;; Copyright © 2017, 2019 Hartmut Goebel +;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero ;;; ;;; This file is part of GNU Guix. ;;; @@ -10157,3 +10158,35 @@ best human chess grandmasters. It can be used with UCI-compatible GUIs like ChessX.") (home-page "https://stockfishchess.org/") (license license:gpl3+))) + +(define-public barrage + (package + (name "barrage") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/lgames/barrage/" + "barrage-" version ".tar.gz")) + (sha256 + (base32 "0139wxyrir10cbkvkjn548xgmp84wax8mfwk80yxbxlcdamrg257")))) + (build-system gnu-build-system) + (inputs + `(("hicolor-icon-theme" ,hicolor-icon-theme) + ("sdl" ,sdl) + ("sdl-mixer" ,sdl-mixer))) + (arguments + `(#:configure-flags + (list + (string-append "CFLAGS=" + "-I" (assoc-ref %build-inputs "sdl-mixer") + "/include/SDL")))) + (home-page "http://lgames.sourceforge.net/Barrage/") + (synopsis "Violent point-and-click shooting game with nice effects") + (description + "Barrage is a rather destructive action game that puts you on a shooting +range with the objective to hit as many dummy targets as possible within +3 minutes. You control a gun that may either fire small or large grenades at +soldiers, jeeps and tanks. The gameplay is simple but it is not that easy to +get high scores.") + (license license:gpl2+))) -- cgit v1.2.3 From f08d654af697d3f52060ed505aa78e38cd8fe9da Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 13 Mar 2020 20:34:14 +0000 Subject: gnu: Add python-capablerobot-usbhub. * gnu/packages/libusb (python-capablerobot-usbhub): New variable. --- gnu/packages/libusb.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index f41ed6b9bc..01c138cb4e 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -302,6 +302,47 @@ wrapper for accessing libusb-1.0.") (define-public python2-pyusb (package-with-python2 python-pyusb)) +(define-public python-capablerobot-usbhub + (package + (name "python-capablerobot-usbhub") + (version "0.2.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "capablerobot_usbhub" version)) + (sha256 + (base32 + "1priic4iq2vn1rc711kzxwhxrwa508rkxrr193qdz2lw26kdhvix")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-udev-rules + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/lib/udev/rules.d")) + (copy-file "50-capablerobot-usbhub.rules" + (string-append out + "/lib/udev/rules.d/" + "50-capablerobot-usbhub.rules")) + #t)))))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-construct" ,python-construct) + ("python-pyusb" ,python-pyusb) + ("python-pyyaml" ,python-pyyaml))) + (home-page + "https://github.com/CapableRobot/CapableRobot_USBHub_Driver") + (synopsis + "Host side driver for the Capable Robot Programmable USB Hub") + (description + "This package provides access to the internal state of the Capable Robot +USB Hub, allowing you to monitor and control the Hub from an upstream +computer. It also creates a transparent CircuitPython Bridge, allowing +unmodified CircuitPython code to run on the host computer and interact with +I2C and SPI devices attached to the USB Hub.") + (license license:expat))) + (define-public libplist (package (name "libplist") -- cgit v1.2.3 From 3c9d89b5e2da2731ccc56a4cb745e1868175db79 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 13 Mar 2020 12:33:00 -0400 Subject: gnu: WebKitGTK: Update to 2.28.0 [fixes CVE-2020-10018]. * gnu/packages/webkit.scm (webkitgtk): Update to 2.28.0. --- 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 1474b6623d..16e2b009fc 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -121,14 +121,14 @@ engine that uses Wayland for graphics output.") (define-public webkitgtk (package (name "webkitgtk") - (version "2.26.4") + (version "2.28.0") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "0gqi9f9njrdn8vad1zvr59b25arwc8r0n8bp25sgkbfz2c3r11j3")))) + "12qfs9w93c5kiyi14ynm4rf4ad3c213dvzmdrc9c3ab2iwbks7rn")))) (build-system cmake-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 84f19b1d05fcbf68883d72eb7d25fc8aefe26d62 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:17:00 +0100 Subject: gnu: libsmpeg: Use HTTPS home page. * gnu/packages/video.scm (libsmpeg)[home-page]: Use HTTPS. --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 41e6835baf..0e428f345d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2580,7 +2580,7 @@ Other features include a live preview and live streaming.") ("automake" ,automake))) (inputs `(("sdl" ,sdl2))) - (home-page "http://icculus.org/smpeg/") + (home-page "https://icculus.org/smpeg/") (synopsis "SDL MPEG decoding library") (description "SMPEG (SDL MPEG Player Library) is a free MPEG1 video player library -- cgit v1.2.3 From bbaaee631970a03bc8a929fb900fad57894d731d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Mar 2020 20:32:34 +0100 Subject: gnu: libpipeline: Update to 1.5.2. * gnu/packages/man.scm (libpipeline): Update to 1.5.2. --- gnu/packages/man.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 3f31ec96b3..4719777303 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -40,7 +40,7 @@ (define-public libpipeline (package (name "libpipeline") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append @@ -48,7 +48,7 @@ version ".tar.gz")) (sha256 (base32 - "0bwh5xz5f2czwb7f564jz1mp4znm8pldnvf65fs0hpw4gmmp0cyn")))) + "1ysrn22ixd4nmggy6f7qcsm7waadmlbg2i0n9mh6g7dfq54wcngx")))) (build-system gnu-build-system) (home-page "http://libpipeline.nongnu.org/") (synopsis "C library for manipulating pipelines of subprocesses") -- cgit v1.2.3 From 0d49a4bbe1df4b12abf1ca2710170b568e33c140 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:06:10 +0100 Subject: gnu: tegola: Use HTTPS home page. * gnu/packages/geo.scm (tegola)[home-page]: Use HTTPS. --- gnu/packages/geo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 7fd04f25c3..0e5afdae30 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -776,7 +776,7 @@ extension.") "cmd/tegola_lambda/main.go") (("version not set") ,version))) #t))))) - (home-page "http://tegola.io") + (home-page "https://tegola.io") (synopsis "Vector tile server for maps") (description "Tegola is a free vector tile server written in Go. Tegola takes geospatial data and slices it into vector tiles that can be efficiently -- cgit v1.2.3 From 78b2034b5bd879a86a1ab24db3f0da1bc2998055 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Mar 2020 22:14:18 +0100 Subject: gnu: perl-test2-suite: Correct name. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/perl-check.scm (perl-test2-bundle-extended): Rename to… (perl-test2-suite): …this. [name]: Adjust accordingly. (perl-test2-plugin-nowarnings)[propagated-inputs]: Use new name. * gnu/packages/perl.scm (perl-params-validationcompiler)[native-inputs]: Likewise. --- gnu/packages/perl-check.scm | 8 ++++---- gnu/packages/perl.scm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 9944c31305..2f6976e70f 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -66,9 +66,9 @@ implementation as used in cperl. It does not store the mocked overrides lexically, just dynamically.") (license artistic2.0))) -(define-public perl-test2-bundle-extended +(define-public perl-test2-suite (package - (name "perl-test2-bundle-extended") + (name "perl-test2-suite") (version "0.000072") (source (origin @@ -88,7 +88,7 @@ lexically, just dynamically.") `(("perl-importer" ,perl-importer) ("perl-term-table" ,perl-term-table) ("perl-sub-info" ,perl-sub-info))) - (home-page "https://metacpan.org/pod/Test2::Bundle::Extended") + (home-page "https://metacpan.org/pod/Test2-Suite") (synopsis "Full set of tools for Test2::Suite") (description "This package provides a rich set of tools, plugins, bundles, etc built upon the Test2 testing library.") @@ -108,7 +108,7 @@ etc built upon the Test2 testing library.") "002qk6qsm0l6r2kaxywvc38w0yf0mlavgywq8li076pn6kcw3242")))) (build-system perl-build-system) (propagated-inputs - `(("perl-test2-bundle-extended" ,perl-test2-bundle-extended))) + `(("perl-test2-suite" ,perl-test2-suite))) (home-page "https://metacpan.org/release/Test2-Plugin-NoWarnings") (synopsis "Fail if tests warn") (description "Loading this plugin causes your tests to fail if there any diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 26989330d4..ca06098c87 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7201,8 +7201,8 @@ function call parameters to an arbitrary level of specificity.") (native-inputs ;; For tests. `(("perl-test-without-module" ,perl-test-without-module) - ("perl-test2-bundle-extended" ,perl-test2-bundle-extended) ("perl-test2-plugin-nowarnings" ,perl-test2-plugin-nowarnings) + ("perl-test2-suite" ,perl-test2-suite) ("perl-type-tiny" ,perl-type-tiny))) (propagated-inputs `(("perl-eval-closure" ,perl-eval-closure) -- cgit v1.2.3 From 9afbfc7a9a54dba6a64783f79f5bf8240604e62e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Mar 2020 22:18:27 +0100 Subject: gnu: perl-test2-plugin-nowarnings: Run all tests. * gnu/packages/perl-check.scm (perl-test2-plugin-nowarnings) [native-inputs]: Add perl-ipc-run3. --- gnu/packages/perl-check.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 2f6976e70f..8bbe57ddfe 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -107,6 +107,8 @@ etc built upon the Test2 testing library.") (base32 "002qk6qsm0l6r2kaxywvc38w0yf0mlavgywq8li076pn6kcw3242")))) (build-system perl-build-system) + (native-inputs + `(("perl-ipc-run3" ,perl-ipc-run3))) (propagated-inputs `(("perl-test2-suite" ,perl-test2-suite))) (home-page "https://metacpan.org/release/Test2-Plugin-NoWarnings") -- cgit v1.2.3 From 788425c2a8df0545fd31cb8ed4578ecb635739c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:58:28 +0100 Subject: gnu: taglib: Use HTTPS home page. * gnu/packages/mp3.scm (taglib)[home-page]: Use HTTPS. --- gnu/packages/mp3.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index af3cc2540f..ae234afa29 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -172,7 +172,7 @@ a highly stable and efficient implementation.") '(#:tests? #f ; Tests are not ran with BUILD_SHARED_LIBS on. #:configure-flags (list "-DBUILD_SHARED_LIBS=ON"))) (inputs `(("zlib" ,zlib))) - (home-page "http://taglib.org") + (home-page "https://taglib.org") (synopsis "Library to access audio file meta-data") (description "TagLib is a C++ library for reading and editing the meta-data of several -- cgit v1.2.3 From d7d2b1dcfd17b2d964063aa6ef2ac03439afa54e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:57:45 +0100 Subject: gnu: miredo: Use HTTPS home page. * gnu/packages/networking.scm (miredo)[home-page]: Use HTTPS. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7f4009df9b..b7e79ce596 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -167,7 +167,7 @@ or, more generally, MAC addresses of the same category of hardware.") (substitute* "src/Makefile" (("^TESTS = .*") "TESTS = \n")) #t))))) - (home-page "http://www.remlab.net/miredo/") + (home-page "https://www.remlab.net/miredo/") (synopsis "Teredo IPv6 tunneling software") (description "Miredo is an implementation (client, relay, server) of the Teredo -- cgit v1.2.3 From 9dc6e542b57c45ea41418f36d6b1a09148b14f56 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Mar 2020 22:47:31 +0100 Subject: gnu: nginx: Update to 1.17.9. * gnu/packages/web.scm (nginx): Update to 1.17.9. --- 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 3d6f2d5dcf..e8c505df97 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -221,14 +221,14 @@ Interface} specification.") ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) ;; Consider updating the nginx-documentation package together with this one. - (version "1.17.8") + (version "1.17.9") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "0nwn4md8sxhks2j77qq1nvk5pfz3yykfhh2b507b6l2idp7kxllp")))) + "12dnrdxwnlid0wr797vdxj9z1fmxnk7ib55bznvl2g3mbi05vmkx")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) -- cgit v1.2.3 From e819fc0285aff217960fe0ef7cd1240959decba1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:55:03 +0100 Subject: gnu: trio: Use HTTPS home page. * gnu/packages/code.scm (trio)[home-page]: Use HTTPS. --- gnu/packages/code.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 6af1d413b8..c1eaaf1aab 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -306,7 +306,7 @@ tools such as @command{grep}.") (base32 "02pwd5m5vq7hbrffgm2na1dfc249z50yyr5jv73vdw15bd7ygl44")))) (build-system gnu-build-system) - (home-page "http://daniel.haxx.se/projects/trio/") + (home-page "https://daniel.haxx.se/projects/trio/") (synopsis "Portable and extendable printf and string functions") (description "Trio is a set of @code{printf} and string functions designed be used by -- cgit v1.2.3 From 364a1374ad5e04a91cdc29203f0c8073eede72d4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 12 Mar 2020 15:16:58 -0400 Subject: gnu: BlueZ: Fix CVE-2020-0556. * gnu/packages/patches/bluez-CVE-2020-0556.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/linux.scm (bluez)[replacement]: New field. (bluez/fixed): New variable. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 9 ++ gnu/packages/patches/bluez-CVE-2020-0556.patch | 180 +++++++++++++++++++++++++ 3 files changed, 190 insertions(+) create mode 100644 gnu/packages/patches/bluez-CVE-2020-0556.patch diff --git a/gnu/local.mk b/gnu/local.mk index 99baddea92..8e312e24e7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -763,6 +763,7 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ + %D%/packages/patches/bluez-CVE-2020-0556.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-bs4.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7f293a9071..b9787f2ec5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3994,6 +3994,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") + (replacement bluez/fixed) (version "5.52") (source (origin (method url-fetch) @@ -4059,6 +4060,14 @@ Bluetooth audio output devices like headphones or loudspeakers.") is flexible, efficient and uses a modular implementation.") (license license:gpl2+))) +(define bluez/fixed + (package + (inherit bluez) + (source (origin + (inherit (package-source bluez)) + (patches (append (origin-patches (package-source bluez)) + (search-patches "bluez-CVE-2020-0556.patch"))))))) + (define-public fuse-exfat (package (name "fuse-exfat") diff --git a/gnu/packages/patches/bluez-CVE-2020-0556.patch b/gnu/packages/patches/bluez-CVE-2020-0556.patch new file mode 100644 index 0000000000..7c34459a3a --- /dev/null +++ b/gnu/packages/patches/bluez-CVE-2020-0556.patch @@ -0,0 +1,180 @@ +Fix CVE-2020-0556: + +https://lore.kernel.org/linux-bluetooth/20200310023516.209146-1-alainm@chromium.org/ +https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0556 + +Patches copied from upstream source repository: + +https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=3cccdbab2324086588df4ccf5f892fb3ce1f1787 +https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=8cdbd3b09f29da29374e2f83369df24228da0ad1 + +From 3cccdbab2324086588df4ccf5f892fb3ce1f1787 Mon Sep 17 00:00:00 2001 +From: Alain Michaud +Date: Tue, 10 Mar 2020 02:35:18 +0000 +Subject: [PATCH] HID accepts bonded device connections only. + +This change adds a configuration for platforms to choose a more secure +posture for the HID profile. While some older mice are known to not +support pairing or encryption, some platform may choose a more secure +posture by requiring the device to be bonded and require the +connection to be encrypted when bonding is required. + +Reference: +https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html +--- + profiles/input/device.c | 23 ++++++++++++++++++++++- + profiles/input/device.h | 1 + + profiles/input/input.conf | 8 ++++++++ + profiles/input/manager.c | 13 ++++++++++++- + 4 files changed, 43 insertions(+), 2 deletions(-) + +diff --git a/profiles/input/device.c b/profiles/input/device.c +index 2cb3811c8..d89da2d7c 100644 +--- a/profiles/input/device.c ++++ b/profiles/input/device.c +@@ -92,6 +92,7 @@ struct input_device { + + static int idle_timeout = 0; + static bool uhid_enabled = false; ++static bool classic_bonded_only = false; + + void input_set_idle_timeout(int timeout) + { +@@ -103,6 +104,11 @@ void input_enable_userspace_hid(bool state) + uhid_enabled = state; + } + ++void input_set_classic_bonded_only(bool state) ++{ ++ classic_bonded_only = state; ++} ++ + static void input_device_enter_reconnect_mode(struct input_device *idev); + static int connection_disconnect(struct input_device *idev, uint32_t flags); + +@@ -970,8 +976,18 @@ static int hidp_add_connection(struct input_device *idev) + if (device_name_known(idev->device)) + device_get_name(idev->device, req->name, sizeof(req->name)); + ++ /* Make sure the device is bonded if required */ ++ if (classic_bonded_only && !device_is_bonded(idev->device, ++ btd_device_get_bdaddr_type(idev->device))) { ++ error("Rejected connection from !bonded device %s", dst_addr); ++ goto cleanup; ++ } ++ + /* Encryption is mandatory for keyboards */ +- if (req->subclass & 0x40) { ++ /* Some platforms may choose to require encryption for all devices */ ++ /* Note that this only matters for pre 2.1 devices as otherwise the */ ++ /* device is encrypted by default by the lower layers */ ++ if (classic_bonded_only || req->subclass & 0x40) { + if (!bt_io_set(idev->intr_io, &gerr, + BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, + BT_IO_OPT_INVALID)) { +@@ -1203,6 +1219,11 @@ static void input_device_enter_reconnect_mode(struct input_device *idev) + DBG("path=%s reconnect_mode=%s", idev->path, + reconnect_mode_to_string(idev->reconnect_mode)); + ++ /* Make sure the device is bonded if required */ ++ if (classic_bonded_only && !device_is_bonded(idev->device, ++ btd_device_get_bdaddr_type(idev->device))) ++ return; ++ + /* Only attempt an auto-reconnect when the device is required to + * accept reconnections from the host. + */ +diff --git a/profiles/input/device.h b/profiles/input/device.h +index 51a9aee18..3044db673 100644 +--- a/profiles/input/device.h ++++ b/profiles/input/device.h +@@ -29,6 +29,7 @@ struct input_conn; + + void input_set_idle_timeout(int timeout); + void input_enable_userspace_hid(bool state); ++void input_set_classic_bonded_only(bool state); + + int input_device_register(struct btd_service *service); + void input_device_unregister(struct btd_service *service); +diff --git a/profiles/input/input.conf b/profiles/input/input.conf +index 3e1d65aae..166aff4a4 100644 +--- a/profiles/input/input.conf ++++ b/profiles/input/input.conf +@@ -11,3 +11,11 @@ + # Enable HID protocol handling in userspace input profile + # Defaults to false (HIDP handled in HIDP kernel module) + #UserspaceHID=true ++ ++# Limit HID connections to bonded devices ++# The HID Profile does not specify that devices must be bonded, however some ++# platforms may want to make sure that input connections only come from bonded ++# device connections. Several older mice have been known for not supporting ++# pairing/encryption. ++# Defaults to false to maximize device compatibility. ++#ClassicBondedOnly=true +diff --git a/profiles/input/manager.c b/profiles/input/manager.c +index 1d31b0652..5cd27b839 100644 +--- a/profiles/input/manager.c ++++ b/profiles/input/manager.c +@@ -96,7 +96,7 @@ static int input_init(void) + config = load_config_file(CONFIGDIR "/input.conf"); + if (config) { + int idle_timeout; +- gboolean uhid_enabled; ++ gboolean uhid_enabled, classic_bonded_only; + + idle_timeout = g_key_file_get_integer(config, "General", + "IdleTimeout", &err); +@@ -114,6 +114,17 @@ static int input_init(void) + input_enable_userspace_hid(uhid_enabled); + } else + g_clear_error(&err); ++ ++ classic_bonded_only = g_key_file_get_boolean(config, "General", ++ "ClassicBondedOnly", &err); ++ ++ if (!err) { ++ DBG("input.conf: ClassicBondedOnly=%s", ++ classic_bonded_only ? "true" : "false"); ++ input_set_classic_bonded_only(classic_bonded_only); ++ } else ++ g_clear_error(&err); ++ + } + + btd_profile_register(&input_profile); +-- +2.25.1 + +From 8cdbd3b09f29da29374e2f83369df24228da0ad1 Mon Sep 17 00:00:00 2001 +From: Alain Michaud +Date: Tue, 10 Mar 2020 02:35:16 +0000 +Subject: [PATCH] HOGP must only accept data from bonded devices. + +HOGP 1.0 Section 6.1 establishes that the HOGP must require bonding. + +Reference: +https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.htm +--- + profiles/input/hog.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/profiles/input/hog.c b/profiles/input/hog.c +index 83c017dcb..dfac68921 100644 +--- a/profiles/input/hog.c ++++ b/profiles/input/hog.c +@@ -186,6 +186,10 @@ static int hog_accept(struct btd_service *service) + return -EINVAL; + } + ++ /* HOGP 1.0 Section 6.1 requires bonding */ ++ if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) ++ return -ECONNREFUSED; ++ + /* TODO: Replace GAttrib with bt_gatt_client */ + bt_hog_attach(dev->hog, attrib); + +-- +2.25.1 + -- cgit v1.2.3 From 39356057bce20f74120b6d227567a943556717cc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Mar 2020 15:31:59 -0400 Subject: doc: Update guidance about Python 2 package variants. * doc/contributing.texi (Python Modules): Don't recommend adding Python-2 package variants by default. --- doc/contributing.texi | 11 ++++++----- doc/guix.texi | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index afcc030b4f..31b875f817 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -612,11 +612,12 @@ To avoid confusion and naming clashes with other programming languages, it seems desirable that the name of a package for a Python module contains the word @code{python}. -Some modules are compatible with only one version of Python, others with both. -If the package Foo compiles only with Python 3, we name it -@code{python-foo}; if it compiles only with Python 2, we name it -@code{python2-foo}. If it is compatible with both versions, we create two -packages with the corresponding names. +Some modules are compatible with only one version of Python, others with +both. If the package Foo is compiled with Python 3, we name it +@code{python-foo}. If it is compiled with Python 2, we name it +@code{python2-foo}. Packages should be added when they are necessary; +we don't add Python 2 variants of the package unless we are going to use +them. If a project already contains the word @code{python}, we drop this; for instance, the module python-dateutil is packaged under the names diff --git a/doc/guix.texi b/doc/guix.texi index 8acae26b9a..4658c6f5eb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -28,7 +28,7 @@ Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* -Copyright @copyright{} 2015, 2016, 2017, 2019 Leo Famulari@* +Copyright @copyright{} 2015, 2016, 2017, 2019, 2020 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* -- cgit v1.2.3 From 989d564f4434c6e43df7ccb0d1701e89e243e404 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 13 Mar 2020 20:18:53 +0100 Subject: gnu: launchmon: Fix build with GCC 7. * gnu/packages/admin.scm (launchmon)[source](modules, snippet): New fields. --- gnu/packages/admin.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 0f27e6370b..5ec34864e2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3170,7 +3170,16 @@ late.") version "/launchmon-v" version ".tar.gz")) (sha256 (base32 - "0fm3nd9mydm9v2bf7bh01dbgrfnpwkapxa3dsvy3x1z0rz61qc0x")))) + "0fm3nd9mydm9v2bf7bh01dbgrfnpwkapxa3dsvy3x1z0rz61qc0x")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix build failure with GCC 7 due to a conversion error. + ;; Remove for versions > 1.0.2. + (substitute* "launchmon/src/linux/lmon_api/lmon_coloc_spawner.cxx" + ((" lmonpl = '\\\\0'") + " *lmonpl = '\\0'")) + #t)))) (build-system gnu-build-system) (inputs `(("mpi" ,openmpi) -- cgit v1.2.3 From a96d4897aedb36354d70fb03492a002a7ba67aa7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:57:26 +0100 Subject: gnu: ncftp: Use HTTPS home page. * gnu/packages/ftp.scm (ncftp)[home-page]: Use HTTPS. --- gnu/packages/ftp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 58d817853b..273128f631 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -130,7 +130,7 @@ reliability in mind.") (string-append "--prefix=" out)))))) #:tests? #f)) ;there are no tests (inputs `(("ncurses" ,ncurses))) - (home-page "http://www.ncftp.com/ncftp/") + (home-page "https://www.ncftp.com/ncftp/") (synopsis "Command-line File Transfer Protocol (FTP) client") (description "NcFTP Client (or just NcFTP) is a set of command-line programs to access -- cgit v1.2.3 From bb45b9c258289e575ca009175b35b8c6d7f6e776 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:58:05 +0100 Subject: gnu: vim-scheme: Use HTTPS home page. * gnu/packages/vim.scm (vim-scheme)[home-page]: Use HTTPS. --- gnu/packages/vim.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 5b03124e38..7bea7fa791 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -398,7 +398,7 @@ trouble using them, because you do not have to remember each snippet name.") (synopsis "Scheme syntax for Vim") (description "@code{vim-scheme} provides Scheme support for Vim (R7RS and CHICKEN).") - (home-page "http://foldling.org/git/vim-scheme.git/") + (home-page "https://foldling.org/git/vim-scheme.git/") (license license:public-domain)))) (define-public vim-luna -- cgit v1.2.3 From 450a1af293b30fa1dbf25a42b8a86b5b3bfb4d4a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:32:49 +0100 Subject: gnu: iodine: Use HTTPS home page. * gnu/packages/networking.scm (iodine)[home-page]: Use HTTPS. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b7e79ce596..9fd58a5659 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -550,7 +550,7 @@ test_parse_format_ipv(4(|_listen_all|_mapped_ipv6)|6)\\);") ("zlib" ,zlib))) (native-inputs `(("check" ,check) ("pkg-config" ,pkg-config))) - (home-page "http://code.kryo.se/iodine/") + (home-page "https://code.kryo.se/iodine/") (synopsis "Tunnel IPv4 data through a DNS server") (description "Iodine tunnels IPv4 data through a DNS server. This can be useful in different situations where internet access is firewalled, but -- cgit v1.2.3 From 1df9bee78645add6a80277941ab4f0658feda9b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:33:39 +0100 Subject: gnu: scm: Use HTTPS home page. * gnu/packages/scheme.scm (scm)[home-page]: Use HTTPS. --- gnu/packages/scheme.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index e311de0638..d8a1a04ba4 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -801,7 +801,7 @@ utility functions for all standard Scheme implementations.") (inputs `(("slib" ,slib))) (native-inputs `(("unzip" ,unzip) ("texinfo" ,texinfo))) - (home-page "http://people.csail.mit.edu/jaffer/SCM") + (home-page "https://people.csail.mit.edu/jaffer/SCM") (synopsis "Scheme implementation conforming to R5RS and IEEE P1178") (description "GNU SCM is an implementation of Scheme. This implementation includes Hobbit, a Scheme-to-C compiler, which can -- cgit v1.2.3 From 954bfbdf775d5edd3de162d33f69ed586e0f3103 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:49:47 +0100 Subject: gnu: cdparanoia: Use HTTPS home page. * gnu/packages/cdrom.scm (cdparanoia)[home-page]: Use HTTPS. --- gnu/packages/cdrom.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index b6bdf33eef..d6127d11f9 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -213,7 +213,7 @@ files.") `(#:tests? #f ; there is no check target #:configure-flags ; Add $libdir to the RUNPATH of all the executables. (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")))) - (home-page "http://www.xiph.org/paranoia/") + (home-page "https://www.xiph.org/paranoia/") (synopsis "Audio CD reading utility") (description "Cdparanoia retrieves audio tracks from CDDA capable CDROM drives. The data can be saved to a file or directed to standard output -- cgit v1.2.3 From ec4c170f947f90ad26fb657d23290fd07c7d0459 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Mar 2020 03:24:10 +0100 Subject: gnu: blender: Update to 2.82a. * gnu/packages/graphics.scm (blender): Update to 2.82a. --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index c30f23d921..15dc92e98e 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -88,14 +88,14 @@ (define-public blender (package (name "blender") - (version "2.82") + (version "2.82a") (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "0rgw8nilvn6k6r7p28y2l1rwpami1cc8xz473jaahn7wa4ndyah0")))) + "18zbdgas6qf2kmvvlimxgnq7y9kj7hdxcgixrs6fj50x40q01q2d")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) -- cgit v1.2.3 From 71441a3851801a14a3f9d6dedc0a80361c1a7317 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:53:57 +0100 Subject: gnu: hyperestraier: Use HTTPS home page. * gnu/packages/search.scm (hyperestraier)[home-page]: Use HTTPS. --- gnu/packages/search.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index d1b67a3943..dcfd1ec1bd 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -249,7 +249,7 @@ for parsing HTML files.") `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")))) - (home-page "http://fallabs.com/hyperestraier") + (home-page "https://fallabs.com/hyperestraier") (synopsis "Full-text search system") (description "Hyper Estraier can be used to integrate full-text search into applications, using either the provided command line and CGI -- cgit v1.2.3 From 554f5b62805b900a9e4e320cbbbb800c13557b7e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 18 Feb 2020 14:57:38 -0500 Subject: gnu: Add SVT-AV1. * gnu/packages/video.scm (svt-av1): New variable. --- gnu/packages/video.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0e428f345d..074a1235a3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2018 Roel Janssen ;;; Copyright © 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2018, 2019 Pierre Neidhardt -;;; Copyright © 2018, 2019 Leo Famulari +;;; Copyright © 2018, 2019, 2020 Leo Famulari ;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Björn Höfling @@ -3793,3 +3793,40 @@ Theora videos. Theorafile was written to be used for FNA's VideoPlayer.") DVD using @command{libdvdcss}, but does @strong{not} demux, remux, transcode or reformat the videos in any way, producing perfect backups.") (license license:gpl3+))) + +(define-public svt-av1 + (package + (name "svt-av1") + (version "0.8.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenVisualCloud/SVT-AV1.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08sx9zhhks8wzq05f67jqmc1zqmmi7hqkgg2gyjpcsan5qc5476w")))) + (build-system cmake-build-system) + ;; SVT-AV1 only supports Intel-compatible CPUs. + (supported-systems '("x86_64-linux" "i686-linux")) + (arguments + ;; The test suite tries to download test data and git clone a 3rd-party + ;; fork of libaom. Skip it. + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (doc (string-append out "/share/doc/svt-av1-" ,version))) + (copy-recursively "../source/Docs" doc) + #t)))))) + (native-inputs + `(("yasm" ,yasm))) + (synopsis "AV1 video codec") + (description "SVT-AV1 is an AV1 codec implementation. The encoder is a +work-in-progress, aiming to support video-on-demand and live streaming +applications. It only supports Intel-compatible CPUs (x86).") + (home-page "https://github.com/OpenVisualCloud/SVT-AV1") + (license license:bsd-2))) -- cgit v1.2.3 From b471337dea828b403635cc2391836ffe6ca0ad31 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 01:57:10 +0100 Subject: gnu: suitesparse: Build with cmake-minimal. * gnu/packages/maths.scm (suitesparse)[native-inputs]: Change from CMAKE to CMAKE-MINIMAL. --- 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 e694a5b187..499fdb06f7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3463,7 +3463,7 @@ Fresnel integrals, and similar related functions as well.") ("lapack" ,lapack) ("metis" ,metis))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("m4" ,m4))) (home-page "http://faculty.cse.tamu.edu/davis/suitesparse.html") (synopsis "Suite of sparse matrix software") -- cgit v1.2.3 From 6d84566e5e0dc8adddd0b68888fd3b317323718d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 10:48:57 +0100 Subject: gnu: GraphicsMagick: Update to 1.3.35. * gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.35. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 1ea4b5bd6a..c575162dfe 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -170,7 +170,7 @@ script.") (define-public graphicsmagick (package (name "graphicsmagick") - (version "1.3.34") + (version "1.3.35") (source (origin (method url-fetch) @@ -183,7 +183,7 @@ script.") "/GraphicsMagick-" version ".tar.xz"))) (sha256 (base32 - "197pshms3m8mn2x1ryiag37ambm8qmb448spch66l3gdfd8rs06z")))) + "0l024l4hawm9s3jqrgi2j0lxgm61dqh8sgkj1017ma7y11hqv2hq")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From a92a93c9a47f26de8aed907e573aee7aed5fa92f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 11:31:03 +0100 Subject: gnu: cppzmq: Update to 4.6.0. * gnu/packages/networking.scm (cppzmq): Update to 4.6.0. [arguments]: Add #:configure-flags. --- gnu/packages/networking.scm | 56 +++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9fd58a5659..4fa5008149 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2018 Tonton ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Theodoros Foradis -;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018, 2020 Marius Bakke ;;; Copyright © 2018, 2020 Oleg Pykhalov ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Maxim Cournoyer @@ -342,33 +342,35 @@ between different versions of ØMQ.") (license license:mpl2.0))) (define-public cppzmq - (let ((revision "0") - (commit "d9f0f016c07046742738c65e1eb84722ae32d7d4")) - (package - (name "cppzmq") - (version (string-append "4.2.2-" revision "." - (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/zeromq/cppzmq") - (commit commit))) - (sha256 - (base32 - "1gmqlm00y6xpa5m6d4ajq3ww63n2w7h4sy997wj81vcqmqx45b1f")) - (file-name (string-append name "-" version "-checkout")))) - (build-system cmake-build-system) - (arguments '(#:tests? #f)) ; No tests. - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("zeromq" ,zeromq))) - (home-page "http://zeromq.org") - (synopsis "C++ bindings for the ØMQ messaging library") - (description - "This package provides header-only C++ bindings for ØMQ. The header + (package + (name "cppzmq") + (version "4.6.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zeromq/cppzmq") + (commit (string-append "v" version)))) + (sha256 + (base32 + "19acx2bzi4n6fdnfgkja1nds7m1bwg8lw5vfcijrx9fv75pa7m8h")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + '(;; FIXME: The test suite requires downloading Catch and custom + ;; CMake targets, and refuses to use the system version. + ;; See . + #:tests? #f + #:configure-flags '("-DCPPZMQ_BUILD_TESTS=OFF"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("zeromq" ,zeromq))) + (home-page "http://zeromq.org") + (synopsis "C++ bindings for the ØMQ messaging library") + (description + "This package provides header-only C++ bindings for ØMQ. The header files contain direct mappings of the abstractions provided by the ØMQ C API.") - (license license:expat)))) + (license license:expat))) (define-public librdkafka (package -- cgit v1.2.3 From f57566873093f89bc01ef127f2804ec36d4dc425 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 11:32:02 +0100 Subject: gnu: libopenshot-audio: Update to 0.2.0. * gnu/packages/audio.scm (libopenshot-audio): Update to 0.2.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 b6e0a436c3..758c87cb2c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3734,7 +3734,7 @@ surround).") (define-public libopenshot-audio (package (name "libopenshot-audio") - (version "0.1.8") + (version "0.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -3743,7 +3743,7 @@ surround).") (file-name (git-file-name name version)) (sha256 (base32 - "1fvp6nmf30xzkmcznakh8dv5vn9d7nq051pqcqv638hsfppkmcrl")))) + "13if0m5mvlqly8gmbhschzb9papkgp3yqivklhb949dhy16m8zgf")))) (build-system cmake-build-system) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From 747953c430039055140e29546ff50641da1ab440 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Mar 2020 11:32:26 +0100 Subject: gnu: libopenshot: Update to 0.2.5. * gnu/packages/video.scm (libopenshot): Update to 0.2.5. --- 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 074a1235a3..c9d9cd5b91 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3493,7 +3493,7 @@ create smoother and stable videos.") (define-public libopenshot (package (name "libopenshot") - (version "0.2.3") + (version "0.2.5") (source (origin (method git-fetch) (uri (git-reference @@ -3502,7 +3502,7 @@ create smoother and stable videos.") (file-name (git-file-name name version)) (sha256 (base32 - "0r1qmr8ar5n72603xkj9h065vbpznrqsq88kxxmn9n8djyyvk03k")) + "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp")) (modules '((guix build utils))) (snippet '(begin ;; Allow overriding of the python installation dir -- cgit v1.2.3