From 0c5d0c57d370b34f3ba677838deaa8baf7bca58a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 6 Nov 2020 08:54:27 -0500 Subject: services: mpd: Do not eagerly look for a user. Running 'guix system search mpd' would throw a backtrace because the mpd-shepherd-service service start Gexp contained an unquoted call to 'getpwnam', which would look for a missing 'mpd' user and fail. * gnu/services/audio.scm (mpd-shepherd-service): gexp-unquote only the relevant variable rather than the whole expression. --- gnu/services/audio.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index 37f2efa479..5d33032501 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -143,11 +143,11 @@ audio_output { #:pid-file #$(mpd-file-name config "pid") #:environment-variables ;; Required to detect PulseAudio when run under a user account. - '(#$(string-append - "XDG_RUNTIME_DIR=/run/user/" - (number->string + (list (string-append + "XDG_RUNTIME_DIR=/run/user/" + (number->string (passwd:uid - (getpwnam (mpd-configuration-user config)))))) + (getpwnam #$(mpd-configuration-user config)))))) #:log-file #$(mpd-file-name config "log"))) (stop #~(make-kill-destructor)))) -- cgit v1.2.3 From 3c69e81d85e337ccceb2248c497bd1732a63f7ec Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 6 Nov 2020 16:12:10 +0100 Subject: tests: docker-system: Increase VM memory. The test was failing with ENOSPC. * gnu/tests/docker.scm (run-docker-system-test)[vm]: Increase 'memory-size'. (%test-docker-system): Change 'locale-libcs' for the OS passed to 'system-docker-image'. --- gnu/tests/docker.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index ea6c9a33fe..c70c3ddb9e 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -27,8 +27,9 @@ #:use-module (gnu services networking) #:use-module (gnu services docker) #:use-module (gnu services desktop) - #:use-module (gnu packages docker) + #:use-module ((gnu packages base) #:select (glibc)) #:use-module (gnu packages guile) + #:use-module (gnu packages docker) #:use-module (guix gexp) #:use-module (guix grafts) #:use-module (guix monads) @@ -206,7 +207,7 @@ inside %DOCKER-OS." ;; load' must be able to store the whole image into memory, hence the ;; huge memory requirements. We should avoid the volatile-root setup ;; instead. - (memory-size 3500) + (memory-size 4000) (port-forwardings '()))) (define test @@ -298,5 +299,9 @@ inside %DOCKER-OS." (description "Run a system image as produced by @command{guix system docker-image} inside Docker.") (value (with-monad %store-monad - (>>= (system-docker-image (simple-operating-system)) + (>>= (system-docker-image (operating-system + (inherit (simple-operating-system)) + ;; Use locales for a single libc to + ;; reduce space requirements. + (locale-libcs (list glibc)))) run-docker-system-test))))) -- cgit v1.2.3 From 7209d7cbc37c108ca1148561a681258bb2222ab1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 6 Nov 2020 22:58:28 +0100 Subject: services: mpd: Always create the "mpd" user account. * gnu/services/audio.scm (%mpd-accounts): New variable. (mpd-service-type)[extensions]: Add ACCOUNT-SERVICE-TYPE extension. --- gnu/services/audio.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index 5d33032501..5729b6bb0e 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,8 @@ #:use-module (guix gexp) #:use-module (gnu services) #:use-module (gnu services shepherd) + #:use-module (gnu system shadow) + #:use-module (gnu packages admin) #:use-module (gnu packages mpd) #:use-module (guix records) #:use-module (ice-9 match) @@ -162,6 +165,22 @@ audio_output { (mkdir-p directory) (chown directory (passwd:uid %user) (passwd:gid %user)))))) + +(define %mpd-accounts + ;; Default account and group for MPD. + (list (user-group (name "mpd") (system? #t)) + (user-account + (name "mpd") + (group "mpd") + (system? #t) + (comment "Music Player Daemon (MPD) user") + + ;; Note: /var/run/mpd hosts one sub-directory per user, of which + ;; /var/run/mpd/mpd corresponds to the "mpd" user. + (home-directory "/var/run/mpd/mpd") + + (shell (file-append shadow "/sbin/nologin"))))) + (define mpd-service-type (service-type (name 'mpd) @@ -169,6 +188,8 @@ audio_output { (extensions (list (service-extension shepherd-root-service-type (compose list mpd-shepherd-service)) + (service-extension account-service-type + (const %mpd-accounts)) (service-extension activation-service-type mpd-service-activation))) (default-value (mpd-configuration)))) -- cgit v1.2.3 From bb124f6e9c0af0a23736f233c2ea2c9c9b4a40a6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 6 Nov 2020 23:10:18 +0100 Subject: services: mpd: Fix daemon startup. Until now it would wait for a PID file that'd never come. * gnu/services/audio.scm (mpd-shepherd-service): Add 'requirement'. Remove #:pid-file from 'start'. (mpd-service-activation): Create the ".mpd" directory since that's what the daemon expects. --- gnu/services/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index 5729b6bb0e..627b941871 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -138,12 +138,12 @@ audio_output { (define (mpd-shepherd-service config) (shepherd-service (documentation "Run the MPD (Music Player Daemon)") + (requirement '(user-processes)) (provision '(mpd)) (start #~(make-forkexec-constructor (list #$(file-append mpd "/bin/mpd") "--no-daemon" #$(mpd-config->file config)) - #:pid-file #$(mpd-file-name config "pid") #:environment-variables ;; Required to detect PulseAudio when run under a user account. (list (string-append @@ -161,7 +161,7 @@ audio_output { (define %user (getpw #$(mpd-configuration-user config))) - (let ((directory #$(mpd-file-name config ""))) + (let ((directory #$(mpd-file-name config ".mpd"))) (mkdir-p directory) (chown directory (passwd:uid %user) (passwd:gid %user)))))) -- cgit v1.2.3 From 9909eddbc55c6cac5acccab453993cd113aa38a1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 6 Nov 2020 23:12:12 +0100 Subject: tests: mpd: Remove race condition; use default MPD configuration. * gnu/tests/audio.scm (%mpd-os): Use the default 'mpd-configuration'. (run-mpd-test)[test]("mpd listening"): New test. ("mpc connect"): Use 'system*' and 'test-equal'. --- gnu/tests/audio.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/audio.scm b/gnu/tests/audio.scm index 8eadaf02e1..7bf7d4ef14 100644 --- a/gnu/tests/audio.scm +++ b/gnu/tests/audio.scm @@ -28,9 +28,7 @@ (define %mpd-os (simple-operating-system - (service mpd-service-type - (mpd-configuration - (user "root"))))) + (service mpd-service-type))) (define (run-mpd-test) "Run tests in %mpd-os, which has mpd running." @@ -62,9 +60,14 @@ (start-service 'mpd)) marionette)) - (test-assert "mpc connect" + (test-assert "mpd listening" + ;; Wait until mpd is actually listening before spawning 'mpc'. + (wait-for-tcp-port 6600 marionette)) + + (test-equal "mpc connect" + 0 (marionette-eval - '(zero? (system #$(file-append mpd-mpc "/bin/mpc"))) + '(system* #$(file-append mpd-mpc "/bin/mpc")) marionette)) (test-end) -- cgit v1.2.3 From 02f5ee01c96589fc13f1e21b85b0b48100aec4e8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Mar 2020 15:06:23 +0100 Subject: gnu: libffi: Fix building on powerpc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libffi.scm (libffi)[inputs]: New field. [arguments]: Add 'apply-patch' phase when targeting PowerPC. * gnu/packages/patches/libffi-3.3-powerpc-fixes.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Co-authored-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/libffi.scm | 24 +++- .../patches/libffi-3.3-powerpc-fixes.patch | 138 +++++++++++++++++++++ 3 files changed, 160 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/libffi-3.3-powerpc-fixes.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 72f81a9913..105e4dd28c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1194,6 +1194,7 @@ dist_patch_DATA = \ %D%/packages/patches/jsoncpp-fix-inverted-case.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ + %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libvirt-create-machine-cgroup.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index ec8703ffdb..d324892330 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -1,8 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2020 Ludovic Courtès ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2015, 2019 Ricardo Wurmus -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2020 Efraim Flashner ;;; Copyright © 2016, 2017 Ben Woodcroft ;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -55,7 +55,25 @@ (arguments `(;; Prevent the build system from passing -march and -mtune to the ;; compiler. See "ax_cc_maxopt.m4" and "ax_gcc_archflag.m4". - #:configure-flags '("--enable-portable-binary" "--without-gcc-arch"))) + #:configure-flags '("--enable-portable-binary" "--without-gcc-arch") + + ;; TODO: Inline patch on next rebuild cycle. + ,@(if (string-prefix? "powerpc-" (or (%current-target-system) + (%current-system))) + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'apply-patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch (assoc-ref inputs + "powerpc-patch"))) + (invoke "patch" "--batch" "-p1" + "-i" patch)))))) + '()))) + (inputs + (if (string-prefix? "powerpc-" (or (%current-target-system) + (%current-system))) + `(("powerpc-patch" ,@(search-patches + "libffi-3.3-powerpc-fixes.patch"))) + '())) (outputs '("out" "debug")) (synopsis "Foreign function call interface library") (description diff --git a/gnu/packages/patches/libffi-3.3-powerpc-fixes.patch b/gnu/packages/patches/libffi-3.3-powerpc-fixes.patch new file mode 100644 index 0000000000..971ed26180 --- /dev/null +++ b/gnu/packages/patches/libffi-3.3-powerpc-fixes.patch @@ -0,0 +1,138 @@ +This is a combination of the following 4 commits: +https://github.com/libffi/libffi/commit/01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd.patch +https://github.com/libffi/libffi/commit/6663047f56c2932a6b10a790f4ac6666dd181326.patch +https://github.com/libffi/libffi/commit/e50b9ef8b910fa642ef158f6642e60d54d7ad740.patch +https://github.com/libffi/libffi/commit/4d6d2866ae43e55325e8ee96561221804602cd7a.patch + +From 2dbfa92a95e3bacabca431b89d2a5925e48a0e40 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Thu, 28 Nov 2019 12:42:41 +0000 + +powerpc: fix build failure on power7 and older (#532) + +Build failure looks as: +``` +libtool: compile: powerpc-unknown-linux-gnu-gcc \ + -O2 -mcpu=powerpc -mtune=powerpc -pipe ... -c src/powerpc/ffi.c ... +In file included from src/powerpc/ffi.c:33: +src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target + 65 | typedef __int128 float128; + | ^~~~~~~~ +``` + +The fix avoids using __int128 in favour of aligned char[16]. + +Closes: https://github.com/libffi/libffi/issues/531 +Signed-off-by: Sergei Trofimovich + +Address platforms with no __int128. + +powerpc64: Use memcpy to help platforms with no __int128. (#534) + +Signed-off-by: Khem Raj + +Update powerpc sysv assembly for ffi_powerpc.h changes (#541) + +Some of the flag bits were moved when adding powerpc64 vector support. + +Fixes #536 +--- + src/powerpc/ffi_linux64.c | 12 ++++++------ + src/powerpc/ffi_powerpc.h | 2 +- + src/powerpc/sysv.S | 12 +++++------- + 3 files changed, 12 insertions(+), 14 deletions(-) + +diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c +index de0d033..4d50878 100644 +--- a/src/powerpc/ffi_linux64.c ++++ b/src/powerpc/ffi_linux64.c +@@ -547,9 +547,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) + if (next_arg.ul == gpr_end.ul) + next_arg.ul = rest.ul; + if (vecarg_count < NUM_VEC_ARG_REGISTERS64 && i < nfixedargs) +- *vec_base.f128++ = **p_argv.f128; ++ memcpy (vec_base.f128++, *p_argv.f128, sizeof (float128)); + else +- *next_arg.f128 = **p_argv.f128; ++ memcpy (next_arg.f128, *p_argv.f128, sizeof (float128)); + if (++next_arg.f128 == gpr_end.f128) + next_arg.f128 = rest.f128; + vecarg_count++; +@@ -680,9 +680,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) + { + if (vecarg_count < NUM_VEC_ARG_REGISTERS64 + && i < nfixedargs) +- *vec_base.f128++ = *arg.f128++; ++ memcpy (vec_base.f128++, arg.f128, sizeof (float128)); + else +- *next_arg.f128 = *arg.f128++; ++ memcpy (next_arg.f128, arg.f128++, sizeof (float128)); + if (++next_arg.f128 == gpr_end.f128) + next_arg.f128 = rest.f128; + vecarg_count++; +@@ -986,9 +986,9 @@ ffi_closure_helper_LINUX64 (ffi_cif *cif, + do + { + if (pvec < end_pvec && i < nfixedargs) +- *to.f128 = *pvec++; ++ memcpy (to.f128, pvec++, sizeof (float128)); + else +- *to.f128 = *from.f128; ++ memcpy (to.f128, from.f128, sizeof (float128)); + to.f128++; + from.f128++; + } +diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h +index 5ee2a70..8e2f2f0 100644 +--- a/src/powerpc/ffi_powerpc.h ++++ b/src/powerpc/ffi_powerpc.h +@@ -62,7 +62,7 @@ typedef _Float128 float128; + #elif defined(__FLOAT128__) + typedef __float128 float128; + #else +-typedef __int128 float128; ++typedef char float128[16] __attribute__((aligned(16))); + #endif + + void FFI_HIDDEN ffi_closure_SYSV (void); +diff --git a/src/powerpc/sysv.S b/src/powerpc/sysv.S +index 1474ce7..df97734 100644 +--- a/src/powerpc/sysv.S ++++ b/src/powerpc/sysv.S +@@ -104,17 +104,16 @@ ENTRY(ffi_call_SYSV) + bctrl + + /* Now, deal with the return value. */ +- mtcrf 0x01,%r31 /* cr7 */ ++ mtcrf 0x03,%r31 /* cr6-cr7 */ + bt- 31,L(small_struct_return_value) + bt- 30,L(done_return_value) + #ifndef __NO_FPRS__ + bt- 29,L(fp_return_value) + #endif + stw %r3,0(%r30) +- bf+ 28,L(done_return_value) ++ bf+ 27,L(done_return_value) + stw %r4,4(%r30) +- mtcrf 0x02,%r31 /* cr6 */ +- bf 27,L(done_return_value) ++ bf 26,L(done_return_value) + stw %r5,8(%r30) + stw %r6,12(%r30) + /* Fall through... */ +@@ -145,10 +144,9 @@ L(done_return_value): + #ifndef __NO_FPRS__ + L(fp_return_value): + .cfi_restore_state +- bf 28,L(float_return_value) ++ bf 27,L(float_return_value) + stfd %f1,0(%r30) +- mtcrf 0x02,%r31 /* cr6 */ +- bf 27,L(done_return_value) ++ bf 26,L(done_return_value) + stfd %f2,8(%r30) + b L(done_return_value) + L(float_return_value): +-- +2.26.0 + -- cgit v1.2.3 From de6b649f8031cc2fa45099a3c41d78c2e302fdf2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 7 Nov 2020 12:07:41 +0100 Subject: tests: git-http: Avoid race condition. * gnu/tests/version-control.scm (run-git-http-test)[test]("fcgiwrap listens"): New test. --- gnu/tests/version-control.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests/version-control.scm b/gnu/tests/version-control.scm index 230aa9edf9..d3cf19c913 100644 --- a/gnu/tests/version-control.scm +++ b/gnu/tests/version-control.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Oleg Pykhalov -;;; Copyright © 2017, 2018 Ludovic Courtès +;;; Copyright © 2017, 2018, 2020 Ludovic Courtès ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2018 Christopher Baines ;;; @@ -285,6 +285,10 @@ HTTP-PORT." '(file-exists? "/srv/git/test") marionette)) + (test-assert "fcgiwrap listens" + ;; Wait for fcgiwrap to be ready before cloning. + (wait-for-tcp-port 9000 marionette)) + ;; Make sure we can clone the repo from the host. (test-equal "clone" '#$README-contents -- cgit v1.2.3 From 7286c9b1879453ea4e0a08e91cc48706d8887f37 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 7 Nov 2020 12:48:24 +0100 Subject: tests: nfs-root-fs: Use the right store file name. * gnu/tests/nfs.scm (run-nfs-root-fs-test): Pass "nfs-root-fs-test" as the first argument to 'gexp->derivation'. --- gnu/tests/nfs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index da729ddcc9..5d04af38fb 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -404,7 +404,7 @@ directories can be mounted.") (test-end) (exit (= (test-runner-fail-count (test-runner-current)) 0))))) - (gexp->derivation "nfs-server-test" test)) + (gexp->derivation "nfs-root-fs-test" test)) (define %test-nfs-root-fs (system-test -- cgit v1.2.3 From ae0fe289d3e5e0ae7d8c0764ddb4f58b275ee3b0 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 6 Nov 2020 10:59:54 +0100 Subject: installer: Limit listbox height. Fixes: . * gnu/installer/newt.scm (init): Print screen size. * gnu/installer/newt/page.scm (default-listbox-height): New variable. (run-listbox-selection-page): Use it. * gnu/installer/newt/wifi.scm (wifi-listbox-height): Ditto. * gnu/installer/newt/network.scm (run-technology-page): Set the maximum listbox height to 5. * gnu/installer/newt/ethernet.scm (run-ethernet-page): Ditto. * gnu/installer/newt/final.scm (run-config-display-page): Change listbox height. * gnu/installer/newt/partition.scm (run-disk-page): Ditto. * gnu/installer/newt/welcome.scm (display-logo?): New procedure. (run-menu-page): Use it. * gnu/installer/steps.scm (%configuration-file-width): Remove it. --- gnu/installer/newt.scm | 1 + gnu/installer/newt/ethernet.scm | 2 +- gnu/installer/newt/final.scm | 5 ++--- gnu/installer/newt/network.scm | 2 +- gnu/installer/newt/page.scm | 11 +++++++++-- gnu/installer/newt/partition.scm | 2 +- gnu/installer/newt/welcome.scm | 8 +++++++- gnu/installer/newt/wifi.scm | 3 ++- gnu/installer/steps.scm | 2 -- 9 files changed, 24 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/newt.scm b/gnu/installer/newt.scm index fdab721b2f..a1cbeca49a 100644 --- a/gnu/installer/newt.scm +++ b/gnu/installer/newt.scm @@ -46,6 +46,7 @@ (newt-init) (clear-screen) (set-screen-size!) + (syslog "Display is ~ax~a.~%" (screen-columns) (screen-rows)) (push-help-line (format #f (G_ "Press for installation parameters.")))) diff --git a/gnu/installer/newt/ethernet.scm b/gnu/installer/newt/ethernet.scm index ba5e222a37..ecd22efbb2 100644 --- a/gnu/installer/newt/ethernet.scm +++ b/gnu/installer/newt/ethernet.scm @@ -77,7 +77,7 @@ connection is pending." #:title (G_ "Ethernet connection") #:listbox-items services #:listbox-item->text ethernet-service->text - #:listbox-height (min (+ (length services) 2) 10) + #:listbox-height (min (+ (length services) 2) 5) #:button-text (G_ "Exit") #:button-callback-procedure (lambda _ diff --git a/gnu/installer/newt/final.scm b/gnu/installer/newt/final.scm index 5019a67429..7f6dd9f075 100644 --- a/gnu/installer/newt/final.scm +++ b/gnu/installer/newt/final.scm @@ -40,9 +40,8 @@ file)) (define* (run-config-display-page #:key locale) - (let ((width (%configuration-file-width)) - (height (nearest-exact-integer - (/ (screen-rows) 2)))) + (let ((width (max 70 (- (screen-columns) 20))) + (height (default-listbox-height))) (run-file-textbox-page #:info-text (format #f (G_ "\ We're now ready to proceed with the installation! \ diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm index 461d5d99c0..4af7143d63 100644 --- a/gnu/installer/newt/network.scm +++ b/gnu/installer/newt/network.scm @@ -80,7 +80,7 @@ network devices were found. Do you want to continue anyway?")) #:title (G_ "Internet access") #:listbox-items items #:listbox-item->text technology->text - #:listbox-height (min (+ (length items) 2) 10) + #:listbox-height (min (+ (length items) 2) 5) #:button-text (G_ "Exit") #:button-callback-procedure (lambda _ diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm index 1d6b9979b4..4209674c28 100644 --- a/gnu/installer/newt/page.scm +++ b/gnu/installer/newt/page.scm @@ -32,7 +32,9 @@ #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (newt) - #:export (draw-info-page + #:export (default-listbox-height + + draw-info-page draw-connecting-page run-input-page run-error-page @@ -168,6 +170,10 @@ Like 'run-form', return two values: the exit reason, and an \"argument\"." (_ (values reason argument)))))) +(define (default-listbox-height) + "Return the default listbox height." + (max 5 (- (screen-rows) 20))) + (define (draw-info-page text title) "Draw an informative page with the given TEXT as content. Set the title of this page to TITLE." @@ -339,7 +345,8 @@ of the page is set to TITLE." (info-textbox-width 50) listbox-items listbox-item->text - (listbox-height 20) + (listbox-height + (default-listbox-height)) (listbox-default-item #f) (listbox-allow-multiple? #f) (sort-listbox-items? #t) diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index 35f76db3ed..8561eb1ecf 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -681,7 +681,7 @@ by pressing the Exit button.~%~%"))) (G_ "Guided partitioning") (G_ "Manual partitioning")) #:info-textbox-width 76 ;we need a lot of room for INFO-TEXT - #:listbox-height 12 + #:listbox-height (max 5 (- (screen-rows) 30)) #:listbox-items (disk-items) #:listbox-item->text cdr #:sort-listbox-items? #f diff --git a/gnu/installer/newt/welcome.scm b/gnu/installer/newt/welcome.scm index 1b4b2df816..5f461279e2 100644 --- a/gnu/installer/newt/welcome.scm +++ b/gnu/installer/newt/welcome.scm @@ -38,6 +38,9 @@ (define info-textbox-width (make-parameter 70)) (define options-listbox-height (make-parameter 5)) +(define (display-logo?) + (> (screen-rows) 35)) + (define* (run-menu-page title info-text logo #:key listbox-items @@ -55,7 +58,10 @@ we want this page to occupy all the screen space available." items)) (let* ((logo-textbox - (make-textbox -1 -1 (logo-width) (logo-height) 0)) + (make-textbox -1 -1 + (if (display-logo?) (logo-width) 0) + (if (display-logo?) (logo-height) 0) + 0)) (info-textbox (make-reflowed-textbox -1 -1 info-text diff --git a/gnu/installer/newt/wifi.scm b/gnu/installer/newt/wifi.scm index 3fd5756b99..f5d8f1fdbf 100644 --- a/gnu/installer/newt/wifi.scm +++ b/gnu/installer/newt/wifi.scm @@ -165,7 +165,8 @@ of records present in LISTBOX." (define service-name-max-length (make-parameter 20)) ;; Height of the listbox displaying wifi services. -(define wifi-listbox-height (make-parameter 20)) +(define wifi-listbox-height (make-parameter + (default-listbox-height))) ;; Information textbox width. (define info-textbox-width (make-parameter 40)) diff --git a/gnu/installer/steps.scm b/gnu/installer/steps.scm index 16d74c207f..fdcfb0cb4d 100644 --- a/gnu/installer/steps.scm +++ b/gnu/installer/steps.scm @@ -50,7 +50,6 @@ %installer-configuration-file %installer-target-dir - %configuration-file-width format-configuration configuration->file)) @@ -218,7 +217,6 @@ stored in RESULTS. Return #f otherwise." (define %installer-configuration-file (make-parameter "/mnt/etc/config.scm")) (define %installer-target-dir (make-parameter "/mnt")) -(define %configuration-file-width (make-parameter 79)) (define (format-configuration steps results) "Return the list resulting from the application of the procedure defined in -- cgit v1.2.3 From 4e9ded6d276bf488593f53a84b6e50771abac13f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 8 Nov 2020 14:27:35 +0100 Subject: image: Offload "disk-image" derivations. This is a followup to 99efa804bd6df5de4760ec5974ed2297f1746366. * gnu/system/image.scm (system-disk-image): Pass #:local-build? #f to 'computed-file'. --- gnu/system/image.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 4075a26552..81152f0fc4 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -414,6 +414,7 @@ image ~a { out-image)) (convert-disk-image out-image '#$format #$output))))) (computed-file name builder + #:local-build? #f ;too I/O-intensive #:options `(#:substitutable? ,substitutable?)))) -- cgit v1.2.3 From bc47583412745e38d994a4ba71cda6564aed3a35 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 8 Nov 2020 16:55:07 +0100 Subject: gnu: cross-base: Move glibc Hurd patches to 'inputs'. Fixes "guix build --target=i586-pc-gnu bootstrap-tarballs". * gnu/packages/cross-base.scm (cross-libc): Move Hurd patches from 'native-inputs' to 'inputs'. --- gnu/packages/cross-base.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index b35a3cb40b..c1e5f2eb79 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -539,19 +539,20 @@ and the cross tool chain." ;; FIXME: 'static-bash' should really be an input, not a native input, but ;; to do that will require building an intermediate cross libc. - (inputs '()) + (inputs (if (hurd-triplet? target) + `(;; TODO: move to glibc in the next rebuild cycle + ("hurd-mach-print.patch" + ,(search-patch "glibc-hurd-mach-print.patch")) + ("hurd-gettyent.patch" + ,(search-patch "glibc-hurd-gettyent.patch"))) + '())) (native-inputs `(("cross-gcc" ,xgcc) ("cross-binutils" ,xbinutils) ,@(if (hurd-triplet? target) `(("cross-mig" ,@(assoc-ref (package-native-inputs xheaders) - "cross-mig")) - ;; TODO: move to glibc in the next rebuild cycle - ("hurd-mach-print.patch" - ,@(search-patches "glibc-hurd-mach-print.patch")) - ("hurd-gettyent.patch" - ,@(search-patches "glibc-hurd-gettyent.patch"))) + "cross-mig"))) '()) ,@(package-inputs libc) ;FIXME: static-bash ,@(package-native-inputs libc)))))) -- cgit v1.2.3 From ad2c3ba7504e34bc00808b2dc7d4df5e773f4ffd Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 8 Nov 2020 19:38:31 +0100 Subject: installer: parted: Add debug output. * gnu/installer/parted.scm (mkpart): Log partition creation. --- gnu/installer/parted.scm | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index f2352c5779..f592d315f5 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -758,11 +758,33 @@ cause them to cross." dev-constraint)) (no-constraint (constraint-any device)) ;; Try to create a partition with an optimal alignment - ;; constraint. If it fails, fallback to creating a partition with - ;; no specific constraint. + ;; constraint. If it fails, fallback to creating a partition + ;; with no specific constraint. + (partition-constraint-ok? + (disk-add-partition disk partition final-constraint)) + (partition-no-contraint-ok? + (or partition-constraint-ok? + (disk-add-partition disk partition no-constraint))) (partition-ok? - (or (disk-add-partition disk partition final-constraint) - (disk-add-partition disk partition no-constraint)))) + (or partition-constraint-ok? partition-no-contraint-ok?))) + (syslog "Creating partition: +~/type: ~a +~/filesystem-type: ~a +~/start: ~a +~/end: ~a +~/start-range: [~a, ~a] +~/end-range: [~a, ~a] +~/constraint: ~a +~/no-constraint: ~a +" + partition-type + (filesystem-type-name filesystem-type) + start-sector* + end-sector + (geometry-start start-range) (geometry-end start-range) + (geometry-start end-range) (geometry-end end-range) + partition-constraint-ok? + partition-no-contraint-ok?) ;; Set the partition name if supported. (when (and partition-ok? has-name? name) (partition-set-name partition name)) -- cgit v1.2.3 From 86e9e5cb230c3c10272a223ea04e7564f3c1463b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 9 Nov 2020 22:44:18 +0100 Subject: services: nginx: Re-introduce server-names-hash-bucket-size. This was unintentionally removed in 00014f769233facebd84f13a00b10032a22cb440. * gnu/services/web.scm (default-nginx-config): Re-introduce processing of server-names-hash-bucket-size option. --- gnu/services/web.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 7e17dac6e2..53858436fa 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -668,6 +668,12 @@ of index files." '#$lua-package-cpath) ";")) "") + (if server-names-hash-bucket-size + (string-append + " server_names_hash_bucket_size " + (number->string server-names-hash-bucket-size) + ";\n") + "") (if server-names-hash-bucket-max-size (string-append " server_names_hash_bucket_max_size " -- cgit v1.2.3 From 70ffa8af1e93ab8a92c4622745e9cb4a2782f3c8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 9 Nov 2020 23:24:33 +0100 Subject: machine: ssh: Do not import the host (guix config). * gnu/machine/ssh.scm (machine-boot-parameters): Use 'make-config.scm' for (guix config). --- gnu/machine/ssh.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index a3a12fb54b..1b748c8da7 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -37,6 +37,7 @@ #:use-module (guix ssh) #:use-module (guix store) #:use-module (guix utils) + #:use-module ((guix self) #:select (make-config.scm)) #:use-module (gcrypt pk-crypto) #:use-module (ice-9 format) #:use-module (ice-9 match) @@ -353,8 +354,9 @@ of MACHINE's system profile, ordered from most recent to oldest." (define remote-exp (with-extensions (list guile-gcrypt) - (with-imported-modules (source-module-closure '((guix config) - (guix profiles))) + (with-imported-modules (source-module-closure + `(((guix config) => ,(make-config.scm)) + (guix profiles))) #~(begin (use-modules (guix config) (guix profiles) -- cgit v1.2.3 From 7a20c1676a8421f3ac06a2634a27c2837293df0b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 10 Nov 2020 12:20:09 +0100 Subject: vm: 'system-qemu-image' forces the use of i386/BIOS GRUB. Fixes . Reported by Maxim Cournoyer . * gnu/system/vm.scm (system-qemu-image): Add 'bootloader' field to OS. --- gnu/system/vm.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 21d777a3fe..c9580f6e7f 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -655,7 +655,14 @@ of the GNU system as described by OS." 'dce))) - (let* ((os (operating-system (inherit os) + (let* ((os (operating-system + (inherit os) + + ;; As in 'virtualized-operating-system', use BIOS-style GRUB. + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vda"))) + ;; Assume we have an initrd with the whole QEMU shebang. ;; Force our own root file system. Refer to it by UUID so that -- cgit v1.2.3 From 74361d3ee8c1524ee3f3496f113b9a8bf644e023 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 10 Nov 2020 16:43:59 +0100 Subject: gnu: python2-pygobject@2: Shorten patch file name. The file would not be included in the tarball produced by "make dist" because its name was too long. * gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch: Rename to... * gnu/packages/patches/python2-pygobject-2-deprecation.patch: ... this. * gnu/packages/glib.scm (python2-pygobject-2)[source]: Adjust accordingly. * gnu/local.mk (dist_patch_DATA): Likewise. --- gnu/local.mk | 2 +- gnu/packages/glib.scm | 3 +- .../patches/python2-pygobject-2-deprecation.patch | 39 ++++++++++++++++++++++ ...on2-pygobject-2-gi-info-type-error-domain.patch | 39 ---------------------- 4 files changed, 41 insertions(+), 42 deletions(-) create mode 100644 gnu/packages/patches/python2-pygobject-2-deprecation.patch delete mode 100644 gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 105e4dd28c..9a8d6dd4d9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1524,7 +1524,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python-pycrypto-time-clock.patch \ - %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ + %D%/packages/patches/python2-pygobject-2-deprecation.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python-robotframework-source-date-epoch.patch \ %D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index bba9461d44..901222476a 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -698,8 +698,7 @@ useful for C++.") (sha256 (base32 "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv")) - (patches (search-patches - "python2-pygobject-2-gi-info-type-error-domain.patch")))) + (patches (search-patches "python2-pygobject-2-deprecation.patch")))) (build-system gnu-build-system) (native-inputs `(("which" ,which) diff --git a/gnu/packages/patches/python2-pygobject-2-deprecation.patch b/gnu/packages/patches/python2-pygobject-2-deprecation.patch new file mode 100644 index 0000000000..6a08e56351 --- /dev/null +++ b/gnu/packages/patches/python2-pygobject-2-deprecation.patch @@ -0,0 +1,39 @@ +From e5df32ffbf37481dbb6a70c4d4e7b7b9778c5549 Mon Sep 17 00:00:00 2001 +From: "John (J5) Palmieri" +Date: Sat, 13 Aug 2011 04:13:28 -0400 +Subject: remove references to deprecated GI_INFO_TYPE_ERROR_DOMAIN + + +diff --git a/gi/pygi-info.c b/gi/pygi-info.c +index 8729e25..007b609 100644 +--- a/gi/pygi-info.c ++++ b/gi/pygi-info.c +@@ -165,9 +165,6 @@ _pygi_info_new (GIBaseInfo *info) + case GI_INFO_TYPE_CONSTANT: + type = &PyGIConstantInfo_Type; + break; +- case GI_INFO_TYPE_ERROR_DOMAIN: +- type = &PyGIErrorDomainInfo_Type; +- break; + case GI_INFO_TYPE_UNION: + type = &PyGIUnionInfo_Type; + break; +@@ -484,7 +481,6 @@ _pygi_g_type_info_size (GITypeInfo *type_info) + case GI_INFO_TYPE_INVALID: + case GI_INFO_TYPE_FUNCTION: + case GI_INFO_TYPE_CONSTANT: +- case GI_INFO_TYPE_ERROR_DOMAIN: + case GI_INFO_TYPE_VALUE: + case GI_INFO_TYPE_SIGNAL: + case GI_INFO_TYPE_PROPERTY: +@@ -863,7 +859,6 @@ pygi_g_struct_info_is_simple (GIStructInfo *struct_info) + case GI_INFO_TYPE_INVALID: + case GI_INFO_TYPE_FUNCTION: + case GI_INFO_TYPE_CONSTANT: +- case GI_INFO_TYPE_ERROR_DOMAIN: + case GI_INFO_TYPE_VALUE: + case GI_INFO_TYPE_SIGNAL: + case GI_INFO_TYPE_PROPERTY: +-- +cgit v0.10.1 + diff --git a/gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch b/gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch deleted file mode 100644 index 6a08e56351..0000000000 --- a/gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e5df32ffbf37481dbb6a70c4d4e7b7b9778c5549 Mon Sep 17 00:00:00 2001 -From: "John (J5) Palmieri" -Date: Sat, 13 Aug 2011 04:13:28 -0400 -Subject: remove references to deprecated GI_INFO_TYPE_ERROR_DOMAIN - - -diff --git a/gi/pygi-info.c b/gi/pygi-info.c -index 8729e25..007b609 100644 ---- a/gi/pygi-info.c -+++ b/gi/pygi-info.c -@@ -165,9 +165,6 @@ _pygi_info_new (GIBaseInfo *info) - case GI_INFO_TYPE_CONSTANT: - type = &PyGIConstantInfo_Type; - break; -- case GI_INFO_TYPE_ERROR_DOMAIN: -- type = &PyGIErrorDomainInfo_Type; -- break; - case GI_INFO_TYPE_UNION: - type = &PyGIUnionInfo_Type; - break; -@@ -484,7 +481,6 @@ _pygi_g_type_info_size (GITypeInfo *type_info) - case GI_INFO_TYPE_INVALID: - case GI_INFO_TYPE_FUNCTION: - case GI_INFO_TYPE_CONSTANT: -- case GI_INFO_TYPE_ERROR_DOMAIN: - case GI_INFO_TYPE_VALUE: - case GI_INFO_TYPE_SIGNAL: - case GI_INFO_TYPE_PROPERTY: -@@ -863,7 +859,6 @@ pygi_g_struct_info_is_simple (GIStructInfo *struct_info) - case GI_INFO_TYPE_INVALID: - case GI_INFO_TYPE_FUNCTION: - case GI_INFO_TYPE_CONSTANT: -- case GI_INFO_TYPE_ERROR_DOMAIN: - case GI_INFO_TYPE_VALUE: - case GI_INFO_TYPE_SIGNAL: - case GI_INFO_TYPE_PROPERTY: --- -cgit v0.10.1 - -- cgit v1.2.3 From 8515ea12d283632e7d0103286e679542d896058b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 10 Nov 2020 17:49:14 +0100 Subject: gnu: audiofile: Shorten patch file names. At least 'audiofile-division-by-zero-BlockCodec-runPull.patch' could end up not being included in a tarball. * gnu/packages/patches/audiofile-Check-the-number-of-coefficients.patch: Rename to... * gnu/packages/patches/audiofile-check-number-of-coefficients.patch: ... this. * gnu/packages/patches/audiofile-division-by-zero-BlockCodec-runPull.patch: Rename to... * gnu/packages/patches/audiofile-division-by-zero.patch: ....this. * gnu/packages/patches/audiofile-signature-of-multiplyCheckOverflow.patch: Rename to... * gnu/packages/patches/audiofile-function-signature.patch: ... this. * gnu/packages/patches/audiofile-Fix-multiply-overflow-sfconvert.patch: Rename to.... * gnu/packages/patches/audiofile-multiply-overflow.patch: ... this. * gnu/packages/patches/audiofile-Fix-overflow-in-MSADPCM-decodeSam.patch: Rename to... * gnu/packages/patches/audiofile-overflow-in-MSADPCM.patch: ... this. * gnu/packages/audio.scm (audiofile)[source]: Adjust accordingly. * gnu/local.mk (dist_patch_DATA): Likewise. --- gnu/local.mk | 12 +-- gnu/packages/audio.scm | 10 +- ...udiofile-Check-the-number-of-coefficients.patch | 30 ------ ...audiofile-Fix-multiply-overflow-sfconvert.patch | 66 ------------ ...diofile-Fix-overflow-in-MSADPCM-decodeSam.patch | 116 --------------------- .../audiofile-check-number-of-coefficients.patch | 30 ++++++ ...ofile-division-by-zero-BlockCodec-runPull.patch | 21 ---- .../patches/audiofile-division-by-zero.patch | 21 ++++ .../patches/audiofile-function-signature.patch | 35 +++++++ .../patches/audiofile-multiply-overflow.patch | 66 ++++++++++++ .../patches/audiofile-overflow-in-MSADPCM.patch | 116 +++++++++++++++++++++ ...iofile-signature-of-multiplyCheckOverflow.patch | 35 ------- 12 files changed, 279 insertions(+), 279 deletions(-) delete mode 100644 gnu/packages/patches/audiofile-Check-the-number-of-coefficients.patch delete mode 100644 gnu/packages/patches/audiofile-Fix-multiply-overflow-sfconvert.patch delete mode 100644 gnu/packages/patches/audiofile-Fix-overflow-in-MSADPCM-decodeSam.patch create mode 100644 gnu/packages/patches/audiofile-check-number-of-coefficients.patch delete mode 100644 gnu/packages/patches/audiofile-division-by-zero-BlockCodec-runPull.patch create mode 100644 gnu/packages/patches/audiofile-division-by-zero.patch create mode 100644 gnu/packages/patches/audiofile-function-signature.patch create mode 100644 gnu/packages/patches/audiofile-multiply-overflow.patch create mode 100644 gnu/packages/patches/audiofile-overflow-in-MSADPCM.patch delete mode 100644 gnu/packages/patches/audiofile-signature-of-multiplyCheckOverflow.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 9a8d6dd4d9..d5a13cbdbd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -800,14 +800,14 @@ dist_patch_DATA = \ %D%/packages/patches/audiofile-CVE-2015-7747.patch \ %D%/packages/patches/audiofile-CVE-2018-13440.patch \ %D%/packages/patches/audiofile-CVE-2018-17095.patch \ - %D%/packages/patches/audiofile-Check-the-number-of-coefficients.patch \ + %D%/packages/patches/audiofile-check-number-of-coefficients.patch \ %D%/packages/patches/audiofile-Fail-on-error-in-parseFormat.patch \ %D%/packages/patches/audiofile-Fix-index-overflow-in-IMA.cpp.patch \ - %D%/packages/patches/audiofile-Fix-multiply-overflow-sfconvert.patch \ - %D%/packages/patches/audiofile-Fix-overflow-in-MSADPCM-decodeSam.patch \ - %D%/packages/patches/audiofile-division-by-zero-BlockCodec-runPull.patch \ - %D%/packages/patches/audiofile-hurd.patch \ - %D%/packages/patches/audiofile-signature-of-multiplyCheckOverflow.patch \ + %D%/packages/patches/audiofile-multiply-overflow.patch \ + %D%/packages/patches/audiofile-overflow-in-MSADPCM.patch \ + %D%/packages/patches/audiofile-division-by-zero.patch \ + %D%/packages/patches/audiofile-hurd.patch \ + %D%/packages/patches/audiofile-function-signature.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ %D%/packages/patches/avahi-localstatedir.patch \ %D%/packages/patches/avogadro-boost148.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6479398cb5..6733c8d212 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -862,16 +862,16 @@ tools.") "audiofile-Fix-index-overflow-in-IMA.cpp.patch" ;; CVE-2017-6827, CVE-2017-6828, CVE-2017-6832, CVE-2017-6835, ;; CVE-2017-6837: - "audiofile-Check-the-number-of-coefficients.patch" + "audiofile-check-number-of-coefficients.patch" ;; CVE-2017-6839: - "audiofile-Fix-overflow-in-MSADPCM-decodeSam.patch" + "audiofile-overflow-in-MSADPCM.patch" ;; CVE-2017-6830, CVE-2017-6834, CVE-2017-6836, CVE-2017-6838: - "audiofile-Fix-multiply-overflow-sfconvert.patch" - "audiofile-signature-of-multiplyCheckOverflow.patch" + "audiofile-multiply-overflow.patch" + "audiofile-function-signature.patch" ;; CVE-2017-6831: "audiofile-Fail-on-error-in-parseFormat.patch" ;; CVE-2017-6833: - "audiofile-division-by-zero-BlockCodec-runPull.patch" + "audiofile-division-by-zero.patch" "audiofile-CVE-2018-13440.patch" "audiofile-CVE-2018-17095.patch")))) (properties `((lint-hidden-cve . ("CVE-2017-6829" diff --git a/gnu/packages/patches/audiofile-Check-the-number-of-coefficients.patch b/gnu/packages/patches/audiofile-Check-the-number-of-coefficients.patch deleted file mode 100644 index f9427cbe61..0000000000 --- a/gnu/packages/patches/audiofile-Check-the-number-of-coefficients.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Antonio Larrosa -Date: Mon, 6 Mar 2017 12:51:22 +0100 -Subject: Always check the number of coefficients - -When building the library with NDEBUG, asserts are eliminated -so it's better to always check that the number of coefficients -is inside the array range. - -This fixes the 00191-audiofile-indexoob issue in #41 ---- - libaudiofile/WAVE.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libaudiofile/WAVE.cpp b/libaudiofile/WAVE.cpp -index 9dd8511..0fc48e8 100644 ---- a/libaudiofile/WAVE.cpp -+++ b/libaudiofile/WAVE.cpp -@@ -281,6 +281,12 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size) - - /* numCoefficients should be at least 7. */ - assert(numCoefficients >= 7 && numCoefficients <= 255); -+ if (numCoefficients < 7 || numCoefficients > 255) -+ { -+ _af_error(AF_BAD_HEADER, -+ "Bad number of coefficients"); -+ return AF_FAIL; -+ } - - m_msadpcmNumCoefficients = numCoefficients; - diff --git a/gnu/packages/patches/audiofile-Fix-multiply-overflow-sfconvert.patch b/gnu/packages/patches/audiofile-Fix-multiply-overflow-sfconvert.patch deleted file mode 100644 index 0f17140d6b..0000000000 --- a/gnu/packages/patches/audiofile-Fix-multiply-overflow-sfconvert.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Antonio Larrosa -Date: Mon, 6 Mar 2017 13:54:52 +0100 -Subject: Check for multiplication overflow in sfconvert - -Checks that a multiplication doesn't overflow when -calculating the buffer size, and if it overflows, -reduce the buffer size instead of failing. - -This fixes the 00192-audiofile-signintoverflow-sfconvert case -in #41 ---- - sfcommands/sfconvert.c | 34 ++++++++++++++++++++++++++++++++-- - 1 file changed, 32 insertions(+), 2 deletions(-) - -diff --git a/sfcommands/sfconvert.c b/sfcommands/sfconvert.c -index 80a1bc4..970a3e4 100644 ---- a/sfcommands/sfconvert.c -+++ b/sfcommands/sfconvert.c -@@ -45,6 +45,33 @@ void printusage (void); - void usageerror (void); - bool copyaudiodata (AFfilehandle infile, AFfilehandle outfile, int trackid); - -+int firstBitSet(int x) -+{ -+ int position=0; -+ while (x!=0) -+ { -+ x>>=1; -+ ++position; -+ } -+ return position; -+} -+ -+#ifndef __has_builtin -+#define __has_builtin(x) 0 -+#endif -+ -+int multiplyCheckOverflow(int a, int b, int *result) -+{ -+#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) -+ return __builtin_mul_overflow(a, b, result); -+#else -+ if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits -+ return true; -+ *result = a * b; -+ return false; -+#endif -+} -+ - int main (int argc, char **argv) - { - if (argc == 2) -@@ -323,8 +350,11 @@ bool copyaudiodata (AFfilehandle infile, AFfilehandle outfile, int trackid) - { - int frameSize = afGetVirtualFrameSize(infile, trackid, 1); - -- const int kBufferFrameCount = 65536; -- void *buffer = malloc(kBufferFrameCount * frameSize); -+ int kBufferFrameCount = 65536; -+ int bufferSize; -+ while (multiplyCheckOverflow(kBufferFrameCount, frameSize, &bufferSize)) -+ kBufferFrameCount /= 2; -+ void *buffer = malloc(bufferSize); - - AFframecount totalFrames = afGetFrameCount(infile, AF_DEFAULT_TRACK); - AFframecount totalFramesWritten = 0; diff --git a/gnu/packages/patches/audiofile-Fix-overflow-in-MSADPCM-decodeSam.patch b/gnu/packages/patches/audiofile-Fix-overflow-in-MSADPCM-decodeSam.patch deleted file mode 100644 index 2be930b924..0000000000 --- a/gnu/packages/patches/audiofile-Fix-overflow-in-MSADPCM-decodeSam.patch +++ /dev/null @@ -1,116 +0,0 @@ -From: Antonio Larrosa -Date: Mon, 6 Mar 2017 13:43:53 +0100 -Subject: Check for multiplication overflow in MSADPCM decodeSample - -Check for multiplication overflow (using __builtin_mul_overflow -if available) in MSADPCM.cpp decodeSample and return an empty -decoded block if an error occurs. - -This fixes the 00193-audiofile-signintoverflow-MSADPCM case of #41 ---- - libaudiofile/modules/BlockCodec.cpp | 5 ++-- - libaudiofile/modules/MSADPCM.cpp | 47 +++++++++++++++++++++++++++++++++---- - 2 files changed, 46 insertions(+), 6 deletions(-) - -diff --git a/libaudiofile/modules/BlockCodec.cpp b/libaudiofile/modules/BlockCodec.cpp -index 45925e8..4731be1 100644 ---- a/libaudiofile/modules/BlockCodec.cpp -+++ b/libaudiofile/modules/BlockCodec.cpp -@@ -52,8 +52,9 @@ void BlockCodec::runPull() - // Decompress into m_outChunk. - for (int i=0; i(m_inChunk->buffer) + i * m_bytesPerPacket, -- static_cast(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount); -+ if (decodeBlock(static_cast(m_inChunk->buffer) + i * m_bytesPerPacket, -+ static_cast(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount)==0) -+ break; - - framesRead += m_framesPerPacket; - } -diff --git a/libaudiofile/modules/MSADPCM.cpp b/libaudiofile/modules/MSADPCM.cpp -index 8ea3c85..ef9c38c 100644 ---- a/libaudiofile/modules/MSADPCM.cpp -+++ b/libaudiofile/modules/MSADPCM.cpp -@@ -101,24 +101,60 @@ static const int16_t adaptationTable[] = - 768, 614, 512, 409, 307, 230, 230, 230 - }; - -+int firstBitSet(int x) -+{ -+ int position=0; -+ while (x!=0) -+ { -+ x>>=1; -+ ++position; -+ } -+ return position; -+} -+ -+#ifndef __has_builtin -+#define __has_builtin(x) 0 -+#endif -+ -+int multiplyCheckOverflow(int a, int b, int *result) -+{ -+#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) -+ return __builtin_mul_overflow(a, b, result); -+#else -+ if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits -+ return true; -+ *result = a * b; -+ return false; -+#endif -+} -+ -+ - // Compute a linear PCM value from the given differential coded value. - static int16_t decodeSample(ms_adpcm_state &state, -- uint8_t code, const int16_t *coefficient) -+ uint8_t code, const int16_t *coefficient, bool *ok=NULL) - { - int linearSample = (state.sample1 * coefficient[0] + - state.sample2 * coefficient[1]) >> 8; -+ int delta; - - linearSample += ((code & 0x08) ? (code - 0x10) : code) * state.delta; - - linearSample = clamp(linearSample, MIN_INT16, MAX_INT16); - -- int delta = (state.delta * adaptationTable[code]) >> 8; -+ if (multiplyCheckOverflow(state.delta, adaptationTable[code], &delta)) -+ { -+ if (ok) *ok=false; -+ _af_error(AF_BAD_COMPRESSION, "Error decoding sample"); -+ return 0; -+ } -+ delta >>= 8; - if (delta < 16) - delta = 16; - - state.delta = delta; - state.sample2 = state.sample1; - state.sample1 = linearSample; -+ if (ok) *ok=true; - - return static_cast(linearSample); - } -@@ -212,13 +248,16 @@ int MSADPCM::decodeBlock(const uint8_t *encoded, int16_t *decoded) - { - uint8_t code; - int16_t newSample; -+ bool ok; - - code = *encoded >> 4; -- newSample = decodeSample(*state[0], code, coefficient[0]); -+ newSample = decodeSample(*state[0], code, coefficient[0], &ok); -+ if (!ok) return 0; - *decoded++ = newSample; - - code = *encoded & 0x0f; -- newSample = decodeSample(*state[1], code, coefficient[1]); -+ newSample = decodeSample(*state[1], code, coefficient[1], &ok); -+ if (!ok) return 0; - *decoded++ = newSample; - - encoded++; diff --git a/gnu/packages/patches/audiofile-check-number-of-coefficients.patch b/gnu/packages/patches/audiofile-check-number-of-coefficients.patch new file mode 100644 index 0000000000..f9427cbe61 --- /dev/null +++ b/gnu/packages/patches/audiofile-check-number-of-coefficients.patch @@ -0,0 +1,30 @@ +From: Antonio Larrosa +Date: Mon, 6 Mar 2017 12:51:22 +0100 +Subject: Always check the number of coefficients + +When building the library with NDEBUG, asserts are eliminated +so it's better to always check that the number of coefficients +is inside the array range. + +This fixes the 00191-audiofile-indexoob issue in #41 +--- + libaudiofile/WAVE.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libaudiofile/WAVE.cpp b/libaudiofile/WAVE.cpp +index 9dd8511..0fc48e8 100644 +--- a/libaudiofile/WAVE.cpp ++++ b/libaudiofile/WAVE.cpp +@@ -281,6 +281,12 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size) + + /* numCoefficients should be at least 7. */ + assert(numCoefficients >= 7 && numCoefficients <= 255); ++ if (numCoefficients < 7 || numCoefficients > 255) ++ { ++ _af_error(AF_BAD_HEADER, ++ "Bad number of coefficients"); ++ return AF_FAIL; ++ } + + m_msadpcmNumCoefficients = numCoefficients; + diff --git a/gnu/packages/patches/audiofile-division-by-zero-BlockCodec-runPull.patch b/gnu/packages/patches/audiofile-division-by-zero-BlockCodec-runPull.patch deleted file mode 100644 index e001133916..0000000000 --- a/gnu/packages/patches/audiofile-division-by-zero-BlockCodec-runPull.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Antonio Larrosa -Date: Thu, 9 Mar 2017 10:21:18 +0100 -Subject: Check for division by zero in BlockCodec::runPull - ---- - libaudiofile/modules/BlockCodec.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libaudiofile/modules/BlockCodec.cpp b/libaudiofile/modules/BlockCodec.cpp -index 4731be1..eb2fb4d 100644 ---- a/libaudiofile/modules/BlockCodec.cpp -+++ b/libaudiofile/modules/BlockCodec.cpp -@@ -47,7 +47,7 @@ void BlockCodec::runPull() - - // Read the compressed data. - ssize_t bytesRead = read(m_inChunk->buffer, m_bytesPerPacket * blockCount); -- int blocksRead = bytesRead >= 0 ? bytesRead / m_bytesPerPacket : 0; -+ int blocksRead = (bytesRead >= 0 && m_bytesPerPacket > 0) ? bytesRead / m_bytesPerPacket : 0; - - // Decompress into m_outChunk. - for (int i=0; i +Date: Thu, 9 Mar 2017 10:21:18 +0100 +Subject: Check for division by zero in BlockCodec::runPull + +--- + libaudiofile/modules/BlockCodec.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libaudiofile/modules/BlockCodec.cpp b/libaudiofile/modules/BlockCodec.cpp +index 4731be1..eb2fb4d 100644 +--- a/libaudiofile/modules/BlockCodec.cpp ++++ b/libaudiofile/modules/BlockCodec.cpp +@@ -47,7 +47,7 @@ void BlockCodec::runPull() + + // Read the compressed data. + ssize_t bytesRead = read(m_inChunk->buffer, m_bytesPerPacket * blockCount); +- int blocksRead = bytesRead >= 0 ? bytesRead / m_bytesPerPacket : 0; ++ int blocksRead = (bytesRead >= 0 && m_bytesPerPacket > 0) ? bytesRead / m_bytesPerPacket : 0; + + // Decompress into m_outChunk. + for (int i=0; i +Date: Fri, 10 Mar 2017 15:40:02 +0100 +Subject: Fix signature of multiplyCheckOverflow. It returns a bool, not an int + +--- + libaudiofile/modules/MSADPCM.cpp | 2 +- + sfcommands/sfconvert.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libaudiofile/modules/MSADPCM.cpp b/libaudiofile/modules/MSADPCM.cpp +index ef9c38c..d8c9553 100644 +--- a/libaudiofile/modules/MSADPCM.cpp ++++ b/libaudiofile/modules/MSADPCM.cpp +@@ -116,7 +116,7 @@ int firstBitSet(int x) + #define __has_builtin(x) 0 + #endif + +-int multiplyCheckOverflow(int a, int b, int *result) ++bool multiplyCheckOverflow(int a, int b, int *result) + { + #if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) + return __builtin_mul_overflow(a, b, result); +diff --git a/sfcommands/sfconvert.c b/sfcommands/sfconvert.c +index 970a3e4..367f7a5 100644 +--- a/sfcommands/sfconvert.c ++++ b/sfcommands/sfconvert.c +@@ -60,7 +60,7 @@ int firstBitSet(int x) + #define __has_builtin(x) 0 + #endif + +-int multiplyCheckOverflow(int a, int b, int *result) ++bool multiplyCheckOverflow(int a, int b, int *result) + { + #if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) + return __builtin_mul_overflow(a, b, result); diff --git a/gnu/packages/patches/audiofile-multiply-overflow.patch b/gnu/packages/patches/audiofile-multiply-overflow.patch new file mode 100644 index 0000000000..0f17140d6b --- /dev/null +++ b/gnu/packages/patches/audiofile-multiply-overflow.patch @@ -0,0 +1,66 @@ +From: Antonio Larrosa +Date: Mon, 6 Mar 2017 13:54:52 +0100 +Subject: Check for multiplication overflow in sfconvert + +Checks that a multiplication doesn't overflow when +calculating the buffer size, and if it overflows, +reduce the buffer size instead of failing. + +This fixes the 00192-audiofile-signintoverflow-sfconvert case +in #41 +--- + sfcommands/sfconvert.c | 34 ++++++++++++++++++++++++++++++++-- + 1 file changed, 32 insertions(+), 2 deletions(-) + +diff --git a/sfcommands/sfconvert.c b/sfcommands/sfconvert.c +index 80a1bc4..970a3e4 100644 +--- a/sfcommands/sfconvert.c ++++ b/sfcommands/sfconvert.c +@@ -45,6 +45,33 @@ void printusage (void); + void usageerror (void); + bool copyaudiodata (AFfilehandle infile, AFfilehandle outfile, int trackid); + ++int firstBitSet(int x) ++{ ++ int position=0; ++ while (x!=0) ++ { ++ x>>=1; ++ ++position; ++ } ++ return position; ++} ++ ++#ifndef __has_builtin ++#define __has_builtin(x) 0 ++#endif ++ ++int multiplyCheckOverflow(int a, int b, int *result) ++{ ++#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) ++ return __builtin_mul_overflow(a, b, result); ++#else ++ if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits ++ return true; ++ *result = a * b; ++ return false; ++#endif ++} ++ + int main (int argc, char **argv) + { + if (argc == 2) +@@ -323,8 +350,11 @@ bool copyaudiodata (AFfilehandle infile, AFfilehandle outfile, int trackid) + { + int frameSize = afGetVirtualFrameSize(infile, trackid, 1); + +- const int kBufferFrameCount = 65536; +- void *buffer = malloc(kBufferFrameCount * frameSize); ++ int kBufferFrameCount = 65536; ++ int bufferSize; ++ while (multiplyCheckOverflow(kBufferFrameCount, frameSize, &bufferSize)) ++ kBufferFrameCount /= 2; ++ void *buffer = malloc(bufferSize); + + AFframecount totalFrames = afGetFrameCount(infile, AF_DEFAULT_TRACK); + AFframecount totalFramesWritten = 0; diff --git a/gnu/packages/patches/audiofile-overflow-in-MSADPCM.patch b/gnu/packages/patches/audiofile-overflow-in-MSADPCM.patch new file mode 100644 index 0000000000..2be930b924 --- /dev/null +++ b/gnu/packages/patches/audiofile-overflow-in-MSADPCM.patch @@ -0,0 +1,116 @@ +From: Antonio Larrosa +Date: Mon, 6 Mar 2017 13:43:53 +0100 +Subject: Check for multiplication overflow in MSADPCM decodeSample + +Check for multiplication overflow (using __builtin_mul_overflow +if available) in MSADPCM.cpp decodeSample and return an empty +decoded block if an error occurs. + +This fixes the 00193-audiofile-signintoverflow-MSADPCM case of #41 +--- + libaudiofile/modules/BlockCodec.cpp | 5 ++-- + libaudiofile/modules/MSADPCM.cpp | 47 +++++++++++++++++++++++++++++++++---- + 2 files changed, 46 insertions(+), 6 deletions(-) + +diff --git a/libaudiofile/modules/BlockCodec.cpp b/libaudiofile/modules/BlockCodec.cpp +index 45925e8..4731be1 100644 +--- a/libaudiofile/modules/BlockCodec.cpp ++++ b/libaudiofile/modules/BlockCodec.cpp +@@ -52,8 +52,9 @@ void BlockCodec::runPull() + // Decompress into m_outChunk. + for (int i=0; i(m_inChunk->buffer) + i * m_bytesPerPacket, +- static_cast(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount); ++ if (decodeBlock(static_cast(m_inChunk->buffer) + i * m_bytesPerPacket, ++ static_cast(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount)==0) ++ break; + + framesRead += m_framesPerPacket; + } +diff --git a/libaudiofile/modules/MSADPCM.cpp b/libaudiofile/modules/MSADPCM.cpp +index 8ea3c85..ef9c38c 100644 +--- a/libaudiofile/modules/MSADPCM.cpp ++++ b/libaudiofile/modules/MSADPCM.cpp +@@ -101,24 +101,60 @@ static const int16_t adaptationTable[] = + 768, 614, 512, 409, 307, 230, 230, 230 + }; + ++int firstBitSet(int x) ++{ ++ int position=0; ++ while (x!=0) ++ { ++ x>>=1; ++ ++position; ++ } ++ return position; ++} ++ ++#ifndef __has_builtin ++#define __has_builtin(x) 0 ++#endif ++ ++int multiplyCheckOverflow(int a, int b, int *result) ++{ ++#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) ++ return __builtin_mul_overflow(a, b, result); ++#else ++ if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits ++ return true; ++ *result = a * b; ++ return false; ++#endif ++} ++ ++ + // Compute a linear PCM value from the given differential coded value. + static int16_t decodeSample(ms_adpcm_state &state, +- uint8_t code, const int16_t *coefficient) ++ uint8_t code, const int16_t *coefficient, bool *ok=NULL) + { + int linearSample = (state.sample1 * coefficient[0] + + state.sample2 * coefficient[1]) >> 8; ++ int delta; + + linearSample += ((code & 0x08) ? (code - 0x10) : code) * state.delta; + + linearSample = clamp(linearSample, MIN_INT16, MAX_INT16); + +- int delta = (state.delta * adaptationTable[code]) >> 8; ++ if (multiplyCheckOverflow(state.delta, adaptationTable[code], &delta)) ++ { ++ if (ok) *ok=false; ++ _af_error(AF_BAD_COMPRESSION, "Error decoding sample"); ++ return 0; ++ } ++ delta >>= 8; + if (delta < 16) + delta = 16; + + state.delta = delta; + state.sample2 = state.sample1; + state.sample1 = linearSample; ++ if (ok) *ok=true; + + return static_cast(linearSample); + } +@@ -212,13 +248,16 @@ int MSADPCM::decodeBlock(const uint8_t *encoded, int16_t *decoded) + { + uint8_t code; + int16_t newSample; ++ bool ok; + + code = *encoded >> 4; +- newSample = decodeSample(*state[0], code, coefficient[0]); ++ newSample = decodeSample(*state[0], code, coefficient[0], &ok); ++ if (!ok) return 0; + *decoded++ = newSample; + + code = *encoded & 0x0f; +- newSample = decodeSample(*state[1], code, coefficient[1]); ++ newSample = decodeSample(*state[1], code, coefficient[1], &ok); ++ if (!ok) return 0; + *decoded++ = newSample; + + encoded++; diff --git a/gnu/packages/patches/audiofile-signature-of-multiplyCheckOverflow.patch b/gnu/packages/patches/audiofile-signature-of-multiplyCheckOverflow.patch deleted file mode 100644 index 35627d3869..0000000000 --- a/gnu/packages/patches/audiofile-signature-of-multiplyCheckOverflow.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Antonio Larrosa -Date: Fri, 10 Mar 2017 15:40:02 +0100 -Subject: Fix signature of multiplyCheckOverflow. It returns a bool, not an int - ---- - libaudiofile/modules/MSADPCM.cpp | 2 +- - sfcommands/sfconvert.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libaudiofile/modules/MSADPCM.cpp b/libaudiofile/modules/MSADPCM.cpp -index ef9c38c..d8c9553 100644 ---- a/libaudiofile/modules/MSADPCM.cpp -+++ b/libaudiofile/modules/MSADPCM.cpp -@@ -116,7 +116,7 @@ int firstBitSet(int x) - #define __has_builtin(x) 0 - #endif - --int multiplyCheckOverflow(int a, int b, int *result) -+bool multiplyCheckOverflow(int a, int b, int *result) - { - #if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) - return __builtin_mul_overflow(a, b, result); -diff --git a/sfcommands/sfconvert.c b/sfcommands/sfconvert.c -index 970a3e4..367f7a5 100644 ---- a/sfcommands/sfconvert.c -+++ b/sfcommands/sfconvert.c -@@ -60,7 +60,7 @@ int firstBitSet(int x) - #define __has_builtin(x) 0 - #endif - --int multiplyCheckOverflow(int a, int b, int *result) -+bool multiplyCheckOverflow(int a, int b, int *result) - { - #if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) - return __builtin_mul_overflow(a, b, result); -- cgit v1.2.3 From 000e7a0abc747ab6eb4fc23e80e4e9fbe8e75781 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 10 Nov 2020 21:49:15 +0100 Subject: vm: expression->derivation-in-linux-vm: Run in a UTF-8 locale. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Add calls to 'setenv' and 'setlocale'. --- gnu/system/vm.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index c9580f6e7f..07a59a3cd2 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -224,6 +224,12 @@ substitutable." (use-modules (guix build utils) (gnu build vm)) + ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded + ;; by 'estimated-partition-size' below. + (setenv "GUIX_LOCPATH" + #+(file-append glibc-utf8-locales "/lib/locale")) + (setlocale LC_ALL "en_US.utf8") + (let* ((native-inputs '#+(list qemu (canonical-package coreutils))) (linux (string-append -- cgit v1.2.3 From fbf3f47f854549c060352281714f6e674901feb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Nov 2020 21:29:11 +0100 Subject: gnu: vim: Update to 8.2.1971. * gnu/packages/vim.scm (vim): Update to 8.2.1971. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 87539e353f..8f9aca8f58 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-public vim (package (name "vim") - (version "8.2.1964") + (version "8.2.1971") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0rhx93xq5gk7lgxnm0h0lnwl6zgifcnl0c9k0f4fqb6cx81ihp4q")))) + "00svmci7hqgpj41rpa2lxcp8qgd3p7rpy4bzan1a512b07k35rb7")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 29cf85b85793724aa0f1de2b5cda7f70cdb1752f Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Tue, 10 Nov 2020 16:10:17 +0100 Subject: gnu: oath-toolkit: Update to 2.6.3. * gnu/packages/authentication.scm (oath-toolkit): Update to 2.6.3. [source]: Remove obsolete patches. * gnu/packages/patches/oath-toolkit-glibc-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Leo Famulari --- gnu/local.mk | 1 - gnu/packages/authentication.scm | 16 +--- .../patches/oath-toolkit-glibc-compat.patch | 90 ---------------------- 3 files changed, 2 insertions(+), 105 deletions(-) delete mode 100644 gnu/packages/patches/oath-toolkit-glibc-compat.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 288784b427..c2b2143213 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1387,7 +1387,6 @@ dist_patch_DATA = \ %D%/packages/patches/nvi-dbpagesize-binpower.patch \ %D%/packages/patches/nvi-db4.patch \ %D%/packages/patches/nyacc-binary-literals.patch \ - %D%/packages/patches/oath-toolkit-glibc-compat.patch \ %D%/packages/patches/ocaml-bitstring-fix-configure.patch \ %D%/packages/patches/ocaml-CVE-2015-8869.patch \ %D%/packages/patches/ocaml-Add-a-.file-directive.patch \ diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm index b3ff912c8f..52ab445775 100644 --- a/gnu/packages/authentication.scm +++ b/gnu/packages/authentication.scm @@ -33,26 +33,14 @@ (define-public oath-toolkit (package (name "oath-toolkit") - (version "2.6.2") + (version "2.6.3") (source (origin (method url-fetch) (uri (string-append "https://download.savannah.nongnu.org/releases/" name "/" name "-" version ".tar.gz")) - (patches - (append (search-patches "oath-toolkit-glibc-compat.patch") - (list (origin - ;; This huge commit updates gnulib for GCC 7 compatibility. - (method url-fetch) - (uri (string-append - "https://gitlab.com/oath-toolkit/oath-toolkit/commit/" - "2fffce2a471f74a585939c84cce16ef3015e5d3d.diff")) - (file-name "oath-toolkit-update-gnulib.patch") - (sha256 - (base32 - "088c9s4ay1b54bjqc4mwfs5l3f6357zj5vpw771zlq5g4addd4s0")))))) (sha256 - (base32 "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h")))) + (base32 "1cjial8njck2sd7452jcxspbi5h5fnp3n8v3wbmlw8fzqmgzvxx1")))) (build-system gnu-build-system) (arguments ;; TODO ‘--enable-pskc’ causes xmlsec-related test suite failures. diff --git a/gnu/packages/patches/oath-toolkit-glibc-compat.patch b/gnu/packages/patches/oath-toolkit-glibc-compat.patch deleted file mode 100644 index 22814599e5..0000000000 --- a/gnu/packages/patches/oath-toolkit-glibc-compat.patch +++ /dev/null @@ -1,90 +0,0 @@ -Adjust the bundled Gnulib to cope with removal of libio interface in Glibc 2.28. - -Based on this upstream gnulib patch: -https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e - ---- a/liboath/gl/fflush.c -+++ b/liboath/gl/fflush.c -@@ -33,7 +33,7 @@ - #undef fflush - - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ - static void -@@ -72,7 +72,7 @@ - - #endif - --#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) - - # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -@@ -148,7 +148,7 @@ - if (stream == NULL || ! freading (stream)) - return fflush (stream); - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - clear_ungetc_buffer_preserving_position (stream); - ---- a/liboath/gl/fpurge.c -+++ b/liboath/gl/fpurge.c -@@ -62,7 +62,7 @@ - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ ---- a/libaoth/gl/freading.c -+++ b/liboath/gl/freading.c -@@ -31,7 +31,7 @@ - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 - && fp->_IO_read_base != NULL)); ---- a/liboath/gl/fseeko.c -+++ b/liboath/gl/fseeko.c -@@ -47,7 +47,7 @@ - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) -@@ -123,7 +123,7 @@ - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ ---- a/liboath/gl/stdio-impl.h -+++ b/liboath/gl/stdio-impl.h -@@ -18,6 +18,11 @@ - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private, so define it here for now. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif -+ - /* BSD stdio derived implementations. */ - - #if defined __NetBSD__ /* NetBSD */ -- cgit v1.2.3 From d71f9e6f1611e8be13f89379ed4d1b32f72e5e50 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 11 Nov 2020 00:15:33 -0500 Subject: gnu: icecat: Update to 78.4.1-guix0-preview1 [fixes CVE-2020-26950]. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. * gnu/packages/patches/icecat-makeicecat.patch: Adapt to new version. --- gnu/packages/gnuzilla.scm | 12 ++++++------ gnu/packages/patches/icecat-makeicecat.patch | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b6e68c8132..39b4d9f7c1 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -550,8 +550,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "78.4.0-guix0-preview1") -(define %icecat-build-id "20201019000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "78.4.1-guix0-preview1") +(define %icecat-build-id "20201110000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -573,11 +573,11 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "1z3hj45bnd12z3g6ajv9qrgclca7fymi1sxj9l9nh9q6y6xz0g4f")))) + "0q57b0s6xhps4dzp2cih4ajdj6hdas0j6jx0sidzj72vjzfywy0r")))) - (upstream-icecat-base-version "78.4.0") ; maybe older than base-version + (upstream-icecat-base-version "78.4.1") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "05adddbf87a5ee11de7cd90794c331a178bcfd5c") + (gnuzilla-commit "df2c2e22a0c6ea5b4dcaed52884223bfa6ffacde") (gnuzilla-source (origin (method git-fetch) @@ -589,7 +589,7 @@ from forcing GEXP-PROMISE." (string-take gnuzilla-commit 8))) (sha256 (base32 - "128h0gnn1adinjkfmskxdjkvyh60li8czlar2xdjn2b6myiq5yny")))) + "1y1p2g9xvqsg0im58lhdkrp8z0zlxw6i3qqplqdpbidmjwibmqjz")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index e0cdde61ec..f82df9f68e 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -25,7 +25,7 @@ index 8be2362..48716f2 100755 -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n 8e3cf0bbf1062768134db2eb10ab774731ca5ec6694b65def82234bb0a9170fc firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n 1978eedd975b1cf95bd4a04b2381560d1ad9a4223032717f23fac26e3458a760 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -37,7 +37,7 @@ index 8be2362..48716f2 100755 +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc -+# echo -n 8e3cf0bbf1062768134db2eb10ab774731ca5ec6694b65def82234bb0a9170fc firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n 1978eedd975b1cf95bd4a04b2381560d1ad9a4223032717f23fac26e3458a760 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz -- cgit v1.2.3 From e3ae31347882b25e1513e4475616fb6e4497e280 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 1 Nov 2020 11:16:08 -0500 Subject: gnu: mingetty-shepherd-service: Make 'clear-on-logout' configurable. Also change the default configuration to clear on logout, which is the upstream default. * gnu/services/base.scm (): Add 'clear-on-logout?' field. (mingetty-shepherd-service): Pass the "--noclear" option to mingetty only if 'clear-on-logout?' is #false. * doc/guix.texi (Base Services): Document the 'clear-on-logout?' field. --- doc/guix.texi | 3 +++ gnu/services/base.scm | 28 ++++++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 35bf5177e6..eb0f47a6af 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14528,6 +14528,9 @@ the name of the log-in program. When set to @code{#t} in conjunction with @var{auto-login}, the user will have to press a key before the log-in shell is launched. +@item @code{clear-on-logout?} (default: @code{#t}) +When set to @code{#t}, the screen will be cleared after logout. + @item @code{mingetty} (default: @var{mingetty}) The Mingetty package to use. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 499e50bfd7..416bc02a96 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015, 2016 Alex Kost -;;; Copyright © 2015, 2016 Mark H Weaver +;;; Copyright © 2015, 2016, 2020 Mark H Weaver ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016 David Craven @@ -1024,20 +1024,22 @@ the tty to run, among other things." (define-record-type* mingetty-configuration make-mingetty-configuration mingetty-configuration? - (mingetty mingetty-configuration-mingetty ; - (default mingetty)) - (tty mingetty-configuration-tty) ;string - (auto-login mingetty-auto-login ;string | #f - (default #f)) - (login-program mingetty-login-program ;gexp - (default #f)) - (login-pause? mingetty-login-pause? ;Boolean - (default #f))) + (mingetty mingetty-configuration-mingetty ; + (default mingetty)) + (tty mingetty-configuration-tty) ;string + (auto-login mingetty-auto-login ;string | #f + (default #f)) + (login-program mingetty-login-program ;gexp + (default #f)) + (login-pause? mingetty-login-pause? ;Boolean + (default #f)) + (clear-on-logout? mingetty-clear-on-logout? ;Boolean + (default #t))) (define mingetty-shepherd-service (match-lambda (($ mingetty tty auto-login login-program - login-pause?) + login-pause? clear-on-logout?) (list (shepherd-service (documentation "Run mingetty on an tty.") @@ -1050,7 +1052,6 @@ the tty to run, among other things." (start #~(make-forkexec-constructor (list #$(file-append mingetty "/sbin/mingetty") - "--noclear" ;; Avoiding 'vhangup' allows us to avoid 'setfont' ;; errors down the path where various ioctls get @@ -1058,6 +1059,9 @@ the tty to run, among other things." ;; in Linux. "--nohangup" #$tty + #$@(if clear-on-logout? + #~() + #~("--noclear")) #$@(if auto-login #~("--autologin" #$auto-login) #~()) -- cgit v1.2.3 From c6843f17517afe44a51593bcad1a9d12b296131a Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 11 Nov 2020 09:02:26 +0000 Subject: gnu: python-petsc4py: Fix build with python 3.8. * gnu/packages/maths.scm (python-petsc4py)[source]: Add snippet. [native-inputs]: New field. --- gnu/packages/maths.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ba46937f9a..295e2dd35e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2470,7 +2470,18 @@ scientific applications modeled by partial differential equations.") (uri (pypi-uri "petsc4py" version)) (sha256 (base32 - "1rm1qj5wlkhxl39by9n78lh3gbmii31wsnb8j1rr5hvfr5xgbx2q")))) + "1rm1qj5wlkhxl39by9n78lh3gbmii31wsnb8j1rr5hvfr5xgbx2q")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Ensure source file is regenerated in the build phase. + (delete-file "src/petsc4py.PETSc.c") + ;; Remove legacy GC code. See + ;; https://bitbucket.org/petsc/petsc4py/issues/125. + (substitute* "src/PETSc/cyclicgc.pxi" + ((".*gc_refs.*") "" ) + ((".*PyGC_Head.*") "")) + #t)))) (build-system python-build-system) (arguments `(#:phases @@ -2482,6 +2493,8 @@ scientific applications modeled by partial differential equations.") #t)) (add-before 'check 'mpi-setup ,%openmpi-setup)))) + (native-inputs + `(("python-cython" ,python-cython))) (inputs `(("petsc" ,petsc-openmpi) ("python-numpy" ,python-numpy))) -- cgit v1.2.3 From fbf1b56d833fd72679668a75aad52f634856828f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 11 Nov 2020 10:59:18 +0100 Subject: gnu: emacs-leaf: Update to 4.3.2. * gnu/packages/emacs-xyz.scm (emacs-leaf): Update to 4.3.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d27d397775..95e060f1ba 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11174,14 +11174,14 @@ performance-oriented and tidy.") (define-public emacs-leaf (package (name "emacs-leaf") - (version "4.2.5") + (version "4.3.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "leaf-" version ".tar")) (sha256 - (base32 "0y78mp4c2gcwp7dc87wlx3r4hfmap14vvx8gkjc9nkf99qavpnkw")))) + (base32 "190sfnnii9jnj8amjkdabd8w9k2xyalhg4h488a5gzjxdzz2s6zi")))) (build-system emacs-build-system) (home-page "https://github.com/conao3/leaf.el") (synopsis "Simplify your init.el configuration, extended use-package") -- cgit v1.2.3 From 7135dc36e00919c7f64aa5fa85d6b7e61f26a277 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Wed, 11 Nov 2020 10:48:30 +0300 Subject: gnu: emacs-use-package: Update to 2.4.1 * gnu/packages/emacs-xyz.scm (emacs-use-package): Update to 2.4.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 95e060f1ba..328a3f3f6f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11131,7 +11131,7 @@ abbreviation of the mode line displays (lighters) of minor modes.") (define-public emacs-use-package (package (name "emacs-use-package") - (version "2.4") + (version "2.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -11140,7 +11140,7 @@ abbreviation of the mode line displays (lighters) of minor modes.") (file-name (git-file-name name version)) (sha256 (base32 - "1b7mjjh0d6fmkkd9vyj64vca27xqhga0nvyrrcqxpqjn62zq046y")))) + "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) -- cgit v1.2.3 From f64d265076490b1953bd9f9cdd1a097ca9919547 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 11 Nov 2020 11:25:55 +0100 Subject: gnu: mednafen: Update to 1.26.1. * gnu/packages/emulators.scm (mednafen): Update to 1.26.1. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 5b1d3788ad..a1f55cbe3d 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -477,14 +477,14 @@ V2.") (define-public mednafen (package (name "mednafen") - (version "1.24.3") + (version "1.26.1") (source (origin (method url-fetch) (uri (string-append "https://mednafen.github.io/releases/files/" "mednafen-" version ".tar.xz")) (sha256 - (base32 "03zplcfvmnnv7grhacmr1zy789pb2wda36wylmzmar23g0zqbsix")))) + (base32 "1x7xhxjhwsdbak8l0iyb497f043xkhibk73w96xck4j2bk10fac4")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 3d5cdccab369700f1f840fc47ebe6d79ea3da297 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 10 Nov 2020 20:17:51 +0200 Subject: gnu: zeromq: Don't build static library. This saves about 70% of the package size. * gnu/packages/networking.scm (zeromq)[arguments]: Add configure flag to skip building static library. --- gnu/packages/networking.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f94c3e410f..7325e35054 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -872,6 +872,7 @@ transparently check connection attempts against an access control list.") (base32 "18km71p77jm1w7wly2a5mxvphjb0f2l6s08cg382x55f6zdqb4lx")))) (build-system gnu-build-system) + (arguments '(#:configure-flags '("--disable-static"))) (home-page "https://zeromq.org") (synopsis "Library for message-based applications") (description -- cgit v1.2.3 From c953036ba8b9efcfd7e224a9d60846bb99c43cc3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 11 Nov 2020 12:22:43 +0100 Subject: gnu: pyzo: Update to 4.11.0. * gnu/packages/python-xyz.scm (pyzo): Update to 4.11.0. --- gnu/packages/python-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9d12cd30fd..d91e28585b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21867,13 +21867,13 @@ dictionaries.") (define-public pyzo (package (name "pyzo") - (version "4.10.2") + (version "4.11.0") (source (origin (method url-fetch) (uri (pypi-uri "pyzo" version)) (sha256 - (base32 "1zplxcb78qy8qibifmnsx5i9gnlfmw9n6nr4yflsabpxw57mx4m1")))) + (base32 "0vzsk6rchavlvy7ciq1z9qh3qrj9q213v2nn491fgjq3g19glj53")))) (build-system python-build-system) (arguments `(#:phases @@ -21883,8 +21883,8 @@ dictionaries.") ;; Tests fail with "Permission denied: '/homeless-shelter'". (setenv "HOME" "/tmp") #t))) - ;; Tests fail with "Uncaught Python exception: invalid literal for - ;; int() with base 10: 'test'". + ;; Tests fail with "Uncaught Python exception: python: undefined + ;; symbol: objc_getClass". #:tests? #f)) (propagated-inputs `(("python-pyqt" ,python-pyqt))) -- cgit v1.2.3 From a58adb8911f1a38392b7ebf335ec32b0c046f7d3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Nov 2020 14:10:37 +0200 Subject: gnu: libbluray: Don't build static library. * gnu/packages/video.scm (libbluray)[arguments]: Add configure flag to skip static library. --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5ea07fd6ed..9a16b50e58 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2479,7 +2479,8 @@ Both command-line and GTK2 interface are available.") "1zxfnw1xbghcj7b3zz5djndv6gwssxda19cz1lrlqrkg8577r7kd")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--disable-bdjava-jar") + `(#:configure-flags '("--disable-bdjava-jar" + "--disable-static") #:phases (modify-phases %standard-phases (add-after 'unpack 'refer-to-libxml2-in-.pc-file -- cgit v1.2.3 From 12c40ca91979f38f759cd6e976576ee0b2218543 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Nov 2020 14:16:21 +0200 Subject: gnu: libcaca: Don't build static library. * gnu/packages/video.scm (libcaca)[arguments]: Add configure-flag to skip static library. --- gnu/packages/video.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9a16b50e58..76ea742a11 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1228,6 +1228,8 @@ ASS/SSA (Advanced Substation Alpha/SubStation Alpha) subtitle format.") (base32 "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("freeglut" ,freeglut) -- cgit v1.2.3 From 0da64c60fb7ad10afbec32608a148ff9c386c47e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 11 Nov 2020 13:40:36 +0100 Subject: gnu: nyxt: Update to 2-pre-release-4. * gnu/packages/web-browsers.scm (nyxt): Update to 2-pre-release-4. --- gnu/packages/web-browsers.scm | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index eb49a8fdea..5cb5185a31 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -461,7 +461,7 @@ driven and does not detract you from your daily work.") (name "nyxt") ;; Package the pre-release because latest stable 1.5.0 does not build ;; anymore. - (version "2-pre-release-3") + (version "2-pre-release-4") (source (origin (method git-fetch) @@ -472,7 +472,7 @@ driven and does not detract you from your daily work.") (commit version))) (sha256 (base32 - "16crhc89hpvzkms5fypq9vdrf7glidqwh7yvy5cdmjdq4v7fkmy4")) + "00865plmvgl1nj009a4w9bcb5mf0zgqjx7w6slacyqgidjzad6qm")) (file-name (git-file-name "nyxt" version)))) (build-system gnu-build-system) (arguments @@ -482,28 +482,20 @@ driven and does not detract you from your daily work.") #:strip-binaries? #f ; Stripping breaks SBCL binaries. #:phases (modify-phases %standard-phases - ;; Version is guessed from .git which Guix does not have. - (add-after 'unpack 'patch-version - (lambda* (#:key inputs #:allow-other-keys) - (let ((version (format #f "~a" ,version)) - (file "source/global.lisp")) - (chmod file #o666) - (let ((port (open-file file "a"))) - (format port "(setf +version+ ~s)" version) - (close-port port))) - #t)) - (add-before 'build 'make-desktop-version-number - (lambda _ - (with-output-to-file "version" - (lambda _ - (format #t "~a" ,version) - #t)))) - (delete 'configure) (add-before 'build 'fix-common-lisp-cache-folder (lambda _ (setenv "HOME" "/tmp") #t)) + (add-before 'build 'set-version + (lambda _ + (setenv "NYXT_VERSION" ,version) + #t)) + (add-before 'check 'configure-tests + (lambda _ + (setenv "NYXT_TESTS_NO_NETWORK" "1") + (setenv "NYXT_TESTS_ERROR_ON_FAIL" "1") + #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((bin (string-append (assoc-ref outputs "out") "/bin/nyxt")) -- cgit v1.2.3 From 903ff4254f7657e5b54cb2c26a632634f333266f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 11 Nov 2020 13:57:41 +0100 Subject: gnu: monero-gui: Update to 0.17.1.4. * gnu/packages/finance.scm (monero-gui): Update to 0.17.1.4. [inputs]: Remove qtlocation and qtmultimedia. [arguments]: Remove custom CMAKE_BUILD_TYPE, and set CMAKE_PREFIX_PATH to empty string in 'configure-flags' to fix a "file name too long" error during build. Remove patching of "monero/src/version.cpp.in" in 'fix-build' phase. --- gnu/packages/finance.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index f05781d998..5b3ee2c65c 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -727,7 +727,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.17.1.1") + (version "0.17.1.4") (source (origin (method git-fetch) @@ -736,7 +736,7 @@ the Monero command line client and daemon.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0aqhp4rmqsgwjb875kgh6qwz0wyyiag1fksyic9cnhgg5j5y95nx")))) + (base32 "1ixjfdlvwr2an2s9jaql240bk7jpq5hhm5c4hww0bicyy3fp12ng")))) (build-system qt-build-system) (native-inputs `(,@(package-native-inputs monero) @@ -748,8 +748,6 @@ the Monero command line client and daemon.") ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) - ("qtlocation" ,qtlocation) - ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2",qtquickcontrols2) ("qtsvg" ,qtsvg) @@ -761,7 +759,7 @@ the Monero command line client and daemon.") "-DENABLE_PASS_STRENGTH_METER=ON" (string-append "-DReadline_ROOT_DIR=" (assoc-ref %build-inputs "readline")) - "-DCMAKE_BUILD_TYPE=Release") + "-DCMAKE_PREFIX_PATH=\"\"") #:phases (modify-phases %standard-phases (add-after 'unpack 'extract-monero-sources @@ -774,9 +772,6 @@ the Monero command line client and daemon.") #t)) (add-after 'extract-monero-sources 'fix-build (lambda _ - (substitute* "monero/src/version.cpp.in" - (("@VERSION_IS_RELEASE@") - "false")) (substitute* "src/version.js.in" (("@VERSION_TAG_GUI@") ,version)) -- cgit v1.2.3 From 191a4ced8efb98d66d547a3ee6c7b027120c7071 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 11 Nov 2020 14:14:17 +0100 Subject: gnu: giac: Update to 1.6.0-31. * gnu/packages/algebra.scm (giac): Update to 1.6.0-31. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 56d1d32ec7..ed35a6832f 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -355,7 +355,7 @@ precision.") (define-public giac (package (name "giac") - (version "1.6.0-25") + (version "1.6.0-31") (source (origin (method url-fetch) @@ -367,7 +367,7 @@ precision.") "~parisse/debian/dists/stable/main/source/" "giac_" version ".tar.gz")) (sha256 - (base32 "11kik2csdg9wy0npiih21kaag0nc89i9ldgk7ak7gvf9ycddm6mh")))) + (base32 "1dr1y88sx2gzldn0zl6p8b1ngjjcmh89iv4kzyhi2cf74j3yw85m")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) -- cgit v1.2.3 From c26a016e97ec9747e166bd5b58c9f3d53e0f1f17 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 14:03:02 +0100 Subject: gnu: mailman: Update to 3.3.2. * gnu/packages/mail.scm (mailman): Update to 3.3.2. --- gnu/packages/mail.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 488e714976..8ba0b0b946 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2881,14 +2881,13 @@ messages with @acronym{DKIM, DomainKeys Identified Mail} (RFC 4871).") (define-public mailman (package (name "mailman") - (version "3.3.1") + (version "3.3.2") (source (origin (method url-fetch) (uri (pypi-uri "mailman" version)) (sha256 - (base32 - "0idfiv48jjgc0jq4731094ddhraqq8bxnwmjk6sg5ask0jss9kxq")))) + (base32 "0a5ckbf8hc3y28b7p5psp0d4bxk601jlr5pd3hhh545xd8d9f0dg")))) (build-system python-build-system) (propagated-inputs `(("gunicorn" ,gunicorn) -- cgit v1.2.3 From b45ae3bd28b2134fdecac3eef53a54f78795bc93 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 12:56:38 +0100 Subject: gnu: telepathy-idle: Update to 0.2.2. * gnu/packages/freedesktop.scm (telepathy-idle): Update to 0.2.2. [source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add autoconf, automake, and libootl. --- gnu/packages/freedesktop.scm | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6caff14cf2..94ec2cd44a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1393,17 +1393,22 @@ different sorts of messages in different formats.") (define-public telepathy-idle (package (name "telepathy-idle") - (version "0.2.0") - (source (origin - (method url-fetch) - (uri (string-append "https://telepathy.freedesktop.org/releases/" - name "/" name "-" version ".tar.bz2")) - (sha256 - (base32 - "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh")))) + (version "0.2.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelepathyIM/telepathy-idle") + (commit (string-append "telepathy-idle-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pfw4g2cicw3ykxhsy743r0fc1yqbdrqxh2c5ha6am19dajcr95l")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) (inputs `(("xsltproc" ,libxslt) ("python" ,python-2) -- cgit v1.2.3 From d265e61f50a91c645e72b871a0d6bb0d63d1ec02 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 13:25:44 +0100 Subject: gnu: acpica: Update to 20200925. * gnu/packages/admin.scm (acpica): Update to 20200925. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ba7b46401a..6aa8d8721d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1842,7 +1842,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (define-public acpica (package (name "acpica") - (version "20200717") + (version "20200925") (source (origin (method url-fetch) (uri (string-append @@ -1850,7 +1850,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") version ".tar.gz")) (sha256 (base32 - "0jyy71szjr40c8v40qqw6yh3gfk8d6sl3nay69zrn5d88i3r0jca")))) + "18n6129fkgj85piid7v4zxxksv3h0amqp4p977vcl9xg3bq0zd2w")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From 9d8ebe703e3a3caa2c6b4aaaf9a61b00b7bd0f5b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 13:26:52 +0100 Subject: gnu: tome4: Update to 1.7.2. * gnu/packages/games.scm (tome4): Update to 1.7.2. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b94c5e32f3..7c36e67498 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6590,7 +6590,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as (define-public tome4 (package (name "tome4") - (version "1.7.0") + (version "1.7.2") (synopsis "Single-player, RPG roguelike game set in the world of Eyal") (source (origin @@ -6598,7 +6598,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as (uri (string-append "https://te4.org/dl/t-engine/t-engine4-src-" version ".tar.bz2")) (sha256 - (base32 "1fs0320n3ndd5kd6j9y22jsd1hbn356d4dr11kl3iy5ssix7832s")) + (base32 "1xa0pdn9pggwf7hnqb87ya2qxqhjahkdjwf8cr2y01gixgrkj9lv")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 0b09364d5f00d2b8b2e341487c6a33ede76bfb9a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 13:35:00 +0100 Subject: gnu: tome4: Prepare for cross-compilation. * gnu/packages/games.scm (tome4)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/games.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7c36e67498..439e369fe4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6620,7 +6620,9 @@ Crowther & Woods, its original authors, in 1995. It has been known as ("vorbis" ,libvorbis) ("luajit" ,luajit))) (arguments - `(#:make-flags '("CC=gcc" "config=release") + `(#:make-flags + (list (string-append "CC=" ,(cc-for-target)) + "config=release") ;; XXX: Building in parallel occasionally causes this build failure: ;; ../src/luajit2/src/host/buildvm.c:73:10: fatal error: buildvm_arch.h: ;; No such file or directory -- cgit v1.2.3 From 3f849e7ec76a65009f217f58b8fef3d8c0847b55 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 13:35:18 +0100 Subject: gnu: setzer: Update to 0.3.6. * gnu/packages/gnome.scm (setzer): Update to 0.3.6. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1a605b50dd..d697de74ab 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11468,7 +11468,7 @@ and toolbars.") (define-public setzer (package (name "setzer") - (version "0.3.5") + (version "0.3.6") (source (origin (method git-fetch) @@ -11477,7 +11477,7 @@ and toolbars.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qdffi6hws1a104bqzpaxbbjimjcwwmhgb3baiwh0w0b8nhbmhjl")))) + (base32 "118gip6bv4mcsq4nrai7kl0vmqqbyzpsd4ky9vhxb1x2cvg048s8")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 5b39f44382ea749b5ba05fcf65e9a09d6d83a103 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 14:16:01 +0100 Subject: gnu: mpd: Update to 0.22.3. * gnu/packages/mpd.scm (mpd): Update to 0.22.3. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index b4e1182e52..4944c960a6 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -104,7 +104,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.22.2") + (version "0.22.3") (source (origin (method url-fetch) (uri @@ -113,7 +113,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "0dldj7r58a3zxbvhs188p8mb4wcffnp66kpnglm4vwcp0wpmn6rn")))) + "1kvcarqijyw07bdqszjsn62plmncaid5az0q542p6rsygc1i501k")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=enabled"))) -- cgit v1.2.3 From 83fcb65794400da3e5bf59d0081c039e938346dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 16:53:53 +0100 Subject: gnu: perl-algorithm-c3: Update to 0.11. * gnu/packages/perl.scm (perl-algorithm-c3): Update to 0.11. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index ad84d63785..7b16d85ffd 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -269,15 +269,14 @@ more.") (define-public perl-algorithm-c3 (package (name "perl-algorithm-c3") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/" "Algorithm-C3-" version ".tar.gz")) (sha256 - (base32 - "01hlcaxndls86bl92rkd3fvf9pfa3inxqaimv88bxs95803kmkss")))) + (base32 "02ck52cf0yyk57354rd1rp5l0kbfwi1pvg2lh3jadvjxfrkq9x5a")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Algorithm-C3") (synopsis "Module for merging hierarchies using the C3 algorithm") -- cgit v1.2.3 From db0481405faddef518f00642faa066751200cf04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 16:54:01 +0100 Subject: gnu: perl-class-c3: Update to 0.35. * gnu/packages/perl.scm (perl-class-c3): Update to 0.35. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 7b16d85ffd..0ead527eb8 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1266,14 +1266,14 @@ different getters and setters.") (define-public perl-class-c3 (package (name "perl-class-c3") - (version "0.34") + (version "0.35") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/" "Class-C3-" version ".tar.gz")) (sha256 - (base32 "1dcibc31v5jwmi6hsdzi7c5ag1sb4wp3kxkibc889qrdj7jm12sd")))) + (base32 "0gp3czp6y0jxx4448kz37f7gdxq4vw514bvc0l98rk4glvqkq1c4")))) (build-system perl-build-system) (propagated-inputs `(("perl-algorithm-c3" ,perl-algorithm-c3))) -- cgit v1.2.3 From 723a5b3a28a9c3eaa5452ce59753617ae62e5135 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 17:15:58 +0100 Subject: gnu: perl-clone-pp: Update to 1.08. * gnu/packages/perl.scm (perl-clone-pp): Update to 1.08. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0ead527eb8..a9c1bbf27d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1692,15 +1692,14 @@ one.") (define-public perl-clone-pp (package (name "perl-clone-pp") - (version "1.07") + (version "1.08") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-" version ".tar.gz")) (sha256 - (base32 - "15dkhqvih6rx9dnngfwwljcm9s8afb0nbyl2vdvhd8frnw4y31dz")))) + (base32 "0y7m25fksiavzg4xj4cm9zkz8rmnk4iqy7lm01m4nmyqlna3082p")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Clone-PP") (synopsis "Recursively copy Perl datatypes") -- cgit v1.2.3 From f10967a7269bcc21a4163c8790f7ec4f2b8b706a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 17:20:06 +0100 Subject: gnu: perl-moox-file-configdir: Update to 0.008. * gnu/packages/perl.scm (perl-moox-file-configdir): Update to 0.008. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a9c1bbf27d..e1568a3140 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7278,15 +7278,14 @@ building is done in @code{MooX::ConfigFromFile::Role}---using (define-public perl-moox-file-configdir (package (name "perl-moox-file-configdir") - (version "0.007") + (version "0.008") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RE/REHSACK/" "MooX-File-ConfigDir-" version ".tar.gz")) (sha256 - (base32 - "074v150wrbddhy1n0qc8s80zrb71l3c4is968cnr06ac5l9kmshz")))) + (base32 "1b033injzk9d8clgip67ps5j5bpkrnag28q89ddwhrgqx12i3m7q")))) (build-system perl-build-system) (propagated-inputs `(("perl-file-configdir" ,perl-file-configdir) -- cgit v1.2.3 From 85a4ddbdbe850ef05164b92b031682cee036a27a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 17:20:20 +0100 Subject: gnu: perl-moox-handlesvia: Update to 0.001009. * gnu/packages/perl.scm (perl-moox-handlesvia): Update to 0.001009. --- gnu/packages/perl.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index e1568a3140..179ab384ad 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7301,17 +7301,16 @@ installing configuration files or for finding any piece of settings.") (define-public perl-moox-handlesvia (package (name "perl-moox-handlesvia") - (version "0.001008") + (version "0.001009") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/M/MA/MATTP/MooX-HandlesVia-" + "mirror://cpan/authors/id/T/TO/TOBYINK/MooX-HandlesVia-" version ".tar.gz")) (sha256 - (base32 - "137yrjn2jmw4cj0fjdajnkjgqr5arnpq72kbm6w66xskncinz55h")))) + (base32 "04kcyflg49rclxa1nm035c05jpyvhdacjyy1wklbgv4li3im6qvi")))) (build-system perl-build-system) (native-inputs `(("perl-moox-types-mooselike" -- cgit v1.2.3 From 72ba2db384364cc2661d88ccb7897da8586d5b04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 17:30:00 +0100 Subject: gnu: perl-text-format: Update to 0.62. * gnu/packages/perl.scm (perl-text-format): Update to 0.62. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 179ab384ad..40d2e6d364 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9833,7 +9833,7 @@ generally slower on larger files.") (define-public perl-text-format (package (name "perl-text-format") - (version "0.61") + (version "0.62") (source (origin (method url-fetch) (uri (string-append @@ -9841,7 +9841,7 @@ generally slower on larger files.") version ".tar.gz")) (sha256 (base32 - "0axfyiml3zwawwd127z8rl2lm53z6dlsflzmp80m3j0myn7kp2mv")))) + "0104z7jjv46kqh77rnx8kvmsbr5dy0s56xm01dckq4ly65br0hkx")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) -- cgit v1.2.3 From e44d774481828ebe4151b3b26e999e07be27c984 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 17:32:38 +0100 Subject: gnu: perl-libintl-perl: Update to 1.32. * gnu/packages/perl.scm (perl-libintl-perl): Update to 1.32. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 40d2e6d364..3808f57d18 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5777,14 +5777,14 @@ one: logging, exceptions, and translations.") (define-public perl-libintl-perl (package (name "perl-libintl-perl") - (version "1.31") + (version "1.32") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/G/GU/GUIDO/" "libintl-perl-" version ".tar.gz")) (sha256 - (base32 "1afandrl44mq9c32r57xr489gkfswdgc97h8x86k98dz1byv3l6a")))) + (base32 "19gbbh9w3rl805mv6mg1q80fsrg610h098qhf7ycnkjnyac84440")))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From b317323a42c8b78ac85c185a5454b345eb0f1337 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 17:47:11 +0100 Subject: gnu: perl-list-moreutils: Update to 0.430. * gnu/packages/perl.scm (perl-list-moreutils): Update to 0.430. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 3808f57d18..2ce2b85000 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5897,15 +5897,14 @@ intersections, unions, unique elements, complements and many more.") (define-public perl-list-moreutils (package (name "perl-list-moreutils") - (version "0.428") + (version "0.430") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RE/REHSACK/" "List-MoreUtils-" version ".tar.gz")) (sha256 - (base32 - "1hkc8xkd27yzfkgaglzn77j4qjmilyva4gaz3pc64vpism2hjgki")))) + (base32 "09v5cipjf634a1176wy2wicibzz51lry0d0yim9rnbfl5j2ggcb3")))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From a78342a32ca55b57f994c49e9a1cbe70b2e12e54 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 17:47:18 +0100 Subject: gnu: perl-list-moreutils-xs: Update to 0.430. * gnu/packages/perl.scm (perl-list-moreutils-xs): Update to 0.430. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 2ce2b85000..d49ca005ba 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5931,15 +5931,14 @@ functionality on lists which is not going to go into List::Util.") (define-public perl-list-moreutils-xs (package (name "perl-list-moreutils-xs") - (version "0.428") + (version "0.430") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-" version ".tar.gz")) (sha256 - (base32 - "0bfndmnkqaaf3gffprak143bzplxd69c368jxgr7rzlx88hyd7wx")))) + (base32 "0hmjkhmk1qlzbg8skq7g1zral07k1x0fk4w2fpcfr7hpgkaldkp8")))) (build-system perl-build-system) (native-inputs `(("perl-config-autoconf" ,perl-config-autoconf) -- cgit v1.2.3 From b91236d92949d04a9b8e851766610baef94d3035 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 17:32:53 +0100 Subject: gnu: chatty: Update to 0.1.17. * gnu/packages/messaging.scm (chatty): Update to 0.1.17. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 7fe58094c0..b462504894 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2373,7 +2373,7 @@ support for high performance Telegram Bot creation.") (define-public chatty (package (name "chatty") - (version "0.1.16") + (version "0.1.17") (source (origin (method git-fetch) (uri (git-reference @@ -2382,7 +2382,7 @@ support for high performance Telegram Bot creation.") (file-name (git-file-name name version)) (sha256 (base32 - "085hb3ii1cy0jb3f0mim25v5r5w3gpfsdpjid5dmrpw4gi88aa2x")))) + "0ba1rw8a3vif9k3570hxjfm25vqys3vk3f6g8z5irklwq4bi6lmn")))) (build-system meson-build-system) (arguments '(#:phases -- cgit v1.2.3 From b9772f62416d5f78f7f377549211f47e9ba1b494 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 17:34:11 +0100 Subject: gnu: python-aiosmtpd: Update to 1.2.2. * gnu/packages/mail.scm (python-aiosmtpd): Update to 1.2.2. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8ba0b0b946..ff036d36a3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3887,7 +3887,7 @@ DKIM and ARC sign messages and output the corresponding signature headers.") (define-public python-aiosmtpd (package (name "python-aiosmtpd") - (version "1.2.1") + (version "1.2.2") (source (origin (method git-fetch) @@ -3895,7 +3895,7 @@ DKIM and ARC sign messages and output the corresponding signature headers.") (url "https://github.com/aio-libs/aiosmtpd") (commit version))) (sha256 - (base32 "14c30dm6jzxiblnsah53fdv68vqhxwvb9x0aq9bc4vcdas747vr7")) + (base32 "0083d6nf75xv8nq1il6jabz36v6c452svy4p402csxwwih5pw6sk")) (file-name (git-file-name name version)))) (build-system python-build-system) (arguments -- cgit v1.2.3 From d2bf896155851fee524b045a790b949ea6863c76 Mon Sep 17 00:00:00 2001 From: Raphaël Mélotte Date: Fri, 6 Nov 2020 20:16:20 +0100 Subject: gnu: eid-mw: Build reproducibly. * gnu/packages/security-token.scm (eid-mw)[arguments]: Add a "make-reproducible" phase to set build date to the epoch. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/security-token.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index cf6bf18373..162868ad7a 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -139,7 +139,13 @@ readers and is needed to communicate with such devices through the (substitute* "scripts/build-aux/genver.sh" (("/bin/sh") (which "sh")) (("^(GITDESC=).*" _ match) (string-append match ,version "\n"))) - (invoke "sh" "./bootstrap.sh")))))) + (invoke "sh" "./bootstrap.sh"))) + (add-after 'unpack 'make-reproducible + (lambda _ + (substitute* "scripts/mac/create-vers.sh" + (("NOW=.*") + "NOW=1970-01-01\n")) + #t))))) (synopsis "Belgian eID Middleware") (description "The Belgian eID Middleware is required to authenticate with online services using the Belgian electronic identity card.") -- cgit v1.2.3 From e6e31a59eb3d400bc264b0f70a1631cf5a8ae9c9 Mon Sep 17 00:00:00 2001 From: Raphaël Mélotte Date: Fri, 6 Nov 2020 20:16:43 +0100 Subject: gnu: eid-mw: Update to 5.0.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/security-token.scm (eid-mw): Update to 5.0.8. [arguments]: Add a ‘remove-failing-test’ phase. [inputs]: Add autoconf-archive and libassuan. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/security-token.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 162868ad7a..09222b571a 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2018, 2019 Chris Marusich ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2020 Raphaël Mélotte ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ #:use-module (gnu packages dns) #:use-module (gnu packages gettext) #:use-module (gnu packages graphviz) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) @@ -102,7 +104,7 @@ readers and is needed to communicate with such devices through the (define-public eid-mw (package (name "eid-mw") - (version "4.4.27") + (version "5.0.8") (source (origin (method git-fetch) @@ -111,13 +113,15 @@ readers and is needed to communicate with such devices through the (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "17lw8iwp7h5cs3db80sysr84ffi333cf2vrhncs9l6hy6glfl2v1")))) + (base32 "1ckini00iz9w96n9hpkx6w2ivpfkd4yyxyhnmsl9n0k8x4j6jg5a")))) (build-system glib-or-gtk-build-system) (native-inputs `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) ("automake" ,automake) ("gettext" ,gettext-minimal) ("libtool" ,libtool) + ("libassuan" ,libassuan) ("pkg-config" ,pkg-config) ("perl" ,perl))) (inputs @@ -145,7 +149,16 @@ readers and is needed to communicate with such devices through the (substitute* "scripts/mac/create-vers.sh" (("NOW=.*") "NOW=1970-01-01\n")) - #t))))) + #t)) + ;; Remove failing test that was removed upstream after version 5.0.8. + ;; See: https://github.com/Fedict/eid-mw/commit/3d1187b1b61118b9ae97607903d3d2fc0bad7518 + (add-before 'check 'remove-failing-test + (lambda _ + (substitute* "tests/unit/Makefile.am" + (("sign_state ordering cardcom_common") + "sign_state ordering #cardcom_common")) + #t)) + ))) (synopsis "Belgian eID Middleware") (description "The Belgian eID Middleware is required to authenticate with online services using the Belgian electronic identity card.") -- cgit v1.2.3 From c746acf3a13983730cf640a901c97c893461aea4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 17:46:18 +0100 Subject: gnu: eid-mw: Don't try to bootstrap twice. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/security-token.scm (eid-mw)[arguments]: Replace the build system's ‘bootstrap’ phase instead of creating another one. --- gnu/packages/security-token.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 09222b571a..45610c4801 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -136,7 +136,7 @@ readers and is needed to communicate with such devices through the (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'bootstrap + (replace 'bootstrap (lambda _ ;; configure.ac relies on ‘git --describe’ to get the version. ;; Patch it to just return the real version number directly. -- cgit v1.2.3 From 785190c755c9fe71cfc3562975db9763cb502785 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Nov 2020 02:58:49 -0500 Subject: gnu: linux-libre: Update to 5.9.8. * gnu/packages/linux.scm (linux-libre-5.9-version): Update to 5.9.8. (deblob-scripts-5.9, linux-libre-5.9-pristine-source): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5e47a6bfb9..82db3ee1ce 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -351,15 +351,15 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernel. That is, the most recently released major ;; version. -(define-public linux-libre-5.9-version "5.9.6") +(define-public linux-libre-5.9-version "5.9.8") (define deblob-scripts-5.9 (linux-libre-deblob-scripts linux-libre-5.9-version (base32 "1l0iw2lp6alk0a8nvdafklyks83iiyw4b2r5xif84z47qfbydsis") - (base32 "0is78bvpx6mrhibpspz4iqnsa1xplh11q1cnalkkm4hpsiy0fi4g"))) + (base32 "0wp0mx5d2qhv7brc595qj34phiaxz9z5gf26w5369nh9mll5cbw6"))) (define-public linux-libre-5.9-pristine-source (let ((version linux-libre-5.9-version) - (hash (base32 "0w2kcng09nzk09dwkx4azdfgnwzbd2mz8lyl4j69bwx837z85hbc"))) + (hash (base32 "19l67gzk97higd2cbggipcb0wi21pv0ag0mc4qh6cqk564xp6mkn"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.9))) -- cgit v1.2.3 From f9a052bee880790d6bb46f3d76969da5aabc98e7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Nov 2020 02:59:26 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.77. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.77. (deblob-scripts-5.4, linux-libre-5.4-pristine-source): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 82db3ee1ce..92a2623f7b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -367,15 +367,15 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.4-version "5.4.75") +(define-public linux-libre-5.4-version "5.4.77") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version (base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25") - (base32 "1h6gbc9cfhb7dqx669iq26a23whka6km5av0ysk61aaz2z57vkrk"))) + (base32 "167zcfkw62pm6nv1xdvvhxw0ca724sywcywnv3z00189f8f8p3vg"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0w0lpiy56zqdm2vpx9ckxakna334n88pnqbv52zyfcslxgb6yinj"))) + (hash (base32 "1xyvml0mps7bsa11bgpa4l0w8x6pasdz9yab2z4ds394f1lkxq53"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 175805d332d666c027fe1559524589dbc79405ba Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Nov 2020 03:00:16 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.157. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.157. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 92a2623f7b..9a04e72ce3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -380,7 +380,7 @@ 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.155") +(define-public linux-libre-4.19-version "4.19.157") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -388,7 +388,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1lj81aadyskmxs3j4s923nhnk69dfj2kiwm0nxabbcjw83sliinb"))) + (hash (base32 "0mgpgv2ny49bb7kgaygy2ay6ckjgw7mg091viivi66jw4mjs7p3n"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From fc42f7e6fd42e72f7ee770d1bbf20a10ea63410c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Nov 2020 03:01:08 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.206. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.206. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9a04e72ce3..8f51ff108e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -393,7 +393,7 @@ 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.204") +(define-public linux-libre-4.14-version "4.14.206") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -401,7 +401,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1ncacsy2g80zigfx8nmr1f7v50s1y9ys1xy9jgizrnvmxjcji0wy"))) + (hash (base32 "1b46f0s15xnlam43cmw8w41rrvcwrhm6km0278lq6f86lpx3w8qw"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 36d67f5ed09d05be30851f62ff10b1b654e3e3b8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Nov 2020 03:01:42 -0500 Subject: gnu: linux-libre 4.9: Update to 4.9.243. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.243. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8f51ff108e..4ce61bd87b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -406,7 +406,7 @@ 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.241") +(define-public linux-libre-4.9-version "4.9.243") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -414,7 +414,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0b5k9cwz7vpaybw4nd03pn2z4d8qbhmhd9mx4j2yd0fqj57x1in4"))) + (hash (base32 "111rlzx6z4kf8zwxncib96d9wy6qmkbs0cq3dhnybipwlyf1iank"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 12d155e2e58672dd16a04aca2aa4d5a5c4a1a7df Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Nov 2020 03:02:09 -0500 Subject: gnu: linux-libre 4.4: Update to 4.4.243. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.243. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4ce61bd87b..8abeb976af 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -419,7 +419,7 @@ 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.241") +(define-public linux-libre-4.4-version "4.4.243") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -427,7 +427,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "054jd6jgymxbkjfmk8wbckihl355gjimjg2xi5yr4v2343qi9zij"))) + (hash (base32 "1daqbmj9ka9wdkkym625hqwqaxq5n11y7c4yc9ln3xkjpnv4dplm"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 5e7eb053c9395c4b3036b27cb50d39be37c85791 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 17:55:39 +0100 Subject: gnu: xfce4-weather-plugin: Update to 0.10.2. * gnu/packages/xfce.scm (xfce4-weather-plugin): Update to 0.10.2. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 904ad19a08..e08e2c4999 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1986,7 +1986,7 @@ lan interface (signal state, signal quality, network name (SSID)).") (define-public xfce4-weather-plugin (package (name "xfce4-weather-plugin") - (version "0.10.1") + (version "0.10.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1995,7 +1995,7 @@ lan interface (signal state, signal quality, network name (SSID)).") "/xfce4-weather-plugin-" version ".tar.bz2")) (sha256 (base32 - "12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg")))) + "1ik2qvmwylsz5vyz4np2y0mmd37s89xkayxi97490c4mj85pj5wh")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 112c584c22ea5ad3264b17bca57ee60225742831 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 17:55:50 +0100 Subject: gnu: xfce4-screensaver: Update to 0.1.11. * gnu/packages/xfce.scm (xfce4-screensaver): Update to 0.1.11. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index e08e2c4999..a21679a4d1 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1176,7 +1176,7 @@ A plugin for the Xfce panel is also available.") (define-public xfce4-screensaver (package (name "xfce4-screensaver") - (version "0.1.10") + (version "0.1.11") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1186,7 +1186,7 @@ A plugin for the Xfce panel is also available.") version ".tar.bz2")) (sha256 (base32 - "0mqxbyq9np6jzky8y35dlxxmk78q2w0jvwg9kh7a4ib7vmw1qvsq")))) + "0xxcvvcch8bqd35ksq8l88a46xnidp59iq4ssyygki0a2vd20h41")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 9e06166da2e88d786de4c480b2bd5f6136144466 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 18:00:25 +0100 Subject: gnu: evisum: Update to 0.5.7. * gnu/packages/enlightenment.scm (evisum): Update to 0.5.7. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 02fd45017a..f306a31e46 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -566,14 +566,14 @@ directories. (define-public evisum (package (name "evisum") - (version "0.5.6") + (version "0.5.7") (source (origin (method url-fetch) (uri (string-append "https://download.enlightenment.org/rel/apps/" "evisum/evisum-" version ".tar.xz")) (sha256 - (base32 "1l8pym7738kncvic5ga03sj9d5igigvmcxa9lbg47z2yvdjwzv97")))) + (base32 "0pm63n3rls8vkjv3awq0f3zlqk33ddql3g0rl2bc46n48g2mcmbd")))) (build-system meson-build-system) (arguments '(#:tests? #f)) ; no tests -- cgit v1.2.3 From c07c8892eec7b4a534a5f7ff01626450ffe66443 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Nov 2020 18:14:23 +0100 Subject: gnu: python-libtmux: Update to 0.8.5. * gnu/packages/tmux.scm (python-libtmux): Update to 0.8.5. [arguments]: Set LANG to make the test suite pass. --- gnu/packages/tmux.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index de55c0b188..95a31f80fd 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -145,7 +145,7 @@ windows.") (define-public python-libtmux (package (name "python-libtmux") - (version "0.8.3") + (version "0.8.5") (source (origin (method git-fetch) @@ -155,7 +155,7 @@ windows.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18dqqd3jmgq3jb1l3xpgywlh4x82mzjxch61gwnlhfaqx5mzvjph")))) + (base32 "1vrd99kl2gsk49mvbp6k7l1k7r96vf1fczsqclb62yd4hdpp7zaa")))) (build-system python-build-system) (propagated-inputs `(("procps" ,procps))) ;tests need top @@ -171,6 +171,8 @@ windows.") (setenv "PYTHONPATH" (string-append (getcwd) "/build/lib:" (getenv "PYTHONPATH"))) + ;; Fix . + (setenv "LANG" "en_US.utf8") ;; Skip tests that I suspect fail because of a change ;; in behavior in tmux 3 from tmux 2 ;; https://github.com/tmux-python/libtmux/issues/281 -- cgit v1.2.3 From b05c96d93d974723142846f94790f349913c0df5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Nov 2020 16:52:47 +0100 Subject: gnu: emacs.scm: Remove unused module import. * gnu/packages/emacs.scm: Don't import (gnu packages imagemagick). --- gnu/packages/emacs.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4963379d74..4f5a67093c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -59,7 +59,6 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages image) - #:use-module (gnu packages imagemagick) #:use-module (gnu packages linux) ; alsa-lib #:use-module (gnu packages mail) ; for mailutils #:use-module (gnu packages multiprecision) -- cgit v1.2.3 From 2ee194dd7dd5c8ad55c90ef0d923026129b09b13 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Nov 2020 16:53:41 +0100 Subject: gnu: networking.scm: Remove unused module import. * gnu/packages/networking.scm: Don't import (gnu packages version-control). --- gnu/packages/networking.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7325e35054..4f7eee6ddb 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -136,7 +136,6 @@ #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) - #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) -- cgit v1.2.3 From 93317a04173adf479b3bb6855741325409da441a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Nov 2020 20:59:31 +0100 Subject: gnu: mgba: Remove unused input. * gnu/packages/emulators.scm (mgba)[inputs]: Remove IMAGEMAGICK. --- gnu/packages/emulators.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index a1f55cbe3d..86880be0d6 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -61,7 +61,6 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages image) - #:use-module (gnu packages imagemagick) #:use-module (gnu packages libedit) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) @@ -567,7 +566,6 @@ The following systems are supported: (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs `(("ffmpeg" ,ffmpeg) - ("imagemagick" ,imagemagick) ("libedit" ,libedit) ("libelf" ,libelf) ("libepoxy" ,libepoxy) -- cgit v1.2.3 From 3645716c56f6f3665a22c959438992aca0ea2e84 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Nov 2020 21:09:07 +0100 Subject: gnu: caja-extensions: Remove unused input. * gnu/packages/mate.scm (caja-extensions)[inputs]: Remove IMAGEMAGICK. --- gnu/packages/mate.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 77e55731a3..a9635d90fe 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -903,7 +903,6 @@ icons on the MATE desktop. It works on local and remote file systems.") ("dbus-glib" ,dbus-glib) ("gajim" ,gajim) ;runtime only? ("gtk+" ,gtk+) - ("imagemagick" ,imagemagick) ("graphicsmagick" ,graphicsmagick) ("mate-desktop" ,mate-desktop) ("pidgin" ,pidgin) ;runtime only? -- cgit v1.2.3 From 18fb81634c284cd02072a757be79328577c40197 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Nov 2020 21:12:59 +0100 Subject: gnu: fbida: Remove unused input. * gnu/packages/pdf.scm (fbida)[inputs]: Remove IMAGEMAGICK. --- gnu/packages/pdf.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 1442d3e43b..2a4be26f8c 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -68,7 +68,6 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) - #:use-module (gnu packages imagemagick) #:use-module (gnu packages javascript) #:use-module (gnu packages lesstif) #:use-module (gnu packages libffi) @@ -1045,7 +1044,6 @@ the PDF pages.") ("libudev" ,eudev) ("libwebp" ,libwebp) ("libdrm" ,libdrm) - ("imagemagick" ,imagemagick) ("giflib" ,giflib) ("glib" ,glib) ("cairo-xcb" ,cairo-xcb) -- cgit v1.2.3 From 5b48d6de23fb3936750df7571d3067b28a8ee6d1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Nov 2020 21:17:46 +0100 Subject: gnu: a2ps: Remove unused input. * gnu/packages/pretty-print.scm (a2ps)[inputs]: Remove IMAGEMAGICK. --- gnu/packages/pretty-print.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index b247cf21e1..05223ae2e6 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -40,7 +40,6 @@ #:use-module (gnu packages gperf) #:use-module (gnu packages groff) #:use-module (gnu packages gv) - #:use-module (gnu packages imagemagick) #:use-module (gnu packages lua) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -72,8 +71,7 @@ (build-system gnu-build-system) (inputs `(("psutils" ,psutils) - ("gv" ,gv) - ("imagemagick" ,imagemagick))) + ("gv" ,gv))) (native-inputs `(("gperf" ,gperf) ("groff" ,groff) -- cgit v1.2.3 From 1aa765fd52086731bf2ec6da04f0afbe6535c8aa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Nov 2020 21:26:03 +0100 Subject: gnu: i3lock-fancy: Inputs are not native. * gnu/packages/wm.scm (i3lock-fancy)[native-inputs]: Move everything ... [inputs]: ... here. --- gnu/packages/wm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3bb7f7e8e8..56a0ca63cf 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -630,7 +630,7 @@ Features include: (string-append bin "/i3lock-fancy")) (copy-recursively "icons" icons) #t)))))) - (native-inputs + (inputs `(("imagemagick" ,imagemagick) ("wmctrl" ,wmctrl) ("gawk" ,gawk))) -- cgit v1.2.3 From 184598a43c0e3fd196f6015b220148db308ee83a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Nov 2020 21:26:43 +0100 Subject: gnu: i3lock-fancy: Fix defunct substitution. * gnu/packages/wm.scm (i3lock-fancy)[arguments]: Fix faulty regular expression. --- gnu/packages/wm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 56a0ca63cf..361cecf26f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -611,7 +611,7 @@ Features include: "/bin/gawk"))) (substitute* "lock" - (("$(which wmctrl)") wmctrl) + (("\\$\\(command -V wmctrl\\)") wmctrl) (("convert") mconvert) (("shot=\\(import") (string-append "shot=\(" mimport)) (("awk -F") (string-append awk " -F")) -- cgit v1.2.3 From 5f799dd119f8b2396ed35add58affc301cf563db Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Nov 2020 21:30:06 +0100 Subject: gnu: python-matplotlib: Remove unused input. * gnu/packages/python-xyz.scm (python-matplotlib)[inputs]: Remove IMAGEMAGICK. --- gnu/packages/python-xyz.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d91e28585b..e5b8db02e0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -138,7 +138,6 @@ #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) - #:use-module (gnu packages imagemagick) #:use-module (gnu packages kerberos) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) @@ -4989,7 +4988,6 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. ("python-cairocffi" ,python-cairocffi))) (inputs `(("libpng" ,libpng) - ("imagemagick" ,imagemagick) ("freetype" ,freetype) ("cairo" ,cairo) ("glib" ,glib) -- cgit v1.2.3 From 4ce58ac0edad000aa116c309b512c6c6e6549ff3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Nov 2020 16:28:06 +0200 Subject: gnu: sbcl-cffi-grovel: End all phases with #t. * gnu/packages/lisp-xyz.scm (sbcl-cffi-grovel)[arguments]: End custom 'install-headers phase with #t. --- gnu/packages/lisp-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index bec4aeeed5..d95da9c1cc 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2599,7 +2599,8 @@ package.") (install-file "grovel/common.h" (string-append (assoc-ref outputs "out") - "/include/grovel")))))))))) + "/include/grovel")) + #t)))))))) (define-public sbcl-cffi (package -- cgit v1.2.3 From a13063d6ac7434beed1c608ce3eb6fb39c740b33 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 Nov 2020 17:22:07 +0200 Subject: gnu: sbcl-cffi-libffi: Fix building on ARM hardware. * gnu/packages/lisp-xyz.scm (sbcl-cffi-libffi-bootstrap)[arguments]: Add phase to adapt code to changes in libffi. --- gnu/packages/lisp-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d95da9c1cc..dfc5a2ad00 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2017 Andy Patterson ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus -;;; Copyright © 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong @@ -2540,6 +2540,12 @@ non-consing thread safe queues and fibonacci priority queues.") (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-arm-support + (lambda _ + ;; This is apparently deprecated since libffi-3.3. + (substitute* "libffi/libffi-types.lisp" + (("\\\(\\\(:unix64.*") ")\n")) + #t)) (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "libffi/libffi.lisp" -- cgit v1.2.3 From a002e8a4f58a45034075cad27bf8eb65679bcc14 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 12 Nov 2020 13:50:05 +0100 Subject: gnu: emacs-lispy: Update to 20201109. * gnu/packages/emacs-xyz.scm (emacs-lispy): Update to 20201109. [native-inputs]: Add which. [arguments]: Fix test command to not use straight.el and disable failing test related to Clojure. --- gnu/packages/emacs-xyz.scm | 109 ++++++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 52 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 328a3f3f6f..27042927ff 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7469,63 +7469,68 @@ navigate code in a tree-like fashion.") (license license:gpl3+))) (define-public emacs-lispy - (package - (name "emacs-lispy") - (version "0.27.0") - (home-page "https://github.com/abo-abo/lispy") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/abo-abo/lispy") - (commit version))) - (sha256 - (base32 - "1cm7f4pyl73f3vhkb7ah6bbbrj2sa7n0p31g09k7dy4zgx04bgw6")) - (file-name (git-file-name name version)))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-ace-window" ,emacs-ace-window) - ("emacs-hydra" ,emacs-hydra) - ("emacs-iedit" ,emacs-iedit) - ("emacs-swiper" ,emacs-swiper) - ("emacs-zoutline" ,emacs-zoutline))) - (native-inputs - `(("emacs-clojure-mode" ,emacs-clojure-mode) - ("emacs-undercover" ,emacs-undercover))) - (arguments - `(#:include (cons* "^lispy-clojure\\.clj$" - "^lispy-python\\.py$" - %default-include) - #:phases - ;; XXX: one failing test involving python evaluation - (modify-phases %standard-phases - (add-before 'check 'make-test-writable - (lambda _ - (make-file-writable "lispy-test.el") - #t)) - (add-before 'check 'remove-python-eval-test - (lambda _ - (emacs-batch-edit-file "lispy-test.el" - `(progn - (progn - (goto-char (point-min)) - (re-search-forward - "ert-deftest lispy-eval-python-str") - (beginning-of-line) - (kill-sexp)) - (basic-save-buffer))) - #t))) - #:tests? #t - #:test-command '("make" "test"))) - (synopsis "Modal S-expression editing") - (description - "Due to the structure of Lisp syntax it's very rare for the programmer + ;; No release since May 2019 and tons of fixes have landed on master. + ;; https://github.com/abo-abo/lispy/issues/513 + (let ((commit "5c8a59ae7dd3dd342e7c86a8c0acdbd13e2989f3")) + (package + (name "emacs-lispy") + (version (git-version "0.27.0" "1" commit)) + (home-page "https://github.com/abo-abo/lispy") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abo-abo/lispy") + (commit commit))) + (sha256 + (base32 + "0738v9bp4dlxbwsnykvc35yh4dl4pvw25jl8srb7r3744ydvgyii")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-ace-window" ,emacs-ace-window) + ("emacs-hydra" ,emacs-hydra) + ("emacs-iedit" ,emacs-iedit) + ("emacs-swiper" ,emacs-swiper) + ("emacs-zoutline" ,emacs-zoutline))) + (native-inputs + `(("which" ,which) + ("emacs-clojure-mode" ,emacs-clojure-mode) + ("emacs-undercover" ,emacs-undercover))) + (arguments + `(#:include (cons* "^lispy-clojure\\.clj$" + "^lispy-python\\.py$" + %default-include) + #:phases + ;; XXX: Some failing tests + (modify-phases %standard-phases + (add-before 'check 'make-test-writable + (lambda _ + (make-file-writable "lispy-test.el") + #t)) + (add-before 'check 'remove-failing-test + (lambda _ + (emacs-batch-edit-file "lispy-test.el" + `(progn + (dolist (test '("lispy-eval-python-str" "lispy--clojure-dot-object")) + (goto-char (point-min)) + (re-search-forward + (concat "ert-deftest " test)) + (beginning-of-line) + (kill-sexp)) + (basic-save-buffer))) + #t))) + #:tests? #t + ;; Set BEMACS to prevent the test suite from loading straight.el. + #:test-command '("make" "test" "BEMACS=emacs -batch"))) + (synopsis "Modal S-expression editing") + (description + "Due to the structure of Lisp syntax it's very rare for the programmer to want to insert characters right before \"(\" or right after \")\". Thus unprefixed printable characters can be used to call commands when the point is at one of these special locations. Lispy provides unprefixed keybindings for S-expression editing when point is at the beginning or end of an S-expression.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-lispyville (let ((commit "1bf38088c981f5ab4ef2e2684952ab6af96378db") -- cgit v1.2.3 From 66479da5e2df0a0bbe0eedd3678c48740f15a1a1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Nov 2020 19:00:06 +0100 Subject: gnu: tor: Update to 0.4.4.6 [fixes TROVE-2020-005]. * gnu/packages/tor.scm (tor): Update to 0.4.4.6. --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 9bde4a4c23..f5f5fe7374 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -54,14 +54,14 @@ (define-public tor (package (name "tor") - (version "0.4.4.5") + (version "0.4.4.6") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "09lr6l98qmc69pzsi8r02z86v969dbfwjrwphfm3npknzq5a0p54")))) + "1p0zpqmbskygx0wmiijhprg8r45n2wqbbjl7kv4gbb83b0alq5az")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 1ed9a078e16ff0326ff855897b2f7a58538aebb9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 12 Nov 2020 08:49:45 +0100 Subject: gnu: ungoogled-chromium: Update to 86.0.4240.198-0.b68e17f [security fixes]. This fixes CVE-2020-16013 and CVE-2020-16017. * gnu/packages/chromium.scm (%chromium-version): Set to 86.0.4240.198. (ungoogled-chromium): Update hash. --- gnu/packages/chromium.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 582919341a..3d6a1b03ec 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -301,7 +301,7 @@ "/svntogit-packages/" revision "/trunk/" name)) (sha256 (base32 hash)))) -(define %chromium-version "86.0.4240.193") +(define %chromium-version "86.0.4240.198") (define %ungoogled-revision "b68e17f32e9eff56615a07b44e457835bb9460c6") (define %debian-revision "debian/84.0.4147.105-1") (define %arch-revision "2cbe439471932d30ff2c8ded6b3dfd51b312bbc9") @@ -455,7 +455,7 @@ %chromium-version ".tar.xz")) (sha256 (base32 - "0d55xkw3fygqpa3a5bvz7vqmzb0d9w1kis72h54cnwsqgw4xag90")) + "0i3s1il0x5yi3528gdsg3bhnyhs2x24zh7p1nd5apv3va9g85ax0")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From 30a1476bbc5bc2ed7c94da0350b2662ecd975f93 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 11 Nov 2020 11:21:31 +0100 Subject: gnu: afew: Update to 3.0.1. * gnu/packages/mail.scm (afew): Update to 3.0.1. [inputs]: Add notmuch and python-dkimpy. [native-inputs]: Add python-freezegun. Signed-off-by: Nicolas Goaziou --- gnu/packages/mail.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ff036d36a3..cc867d2a04 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus -;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2019, 2020 Tanguy Le Carrour ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Justus Winter ;;; Copyright © 2020 Eric Brown @@ -3423,20 +3423,23 @@ the use of a local MTA such as Sendmail.") (define-public afew (package (name "afew") - (version "1.2.0") + (version "3.0.1") (source (origin (method url-fetch) (uri (pypi-uri "afew" version)) (sha256 (base32 - "121w7bd53xyibllxxbfykjj76n81kn1vgjqd22izyh67y8qyyk5r")))) + "0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff")))) (build-system python-build-system) (inputs - `(("python-chardet" ,python-chardet) + `(("notmuch" ,notmuch) + ("python-chardet" ,python-chardet) + ("python-dkimpy" ,python-dkimpy) ("python-notmuch" ,python-notmuch))) (native-inputs - `(("python-setuptools-scm" ,python-setuptools-scm))) + `(("python-freezegun" ,python-freezegun) + ("python-setuptools-scm" ,python-setuptools-scm))) (home-page "https://github.com/afewmail/afew") (synopsis "Initial tagging script for notmuch mail") (description "afew is an initial tagging script for notmuch mail. It -- cgit v1.2.3 From 5f72da5f8a02cd687a57fe0c59077ca068078212 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 11 Nov 2020 11:21:51 +0100 Subject: gnu: alot: Update to 0.9.1. * gnu/packages/mail.scm (alot): Update to 0.9.1. [arguments]: Fix some tests and disable some others. [native-inputs]: Add procps. [inputs]: Remove python2-magic, python2-configobj, python2-twisted, python2-urwid, python2-urwidtrees, python2-pygpgme and python2-notmuch. Add gnupg, python-magic, python-configobj, python-twisted, python-service-identity, python-urwid, python-urwidtrees, python-gpg and python-notmuch. [synopsis]: Update synopsis. [description]: Update description. Signed-off-by: Nicolas Goaziou --- gnu/packages/mail.scm | 52 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index cc867d2a04..bc6eeaba60 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -966,7 +966,7 @@ attachments, create new maildirs, and so on.") (define-public alot (package (name "alot") - (version "0.5.1") + (version "0.9.1") (source (origin (method url-fetch) ;; package author intends on distributing via github rather @@ -977,27 +977,47 @@ attachments, create new maildirs, and so on.") (file-name (string-append "alot-" version ".tar.gz")) (sha256 (base32 - "0wax30hjzmkqfml7hig1dqw1v1y63yc0cgbzl96x58b9h2ggqx3a")))) + "1r0x3n2fxi6sfq3paz8a4vn2mmyqaznj1207wa7jl0ixnjqilb7f")))) (build-system python-build-system) (arguments - `(;; python 3 is currently unsupported, more info: - ;; https://github.com/pazz/alot/blob/master/docs/source/faq.rst - #:python ,python-2)) + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((gnupg (assoc-ref inputs "gnupg"))) + (substitute* "tests/test_crypto.py" + (("gpg2") (string-append gnupg "/bin/gpg"))) + #t))) + (add-before 'check 'disable-failing-tests + ;; FIXME: Investigate why these tests are failing. + (lambda _ + (substitute* "tests/test_helper.py" + (("def test_env_set") "def _test_env_set")) + (substitute* "tests/commands/test_global.py" + (("def test_no_spawn_no_stdin_attached") + "def _test_no_spawn_no_stdin_attached")) + #t))))) (native-inputs - `(("python2-mock" ,python2-mock))) + `(("procps" ,procps) + ("python-mock" ,python-mock))) (inputs - `(("python2-magic" ,python2-magic) - ("python2-configobj" ,python2-configobj) - ("python2-twisted" ,python2-twisted) - ("python2-urwid" ,python2-urwid) - ("python2-urwidtrees" ,python2-urwidtrees) - ("python2-pygpgme" ,python2-pygpgme) - ("python2-notmuch" ,python2-notmuch))) + `(("gnupg" ,gnupg) + ("python-magic" ,python-magic) + ("python-configobj" ,python-configobj) + ("python-twisted" ,python-twisted) + ("python-service-identity" ,python-service-identity) + ("python-urwid" ,python-urwid) + ("python-urwidtrees" ,python-urwidtrees) + ("python-gpg" ,python-gpg) + ("python-notmuch" ,python-notmuch))) (home-page "https://github.com/pazz/alot") - (synopsis "Command-line MUA using @code{notmuch}") + (synopsis "Command-line MUA using Notmuch") (description - "Alot is an experimental terminal mail user agent (@dfn{MUA}) based on -@code{notmuch} mail. It is written in Python using the @code{urwid} toolkit.") + "Alot is a terminal-based mail user agent based on the Notmuch mail +indexer. It is written in Python using the @code{urwid} toolkit and features +a modular and command prompt driven interface to provide a full mail user +agent (@dfn{MUA}) experience as an alternative to the Emacs mode shipped with +Notmuch.") (license license:gpl3+))) (define-public notifymuch -- cgit v1.2.3 From f41c9ab4c3c65e0588b83eefbd2511716aa6d465 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 01:24:01 +0100 Subject: gnu: gpxsee: Update to 7.36. * gnu/packages/gps.scm (gpxsee): Update to 7.36. --- gnu/packages/gps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 60305e62ce..680ddb8ca8 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -184,7 +184,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (define-public gpxsee (package (name "gpxsee") - (version "7.35") + (version "7.36") (source (origin (method git-fetch) (uri (git-reference @@ -193,7 +193,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (file-name (git-file-name name version)) (sha256 (base32 - "1schmymcsd8s0r26qwyx56z107ql8pgrk1pnqy19mc7fyirdwmp5")))) + "18vsw6hw6kn5wmr4iarhx1v8q455j60fhf0hq69jkfyarl56b99j")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 72ee78a6bfb83a3ea03c0da7d705de05362d25ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 01:26:58 +0100 Subject: gnu: muchsync: Update to 6. * gnu/packages/mail.scm (muchsync): Update to 6. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index bc6eeaba60..b6c51c337b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1228,14 +1228,14 @@ and search library.") (define-public muchsync (package (name "muchsync") - (version "5") + (version "6") (source (origin (method url-fetch) (uri (string-append "http://www.muchsync.org/src/" "muchsync-" version ".tar.gz")) (sha256 - (base32 "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb")))) + (base32 "1s799kx16nm5ry1fcqcc0grgxrwnnp4cnzd0hzwbkvc5v2sf6g8b")))) (build-system gnu-build-system) (native-inputs `(("pandoc" ,pandoc) @@ -1255,7 +1255,7 @@ broadband. Muchsync supports arbitrary pairwise synchronization among replicas. A version-vector-based algorithm allows it to exchange only the minimum information necessary to bring replicas up to date regardless of which pairs have previously synchronized.") - (license license:gpl2+))) + (license license:gpl2+))) ; with OpenSSL libcrypto exception (define-public getmail (package -- cgit v1.2.3 From a400ab4f14eddc9395c7cd5d04b6f31cf842e88d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 01:27:12 +0100 Subject: gnu: knot: Update to 3.0.2. * gnu/packages/dns.scm (knot): Update to 3.0.2. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 906333bb44..c361e5c265 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -807,7 +807,7 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "3.0.1") + (version "3.0.2") (source (origin (method git-fetch) @@ -816,7 +816,7 @@ Extensions} (DNSSEC).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10mlzldxqvbaw78nghkr0s73rlbpz9wg16z14321xw2l9xfibkad")) + (base32 "1cinzz8p86fzknnr2z6b49yqr4y05mmnr0l2q3lwzcfhc6dcl8di")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From c645d44f01b72545e051e4ea062d085a5e2631ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 01:35:39 +0100 Subject: gnu: youtube-dl: Update to 2020.11.12. * gnu/packages/video.scm (youtube-dl): Update to 2020.11.12. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 76ea742a11..e23a621516 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2188,14 +2188,14 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2020.11.01.1") + (version "2020.11.12") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/latest/" "youtube-dl-" version ".tar.gz")) (sha256 (base32 - "06lhba4b9bm6f5yqrb5xvdr0l5shwd95djf9nlpg86prr5xihqks")))) + "0c98sjaj6mvxnjp0qnwqbr6fibgb4dlizad2xvkiswf4g4h0pc5f")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 0a46a1e9181cf81daa9404ed1ffb671bf15abdf2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 01:39:05 +0100 Subject: gnu: criu: Update to 3.15. * gnu/packages/virtualization.scm (criu): Update to 3.15. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index b20fb70ecb..e056c5fca7 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1286,14 +1286,14 @@ domains, their live performance and resource utilization statistics.") (define-public criu (package (name "criu") - (version "3.14") + (version "3.15") (source (origin (method url-fetch) (uri (string-append "https://download.openvz.org/criu/criu-" version ".tar.bz2")) (sha256 (base32 - "1jrr3v99g18gc0hriz0avq6ccdvyya0j6wwz888sdsc4icc30gzn")))) + "09d0j24x0cyc7wkgi7cnxqgfjk7kbdlm79zxpj8d356sa3rw2z24")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From bb2232206c990b08ba5a7d5b02bfb607cbb0522f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 01:41:37 +0100 Subject: gnu: criu: Support nftables. * gnu/packages/virtualization.scm (criu)[inputs]: Add nftables. --- gnu/packages/virtualization.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e056c5fca7..deacb60ad0 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1374,7 +1374,8 @@ domains, their live performance and resource utilization statistics.") ("libcap" ,libcap) ("libnet" ,libnet) ("libnl" ,libnl) - ("libbsd" ,libbsd))) + ("libbsd" ,libbsd) + ("nftables" ,nftables))) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl) -- cgit v1.2.3 From 2646b9d6d36d0d268272f4cd9c52ef710eaf1e19 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 01:52:04 +0100 Subject: gnu: vim: Update to 8.2.1980. * gnu/packages/vim.scm (vim): Update to 8.2.1980. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 8f9aca8f58..24bd121345 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-public vim (package (name "vim") - (version "8.2.1971") + (version "8.2.1980") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "00svmci7hqgpj41rpa2lxcp8qgd3p7rpy4bzan1a512b07k35rb7")))) + "1l1bb4lhlivgvj4jaxkibdkcg6rh1gk80d6ni41kphyrir7xahja")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 3ede804f6d4c38ff0b9a5705544a8c35f6827ff1 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Fri, 13 Nov 2020 11:28:43 +0100 Subject: gnu: Add htslib-1.9. * gnu/packages/bioinformatics.scm (htslib-1.9): New variable. --- gnu/packages/bioinformatics.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 06972dee51..ba86333fc3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4250,6 +4250,19 @@ data. It also provides the @command{bgzip}, @command{htsfile}, and ;; the rest is released under the Expat license (license (list license:expat license:bsd-3)))) +(define-public htslib-1.9 + (package (inherit htslib) + (name "htslib") + (version "1.9") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/samtools/htslib/releases/download/" + version "/htslib-" version ".tar.bz2")) + (sha256 + (base32 + "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0")))))) + ;; This package should be removed once no packages rely upon it. (define htslib-1.3 (package -- cgit v1.2.3 From da4a38edad52f7bb5a8d41465d09f3f0197fd0b7 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Fri, 13 Nov 2020 11:29:20 +0100 Subject: gnu: Add samtools-1.9. * gnu/packages/bioinformatics.scm (samtools-1.9): New variable. --- gnu/packages/bioinformatics.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ba86333fc3..e047aebd1d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5699,6 +5699,31 @@ variant calling (in conjunction with bcftools), and a simple alignment viewer.") (license license:expat))) +(define-public samtools-1.9 + (package (inherit samtools) + (name "samtools") + (version "1.9") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://sourceforge/samtools/samtools/" + version "/samtools-" version ".tar.bz2")) + (sha256 + (base32 + "10ilqbmm7ri8z431sn90lvbjwizd0hhkf9rcqw8j823hf26nhgq8")) + (modules '((guix build utils))) + (snippet '(begin + ;; Delete bundled htslib. + (delete-file-recursively "htslib-1.9") + #t)))) + (inputs + `(("htslib" ,htslib-1.9) + ("ncurses" ,ncurses) + ("perl" ,perl) + ("python" ,python) + ("zlib" ,zlib))))) + (define-public samtools-0.1 ;; This is the most recent version of the 0.1 line of samtools. The input ;; and output formats differ greatly from that used and produced by samtools -- cgit v1.2.3 From c3232fcc7785abc1057a0d4b5b1832f1e39c9c1b Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Fri, 13 Nov 2020 11:29:38 +0100 Subject: gnu: bedtools: Use samtools-1.9. The build for bedtools with samtools 1.11 triggers a testsuite failure which is reported here: https://github.com/arq5x/bedtools2/issues/814 * gnu/packages/bioinformatics.scm (bedtools): Use samtools-1.9. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e047aebd1d..8ad38ac498 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -437,7 +437,7 @@ computational cluster.") (native-inputs `(("python" ,python-wrapper))) (inputs - `(("samtools" ,samtools) + `(("samtools" ,samtools-1.9) ("zlib" ,zlib))) (home-page "https://github.com/arq5x/bedtools2") (synopsis "Tools for genome analysis and arithmetic") -- cgit v1.2.3 From 12424b3ecfdf401c72804ddfa4b2fa2d8b1b68e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 14:43:12 +0100 Subject: gnu: libwhich: Cross-compile. * gnu/packages/julia.scm (libwhich)[arguments]: Use CC-FOR-TARGET. Look for zlib in NATIVE-INPUTS. --- gnu/packages/julia.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 65fa726d92..5cb4e53140 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016, 2020 Efraim Flashner ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Tim Howes +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -195,14 +196,14 @@ "1bpa0fcqpa3ai3hm8mz0p13bf76fsq53wsfcx5qw302zh22108xr")))) (arguments `(#:make-flags - (list "CC=gcc") + (list (string-append "CC=" ,(cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) (add-before 'check 'set-ld-library-path - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs #:allow-other-keys) (setenv "LD_LIBRARY_PATH" - (string-append (assoc-ref inputs "zlib") "/lib")))) + (string-append (assoc-ref native-inputs "zlib") "/lib")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From 3a15847685eda86d16ac79900e731bac1904482e Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Fri, 13 Nov 2020 11:20:26 +0000 Subject: gnu: dino: Update to 0.2.0 Update of the recently released Dino 0.2.0 version. Thanks! From 0b764d48996f3851ee2596a25f1fd42a8d3f4063 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Fri, 13 Nov 2020 12:18:11 +0100 Subject: [PATCH] gnu: dino: Update to 0.2.0 * gnu/packages/messaging.scm (dino): Update to 0.2.0 Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b462504894..624ad72c23 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -931,7 +931,7 @@ Encryption to Gajim.") (define-public dino (package (name "dino") - (version "0.1.0") + (version "0.2.0") (outputs '("out" "debug")) (source (origin @@ -940,7 +940,7 @@ Encryption to Gajim.") version "/dino-" version ".tar.gz")) (sha256 (base32 - "0dcq2jhpywgxrp9x1qqmrl2z50hazspqj547b9zz70apy3y4418h")))) + "0iigh7bkil6prf02dqcl6lmd89jxz685h8lqr3ni4x39zkcransn")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From ecc309c14202161eba28d498649a7ed53e89aaae Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Fri, 13 Nov 2020 16:14:01 +0100 Subject: gnu: Add bcftools-1.9. * gnu/packages/bioinformatics.scm (bcftools-1.9): New variable. --- gnu/packages/bioinformatics.scm | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8ad38ac498..22da6ac3ff 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -354,6 +354,28 @@ transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.") ;; The sources are dual MIT/GPL, but becomes GPL-only when USE_GPL=1. (license (list license:gpl3+ license:expat)))) +(define-public bcftools-1.9 + (package (inherit bcftools) + (name "bcftools") + (version "1.9") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/samtools/bcftools/" + "releases/download/" + version "/bcftools-" version ".tar.bz2")) + (sha256 + (base32 + "1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg")) + (modules '((guix build utils))) + (snippet '(begin + ;; Delete bundled htslib. + (delete-file-recursively "htslib-1.9") + #t)))) + (build-system gnu-build-system) + (native-inputs + `(("htslib" ,htslib-1.9) + ("perl" ,perl))))) + (define-public bedops (package (name "bedops") @@ -1955,7 +1977,7 @@ multiple sequence alignments.") ;; FIXME: tests keep timing out on some systems. (invoke "nosetests" "-v" "--processes" "1"))))))) (propagated-inputs - `(("htslib" ,htslib))) ; Included from installed header files. + `(("htslib" ,htslib-1.9))) ; Included from installed header files. (inputs `(("ncurses" ,ncurses) ("curl" ,curl) @@ -1963,7 +1985,7 @@ multiple sequence alignments.") (native-inputs `(("python-cython" ,python-cython) ;; Dependencies below are are for tests only. - ("samtools" ,samtools) + ("samtools" ,samtools-1.9) ("bcftools" ,bcftools) ("python-nose" ,python-nose))) (home-page "https://github.com/pysam-developers/pysam") -- cgit v1.2.3 From 37ba374a536453078a5ba9e81815902b256884c0 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Fri, 13 Nov 2020 16:16:43 +0100 Subject: gnu: Fix build for python-pysam. * gnu/packages/bioinformatics.scm (python-pysam): Use htslib-1.9, samtools-1.9, and bcftools-1.9. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 22da6ac3ff..15230a8ef2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1986,7 +1986,7 @@ multiple sequence alignments.") `(("python-cython" ,python-cython) ;; Dependencies below are are for tests only. ("samtools" ,samtools-1.9) - ("bcftools" ,bcftools) + ("bcftools" ,bcftools-1.9) ("python-nose" ,python-nose))) (home-page "https://github.com/pysam-developers/pysam") (synopsis "Python bindings to the SAMtools C API") -- cgit v1.2.3 From db2f95f1c24f5bfd05aa4c062cc6e7a32088345c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 15:12:52 +0100 Subject: gnu: libwhich: Compile natively, too. This follows up on commit 12424b3ecfdf401c72804ddfa4b2fa2d8b1b68e5. * gnu/packages/julia.scm (libwhich)[arguments]: Fix non-cross compilation. --- gnu/packages/julia.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 5cb4e53140..d8a6d7ac2f 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -201,9 +201,10 @@ (modify-phases %standard-phases (delete 'configure) (add-before 'check 'set-ld-library-path - (lambda* (#:key native-inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (setenv "LD_LIBRARY_PATH" - (string-append (assoc-ref native-inputs "zlib") "/lib")))) + (string-append (assoc-ref (or native-inputs inputs) "zlib") + "/lib")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From f6e031ab36fd99ad3536caabfdaefcc2b5f606a1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 15:14:15 +0100 Subject: gnu: julia: Update to 1.5.3. * gnu/packages/julia.scm (julia): Update to 1.5.3. (libuv-julia): Update to 1fcc6d66f9df74189c74d3d390f02202bb7db953. (julia-patch): Update version. No change to patches. --- gnu/packages/julia.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index d8a6d7ac2f..13c9f7baf1 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -52,8 +52,8 @@ #:use-module (ice-9 match)) (define libuv-julia - (let ((commit "35b1504507a7a4168caae3d78db54d1121b121e1") - (revision "1")) + (let ((commit "1fcc6d66f9df74189c74d3d390f02202bb7db953") + (revision "2")) ;; When upgrading Julia, also upgrade this. Get the commit from ;; https://github.com/JuliaLang/julia/blob/v1.5.2/deps/libuv.version (package @@ -68,7 +68,7 @@ (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0dn3v6fdp1z382pqg3nhjzk60l61ky9b65mfgaj29fv2da95rwjs")))) + "040l7f1hk7xyza11sry5cj4fhw05na949865axqqhxnifdvnmfji")))) (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments libuv) @@ -105,7 +105,7 @@ "/deps/patches/" name ".patch")) (define (julia-patch name sha) - (let ((version "1.5.2")) + (let ((version "1.5.3")) (origin (method url-fetch) (uri (julia-patch-url version name)) (sha256 (base32 sha)) @@ -223,7 +223,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (define-public julia (package (name "julia") - (version "1.5.2") + (version "1.5.3") (source (origin (method url-fetch) (uri (string-append @@ -231,7 +231,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") version "/julia-" version ".tar.gz")) (sha256 (base32 - "08wazf3f1lb2c2c5s700kyak8llfqwki8xlnqyrbwmwxjj801p2n")) + "1zmim82x9kkdcgn0cdi01hmzi59zbszy1sqlygb86xq4hc1n66dy")) (patches (search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From dd012afde475e44cc71ccbf250e8ed0ee1e0e853 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Nov 2020 17:13:19 +0100 Subject: gnu: libfive: Update to 0-4.8ca1b86. * gnu/packages/engineering.scm (libfive): Update to 0-4.8ca1b86. [inputs]: Replace guile-2.2 with guile-3.0. --- gnu/packages/engineering.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index acf048d2e5..596b8a79ab 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -754,8 +754,8 @@ fonts to gEDA.") (license license:gpl2+)))) (define-public libfive - (let ((commit "6e39254e57c179459bb929df49ae96a6017a0ed6") - (revision "3")) + (let ((commit "8ca1b8685ef3fac7b64e66b10459b8421a3020c6") + (revision "4")) (package (name "libfive") (version (git-version "0" revision commit)) @@ -766,7 +766,7 @@ fonts to gEDA.") (commit commit))) (sha256 (base32 - "0ryv2hcbrwqc087w7rrs4a2irkcpmqync00g4dh8n7jn10w2jkim")) + "1c762cd70iv2b9av0l9lq0py9138y98wk3dirhdmil7jncdhvq98")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -784,7 +784,7 @@ fonts to gEDA.") ("libpng" ,libpng) ("qtbase" ,qtbase) ("eigen" ,eigen) - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (home-page "https://libfive.com") (synopsis "Tool for programmatic computer-aided design") (description -- cgit v1.2.3 From 4e9b2e8ba26dd601df67f112852237d5df2f3341 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Nov 2020 17:14:00 +0100 Subject: gnu: inspekt3d: Build with Guile 3. * gnu/packages/engineering.scm (inspekt3d) [source]: Add snippet to allow building with Guile 3.0. [inputs]: Replace guile-2.2 with guile-3.0. [propagated-inputs]: Replace guile-opengl with guile3.0-opengl. --- gnu/packages/engineering.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 596b8a79ab..3da11e3fed 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -810,7 +810,14 @@ language.") (file-name (git-file-name name version)) (sha256 (base32 - "0lan6930g5a9z4ack9jj0zdd0mb2s6q2xzpiwcjdc3pvl9b1nbw4")))) + "0lan6930g5a9z4ack9jj0zdd0mb2s6q2xzpiwcjdc3pvl9b1nbw4")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure.ac" + (("2\\.2") "3.0 2.2")) + #t)))) (build-system gnu-build-system) (arguments `(#:phases @@ -829,10 +836,10 @@ language.") ("pkg-config" ,pkg-config))) (inputs `(("mesa" ,mesa) - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (propagated-inputs `(("libfive" ,libfive) - ("guile-opengl" ,guile-opengl))) + ("guile-opengl" ,guile3.0-opengl))) (home-page "https://gitlab.com/kavalogic-inc/inspekt3d/") (synopsis "Lightweight 3D viewer for Libfive written in Guile Scheme") (description -- cgit v1.2.3 From 647d1ece4910fcf1c4ac7fe24b4b38782e91a2a0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 21:49:33 +0100 Subject: gnu: inxi-minimal: Update to 3.1.09-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.1.09-1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6aa8d8721d..a65d45a960 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3591,7 +3591,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.1.08-1") + (version "3.1.09-1") (source (origin (method git-fetch) @@ -3600,7 +3600,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "15b0fn8kv09k7kzyzix1pr1wmjw5yinzgw01v8pf9p547m4a899a")))) + (base32 "0m6s8kxjppy3jm39is5i1lbrah29cw86rq0vamvx46izbdyf84y5")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit v1.2.3 From 7214dc8449fda35387e8cb90dc7d7c13917cec4a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 21:51:40 +0100 Subject: gnu: python-duniterpy: Update to 0.60.1. * gnu/packages/finance.scm (python-duniterpy): Update to 0.60.1. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 5b3ee2c65c..7b87bde50c 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1091,13 +1091,13 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") (define-public python-duniterpy (package (name "python-duniterpy") - (version "0.60.0") + (version "0.60.1") (source (origin (method url-fetch) (uri (pypi-uri "duniterpy" version)) (sha256 - (base32 "0djn6ykmqbp8l2xbg6z8r7rkz9ijgygp2pr0gc6i7dsrlsqmjh32")))) + (base32 "1cwda5mk05zmpar7fpk9m4bziyz2s5pd0922h22fns5hw7vfsybh")))) (build-system python-build-system) (arguments ;; FIXME: Tests fail with: "TypeError: block_uid() missing 1 required -- cgit v1.2.3 From b5454eb33d35944512a850de372e6198e3c58e9a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 22:20:02 +0100 Subject: gnu: libgda: Update to 5.2.10. * gnu/packages/gnome.scm (libgda): Update to 5.2.10. [source]: Generate git tag from version number. [native-inputs]: Add autoconf-archive. --- gnu/packages/gnome.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d697de74ab..11aa0a7f78 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11966,17 +11966,17 @@ developed with the aim of being used with the Librem 5 phone.") (define-public libgda (package (name "libgda") - (version "5.2.9") + (version "5.2.10") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.gnome.org/GNOME/libgda.git/") - (commit "LIBGDA_5_2_9"))) + (commit (string-append "LIBGDA_" (string-replace-substring + version "." "_"))))) (file-name (git-file-name name version)) (sha256 - (base32 - "122anbk15vj2dfxrw7s48b6zwlpp7cyppshxizynvf3zmc0ygw3j")))) + (base32 "18rg773gq9v3cdywpmrp12c5xyp97ir9yqjinccpi22sksb1kl8a")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-vala") @@ -12021,6 +12021,7 @@ developed with the aim of being used with the Librem 5 phone.") ("vala" ,vala))) (native-inputs `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) ("automake" ,automake) ("glib:bin" ,glib "bin") ("gnome-common" ,gnome-common) -- cgit v1.2.3 From c41314853d69a0b792ddbb84f2f72901f5ae9118 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 23:25:54 +0100 Subject: gnu: nginx-lua-module: Update to 0.10.16. * gnu/packages/web.scm (nginx-lua-module): Update to 0.10.16. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 071f98adc5..dab8ea8c2d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -567,7 +567,7 @@ documentation.") (package (inherit nginx) (name "nginx-lua-module") - (version "0.10.15") + (version "0.10.16") (source (origin (method git-fetch) @@ -576,8 +576,7 @@ documentation.") (commit (string-append "v" version)))) (file-name (git-file-name "lua-nginx-module" version)) (sha256 - (base32 - "1j216isp0546hycklbr5wi8mlga5hq170hk7f2sm16sfavlkh5gz")))) + (base32 "0nwcbqm1visg1dkxav7qa16w0d0n8cgqn4881xiqn88xfkxj0dyg")))) (build-system gnu-build-system) (inputs `(("nginx-sources" ,(package-source nginx-socket-cloexec)) -- cgit v1.2.3 From 9c3a29e3825fe542aee80787c66806913de02358 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 23:32:28 +0100 Subject: gnu: lua-resty-core: Update to 0.1.18. * gnu/packages/lua.scm (lua-resty-core): Update to 0.1.18. --- gnu/packages/lua.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 42ef24e381..433ae20222 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -883,7 +883,7 @@ on numbers.") (define-public lua-resty-core (package (name "lua-resty-core") - (version "0.1.17") + (version "0.1.18") (source (origin (method git-fetch) (uri (git-reference @@ -892,7 +892,7 @@ on numbers.") (file-name (git-file-name name version)) (sha256 (base32 - "11fyli6yrg7b91nv9v2sbrc6y7z3h9lgf4lrrhcjk2bb906576a0")))) + "1c58hykwpg5zqbyhrcb703pzwbkih409v3bh2gady6z2kj9q32dw")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From e0c34c1a4c3a6e5ffc7163c6e114aa89d9cc2329 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Nov 2020 23:36:57 +0100 Subject: gnu: lua-resty-lrucache: Update to 0.10. * gnu/packages/lua.scm (lua-resty-lrucache): Update to 0.10. --- gnu/packages/lua.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 433ae20222..989e7b9b46 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -920,7 +920,7 @@ on numbers.") (define-public lua-resty-lrucache (package (name "lua-resty-lrucache") - (version "0.09") + (version "0.10") (source (origin (method git-fetch) (uri (git-reference @@ -929,7 +929,7 @@ on numbers.") (file-name (git-file-name name version)) (sha256 (base32 - "1mwiy55qs8bija1kpgizmqgk15ijizzv4sa1giaz9qlqs2kqd7q2")))) + "1bsc54v1rvxmkwg7a2c01p192lvw5g576f589is8fy1m1c6v4ap8")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 5ef1913ce6516ddd78c4efe7645b6e06d8925503 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 00:04:08 +0100 Subject: gnu: Add python-pycryptodomex. * gnu/packages/python-crypto.scm (python-pycryptodomex): New public variable. --- gnu/packages/python-crypto.scm | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 1ac98caab0..652bca7bc4 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1029,6 +1029,57 @@ in userspace) (define-public python2-pycryptodome (package-with-python2 python-pycryptodome)) +(define-public python-pycryptodomex + (package + (name "python-pycryptodomex") + (version "3.9.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pycryptodomex" version)) + (sha256 + (base32 "0lbx4qk3xmwqiidhmkj8qa7bh2lf8bwzg0xjpsh2w5zqjrc7qnvv")))) + (build-system python-build-system) + (home-page "https://www.pycryptodome.org") + (synopsis "Low-level cryptographic Python library") + (description + "PyCryptodome is a self-contained Python package of low-level +cryptographic primitives. It's not a wrapper to a separate C library like +OpenSSL. To the largest possible extent, algorithms are implemented in pure +Python. Only the pieces that are extremely critical to performance (e.g., +block ciphers) are implemented as C extensions. + +You are expected to have a solid understanding of cryptography and security +engineering to successfully use these primitives. You must also be able to +recognize that some are obsolete (e.g., TDES) or even insecure (RC4). + +It provides many enhancements over the last release of PyCrypto (2.6.1): + +@itemize +@item Authenticated encryption modes (GCM, CCM, EAX, SIV, OCB) +@item Accelerated AES on Intel platforms via AES-NI +@item First-class support for PyPy +@item Elliptic curves cryptography (NIST P-256 curve only) +@item Better and more compact API (nonce and iv attributes for ciphers, +automatic generation of random nonces and IVs, simplified CTR cipher mode, and +more) +@item SHA-3 (including SHAKE XOFs) and BLAKE2 hash algorithms +@item Salsa20 and ChaCha20 stream ciphers +@item scrypt and HKDF +@item Deterministic (EC)DSA +@item Password-protected PKCS#8 key containers +@item Shamir’s Secret Sharing scheme +@item Random numbers get sourced directly from the OS (and not from a CSPRNG +in userspace) +@item Cleaner RSA and DSA key generation (largely based on FIPS 186-4) +@item Major clean-ups and simplification of the code base +@end itemize + +PyCryptodomex is the stand-alone version of PyCryptodome that no longer +provides drop-in compatibility with PyCrypto.") + (license (list license:bsd-2 + license:public-domain)))) ; code inherited from PyCrypto + (define-public python-m2crypto (package (name "python-m2crypto") -- cgit v1.2.3 From 970a3026e903dbb0e712da624b7dac6c870194c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 00:20:53 +0100 Subject: gnu: python-pycryptodome: Expand description. * gnu/packages/python-crypto.scm (python-pycryptodome)[synopsis, description]: Copy higher-level description from python-pycryptodomex. --- gnu/packages/python-crypto.scm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 652bca7bc4..8911667f22 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -999,16 +999,24 @@ protocol (Javascript Object Signing and Encryption).") "0dh6ky5ngxayyn5f6n7gdamjl49g3khz6pdx9sdnag1zwi8248hs")))) (build-system python-build-system) (home-page "https://www.pycryptodome.org") - (synopsis "Cryptographic library for Python") - (description "This package provides a cryptographic library for Python. + (synopsis "Low-level cryptographic Python library") + (description + "PyCryptodome is a self-contained Python package of low-level +cryptographic primitives. It's not a wrapper to a separate C library like +OpenSSL. To the largest possible extent, algorithms are implemented in pure +Python. Only the pieces that are extremely critical to performance (e.g., +block ciphers) are implemented as C extensions. -It brings the following enhancements with respect to the last official version -of PyCrypto: +You are expected to have a solid understanding of cryptography and security +engineering to successfully use these primitives. You must also be able to +recognize that some are obsolete (e.g., TDES) or even insecure (RC4). + +It provides many enhancements over the last release of PyCrypto (2.6.1): @itemize @item Authenticated encryption modes (GCM, CCM, EAX, SIV, OCB) @item Accelerated AES on Intel platforms via AES-NI -@item First class support for PyPy +@item First-class support for PyPy @item Elliptic curves cryptography (NIST P-256 curve only) @item Better and more compact API (nonce and iv attributes for ciphers, automatic generation of random nonces and IVs, simplified CTR cipher mode, and @@ -1022,8 +1030,11 @@ more) @item Random numbers get sourced directly from the OS (and not from a CSPRNG in userspace) @item Cleaner RSA and DSA key generation (largely based on FIPS 186-4) -@item Major clean ups and simplification of the code base -@end itemize\n") +@item Major clean-ups and simplification of the code base +@end itemize + +This package provides drop-in compatibility with PyCrypto. It is one of two +PyCryptodome variants, the other being python-pycryptodomex.") (license license:bsd-2))) (define-public python2-pycryptodome -- cgit v1.2.3 From c8ca9eb8f369c869b37a6c059713b0c49eaee0a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 00:22:03 +0100 Subject: gnu: python-pycryptodome: Note public-domain legacy. * gnu/packages/python-pycryptodome.scm (python-pycryptodome)[license]: Add public-domain. --- gnu/packages/python-crypto.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 8911667f22..97b55b0021 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1035,7 +1035,8 @@ in userspace) This package provides drop-in compatibility with PyCrypto. It is one of two PyCryptodome variants, the other being python-pycryptodomex.") - (license license:bsd-2))) + (license (list license:bsd-2 + license:public-domain)))) ; code inherited from PyCrypto (define-public python2-pycryptodome (package-with-python2 python-pycryptodome)) -- cgit v1.2.3 From 0404b28dc74348e984dffe303481652c46b0b940 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 00:22:53 +0100 Subject: gnu: python-pykeepass: Update to 3.2.1. * gnu/packages/python-crypto.scm (python-pykeepass): Update to 3.2.1. [propagated-inputs]: Substitute python-pycryptodomex for python-pycryptodome. --- gnu/packages/python-crypto.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 97b55b0021..9bb0cede19 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1127,7 +1127,7 @@ through the Engine interface.") (define-public python-pykeepass (package (name "python-pykeepass") - (version "3.2.0") + (version "3.2.1") (source (origin (method git-fetch) @@ -1137,7 +1137,7 @@ through the Engine interface.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1wxbfpy7467mlnfsvmh685fhfnq4fki9y7yc9cylp30r5n3hisaj")))) + (base32 "1symxf4ahylynihnp9z4z3lh2vy65ipvg8s4hjrnn936hcaaxghk")))) (build-system python-build-system) (arguments `(#:phases @@ -1161,7 +1161,7 @@ through the Engine interface.") ("python-dateutil" ,python-dateutil) ("python-future" ,python-future) ("python-lxml" ,python-lxml) - ("python-pycryptodome" ,python-pycryptodome))) + ("python-pycryptodomex" ,python-pycryptodomex))) (home-page "https://github.com/libkeepass/pykeepass") (synopsis "Python library to interact with keepass databases") (description -- cgit v1.2.3 From 7f9888e53f4632be80d1e7c09fc91a9d0b556236 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 14 Nov 2020 10:15:47 +0800 Subject: gnu: Add sx. * gnu/packages/xdisorg.scm (sx): New variable. --- gnu/packages/xdisorg.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ead74ebe1c..b41111c215 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2550,3 +2550,35 @@ such as sway, similar to @command{rofi}.") "@command{dex}, @dfn{DesktopEntry Execution}, is a program to generate and execute @file{.desktop} files of the Application type.") (license license:gpl3+))) + +(define-public sx + (package + (name "sx") + (version "2.1.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Earnestly/sx") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0p24ghp1ygvyc2hv81byhxax7491yhcc5priq5ldv07nzl7akagc")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no tests + #:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "PREFIX=" out))) + #:phases + (modify-phases %standard-phases + ;; no configure script + (delete 'configure)))) + (propagated-inputs + `(("xauth" ,xauth))) + (home-page "https://github.com/Earnestly/sx") + (synopsis "Start an xorg server") + (description + "@command{sx} is a simple alternative to both @command{xinit} and +@command{startx} for starting an Xorg server.") + (license license:x11))) -- cgit v1.2.3 From 2980b726d3ec209c0cd00160588e2ea948c034ad Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 14 Nov 2020 11:26:04 +0100 Subject: gnu: emacs-helm-system-packages: Update to 1.10.2. * gnu/packages/emacs-xyz.scm (emacs-helm-system-packages): Update to 1.10.2. --- gnu/packages/emacs-xyz.scm | 66 ++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 35 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 27042927ff..b53f460b88 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10712,46 +10712,42 @@ Yasnippet.") (license license:gpl2+)))) (define-public emacs-helm-system-packages - ;; There won't be a new release after 1.10.1 until - ;; https://github.com/emacs-helm/helm-system-packages/issues/25 is fixed, - ;; and latest commits fix import issues with Guix. - (let ((commit "6572340f41611ef1991e9612d34d59130957ee4a")) - (package - (name "emacs-helm-system-packages") - (version (git-version "1.10.1" "1" commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacs-helm/helm-system-packages") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0mcz6vkpk12vsyd37xv1rbg4v442sxc3lj8yxskqg294xbdaclz4")))) - (build-system emacs-build-system) - (inputs - `(("recutils" ,recutils))) - (propagated-inputs - `(("emacs-helm" ,emacs-helm))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((recutils (assoc-ref inputs "recutils"))) - ;; Specify the absolute file names of the various - ;; programs so that everything works out-of-the-box. - (substitute* "helm-system-packages-guix.el" - (("recsel") (string-append recutils "/bin/recsel"))))))))) - (home-page "https://github.com/emacs-helm/helm-system-packages") - (synopsis "Helm System Packages is an interface to your package manager") - (description "List all available packages in Helm (with installed + (package + (name "emacs-helm-system-packages") + (version "1.10.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-helm/helm-system-packages") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13a8jpj4wwm0yjv8hnsizgjf8wi3r2ap87lyvw7g4c7snp2dydwa")))) + (build-system emacs-build-system) + (inputs + `(("recutils" ,recutils))) + (propagated-inputs + `(("emacs-helm" ,emacs-helm))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((recutils (assoc-ref inputs "recutils"))) + ;; Specify the absolute file names of the various + ;; programs so that everything works out-of-the-box. + (substitute* "helm-system-packages-guix.el" + (("recsel") (string-append recutils "/bin/recsel"))))))))) + (home-page "https://github.com/emacs-helm/helm-system-packages") + (synopsis "Helm System Packages is an interface to your package manager") + (description "List all available packages in Helm (with installed packages displayed in their own respective face). Fuzzy-search, mark and execute the desired action over any selections of packages: Install, uninstall, display packages details (in Org Mode) or insert details at point, find files owned by packages... And much more, including performing all the above over the network.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-helm-org-rifle (package -- cgit v1.2.3 From 403ba4140f52b9ea9483e4c775f102bbb9753e51 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 14 Nov 2020 12:22:32 +0100 Subject: gnu: emacs-evil-collection: Update to 20201113. * gnu/packages/emacs-xyz.scm (emacs-evil-collection): Update to 20201113. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b53f460b88..f44a8bc51e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9509,8 +9509,8 @@ extensions.") (license license:gpl3+))) (define-public emacs-evil-collection - (let ((commit "910c1f4507d91a4790e26ddccf73ad1e5a12f68d") - (revision "17")) + (let ((commit "8c256263ad100fecd6246c6c55cbb19dab717c39") + (revision "18")) (package (name "emacs-evil-collection") (version (git-version "0.0.3" revision commit)) @@ -9522,7 +9522,7 @@ extensions.") (file-name (git-file-name name version)) (sha256 (base32 - "0bkx1bwgw1n3fbd95z8i32i1yvv8w8bgzsxsybm1lcgv1v23qn8l")))) + "0hz1yfv5g016dm99bwnibbmyhbi21qlc39ckd7p3s82az89hgf2n")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) -- cgit v1.2.3 From 85ad155158d63f8046bc925049a4fd57008f9303 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Tue, 3 Nov 2020 21:19:16 +0200 Subject: gnu: Add mailcap. * gnu/packages/mail.scm (mailcap): New variable. Signed-off-by: Christopher Baines --- gnu/packages/mail.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b6c51c337b..c3aa91f126 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -748,6 +748,44 @@ MIME-encoded email package.") (home-page "https://github.com/inflex/ripMIME") (license license:bsd-3)))) +(define-public mailcap + (let* ((version "2.1.49") + (tag ;; mailcap tags their releases like this: rMajor-minor-patch + (string-append "r" (string-join (string-split version #\.) "-")))) + (package + (name "mailcap") + (version version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://pagure.io/mailcap.git") + (commit tag))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ck1fw6gqn51phcfakhfpfq1yziv3gnmgjvswzhj9x0p162n6alj")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'install 'set-dest-dir + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "DESTDIR" out) + (substitute* "Makefile" + (("/usr") "")) ; This allows the man page to install. + #t)))))) + (native-inputs + `(("python" ,python))) ; for tests + (synopsis "MIME type associations for file types") + (description + "This package provides MIME type associations for file types.") + (home-page "https://pagure.io/mailcap") + (license (list license:expat ; mailcap.5 + license:public-domain))))) ; mailcap and mime.types + (define-public bogofilter (package (name "bogofilter") -- cgit v1.2.3 From 149dd51d2ffe0b8fe0137b60f94e5fc657c3a880 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Tue, 3 Nov 2020 21:19:17 +0200 Subject: services: gmnisrv: Export procedures and service type. * gnu/services/web.scm: Export gmnisrv-configuration, gmnisrv-configuration?, gmnisrv-configuration-package, gmnisrv-configuration-config-file, gmnisrv-service-type. Signed-off-by: Christopher Baines --- gnu/services/web.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 53858436fa..855f4e649b 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -256,7 +256,14 @@ mumi-configuration-sender mumi-configuration-smtp - mumi-service-type)) + mumi-service-type + + gmnisrv-configuration + gmnisrv-configuration? + gmnisrv-configuration-package + gmnisrv-configuration-config-file + + gmnisrv-service-type)) ;;; Commentary: ;;; -- cgit v1.2.3 From 870d74ab6883196b269382b86b6e48a1cc7ac8ae Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Tue, 3 Nov 2020 21:19:18 +0200 Subject: gnu: gmnisrv: Update to 0-1.d484ba0. * gnu/packages/web.scm (gmnisrv): Update to 0-1.d484ba0. [arguments]: Remove the install-config phase. [propagated-inputs]: Add mailcap. Signed-off-by: Christopher Baines --- gnu/packages/web.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index dab8ea8c2d..0bfaa3b9d7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -129,6 +129,7 @@ #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lsof) #:use-module (gnu packages lua) + #:use-module (gnu packages mail) #:use-module (gnu packages man) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) @@ -7712,10 +7713,11 @@ solution for any project's interface needs: (license license:expat))) (define-public gmnisrv - (let ((commit "a22bec51494a50c044416d469cc33e043480e7fd")) + (let ((commit "d484ba0ab0020866535a44be5948c9482b8f2b8d") + (revision "1")) (package (name "gmnisrv") - (version (git-version "0" "0" commit)) + (version (git-version "0" revision commit)) (home-page "https://git.sr.ht/~sircmpwn/gmnisrv") (source (origin (method git-fetch) @@ -7724,7 +7726,7 @@ solution for any project's interface needs: (commit commit))) (sha256 (base32 - "1k1n7cqd37jgbhxyh231bagdxdxqwpr6n5pk3gax2516w6xbzlb9")) + "11phipixsxx1jgm42agp76p5s68l0zj65kgb41vzaymgwcq79ivn")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -7734,19 +7736,14 @@ solution for any project's interface needs: (lambda _ (setenv "CC" "gcc") #t)) - (delete 'check) - (add-after 'install 'install-config - (lambda* (#:key outputs #:allow-other-keys) - (let ((etc (string-append (assoc-ref outputs "out") - "/etc"))) - (mkdir-p etc) - (copy-file "config.ini" (string-append etc "/gmnisrv.ini")) - #t)))))) + (delete 'check)))) (inputs `(("openssl" ,openssl))) (native-inputs `(("pkg-config" ,pkg-config) ("scdoc" ,scdoc))) + (propagated-inputs + `(("mailcap" ,mailcap))) (synopsis "Simple Gemini protocol server") (description "gmnisrv is a simple Gemini protocol server written in C.") (license (list license:gpl3+ -- cgit v1.2.3 From 199ebb12981e13a1a29501276bcb1675a53080b6 Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 27 Oct 2020 14:18:23 +0100 Subject: gnu: Add kristall. * gnu/packages/web-browsers.scm (kristall): New variable. Signed-off-by: Christopher Baines --- gnu/packages/web-browsers.scm | 126 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 5cb5185a31..51af66ef54 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) + #:use-module (gnu packages fonts) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) @@ -60,6 +62,7 @@ #:use-module (gnu packages lisp) #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lua) + #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -341,6 +344,129 @@ access.") (properties `((lint-hidden-cve . ("CVE-2016-9179")))) (license license:gpl2))) +(define-public kristall + ;; Fixes to the build system applied after the latest tag + ;; Use tagged release when updating + (let ((commit "204b08a9303e75cd8d4c252b0554935062766f86") + (revision "1")) + (package + (name "kristall") + (version (string-append "0.3-" revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MasterQ32/kristall") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mymq0dh6r0829x74j0jkw8hw46amqwbznlf1b4ra6w77h9yz3lj")) + (modules '((srfi srfi-1) + (ice-9 ftw) + (guix build utils))) + (snippet + '(let ((preserved-lib-files '("luis-l-gist"))) + (with-directory-excursion "lib" + (for-each + (lambda (directory) + (simple-format #t "deleting: ~A\n" directory) + (delete-file-recursively directory)) + (lset-difference string=? + (scandir ".") + (cons* "." ".." preserved-lib-files)))) + ;; Contains executable of 7z and pscp + (delete-file-recursively "ci/tools") + ;; Remove bundled fonts + (delete-file-recursively "src/fonts") + #t)))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build qt-utils)) + #:make-flags + (list (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no ./configure script + (delete 'check) ; no check target + (add-before 'build 'set-program-version + (lambda _ + ;; configure.ac relies on ‘git --describe’ to get the version. + ;; Patch it to just return the real version number directly. + (substitute* "src/kristall.pro" + (("(KRISTALL_VERSION=).*" _ match) + (string-append match ,version "\n"))) + #t)) + (add-before 'build 'dont-use-bundled-cmark + (lambda _ + (substitute* "src/kristall.pro" + (("(^include\\(.*cmark.*)" _ match) + (string-append + "LIBS += -I" (assoc-ref %build-inputs "cmark") " -lcmark"))) + #t)) + (add-before 'build 'dont-use-bundled-breeze-stylesheet + (lambda _ + (substitute* "src/kristall.pro" + (("../lib/BreezeStyleSheets/breeze.qrc") + (string-append + (assoc-ref %build-inputs "breeze-stylesheet") "/breeze.qrc"))) + #t)) + (add-before 'build 'dont-use-bundled-fonts + (lambda _ + (substitute* "src/kristall.pro" + ((".*fonts.qrc.*") "")) + (substitute* "src/main.cpp" + (("/fonts/OpenMoji-Color") + (string-append + (assoc-ref %build-inputs "font-openmoji") + "/share/fonts/truetype/OpenMoji-Color")) + (("/fonts/NotoColorEmoji") + (string-append + (assoc-ref %build-inputs "font-google-noto") + "/share/fonts/truetype/NotoColorEmoji"))) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-qt-program out "kristall")) + #t))))) + (native-inputs + `(("breeze-stylesheet" + ,(let ((commit "2d595a956f8a5f493aa51139a470b768a6d82cce") + (revision "0")) + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/Alexhuszagh/BreezeStyleSheets") + (commit "2d595a956f8a5f493aa51139a470b768a6d82cce"))) + (file-name (git-file-name "breeze-stylesheet" + (git-version "0" revision commit))) + (sha256 + (base32 + "1kvkxkisi3czldnb43ig60l55pi4a3m2a4ixp7krhpf9fc5wp294"))))))) + (inputs + `(("cmark" ,cmark) + ("font-google-noto" ,font-google-noto) + ("font-openmoji" ,font-openmoji) + ("openssl" ,openssl) + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg))) + (home-page "https://kristall.random-projects.net") + (synopsis "Small-internet graphical client") + (description "Graphical small-internet client with with many features +including multi-protocol support (gemini, HTTP, HTTPS, gopher, finger), +bookmarks, TSL certificates management, outline generation and a tabbed +interface.") + (license (list license:gpl3+ + ;; for breeze-stylesheet + license:expat))))) + (define-public qutebrowser (package (name "qutebrowser") -- cgit v1.2.3 From 9e4c24ef90545e242539a16a5ea28d7effc45933 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 14 Nov 2020 01:10:29 -0500 Subject: gnu: llvm-9: Standardize patch level. Having a non-standard (different than 1) patch level requirement means the patches cannot be composed easily from different origins. The following command was used to remove one level from the llvm-9 patches: sed -e 's|^--- a/|--- |' -e 's|^+++ b/|+++ |' \ gnu/packages/patches/llvm-9* -i * gnu/packages/llvm.scm (llvm-9)[source]: Drop the patch-flags field. Re-indent list of patches. * gnu/packages/patches/llvm-9-fix-bitcast-miscompilation.patch: Strip one level. * gnu/packages/patches/llvm-9-fix-lpad-miscompilation.patch: Likewise. * gnu/packages/patches/llvm-9-fix-scev-miscompilation.patch: Likewise. --- gnu/packages/llvm.scm | 7 +++---- .../patches/llvm-9-fix-bitcast-miscompilation.patch | 8 ++++---- .../patches/llvm-9-fix-lpad-miscompilation.patch | 8 ++++---- .../patches/llvm-9-fix-scev-miscompilation.patch | 20 ++++++++++---------- 4 files changed, 21 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index b2b80572fb..1560d5900b 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -602,11 +602,10 @@ of programming tools as well as libraries with equivalent functionality.") (sha256 (base32 "16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880")) - (patch-flags '("-p2")) (patches (search-patches - "llvm-9-fix-bitcast-miscompilation.patch" - "llvm-9-fix-scev-miscompilation.patch" - "llvm-9-fix-lpad-miscompilation.patch")))))) + "llvm-9-fix-bitcast-miscompilation.patch" + "llvm-9-fix-scev-miscompilation.patch" + "llvm-9-fix-lpad-miscompilation.patch")))))) (define-public clang-runtime-9 (clang-runtime-from-llvm diff --git a/gnu/packages/patches/llvm-9-fix-bitcast-miscompilation.patch b/gnu/packages/patches/llvm-9-fix-bitcast-miscompilation.patch index fe381acf1b..ec8e888618 100644 --- a/gnu/packages/patches/llvm-9-fix-bitcast-miscompilation.patch +++ b/gnu/packages/patches/llvm-9-fix-bitcast-miscompilation.patch @@ -36,8 +36,8 @@ Differential Revision: https://reviews.llvm.org/D70844 diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp index 2c9ba203fbf3..0af3de300e77 100644 ---- a/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp -+++ b/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp +--- llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp ++++ llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp @@ -18,6 +18,7 @@ #include "llvm/IR/DIBuilder.h" #include "llvm/IR/PatternMatch.h" @@ -158,8 +158,8 @@ index 2c9ba203fbf3..0af3de300e77 100644 diff --git a/llvm/test/Transforms/InstCombine/cast.ll b/llvm/test/Transforms/InstCombine/cast.ll index b6d1eda0601d..3ce8de033422 100644 ---- a/llvm/test/Transforms/InstCombine/cast.ll -+++ b/llvm/test/Transforms/InstCombine/cast.ll +--- llvm/test/Transforms/InstCombine/cast.ll ++++ llvm/test/Transforms/InstCombine/cast.ll @@ -824,7 +824,7 @@ define i64 @test59(i8 %A, i8 %B) { define <3 x i32> @test60(<4 x i32> %call4) { diff --git a/gnu/packages/patches/llvm-9-fix-lpad-miscompilation.patch b/gnu/packages/patches/llvm-9-fix-lpad-miscompilation.patch index 6cfe07e50a..9a97d82ddc 100644 --- a/gnu/packages/patches/llvm-9-fix-lpad-miscompilation.patch +++ b/gnu/packages/patches/llvm-9-fix-lpad-miscompilation.patch @@ -15,8 +15,8 @@ PR45261 diff --git a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp index 5ac3606dc662..2638b1e8a05c 100644 ---- a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp -+++ b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp +--- llvm/lib/CodeGen/SelectionDAG/FastISel.cpp ++++ llvm/lib/CodeGen/SelectionDAG/FastISel.cpp @@ -225,6 +225,21 @@ static bool isRegUsedByPhiNodes(unsigned DefReg, return false; } @@ -50,8 +50,8 @@ index 5ac3606dc662..2638b1e8a05c 100644 } diff --git a/llvm/test/CodeGen/X86/sink-local-value.ll b/llvm/test/CodeGen/X86/sink-local-value.ll index b0e511ac1189..f7d861ac9b6c 100644 ---- a/llvm/test/CodeGen/X86/sink-local-value.ll -+++ b/llvm/test/CodeGen/X86/sink-local-value.ll +--- llvm/test/CodeGen/X86/sink-local-value.ll ++++ llvm/test/CodeGen/X86/sink-local-value.ll @@ -145,6 +145,42 @@ try.cont: ; preds = %entry, %lpad ; CHECK: retl diff --git a/gnu/packages/patches/llvm-9-fix-scev-miscompilation.patch b/gnu/packages/patches/llvm-9-fix-scev-miscompilation.patch index 3f16de5a2b..ec37dc16fd 100644 --- a/gnu/packages/patches/llvm-9-fix-scev-miscompilation.patch +++ b/gnu/packages/patches/llvm-9-fix-scev-miscompilation.patch @@ -21,8 +21,8 @@ llvm-svn: 373184 diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp index 354ae05bb841..c29fc5dbccfb 100644 ---- a/llvm/lib/Analysis/ScalarEvolution.cpp -+++ b/llvm/lib/Analysis/ScalarEvolution.cpp +--- llvm/lib/Analysis/ScalarEvolution.cpp ++++ llvm/lib/Analysis/ScalarEvolution.cpp @@ -4992,7 +4992,7 @@ const SCEV *ScalarEvolution::createSimpleAffineAddRec(PHINode *PN, // overflow. if (auto *BEInst = dyn_cast(BEValueV)) @@ -34,8 +34,8 @@ index 354ae05bb841..c29fc5dbccfb 100644 } diff --git a/llvm/test/Analysis/ScalarEvolution/limit-depth.ll b/llvm/test/Analysis/ScalarEvolution/limit-depth.ll index db68a4f84c91..6fdf8c5df974 100644 ---- a/llvm/test/Analysis/ScalarEvolution/limit-depth.ll -+++ b/llvm/test/Analysis/ScalarEvolution/limit-depth.ll +--- llvm/test/Analysis/ScalarEvolution/limit-depth.ll ++++ llvm/test/Analysis/ScalarEvolution/limit-depth.ll @@ -46,7 +46,7 @@ define void @test_mul(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) { define void @test_sext(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) { ; CHECK-LABEL: @test_sext @@ -47,8 +47,8 @@ index db68a4f84c91..6fdf8c5df974 100644 diff --git a/llvm/test/Analysis/ScalarEvolution/nsw.ll b/llvm/test/Analysis/ScalarEvolution/nsw.ll index 69427368625d..ca24f9d4a04b 100644 ---- a/llvm/test/Analysis/ScalarEvolution/nsw.ll -+++ b/llvm/test/Analysis/ScalarEvolution/nsw.ll +--- llvm/test/Analysis/ScalarEvolution/nsw.ll ++++ llvm/test/Analysis/ScalarEvolution/nsw.ll @@ -163,7 +163,7 @@ bb5: ; preds = %bb2 declare void @f(i32) @@ -60,8 +60,8 @@ index 69427368625d..ca24f9d4a04b 100644 %add = add nsw i32 %v, 1 diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count12.ll b/llvm/test/Analysis/ScalarEvolution/trip-count12.ll index 5e7d72d5e4f3..d0086ee2e6ac 100644 ---- a/llvm/test/Analysis/ScalarEvolution/trip-count12.ll -+++ b/llvm/test/Analysis/ScalarEvolution/trip-count12.ll +--- llvm/test/Analysis/ScalarEvolution/trip-count12.ll ++++ llvm/test/Analysis/ScalarEvolution/trip-count12.ll @@ -1,7 +1,7 @@ ; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s @@ -73,8 +73,8 @@ index 5e7d72d5e4f3..d0086ee2e6ac 100644 define zeroext i16 @test(i16* nocapture %p, i32 %len) nounwind readonly { diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count9.ll b/llvm/test/Analysis/ScalarEvolution/trip-count9.ll index c0a1d12fa00e..9a080b34743f 100644 ---- a/llvm/test/Analysis/ScalarEvolution/trip-count9.ll -+++ b/llvm/test/Analysis/ScalarEvolution/trip-count9.ll +--- llvm/test/Analysis/ScalarEvolution/trip-count9.ll ++++ llvm/test/Analysis/ScalarEvolution/trip-count9.ll @@ -179,7 +179,7 @@ exit: } -- cgit v1.2.3 From 8a34f292923cc4b6487e39570a9c6e0526b094e1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 Nov 2020 22:05:26 -0500 Subject: gnu: python-llvmlite: Update to 0.34.0. This is in preparation of updating the broken python-numba package. * gnu/packages/llvm.scm (python-llvmlite): Update to 0.34.0. [arguments]: Enable tests. [phases]{patch-reference-to-llvmlite, skip-failing-tests} {set-compiler/linker-flags}: New phases. [inputs]: Update custom LLVM input and associated patches. [home-page]: Use HTTPS. --- gnu/packages/llvm.scm | 107 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 78 insertions(+), 29 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 1560d5900b..1db01cea36 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -1044,48 +1045,96 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") (define-public python-llvmlite (package (name "python-llvmlite") - (version "0.30.0") + (version "0.34.0") (source (origin (method url-fetch) (uri (pypi-uri "llvmlite" version)) (sha256 (base32 - "01wspdc0xhnydl66jyhyr4ii16h3fnw6mjihiwnnxdxg9j6kkajf")))) + "0qqzs6h34002ig2jn31vk08q9hh5kn84lhmv4bljz3yakg8y0gph")))) (build-system python-build-system) (arguments - ;; FIXME: One test fails unable to find libm.so - ;; https://github.com/numba/llvmlite/issues/537 - `(#:tests? #f)) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-reference-to-llvmlite.so + ;; ctypes.CDLL uses dlopen to load libllvmlite.so, which + ;; fails, so locate it by its absolute path. Change it in + ;; ffi.py, not utils.py, because setup.py relies on the + ;; output of get_library_name for proper installation. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libllvmlite.so (string-append out "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages/llvmlite/" + "binding/libllvmlite.so"))) + (substitute* "llvmlite/binding/ffi.py" + (("_lib_name = get_library_name\\(\\)") + (format #f "_lib_name = ~s" libllvmlite.so))) + #t))) + (add-after 'unpack 'skip-failing-tests + (lambda _ + (substitute* "llvmlite/tests/test_binding.py" + ((" def test_libm\\(self\\).*" all) + (string-append " @unittest.skip('Fails on Guix')\n" all))) + #t)) + (add-before 'build 'set-compiler/linker-flags + (lambda* (#:key inputs #:allow-other-keys) + (let ((llvm (assoc-ref inputs "llvm"))) + ;; Refer to ffi/Makefile.linux. + (setenv "CPPFLAGS" "-fPIC") + (setenv "LDFLAGS" (string-append "-Wl,-rpath=" + llvm "/lib")) + #t)))))) (inputs `(("llvm" - ,(let ((patches-commit "486edd5fb2a6667feb5c865f300c0da73785434a")) - (package - (inherit llvm-7) - (source - (origin - (inherit (package-source llvm-7)) - (patches + ,(let* ((patches-commit "061ab39e1d4591f3aa842458252a19ad01858167") + (patch-uri (lambda (name) + (string-append + "https://raw.githubusercontent.com/numba/" + "llvmlite/" patches-commit "/conda-recipes/" + name))) + (patch-origin (lambda (name hash) + (origin + (method url-fetch) + (uri (patch-uri name)) + (sha256 (base32 hash))))) + (arch-independent-patches (list + (patch-origin + "partial-testing.patch" + "1cwy4jsmijd838q0bylxl77vrwrb7ksijfly5062ay32303jmj86") + (patch-origin + "0001-Revert-Limit-size-of-non-GlobalValue-name.patch" + "0n4k7za0smx6qwdipsh6x5lm7bfvzzb3p9r8q1zq1dqi4na21295")))) + (if (string=? "aarch64-linux" (%current-system)) + (package + (inherit llvm-9) + (source (origin - (method url-fetch) - (uri (string-append - "https://raw.githubusercontent.com/numba/" - "llvmlite/" patches-commit "/conda-recipes/" - "D47188-svml-VF.patch")) - (sha256 - (base32 - "0wxhgb61k17f0zg2m0726sf3hppm41f8jar2kkg2n8sl5cnjj9mr"))) + (inherit (package-source llvm-9)) + (patches + `(,(patch-origin + "intel-D47188-svml-VF_LLVM9.patch" + "1f9ld7wc8bn4gbvdsmk07w1rq371h42vy05rxsq9a22f57rljqbd") + ,@arch-independent-patches + ,@(origin-patches (package-source llvm-9))))))) + (package + (inherit llvm-10) + (source (origin - (method url-fetch) - (uri (string-append - "https://raw.githubusercontent.com/numba/" - "llvmlite/" patches-commit "/conda-recipes/" - "twine_cfg_undefined_behavior.patch")) - (sha256 - (base32 - "07h71n2m1mn9zcfgw04zglffknplb233zqbcd6pckq0wygkrxflp")))))))))))) - (home-page "http://llvmlite.pydata.org") + (inherit (package-source llvm-10)) + (patches + `(,(patch-origin + "intel-D47188-svml-VF.patch" + "0n46qjwfl7i12bl7wp0cyxl277axfvaaz5lxx5kdlgwjcpa582dg") + ,(patch-origin + "expect-fastmath-entrypoints-in-add-TLI-mappings.ll.patch" + "0jxhjkkwwi1cy898l2n57l73ckpw0v73lqnrifp7r1mwpsh624nv") + ,@arch-independent-patches + ,@(origin-patches (package-source llvm-10)))))))))))) + (home-page "https://llvmlite.pydata.org") (synopsis "Wrapper around basic LLVM functionality") (description "This package provides a Python binding to LLVM for use in Numba.") -- cgit v1.2.3 From 7c816ed4931e0c7f28a7c13e0646a88e79331844 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 Nov 2020 22:57:58 -0500 Subject: gnu: python-numba: Update to 0.51.2. Fixes . * gnu/packages/python-xyz.scm (python-numba): Update to 0.51.2. [arguments]: Remove #:modules. [phases]{check}: Use add-installed-pythonpath instead of some ad-hoc solution. Set HOME. {remove-failing-tests}: Remove. [inputs]: Move to... [native-inputs]: ...here. --- gnu/packages/python-xyz.scm | 66 +++++++++------------------------------------ 1 file changed, 12 insertions(+), 54 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e5b8db02e0..278b557a0b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18691,79 +18691,37 @@ validation testing and application logic.") (define-public python-numba (package (name "python-numba") - (version "0.46.0") + (version "0.51.2") (source (origin (method url-fetch) (uri (pypi-uri "numba" version)) (sha256 (base32 - "1vnfzcq6fcnkmdms6114d49awvvj5181fl7z1wlha27qc2paxjy2")))) + "0s0777m8kq4l96i88zj78np7283v1n4878qfc1gvzb8l45bmkg8n")))) (build-system python-build-system) (arguments - `(#:modules ((guix build utils) - (guix build python-build-system) - (ice-9 ftw) - (srfi srfi-1) - (srfi srfi-26)) - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'disable-proprietary-features (lambda _ (setenv "NUMBA_DISABLE_HSA" "1") (setenv "NUMBA_DISABLE_CUDA" "1") #t)) - (add-after 'unpack 'remove-failing-tests - (lambda _ - ;; FIXME: These tests fail for unknown reasons: - ;; test_non_writable_pycache, test_non_creatable_pycache, and - ;; test_frozen (all in numba.tests.test_dispatcher.TestCache). - (substitute* "numba/tests/test_dispatcher.py" - (("def test(_non_writable_pycache)" _ m) - (string-append "def guix_skip" m)) - (("def test(_non_creatable_pycache)" _ m) - (string-append "def guix_skip" m)) - (("def test(_frozen)" _ m) - (string-append "def guix_skip" m))) - - ;; These tests fail because we don't run the tests from the build - ;; directory: test_setup_py_distutils, test_setup_py_setuptools - ;; They are in numba.tests.test_pycc.TestDistutilsSupport. - (substitute* "numba/tests/test_pycc.py" - (("def test(_setup_py_distutils|_setup_py_setuptools)" _ m) - (string-append "def guix_skip" m))) - - ;; These tests fail because our version of Python does not have - ;; a recognizable front-end for the Numba distribution to use - ;; to check against. - (substitute* "numba/tests/test_entrypoints.py" - (("def test(_init_entrypoint)" _ m) - (string-append "def guix_skip" m))) - (substitute* "numba/tests/test_jitclasses.py" - (("def test(_jitclass_longlabel_not_truncated)" _ m) - (string-append "def guix_skip" m))) - #t)) (replace 'check - (lambda _ - (let ((cwd (getcwd))) - (setenv "PYTHONPATH" - (string-append cwd "/build/" - (find (cut string-prefix? "lib" <>) - (scandir (string-append cwd "/build"))) - ":" - (getenv "PYTHONPATH"))) - ;; Something is wrong with the PYTHONPATH when running the - ;; tests from the build directory, as it complains about not being - ;; able to import certain modules. - (with-directory-excursion "/tmp" - (invoke "python3" "-m" "numba.runtests" "-v" "-m"))) - #t))))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + ;; Something is wrong with the PYTHONPATH when running the + ;; tests from the build directory, as it complains about not being + ;; able to import certain modules. + (with-directory-excursion "/tmp" + (setenv "HOME" (getcwd)) + (invoke "python3" "-m" "numba.runtests" "-v" "-m"))))))) (propagated-inputs `(("python-llvmlite" ,python-llvmlite) ("python-numpy" ,python-numpy) ("python-singledispatch" ,python-singledispatch))) - ;; Needed for tests. - (inputs + (native-inputs ;for tests `(("python-jinja2" ,python-jinja2) ("python-pygments" ,python-pygments))) (home-page "https://numba.pydata.org") -- cgit v1.2.3 From a35f3a423395d7acbf4c717140b3aeb484a25f64 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 Nov 2020 23:56:10 -0500 Subject: gnu: cqfd: Update to 5.2.1. * gnu/packages/docker.scm (cqfd): Update to 5.2.1. --- gnu/packages/docker.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b130298a04..c08f6eb3c6 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2019 Maxim Cournoyer +;;; Copyright © 2019, 2020 Maxim Cournoyer ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Katherine Cox-Buday ;;; Copyright © 2020 Jesse Dowell @@ -671,7 +671,7 @@ provisioning etc.") (define-public cqfd (package (name "cqfd") - (version "5.1.0") + (version "5.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -680,7 +680,7 @@ provisioning etc.") (file-name (git-file-name name version)) (sha256 (base32 - "1xhydz01f2rrnw7rmnaxh3f3q1ariq7j2ig0i0w1p3wn10l3q0nv")))) + "1zqgznfl7slfrddfpy2pfmablbvyf7296d3b3vcprilqb93cc7li")))) (build-system gnu-build-system) (arguments ;; The test suite requires a docker daemon and connectivity. -- cgit v1.2.3 From 2c560aa217284c3152378e5c79f0519d78cba226 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 15:47:00 +0100 Subject: gnu: perl-www-curl: Fix build with curl@7.69.1. * gnu/packages/web.scm (perl-www-curl)[source]: Add perl-www-curl-fix-struct-void.patch. * gnu/packages/patches/perl-www-curl-remove-symbol.patch: Update. * gnu/packages/patches/perl-www-curl-fix-struct-void.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../patches/perl-www-curl-fix-struct-void.patch | 24 +++++++++++++++++++++ .../patches/perl-www-curl-remove-symbol.patch | Bin 1177 -> 984 bytes gnu/packages/web.scm | 4 ++-- 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/perl-www-curl-fix-struct-void.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index b5f9c56324..6a0f378bb0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1450,6 +1450,7 @@ dist_patch_DATA = \ %D%/packages/patches/perl-text-markdown-discount-unbundle.patch \ %D%/packages/patches/perl-module-pluggable-search.patch \ %D%/packages/patches/perl-reproducible-build-date.patch \ + %D%/packages/patches/perl-www-curl-fix-struct-void.patch \ %D%/packages/patches/perl-www-curl-remove-symbol.patch \ %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ diff --git a/gnu/packages/patches/perl-www-curl-fix-struct-void.patch b/gnu/packages/patches/perl-www-curl-fix-struct-void.patch new file mode 100644 index 0000000000..b150950668 --- /dev/null +++ b/gnu/packages/patches/perl-www-curl-fix-struct-void.patch @@ -0,0 +1,24 @@ +From: Tobias Geerinckx-Rice +Date: Sat, 14 Nov 2020 15:40:56 +0100 +Subject: [PATCH] gnu: perl-www-curl: Fix struct void* usage. + +Copied verbatim from Gentoo[0]. Fixes: + + Curl.xs:76:12: error: expected ‘{’ before ‘void’ + struct void *curlm; + ^~~~ + Curl.xs:76:12: error: two or more data types in declaration specifiers + +[0]: https://694466.bugs.gentoo.org/attachment.cgi?id=595098 + +--- WWW-Curl-4.17/Curl.xs 2014-02-21 18:08:30.000000000 +0200 ++++ WWW-Curl-4.17.new/Curl.xs 2019-11-05 21:44:55.434395739 +0200 +@@ -73,7 +73,7 @@ typedef struct { + #ifdef __CURL_MULTI_H + struct CURLM *curlm; + #else +- struct void *curlm; ++ void *curlm; + #endif + } perl_curl_multi; + diff --git a/gnu/packages/patches/perl-www-curl-remove-symbol.patch b/gnu/packages/patches/perl-www-curl-remove-symbol.patch index ae3486708b..c32a34897b 100644 Binary files a/gnu/packages/patches/perl-www-curl-remove-symbol.patch and b/gnu/packages/patches/perl-www-curl-remove-symbol.patch differ diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0bfaa3b9d7..8947889cd7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4423,14 +4423,14 @@ RFC 6570.") (uri (string-append "mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-" version".tar.gz")) - (patches (search-patches "perl-www-curl-remove-symbol.patch")) + (patches (search-patches "perl-www-curl-fix-struct-void.patch" + "perl-www-curl-remove-symbol.patch")) (sha256 (base32 "1fmp9aib1kaps9vhs4dwxn7b15kgnlz9f714bxvqsd1j1q8spzsj")))) (build-system perl-build-system) (arguments '(#:tests? #f ;XXX: tests require network access - #:phases (modify-phases %standard-phases (add-before 'configure 'set-search-path (lambda _ -- cgit v1.2.3 From 808fc71e7c127766d057d099e728464d98e84706 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 16:06:13 +0100 Subject: gnu: fio: Update to 3.24. * gnu/packages/benchmark.scm (fio): Update to 3.24. --- gnu/packages/benchmark.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 8a8309ce52..fa70d2773e 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -47,14 +47,14 @@ (define-public fio (package (name "fio") - (version "3.23") + (version "3.24") (source (origin (method url-fetch) (uri (string-append "https://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "0cy32431hv0i84yrryna5byj4r610n6i1rm8nfflnrznbf051axs")))) + "0qshbyqpvm01hmpkmk0v0jhjz23sngqhy291kiz38z04s2df4vxn")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From e48eac3b3ed0a29dbcf87cd22106354f50494751 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 16:41:25 +0100 Subject: gnu: python-podcastparser: Update to 0.6.6. * gnu/packages/gpodder.scm (python-podcastparser): Update to 0.6.6. [native-inputs, arguments]: Substitute python-pytest for python-coverage & python-nose. --- gnu/packages/gpodder.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 26ea15ba56..fc3a78bc7b 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -177,21 +177,20 @@ downloading episode status changes.") (define-public python-podcastparser (package (name "python-podcastparser") - (version "0.6.5") + (version "0.6.6") (source (origin (method url-fetch) (uri (pypi-uri "podcastparser" version)) (sha256 - (base32 "0k62ppg20i41gcc5x8ddjn7zbpy47hqpxzrq9257g2c71m4qw07b")))) + (base32 "0m24r2qhck0win44xfhxajbppkss4ha6am0042s0xyq3408883m3")))) (native-inputs - `(("python-coverage" ,python-coverage) - ("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest))) (arguments '(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (invoke "nosetests")))))) + (lambda _ (invoke "pytest")))))) (build-system python-build-system) (home-page "http://gpodder.org/podcastparser") (synopsis "Simplified and fast RSS parser Python library") -- cgit v1.2.3 From 1b0cda6b442dd79324eaeb5b552cbc32faca3726 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 18:34:56 +0100 Subject: gnu: qemu: Extend I/O test time-outs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (qemu)[arguments]: Add an ‘extend-test-time-outs’ phase. --- gnu/packages/virtualization.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index deacb60ad0..176201bd33 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -177,6 +177,14 @@ '("include") input-directories) #t))) + (add-after 'unpack 'extend-test-time-outs + (lambda _ + ;; These tests can time out on heavily-loaded and/or slow storage. + (substitute* (cons* "tests/qemu-iotests/common.qemu" + (find-files "tests/qemu-iotests" "^[0-9]+$")) + (("QEMU_COMM_TIMEOUT=[0-9]+" match) + (string-append match "9"))) + (fail))) (add-after 'unpack 'disable-unusable-tests (lambda _ (substitute* "tests/Makefile.include" -- cgit v1.2.3 From 89f25a813a7aae348fdb186d215ead6e044af8fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 18:37:58 +0100 Subject: gnu: perl-lwp-protocol-https: Update to 6.09. * gnu/packages/web.scm (perl-lwp-protocol-https): Update to 6.09. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8947889cd7..0371e99d15 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3789,15 +3789,14 @@ exists it is used instead.") (define-public perl-lwp-protocol-https (package (name "perl-lwp-protocol-https") - (version "6.07") + (version "6.09") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/O/OA/OALDERS/" "LWP-Protocol-https-" version ".tar.gz")) (sha256 - (base32 - "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j")))) + (base32 "14pm785cgyrnppks6ccasb2vkqifh0a8fz36nmnhc2v926jy3kqn")))) (build-system perl-build-system) (native-inputs ;; For tests. -- cgit v1.2.3 From 6f5f60b2891b15036375be28ace1ca87e250d667 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 20:40:46 +0100 Subject: gnu: Add stb-rect-pack. * gnu/packages/stb.scm (stb-rect-pack): New public variable. --- gnu/packages/stb.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm index 9cb2ae10b6..d58b180c69 100644 --- a/gnu/packages/stb.scm +++ b/gnu/packages/stb.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -102,6 +103,12 @@ decoding from file or memory. A variety of formats are supported.")) "stb-image-write is a small library for writing image files to the C@tie{}@code{stdio} interface.")) +(define-public stb-rect-pack + (make-stb-header-package + "stb-rect-pack" "1.00" + "stb-rect-pack is a small rectangle packing library useful for, e.g., packing +rectangular textures into an atlas. It does not do rotation.")) + (define-public stb-sprintf (make-stb-header-package "stb-sprintf" "1.06" -- cgit v1.2.3 From 0e8df7403e0e340456b5420645a96da2cd343c99 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 20:46:49 +0100 Subject: gnu: Update stb to b42009b3b9d4ca35bc703f5310eedc74f584be58. * gnu/packages/stb.scm (stb): Update to commit b42009b3b9d4ca35bc703f5310eedc74f584be58.. (stb-image): Update version number to 2.26. (stb-image-write): Update version number to 1.15. (stb-sprintf): Update version number to 1.09. (stb-truetype): Update version number to 1.24. --- gnu/packages/stb.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm index d58b180c69..094ece536d 100644 --- a/gnu/packages/stb.scm +++ b/gnu/packages/stb.scm @@ -27,8 +27,8 @@ (define stb ;; stb is a collection of libraries developed within the same repository. ;; When updating this, remember to change versions below as appropriate. - (let ((commit "2c2908f50515dcd939f24be261c3ccbcd277bb49") - (revision "1")) + (let ((commit "b42009b3b9d4ca35bc703f5310eedc74f584be58") + (revision "2")) (package (name "stb") (home-page "https://github.com/nothings/stb") @@ -40,7 +40,7 @@ (commit commit))) (sha256 (base32 - "1z753rscqc4clp0rd57bw68i60kz694y1z52bwv6slzmkgds1cki")) + "1gmcjhmj62mfdscrsg2hv4j4j9v447y8zj3rbrm7mqn94cx73z1i")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -93,13 +93,13 @@ the C programming language.") ;; converted to macros as outlined in . (define-public stb-image (make-stb-header-package - "stb-image" "2.22" + "stb-image" "2.26" "stb-image is a small and self-contained library for image loading or decoding from file or memory. A variety of formats are supported.")) (define-public stb-image-write (make-stb-header-package - "stb-image-write" "1.13" + "stb-image-write" "1.15" "stb-image-write is a small library for writing image files to the C@tie{}@code{stdio} interface.")) @@ -111,11 +111,11 @@ rectangular textures into an atlas. It does not do rotation.")) (define-public stb-sprintf (make-stb-header-package - "stb-sprintf" "1.06" + "stb-sprintf" "1.09" "stb-sprintf implements fast @code{sprintf}, @code{snprintf} for C/C++.")) (define-public stb-truetype (make-stb-header-package - "stb-truetype" "1.22" + "stb-truetype" "1.24" "stb-truetype is a library for parsing, decoding, and rasterizing characters from TrueType fonts.")) -- cgit v1.2.3 From e23d5aa908cb8864e3efc0c053aad74f995b5965 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 22:11:41 +0100 Subject: gnu: Add dear-imgui. * gnu/packages/graphics.scm (dear-imgui): New public variable. --- gnu/packages/graphics.scm | 73 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index d0bf577139..189ed94a54 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -90,6 +90,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages sdl) + #:use-module (gnu packages stb) #:use-module (gnu packages swig) #:use-module (gnu packages tbb) #:use-module (gnu packages upnp) @@ -855,6 +856,78 @@ other vector formats such as: @end itemize") (license license:gpl2+))) +(define-public dear-imgui + (package + (name "dear-imgui") + (version "1.79") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocornut/imgui") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0x26igynxp6rlpp2wfc5dr7x6yh583ajb7p23pgycn9vqikn318q")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "VERSION=" ,version)) + #:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-debian-files + (lambda* (#:key inputs #:allow-other-keys) + (invoke "tar" "xvf" (assoc-ref inputs "debian-files")) + (apply invoke "patch" "-Np1" "-i" + (find-files "debian/patches" "\\.patch$")) + (substitute* "Makefile" + ((" Date: Sat, 14 Nov 2020 22:12:58 +0100 Subject: gnu: ogre: Update to 1.12.9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The imgui submodule has been removed upstream. * gnu/packages/graphics.scm (ogre): Update to 1.12.9. [source]: Don't clone recursively. [native-inputs]: Add dear-imgui-source. [arguments]: Add an ‘unpack-dear-imgui’ phase. Add IMGUI_DIR to #:configure-flags. --- gnu/packages/graphics.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 189ed94a54..3603a7ea77 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -931,23 +931,27 @@ operating system features.") (define-public ogre (package (name "ogre") - (version "1.12.6") + (version "1.12.9") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/OGRECave/ogre") - (commit (string-append "v" version)) - (recursive? #t))) ;for Dear ImGui submodule + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ap3krrl55hswv1n2r3ijf3xrb3kf9dnqvwyrc0fgnc7j7vd45sk")))) + (base32 "0b0pwh31nykrfhka6jqwclfx1pxzhj11vkl91951d63kwr5bbzms")))) (build-system cmake-build-system) (arguments '(#:phases (modify-phases %standard-phases + (add-before 'configure 'unpack-dear-imgui + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "dear-imgui-source") + "../dear-imgui-source") + #t)) (add-before 'configure 'pre-configure - ;; CMakeLists.txt forces CMAKE_INSTALL_RPATH value. As + ;; CMakeLists.txt forces a CMAKE_INSTALL_RPATH value. As ;; a consequence, we cannot suggest ours in configure flags. Fix ;; it. (lambda* (#:key inputs outputs #:allow-other-keys) @@ -961,6 +965,7 @@ operating system features.") (string-append out "/lib/OGRE")) ";"))) (list (string-append "-DCMAKE_INSTALL_RPATH=" runpath) + "-DIMGUI_DIR=../dear-imgui-source" "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_TESTS=TRUE" "-DOGRE_INSTALL_DOCS=TRUE" @@ -968,6 +973,7 @@ operating system features.") "-DOGRE_INSTALL_SAMPLES_SOURCE=TRUE")))) (native-inputs `(("boost" ,boost) + ("dear-imgui-source" ,(package-source dear-imgui)) ("doxygen" ,doxygen) ("googletest" ,googletest-1.8) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 1ba5071c2d00477d8dae011c8b6b5cf532073d61 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Nov 2020 23:04:58 +0100 Subject: gnu: msmtp: Update to 1.8.13. * gnu/packages/mail.scm (msmtp): Update to 1.8.13. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c3aa91f126..956ccc981e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1451,14 +1451,14 @@ addons which can add many functionalities to the base client.") (define-public msmtp (package (name "msmtp") - (version "1.8.12") + (version "1.8.13") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/msmtp/releases/" "/msmtp-" version ".tar.xz")) (sha256 - (base32 "0m33m5bc7ajmgy7vivnzj3mhybg37259hx79xypj769kfyafyvx8")))) + (base32 "1fcv99nis7c6yc63n04cncjysv9jndrp469gcfxh54aiinmlbadd")))) (build-system gnu-build-system) (inputs `(("libsecret" ,libsecret) -- cgit v1.2.3 From 80817b509855f2e4f473372fc546c3132fa57fe7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 00:02:18 +0100 Subject: gnu: multipath-tools: Update to 0.8.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (multipath-tools): Update to 0.8.5. [source]: Remove patch. [arguments]: Add a ‘skip-failing-tests’ phase. * gnu/packages/patches/multipath-tools-sans-systemd.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/linux.scm | 17 ++++- .../patches/multipath-tools-sans-systemd.patch | 83 ---------------------- 3 files changed, 14 insertions(+), 87 deletions(-) delete mode 100644 gnu/packages/patches/multipath-tools-sans-systemd.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 6a0f378bb0..91a3295e75 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1357,7 +1357,6 @@ dist_patch_DATA = \ %D%/packages/patches/mozjs38-version-detection.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \ - %D%/packages/patches/multipath-tools-sans-systemd.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mumps-shared-libseq.patch \ %D%/packages/patches/mumps-shared-mumps.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8abeb976af..39abf6e2ba 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4430,7 +4430,7 @@ arrays when needed.") (define-public multipath-tools (package (name "multipath-tools") - (version "0.8.4") + (version "0.8.5") (source (origin (method git-fetch) (uri (git-reference @@ -4439,8 +4439,7 @@ arrays when needed.") (file-name (git-file-name name version)) (sha256 (base32 - "14n8pcgnliicqxzc40xvjxk4cafm4qx7a3rsx5qva74r3ydzx8rn")) - (patches (search-patches "multipath-tools-sans-systemd.patch")) + "0gipg0z79h76j0f449cx4wcrfsv69ravjlpphsac11h302g3nrvg")) (modules '((guix build utils))) (snippet '(begin @@ -4498,6 +4497,18 @@ arrays when needed.") (("-lmultipath -lcmocka") "-lmultipath -L$(mpathcmddir) -lmpathcmd -lcmocka")) #t)) + (add-after 'unpack 'skip-failing-tests + (lambda _ + ;; This test and the module's setup() test an arbitrary block + ;; device node name, but the build environment has none. + (substitute* "tests/devt.c" + (("return get_one_devt.*") "return 0;\n") + (("cmocka_unit_test\\(test_devt2devname_devt_good\\),") "")) + ;; The above triggers -Werror=unused-function. Ignore it. + (substitute* "tests/Makefile" + (("CFLAGS \\+= " match) + (string-append match "-Wno-error=unused-function "))) + #t)) (delete 'configure)))) ; no configure script (native-inputs `(("perl" ,perl) diff --git a/gnu/packages/patches/multipath-tools-sans-systemd.patch b/gnu/packages/patches/multipath-tools-sans-systemd.patch deleted file mode 100644 index 8f3144718c..0000000000 --- a/gnu/packages/patches/multipath-tools-sans-systemd.patch +++ /dev/null @@ -1,83 +0,0 @@ -Fix various compiler warnings when built without systemd. - -Submitted upstream at . - -diff --git a/libmultipath/config.c b/libmultipath/config.c ---- a/libmultipath/config.c -+++ b/libmultipath/config.c -@@ -696,7 +696,7 @@ process_config_dir(struct config *conf, char *dir) - pthread_cleanup_pop(1); - } - --static void set_max_checkint_from_watchdog(struct config *conf) -+static void set_max_checkint_from_watchdog(__attribute__((unused)) struct config *conf) - { - #ifdef USE_SYSTEMD - char *envp = getenv("WATCHDOG_USEC"); -diff --git a/multipathd/main.c b/multipathd/main.c ---- a/multipathd/main.c -+++ b/multipathd/main.c -@@ -176,6 +176,7 @@ daemon_status(void) - /* - * I love you too, systemd ... - */ -+#ifdef USE_SYSTEMD - static const char * - sd_notify_status(enum daemon_status state) - { -@@ -195,7 +196,6 @@ sd_notify_status(enum daemon_status state) - return NULL; - } - --#ifdef USE_SYSTEMD - static void do_sd_notify(enum daemon_status old_state, - enum daemon_status new_state) - { -@@ -247,7 +247,9 @@ enum daemon_status wait_for_state_change_if(enum daemon_status oldstate, - static void __post_config_state(enum daemon_status state) - { - if (state != running_state && running_state != DAEMON_SHUTDOWN) { -- enum daemon_status old_state = running_state; -+ /* save state for sd_notify */ -+ enum daemon_status -+ __attribute__((unused)) old_state = running_state; - - running_state = state; - pthread_cond_broadcast(&config_cond); -@@ -272,7 +274,9 @@ int set_config_state(enum daemon_status state) - pthread_cleanup_push(config_cleanup, NULL); - pthread_mutex_lock(&config_lock); - if (running_state != state) { -- enum daemon_status old_state = running_state; -+ /* save state for sd_notify */ -+ enum daemon_status -+ __attribute__((unused)) old_state = running_state; - - if (running_state == DAEMON_SHUTDOWN) - rc = EINVAL; -@@ -2280,7 +2284,6 @@ checkerloop (void *ap) - struct timespec last_time; - struct config *conf; - int foreign_tick = 0; -- bool use_watchdog; - - pthread_cleanup_push(rcu_unregister, NULL); - rcu_register_thread(); -@@ -2292,11 +2295,15 @@ checkerloop (void *ap) - get_monotonic_time(&last_time); - last_time.tv_sec -= 1; - -- /* use_watchdog is set from process environment and never changes */ - conf = get_multipath_config(); -- use_watchdog = conf->use_watchdog; - put_multipath_config(conf); - -+#ifdef USE_SYSTEMD -+ /* use_watchdog is set from process environment and never changes */ -+ bool use_watchdog; -+ use_watchdog = conf->use_watchdog; -+#endif -+ - while (1) { - struct timespec diff_time, start_time, end_time; - int num_paths = 0, strict_timing, rc = 0; -- cgit v1.2.3 From 8d2ee4c596dc6898ea5f7d414ac5a9e8068d2c90 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 00:11:47 +0100 Subject: gnu: opendoas: Update to 6.8. * gnu/packages/admin.scm (opendoas): Update to 6.8. [arguments]: Adjust makefile name. --- gnu/packages/admin.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a65d45a960..4eaf38e1d8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1494,7 +1494,7 @@ commands and their arguments.") (define-public opendoas (package (name "opendoas") - (version "6.6.1") + (version "6.8") (source (origin (method git-fetch) (uri (git-reference @@ -1503,7 +1503,7 @@ commands and their arguments.") (file-name (git-file-name name version)) (sha256 (base32 - "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn")))) + "1dlwnvy8r6slxcy260gfkximp1ms510wdslpfq9y6xvd2qi5izcb")))) (build-system gnu-build-system) (arguments `(#:phases @@ -1511,19 +1511,17 @@ commands and their arguments.") (replace 'configure ;; The configure script doesn't accept most of the default flags. (lambda* (#:key configure-flags #:allow-other-keys) - ;; The configure script can only be told which compiler to use + ;; The configure script can be told which compiler to use only ;; through environment variables. (setenv "CC" ,(cc-for-target)) (apply invoke "./configure" configure-flags))) (add-before 'install 'fix-makefile (lambda* (#:key outputs #:allow-other-keys) - (substitute* "bsd.prog.mk" + (substitute* "GNUmakefile" (("^\tchown.*$") "")) #t))) #:configure-flags (list (string-append "--prefix=" (assoc-ref %outputs "out")) - ;; Nothing is done with this value (yet?) but it's supported. - ;; (string-append "--target=" (or ,(%current-target-system) "")) "--with-timestamp") ;; Compiler choice is not carried over from the configure script. #:make-flags -- cgit v1.2.3 From 7ea957e2c5886c7b93c3ae31a1a5c41c2bf679dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 00:25:49 +0100 Subject: gnu: superlu: Update to 5.2.2. * gnu/packages/maths.scm (superlu): Update to 5.2.2. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 295e2dd35e..b2f7f02f05 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2908,14 +2908,14 @@ easy-to-write markup language for mathematics.") (define-public superlu (package (name "superlu") - (version "5.2.1") + (version "5.2.2") (source (origin (method url-fetch) (uri (string-append "https://portal.nersc.gov/project/sparse/superlu/" "superlu_" version ".tar.gz")) (sha256 - (base32 "0qzlb7cd608q62kyppd0a8c65l03vrwqql6gsm465rky23b6dyr8")) + (base32 "13520vk6fqspyl22cq4ak2jh3rlmhja4czq56j75fdx65fkk80s7")) (modules '((guix build utils))) (snippet ;; Replace the non-free implementation of MC64 with a stub adapted -- cgit v1.2.3 From cd551413eef6fbf54eff20792661e9fc279bdd7f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 00:26:41 +0100 Subject: gnu: highlight: Update to 3.59. * gnu/packages/pretty-print.scm (highlight): Update to 3.59. --- gnu/packages/pretty-print.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 05223ae2e6..a3f9bef63c 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -270,14 +270,14 @@ seen in a terminal.") (define-public highlight (package (name "highlight") - (version "3.58") + (version "3.59") (source (origin (method url-fetch) (uri (string-append "http://www.andre-simon.de/zip/highlight-" version ".tar.bz2")) (sha256 - (base32 "1y25vc3nysdih4y9z6yqn1k3i6lgkbyqkmdaib2xyfpqw4djb06z")))) + (base32 "18j9q9w9l71zxaaf8klcl4f5rqcmqnz9632azabv8scfw2l6r4l5")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From bb2d1dae20d5a0debc8fde405c34f4f16f189198 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 00:27:26 +0100 Subject: gnu: python-pycryptodome: Update to 3.9.9. * gnu/packages/python-crypto.scm (python-pycryptodome): Update to 3.9.9. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 9bb0cede19..60a9776bae 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -989,14 +989,14 @@ protocol (Javascript Object Signing and Encryption).") (define-public python-pycryptodome (package (name "python-pycryptodome") - (version "3.7.3") + (version "3.9.9") (source (origin (method url-fetch) (uri (pypi-uri "pycryptodome" version)) (sha256 (base32 - "0dh6ky5ngxayyn5f6n7gdamjl49g3khz6pdx9sdnag1zwi8248hs")))) + "1i4m74f88qj9ci8rpyzrbk2slmsdj5ipmwdkq6qk24byalm203li")))) (build-system python-build-system) (home-page "https://www.pycryptodome.org") (synopsis "Low-level cryptographic Python library") -- cgit v1.2.3 From cbfa23c74ec874be7f55ee7758009d477d6c6005 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 00:28:36 +0100 Subject: gnu: python-pycryptodomex: Inherit from python-pycryptodome. * gnu/packages/python-crypto.scm (python-pycryptodomex): Inherit from python-pycryptodome. [build-system, home-page, synopsis, license]: Remove redundant fields. --- gnu/packages/python-crypto.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 60a9776bae..ce183bd6ae 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1042,18 +1042,15 @@ PyCryptodome variants, the other being python-pycryptodomex.") (package-with-python2 python-pycryptodome)) (define-public python-pycryptodomex - (package + (package (inherit python-pycryptodome) (name "python-pycryptodomex") - (version "3.9.9") + (version (package-version python-pycryptodome)) (source (origin (method url-fetch) (uri (pypi-uri "pycryptodomex" version)) (sha256 (base32 "0lbx4qk3xmwqiidhmkj8qa7bh2lf8bwzg0xjpsh2w5zqjrc7qnvv")))) - (build-system python-build-system) - (home-page "https://www.pycryptodome.org") - (synopsis "Low-level cryptographic Python library") (description "PyCryptodome is a self-contained Python package of low-level cryptographic primitives. It's not a wrapper to a separate C library like @@ -1088,9 +1085,7 @@ in userspace) @end itemize PyCryptodomex is the stand-alone version of PyCryptodome that no longer -provides drop-in compatibility with PyCrypto.") - (license (list license:bsd-2 - license:public-domain)))) ; code inherited from PyCrypto +provides drop-in compatibility with PyCrypto."))) (define-public python-m2crypto (package -- cgit v1.2.3 From b070e3f810e672753f85be708788670434f393b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 00:37:50 +0100 Subject: gnu: qemu: Remove left-over debugging statement. This follows up on 1b0cda6b442dd79324eaeb5b552cbc32faca3726. Sigh. * gnu/packages/virtualization.scm (qemu)[arguments]: Remove the FAIL. --- gnu/packages/virtualization.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 176201bd33..ae903261cc 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -183,8 +183,7 @@ (substitute* (cons* "tests/qemu-iotests/common.qemu" (find-files "tests/qemu-iotests" "^[0-9]+$")) (("QEMU_COMM_TIMEOUT=[0-9]+" match) - (string-append match "9"))) - (fail))) + (string-append match "9"))))) (add-after 'unpack 'disable-unusable-tests (lambda _ (substitute* "tests/Makefile.include" -- cgit v1.2.3 From 81643c4cf3e61f5a98b92a72a92c230f5e7ca905 Mon Sep 17 00:00:00 2001 From: Diego Nicola Barbato Date: Sat, 14 Nov 2020 15:07:28 -0500 Subject: gnu: python-matplotlib: Fix rounding errors on x86 CPUs. Fixes . Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 278b557a0b..f2f812a802 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -89,6 +89,7 @@ ;;; Copyright © 2020 Tim Gesthuizen ;;; Copyright © 2020 Bonface Munyoki Kilyungi ;;; Copyright © 2020 Ekaitz Zarraga +;;; Copyright © 2020 Diego N. Barbato ;;; ;;; This file is part of GNU Guix. ;;; @@ -5062,6 +5063,9 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. ;; has not effect. (setenv "LD_LIBRARY_PATH" (string-append cairo "/lib")) (setenv "HOME" (getcwd)) + ;; Fix rounding errors when using the x87 FPU. + (when (string-prefix? "i686" ,(%current-system)) + (setenv "CFLAGS" "-ffloat-store")) (call-with-output-file "setup.cfg" (lambda (port) (format port "[directories]~% -- cgit v1.2.3 From 06269abece3f14cc0829b81e3eca3f627a223b2d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 15 Nov 2020 15:16:41 +0100 Subject: gnu: emacs-helm-sly: Update to 0.5.0. * gnu/packages/emacs-xyz.scm (emacs-helm-sly): Update to 0.5.0. [description]: Fix typos. --- gnu/packages/emacs-xyz.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f44a8bc51e..3eb8920812 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19313,7 +19313,7 @@ correctly.") (define-public emacs-helm-sly (package (name "emacs-helm-sly") - (version "0.4.1") + (version "0.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -19322,7 +19322,7 @@ correctly.") (file-name (git-file-name name version)) (sha256 (base32 - "0b2dx9nzh5233lkix3lz81c9cv626lk2hjpcjiikwvyp6y0q92ys")))) + "1690rxwwg69jbcjhi51nyjlx3gziaiaa8ssyal71gmc6schq2592")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) @@ -19332,11 +19332,12 @@ correctly.") (description "Helm-SLY defines a few new commands: @itemize -@item helm-sly-list-connections: Yet another Lisp connection list with Helm. -@item: helm-sly-apropos: Yet another @command{apropos} with Helm. -@item helm-sly-mini: Like @command{helm-sly-list-connections}, but include an -extra source of Lisp-related buffers, like the events buffer or the scratch -buffer. +@item @code{helm-sly-list-connections}: Yet another Lisp connection list with +Helm. +@item @code{helm-sly-apropos}: Yet another @command{apropos} with Helm. +@item @code{helm-sly-mini}: Like @command{helm-sly-list-connections}, but +include an extra source of Lisp-related buffers, like the events buffer or the +scratch buffer. @end itemize\n") (license license:gpl3+))) -- cgit v1.2.3 From ce18d88347de4239f5c8c7f8e547aff8db83203f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Nov 2020 20:34:01 +0200 Subject: gnu: vim-guix-vim: Update to 0.1.1. * gnu/packages/vim.scm (vim-guix-vim): Update to 0.1.1. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 24bd121345..236bb97cbe 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -800,7 +800,7 @@ through its msgpack-rpc API.") (define-public vim-guix-vim (package (name "vim-guix-vim") - (version "0.1") + (version "0.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -809,7 +809,7 @@ through its msgpack-rpc API.") (file-name (git-file-name name version)) (sha256 (base32 - "1f8h8m96fqh3f9hy87spgh9kdqzyxl11n9s3rywvyq5xhn489bnk")))) + "10bfy0dgwizxr56b4272b7sqajpr6lnz332pzx055dis2zzjap8z")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit v1.2.3 From 00781cb57dda331a462ad8f7e52f8d26ce440298 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 02:12:23 +0100 Subject: gnu: rr: Fix typo. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/debug.scm (rr)[inputs]: Fix ‘cpanproto’ typo. --- gnu/packages/debug.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 9dc32c70f4..3fe5fd07b3 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -613,7 +613,7 @@ error reporting, better tracing, profiling, and a debugger.") ("which" ,which))) (inputs `(("gdb" ,gdb) - ("cpanproto" ,capnproto) + ("capnproto" ,capnproto) ("python" ,python) ("python-pexpect" ,python-pexpect))) (home-page "https://rr-project.org/") -- cgit v1.2.3 From 968b1a3ea24435167efb9cee6c4debc6d18bfd96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 02:13:27 +0100 Subject: gnu: rr: Update to 5.4.0. * gnu/packages/debug.scm (rr): Update to 5.4.0. [arguments]: Add capnproto to the RUNPATH. --- gnu/packages/debug.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 3fe5fd07b3..b3a000e6e3 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020 Eric Bavier ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2019 Pkill -9 ;;; Copyright © 2020 Vincent Legoll @@ -566,7 +566,7 @@ error reporting, better tracing, profiling, and a debugger.") (define-public rr (package (name "rr") - (version "5.3.0") + (version "5.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -574,18 +574,19 @@ error reporting, better tracing, profiling, and a debugger.") (commit version))) (sha256 (base32 - "1x6l1xsdksnhz9v50p4r7hhmr077cq20kaywqy1jzdklvkjqzf64")) + "1sfldgkkmsdyaqa28i5agcykc63gwm3zjihd64g86i852w8al2w6")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:configure-flags ;; The 'rr_exec_stub' is a static binary, which leads CMake to fail - ;; with: - ;; - ;; file RPATH_CHANGE could not write new RPATH: - ;; + ;; with ‘file RPATH_CHANGE could not write new RPATH: ...’. ;; Clear CMAKE_INSTALL_RPATH to avoid that problem. (list "-DCMAKE_INSTALL_RPATH=" + ;; Satisfy the ‘validate-runpath’ phase. This isn't a direct + ;; consequence of clearing CMAKE_INSTALL_RPATH. + (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath=" + (assoc-ref %build-inputs "capnproto") "/lib") ,@(if (and (not (%current-target-system)) (member (%current-system) '("x86_64-linux" "aarch64-linux"))) -- cgit v1.2.3 From 6fa2ea471ea5388d338fd3e526bdbbfbcdbd74e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 02:24:14 +0100 Subject: gnu: python-bottle: Update to 0.12.19. * gnu/packages/python-web.scm (python-bottle): Update to 0.12.19. --- gnu/packages/python-web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e9dde499d5..2aaa5d752c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3515,14 +3515,13 @@ addon modules.") (define-public python-bottle (package (name "python-bottle") - (version "0.12.18") + (version "0.12.19") (source (origin (method url-fetch) (uri (pypi-uri "bottle" version)) (sha256 - (base32 - "17pn43kzr7m6czjbm4nda7kzs4ap9mmb30qfbhifyzas2i5vf688")))) + (base32 "0b6s50vc4iad97b6bb3xnyrgajb3nj6n6jbr5p54a4vapky3zmx9")))) (build-system python-build-system) (home-page "http://bottlepy.org/") (synopsis "WSGI framework for small web-applications.") -- cgit v1.2.3 From 9d69348990fb3a13c9de8a1b69ccf83f6b3906e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 02:24:23 +0100 Subject: gnu: python-bottle: Use HTTPS home page. * gnu/packages/python-web.scm (python-bottle)[home-page]: Use HTTPS. --- gnu/packages/python-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2aaa5d752c..4f7acaf1ad 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3523,7 +3523,7 @@ addon modules.") (sha256 (base32 "0b6s50vc4iad97b6bb3xnyrgajb3nj6n6jbr5p54a4vapky3zmx9")))) (build-system python-build-system) - (home-page "http://bottlepy.org/") + (home-page "https://bottlepy.org/") (synopsis "WSGI framework for small web-applications.") (description "@code{python-bottle} is a WSGI framework for small web-applications.") (license license:expat))) -- cgit v1.2.3 From 2dee1495757a2eb5e74ac8484d158831e66a99e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 14:45:37 +0100 Subject: gnu: python-css-parser: Improve description. * gnu/packages/python-web.scm (python-css-parser)[description]: Say what it is, not only what it was. --- gnu/packages/python-web.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 4f7acaf1ad..e91db73f3e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -969,8 +969,12 @@ options.") (home-page "https://github.com/ebook-utils/css-parser") (synopsis "Fork of cssutils modified for parsing ebooks") (description - "Css-parser is a fork of cssutils 1.0.2, updated and modified for parsing -ebooks, due to cssutils not receiving updates as of 1.0.2.") + "Css-parser is a Python package for parsing and building CSS +Cascading Style Sheets. Currently it provides a DOM only and no rendering +options. + +It's a fork of cssutils 1.0.2, updated and modified for parsing ebooks, due to +cssutils not receiving updates as of 1.0.2.") (license license:lgpl3+))) (define-public python2-css-parser -- cgit v1.2.3 From 73b305737cccaf20cb0b0d82c8f80075b9eda35c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 14:49:47 +0100 Subject: gnu: python-cloudscraper: Remove questionable message. * gnu/packages/python-web.scm (python-cloudscraper)[source]: Add substitution to snippet. --- gnu/packages/python-web.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e91db73f3e..3fec7adf19 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5156,6 +5156,10 @@ Encoding for HTTP.") "captcha/deathbycaptcha.py" "interpreters/js2py.py" "interpreters/v8.py")) + (substitute* "__init__.py" + ;; Perhaps it's a joke, but don't promote proprietary software. + (("([Th]is feature is not available) in the .*'" _ prefix) + (string-append prefix ".'"))) #t)))) (build-system python-build-system) (propagated-inputs -- cgit v1.2.3 From 8c39cfd0e65e6104dca7bdeeb3052cad62bd247b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 14:51:22 +0100 Subject: gnu: python-cloudscraper: Update to 1.2.48. * gnu/packages/python-web.scm (python-cloudscraper): Update to 1.2.48. --- gnu/packages/python-web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3fec7adf19..3daa0c57d5 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5138,14 +5138,13 @@ Encoding for HTTP.") (define-public python-cloudscraper (package (name "python-cloudscraper") - (version "1.2.46") + (version "1.2.48") (source (origin (method url-fetch) (uri (pypi-uri "cloudscraper" version)) (sha256 - (base32 - "1br4p648yassywsd7whz1c7s10rwdysnd7wdqfjq9bksqfxrac3r")) + (base32 "0qjxzb0z5bprvmdhx42ayqhlhi2h49d9dwc0vvycj817s71f2sxv")) (modules '((guix build utils))) (snippet '(with-directory-excursion "cloudscraper" -- cgit v1.2.3 From 3e16b3c42f503748875d0400787d5e683c8b3375 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 15:18:33 +0100 Subject: gnu: python-css-parser: Update to 1.0.6. * gnu/packages/python-web.scm (python-css-parser): Update to 1.0.6. --- gnu/packages/python-web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3daa0c57d5..6e1720376f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -958,14 +958,13 @@ options.") (package (inherit python-cssutils) (name "python-css-parser") - (version "1.0.4") + (version "1.0.6") (source (origin (method url-fetch) (uri (pypi-uri "css-parser" version ".tar.gz")) (sha256 - (base32 - "0i4xfykiffxzr4f6y0m2ggqvx1rzam6pw6krlr5k6ldf29akbay7")))) + (base32 "0bmg4kiiir6pj9x3sd12x4dz2c1xpp2bn5nn60fxnbk2lnl4im2f")))) (home-page "https://github.com/ebook-utils/css-parser") (synopsis "Fork of cssutils modified for parsing ebooks") (description -- cgit v1.2.3 From 1d17a07eb8a927f1228b404b1c367f8d3a51852f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 17:43:41 +0100 Subject: gnu: font-jetbrains-mono: Update to 2.210. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts.scm (font-jetbrains-mono): Update to 2.210. [source]: Download from GitHub. [arguments]: Replace the ‘install-license-files’ phase. --- gnu/packages/fonts.scm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 396e89a1fd..8940b04ca3 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1761,24 +1761,30 @@ This package provides the TrueType fonts.") (define-public font-jetbrains-mono (package (name "font-jetbrains-mono") - (version "2.002") + (version "2.210") (source (origin (method url-fetch) (uri - (string-append "https://download.jetbrains.com/fonts/" - "JetBrainsMono-" version ".zip")) + (string-append "https://github.com/JetBrains/JetBrainsMono/releases/" + "download/v" version "/JetBrainsMono-" version ".zip")) (sha256 - (base32 "0lcsl718jhkqgld1xqll7fsv8j968jlf292541fkqxwm8i5g93sn")))) + (base32 "19wbggnmqs3k1wdqy7l7imnx23g7hh159pl32nz3mzz8s8sqfdix")))) (build-system font-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-before 'install-license-files 'change-directory-to-archive-root - ;; Find the LICENSE file outside of the default subdirectory. + ;; Find the license file outside of the default subdirectory. (lambda _ (chdir "..") - #t))))) + #t)) + (replace 'install-license-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (install-file "OFL.txt" doc) + #t)))))) (home-page "https://www.jetbrains.com/lp/mono/") (synopsis "Mono typeface for developers") (description -- cgit v1.2.3 From 82b3f42d2404b2f4e9a0d40fe709de50e80b17a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 18:11:32 +0100 Subject: gnu: python-scp: Update to 0.13.3. * gnu/packages/python-xyz.scm (python-scp): Update to 0.13.3. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f2f812a802..4959d755f9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3873,14 +3873,13 @@ outside the standard library.") (define-public python-scp (package (name "python-scp") - (version "0.13.2") + (version "0.13.3") (source (origin (method url-fetch) (uri (pypi-uri "scp" version)) (sha256 - (base32 - "1crlpw9lnn58fs1c1rmh7s7s9y5gkgpgjsqlvg9qa51kq1knx7gg")))) + (base32 "1m2v09m407p097cy3xy5rxicqfzrqjwf8v5rd4qhfqkk7lllimwb")))) (build-system python-build-system) (arguments '(#:tests? #f)) ;tests require an SSH server -- cgit v1.2.3 From 11305a17ce89761a697cc66d8d6398b0c09d01d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 18:15:20 +0100 Subject: gnu: perl-net-dns: Update to 1.28. * gnu/packages/networking.scm (perl-net-dns): Update to 1.28. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 4f7eee6ddb..64859a331b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1823,7 +1823,7 @@ private (reserved).") (define-public perl-net-dns (package (name "perl-net-dns") - (version "1.27") + (version "1.28") (source (origin (method url-fetch) @@ -1834,7 +1834,7 @@ private (reserved).") (string-append "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-" version ".tar.gz"))) (sha256 - (base32 "0hdx5ajr34f39rycai090y9w8gq9v0shgziynaaj0rzk21vjfdpk")))) + (base32 "0kh2qbhxv005pqb35mdk2bld7cg7xnxl12qvdwv30sgd91aqica7")))) (build-system perl-build-system) (inputs `(("perl-digest-hmac" ,perl-digest-hmac))) -- cgit v1.2.3 From 3b77ba78684e201382b1c28f2618252205891568 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Fri, 13 Nov 2020 19:39:06 -0500 Subject: gnu: Add b4. * gnu/packages/version-control.scm (b4): New variable. Signed-off-by: Christopher Baines --- gnu/packages/version-control.scm | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 16c70bd1a7..3e46a6162b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2301,6 +2301,49 @@ collections efficiently. Mirrors decide to clone and update repositories based on a manifest file published by servers.") (license license:gpl3+))) +(define-public b4 + (package + (name "b4") + (version "0.5.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/utils/b4/b4.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "1w11fiyspyncz2m7njrjfylgzch4azi7560ngd8i733wvjjhg3mj")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-manpages + (lambda* (#:key outputs #:allow-other-keys) + (let ((man (string-append (assoc-ref outputs "out") + "/man/man5/"))) + (mkdir-p man) + (for-each (lambda (file) (install-file file man)) + (find-files "man" "\\.[1-8]$"))) + #t))))) + (inputs + `(("python-requests" ,python-requests))) + (home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git") + (synopsis "Tool for working with patches in public-inbox archives") + (description + "The @code{b4} command is designed to make it easier to participate in +patch-based workflows for projects that have public-inbox archives. + +Features include: +@itemize +@item downloading a thread's mbox given a message ID +@item processing an mbox so that is ready to be fed to @code{git-am} +@item creating templated replies for processed patches and pull requests +@item submitting cryptographic attestation for patches. +@end itemize") + (license license:gpl2+))) + (define-public git-annex-remote-rclone (package (name "git-annex-remote-rclone") -- cgit v1.2.3 From 15929beb5f1cd2bf96c53eef0f5da3e986c30530 Mon Sep 17 00:00:00 2001 From: luhux Date: Sun, 15 Nov 2020 21:15:33 +0800 Subject: gnu: Add curseofwar Signed-off-by: Julien Lepiller --- gnu/packages/games.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 439e369fe4..4ab7436daf 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -54,6 +54,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Trevor Hass ;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Lu hux ;;; ;;; This file is part of GNU Guix. ;;; @@ -11942,3 +11943,32 @@ inside the Zenith Colony.") X11 that won't set your CPU on fire, drain your laptop battery, or lower video game FPS.") (license license:unlicense)))) + +(define-public curseofwar + (package + (name "curseofwar") + (version "1.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/a-nikolaev/curseofwar") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wd71wdnj9izg5d95m81yx3684g4zdi7fsy0j5wwnbd9j34ilz1i")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f; no tests + #:make-flags + (list "CC=gcc" "PREFIX=" + (string-append "DESTDIR=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs `(("ncurses" ,ncurses))) + (home-page "https://a-nikolaev.github.io/curseofwar/") + (synopsis "Fast-paced action strategy game") + (description "Curse of War is a fast-paced action strategy game for +Linux originally implemented using ncurses user interface.") + (license license:gpl3))) -- cgit v1.2.3 From 54d478fd9b052b7cabf32f06b1faa637a8d1607a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Nov 2020 23:17:40 +0200 Subject: gnu: curseofwar: Cross compile. * gnu/packages/games.scm (curseofwar)[arguments]: Use cc-for-target in make-flags. --- gnu/packages/games.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4ab7436daf..ddf0108367 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11961,7 +11961,8 @@ game FPS.") (arguments `(#:tests? #f; no tests #:make-flags - (list "CC=gcc" "PREFIX=" + (list (string-append "CC=" ,(cc-for-target)) + "PREFIX=" (string-append "DESTDIR=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 0b1d58029ca45613ad2e42f1bc263ae9b161cd4d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Nov 2020 23:19:05 +0200 Subject: gnu: curseofwar: Don't use DESTDIR. * gnu/packages/games.scm (curseofwar)[arguments]: Set PREFIX, not DESTDIR, in make-flags. --- gnu/packages/games.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ddf0108367..4441ec90e1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11962,8 +11962,7 @@ game FPS.") `(#:tests? #f; no tests #:make-flags (list (string-append "CC=" ,(cc-for-target)) - "PREFIX=" - (string-append "DESTDIR=" (assoc-ref %outputs "out"))) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (delete 'configure)))) -- cgit v1.2.3 From 204ac80ee762c8daec90e14dab41170687ef3b2b Mon Sep 17 00:00:00 2001 From: Adam Kandur Date: Sun, 15 Nov 2020 22:25:37 +0100 Subject: gnu: Add emacs-parsec. * gnu/packages/emacs-xyz.scm (emacs-parsec): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3eb8920812..637cdf0f0c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15009,6 +15009,34 @@ and @code{erc-send-modify-hook} to download and show images.") (description "This package provides a list manipulation library for Emacs.") (license license:gpl3+))) +(define-public emacs-parsec + ;; Last release is too old (2016). + (let ((revision "0") + (commit "2cbbbc2254aa7bcaa4fb5e07c8c1bf2f381dba26")) + (package + (name "emacs-parsec") + (version (git-version "0.1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cute-jumper/parsec.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1g1s8s45g3kkbi3h7w0pmadmzdswb64mkdvdpg2lihg341kx37gm")))) + (build-system emacs-build-system) + (home-page "https://github.com/cute-jumper/parsec.el") + (synopsis "Parser combinator library for Emacs Lisp") + (description + "Parsec is a parser combinator library for Emacs Lisp, similar to +Haskell's Parsec library. It contains most of the parser combinators in +Text.Parsec.Combinator, and more combinators can be added if necessary! Most +of the parser combinators have the same behavior as their Haskell +counterparts. Parsec also comes with a simple error handling mechanism so +that it can display an error message showing how the parser fails.") + (license license:gpl3+)))) + (define-public emacs-move-text (package (name "emacs-move-text") -- cgit v1.2.3 From 9ad333f6cdadc2d1e3b8278bbe09026d0a19be3f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 15 Nov 2020 22:29:25 +0100 Subject: gnu: curseofwar: Improve docstring. * gnu/packages/games.scm (curseofwar): Remove unnecessary reference to Linux. Add other available UI. --- gnu/packages/games.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4441ec90e1..2a32b8d616 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11959,7 +11959,7 @@ game FPS.") (base32 "1wd71wdnj9izg5d95m81yx3684g4zdi7fsy0j5wwnbd9j34ilz1i")))) (build-system gnu-build-system) (arguments - `(#:tests? #f; no tests + `(#:tests? #f ; no tests #:make-flags (list (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" (assoc-ref %outputs "out"))) @@ -11969,6 +11969,7 @@ game FPS.") (inputs `(("ncurses" ,ncurses))) (home-page "https://a-nikolaev.github.io/curseofwar/") (synopsis "Fast-paced action strategy game") - (description "Curse of War is a fast-paced action strategy game for -Linux originally implemented using ncurses user interface.") + (description "Curse of War is a fast-paced action strategy game originally +implemented using ncurses user interface. An SDL graphical version is also +available.") (license license:gpl3))) -- cgit v1.2.3 From 31b6ad823b7b80ef6681ea634e0a9eecd5875982 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 15 Nov 2020 22:30:38 +0100 Subject: gnu: curseofwar: Fix license. * gnu/packages/games.scm (curseofwar)[license]: Switch to GPL3+. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2a32b8d616..97b0cb976d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11972,4 +11972,4 @@ game FPS.") (description "Curse of War is a fast-paced action strategy game originally implemented using ncurses user interface. An SDL graphical version is also available.") - (license license:gpl3))) + (license license:gpl3+))) -- cgit v1.2.3 From 7140c55d1712cca1a44fb4c968a0bef42c2324a4 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sun, 15 Nov 2020 18:22:10 +0800 Subject: gnu: texmacs: Update to 1.99.15. * gnu/packages/text-editors.scm(texmacs): Update to 1.99.15. [inputs]: Add qtsvg. Signed-off-by: Nicolas Goaziou --- gnu/packages/text-editors.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 0860189d48..f0bfaad12d 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -756,14 +756,14 @@ editors.") (define-public texmacs (package (name "texmacs") - (version "1.99.13") + (version "1.99.15") (source (origin (method url-fetch) (uri (string-append "https://www.texmacs.org/Download/ftp/tmftp/" "source/TeXmacs-" version "-src.tar.gz")) (sha256 - (base32 "1d590yyanh2ar88pd0ns4mf616bq1lq4cwg93m863anhir5irb82")))) + (base32 "09r88yi2k1vi9pmszw97zblw8bs79h2d5ivb6xk652zyrls2lkvd")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -773,7 +773,8 @@ editors.") ("guile" ,guile-1.8) ("perl" ,perl) ("python" ,python-wrapper) - ("qt" ,qtbase))) + ("qt" ,qtbase) + ("qtsvg" ,qtsvg))) (arguments `(#:tests? #f ; no check target #:phases -- cgit v1.2.3 From 67d905ee79d52158f97beb50faf53153def252e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Nov 2020 22:53:22 +0100 Subject: gnu: straw-viewer: Update to 0.1.1. * gnu/packages/video.scm (straw-viewer): Update to 0.1.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e23a621516..3e31f73017 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1007,7 +1007,7 @@ H.264 (MPEG-4 AVC) video streams.") (define-public straw-viewer (package (name "straw-viewer") - (version "0.1.0") + (version "0.1.1") (source (origin (method git-fetch) @@ -1016,7 +1016,7 @@ H.264 (MPEG-4 AVC) video streams.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0786bppk8dhp5p2284qp7pm3b9vwh1cm4n03hiqwd2vvgv41aypy")))) + (base32 "0idp1ayqghi5bg83v9qmvzz9wj05flwrp1fxb4kqa6vwxmprvhyk")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) -- cgit v1.2.3 From e1fa3ea9fe8d01dd124c5e304bde9243876378ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 15 Nov 2020 23:27:31 +0100 Subject: gnu: methyldackel: Update to 0.5.1. * gnu/packages/bioinformatics.scm (methyldackel): Update to 0.5.1. [arguments]: Link with libbigwig. [inputs]: Add curl and libbigwig; replace htslib with htslib-1.9. --- gnu/packages/bioinformatics.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 15230a8ef2..91fcb28451 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15437,7 +15437,7 @@ patterns.") (define-public methyldackel (package (name "methyldackel") - (version "0.4.0") + (version "0.5.1") (source (origin (method git-fetch) (uri (git-reference @@ -15446,7 +15446,7 @@ patterns.") (file-name (git-file-name name version)) (sha256 (base32 - "10gh8k0ca92kywnrw5pkacq3g6r8s976s12k8jhp8g3g49q9a97g")))) + "1sfhf2ap75qxpnmy1ifgmxqs18rq8mah9mcgkby73vc6h0sw99ws")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -15459,11 +15459,14 @@ patterns.") (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (substitute* "Makefile" + (("-lhts ") "-lhts -lBigWig ") (("install MethylDackel \\$\\(prefix\\)" match) (string-append "install -d $(prefix); " match))) #t))))) (inputs - `(("htslib" ,htslib) + `(("curl" ,curl) ; XXX: needed by libbigwig + ("htslib" ,htslib-1.9) + ("libbigwig" ,libbigwig) ("zlib" ,zlib))) ;; Needed for tests (native-inputs -- cgit v1.2.3