From 933abfba365b03a146b1898d9e785e0daf3ee317 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 8 Jun 2020 13:55:07 -0400 Subject: gnu: Blender: Update to 2.83.0. * gnu/packages/graphics.scm (blender): Update to 2.83.0. --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index b2bc63b9d0..44d78c036b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -206,14 +206,14 @@ (define-public autotrace (define-public blender (package (name "blender") - (version "2.82a") + (version "2.83.0") (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "18zbdgas6qf2kmvvlimxgnq7y9kj7hdxcgixrs6fj50x40q01q2d")))) + "07rzm4xaj94pjxy2vlqfhi1adsqpshfkrzrq8kljmcbnw22vrqhl")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) -- cgit v1.2.3 From 838c4b10e9905e1957a57a281152599c1cdd17ce Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 8 Jun 2020 15:37:21 -0400 Subject: gnu: opensmtpd: Patch bug in 'smtpctl encrypt'. * gnu/packages/mail.scm (opensmtpd)[phases]{fix-smtpctl-encrypt-bug}: New phase. --- gnu/packages/mail.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8337bc7808..0c683f0c92 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2322,6 +2322,13 @@ (define-public opensmtpd "--with-table-db") #:phases (modify-phases %standard-phases + ;; See: https://github.com/OpenSMTPD/OpenSMTPD/issues/1069. + (add-after 'unpack 'fix-smtpctl-encrypt-bug + (lambda _ + (substitute* "smtpd/smtpctl.c" + (("\"encrypt\", \"--\",") + "\"encrypt\",")) + #t)) ;; Fix some incorrectly hard-coded external tool file names. (add-after 'unpack 'patch-FHS-file-names (lambda _ -- cgit v1.2.3 From 21569e53b2fcbd00ad458898ad170be6edef315e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 2 Jun 2020 22:46:01 -0700 Subject: gnu: Add linux-libre 5.7.1. * gnu/packages/linux (deblob-scripts-5.7): New variable. (linux-libre-5.7-version): New variable. (linux-libre-5.7-pristine-source): New variable. (linux-libre-5.7-source): New variable. (linux-libre-headers-5.7): New variable. --- gnu/packages/linux.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 329bf7c327..f5329445cf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -193,6 +193,12 @@ (define (linux-libre-deblob-scripts version "deblob-check")) (sha256 deblob-check-hash)))) +(define deblob-scripts-5.7 + (linux-libre-deblob-scripts + "5.7.1" + (base32 "1c0n39wg6xij4x63ppg0m80kfcffkn3iilm3chyiix09n9g7vb78") + (base32 "02is246xaql1br3kizqicrkp982nw4gdwpn7nlzjazvsmyd1hcv2"))) + (define deblob-scripts-5.6 (linux-libre-deblob-scripts "5.6.7" @@ -370,6 +376,14 @@ (define (%upstream-linux-source version hash) (sha256 hash))) +(define-public linux-libre-5.7-version "5.7.1") +(define-public linux-libre-5.7-pristine-source + (let ((version linux-libre-5.7-version) + (hash (base32 "1vcxrrb2i4366iciw0mfahwbdrzmhrrsr7gi4vdkzznfv2niils0"))) + (make-linux-libre-source version + (%upstream-linux-source version hash) + deblob-scripts-5.7))) + (define-public linux-libre-5.6-version "5.6.17") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) @@ -446,6 +460,11 @@ (define (source-with-patches source patches) (patches (append (origin-patches source) patches)))) +(define-public linux-libre-5.7-source + (source-with-patches linux-libre-5.7-pristine-source + (list %boot-logo-patch + %linux-libre-arm-export-__sync_icache_dcache-patch))) + (define-public linux-libre-5.6-source (source-with-patches linux-libre-5.6-pristine-source (list %boot-logo-patch @@ -554,6 +573,10 @@ (define (make-linux-libre-headers* version source) (description "Headers of the Linux-Libre kernel.") (license license:gpl2))) +(define-public linux-libre-headers-5.7 + (make-linux-libre-headers* linux-libre-5.7-version + linux-libre-5.7-source)) + (define-public linux-libre-headers-5.6 (make-linux-libre-headers* linux-libre-5.6-version linux-libre-5.6-source)) -- cgit v1.2.3 From 637b64ce7c185891339ae8b78c020a336995b64d Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 2 Jun 2020 22:52:05 -0700 Subject: gnu: Add linux-libre-arm64-generic-5.7. * gnu/packages/linux (linux-libre-arm64-generic): New variable. --- gnu/packages/linux.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f5329445cf..dc85fe805b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -956,6 +956,18 @@ (define-public linux-libre-arm64-generic-5.6 ("CONFIG_RTC_DRV_RK808" . #t)) %default-extra-linux-options))) +(define-public linux-libre-arm64-generic-5.7 + (make-linux-libre* linux-libre-5.7-version + linux-libre-5.7-source + '("aarch64-linux") + #:defconfig "defconfig" + #:extra-version "arm64-generic" + #:extra-options + (append + `(;; needed to fix the RTC on rockchip platforms + ("CONFIG_RTC_DRV_RK808" . #t)) + %default-extra-linux-options))) + (define-public linux-libre-riscv64-generic (make-linux-libre* linux-libre-version linux-libre-source -- cgit v1.2.3 From 076779c4d4669c7f72c5f04b6d7ba73244478e73 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 2 Jun 2020 22:55:19 -0700 Subject: gnu: Add linux-libre-arm-generic-5.7. * gnu/packages/linux (linux-libre-arm-generic): New variable. --- gnu/packages/linux.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index dc85fe805b..19f59d219e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -894,6 +894,18 @@ (define-public linux-libre-arm-generic-5.6 ("CONFIG_RTC_DRV_RK808" . #t)) %default-extra-linux-options))) +(define-public linux-libre-arm-generic-5.7 + (make-linux-libre* linux-libre-5.7-version + linux-libre-5.7-source + '("armhf-linux") + #:defconfig "multi_v7_defconfig" + #:extra-version "arm-generic" + #:extra-options + (append + `(;; needed to fix the RTC on rockchip platforms + ("CONFIG_RTC_DRV_RK808" . #t)) + %default-extra-linux-options))) + (define-public linux-libre-arm-veyron (deprecated-package "linux-libre-arm-veyron" linux-libre-arm-generic)) -- cgit v1.2.3 From c34a7dc2bb1380b3b0150f3d2fb64ca83381912c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Jun 2020 23:00:44 +0200 Subject: gnu: v4l2loopback-linux-module: Really disable tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit fdcd193744dbb92d3478c8e4e6c4f4336a872831 was a botched by-hand ‘merge’ that caused the default check phase to run, and fail. * gnu/packages/linux.scm (v4l2loopback-linux-module)[arguments]: Set #:tests? to #f. --- gnu/packages/linux.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 19f59d219e..b3329c92c6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1197,6 +1197,8 @@ (define-public v4l2loopback-linux-module (base32 "1qi4l6yam8nrlmc3zwkrz9vph0xsj1cgmkqci4652mbpbzigg7vn")))) (build-system linux-module-build-system) + (arguments + `(#:tests? #f)) ; no test suite (home-page "https://github.com/umlaeute/v4l2loopback") (synopsis "Linux kernel module to create virtual V4L2 video devices") (description -- cgit v1.2.3 From 9084fc2e90bd9e0b8939f9661f0e03424290df30 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Jun 2020 23:02:57 +0200 Subject: gnu: znc: Update to 1.8.1. * gnu/packages/messaging.scm (znc): Update to 1.8.1. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 12b0cd4782..3216f0d88d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -565,14 +565,14 @@ (define-public pidgin-otr (define-public znc (package (name "znc") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (string-append "http://znc.in/releases/archive/znc-" version ".tar.gz")) (sha256 (base32 - "0m5xf60r40pgbg9lyk56dafxj2hj149pn2wf8vzsp8xgq4kv5zcl")))) + "0hb1v167aa6gv5bcwz352l6b8gnd74ymjw92y4x882l099hzg59i")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 5d95ac9178c2b4f5510390b0c31d440efc3c203d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 8 Jun 2020 14:16:24 +0200 Subject: maint: 'make authenticate' starts from v1.0.0. * Makefile.am (commit_v1_0_1): Remove. (commit_v1_0_0): New variable. (authenticate): Use it. --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0feb75c7c1..9cf9318e8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -633,17 +633,17 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA install-data-hook: touch "$(DESTDIR)$(guileobjectdir)/guix/config.go" -# Commit corresponding to the 'v1.0.1' tag. -commit_v1_0_1 = d68de958b60426798ed62797ff7c96c327a672ac +# Commit corresponding to the 'v1.0.0' tag. +commit_v1_0_0 = 6298c3ffd9654d3231a6f25390b056483e8f407c # Authenticate the current Git checkout by checking signatures on every commit -# starting from $(commit_v1_0_1). +# starting from $(commit_v1_0_0). authenticate: guix/openpgp.go guix/git-authenticate.go guix/git.go $(AM_V_at)echo "Authenticating Git checkout..." ; \ "$(top_builddir)/pre-inst-env" $(GUILE) \ --no-auto-compile -e git-authenticate \ "$(top_srcdir)/build-aux/git-authenticate.scm" \ - "$(commit_v1_0_1)" + "$(commit_v1_0_0)" # Assuming Guix is already installed and the daemon is up and running, this # rule builds from $(srcdir), creating and building derivations. -- cgit v1.2.3 From 72357e2170e88f73c11ff089f87a744cee8606ec Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 8 Jun 2020 21:39:55 +0200 Subject: git: 'commit-difference' really excludes the ancestors of #:excluded. * guix/git.scm (commit-difference): Initialize VISITED to the closure of OLD and EXCLUDED, as written in the docstring. * tests/git.scm ("commit-difference, excluded commits"): Adjust accordingly. --- guix/git.scm | 4 +++- tests/git.scm | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 1671f57d9f..0d8e617cc9 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -416,7 +416,9 @@ (define* (commit-difference new old #:optional (excluded '())) that of OLD." (let loop ((commits (list new)) (result '()) - (visited (commit-closure old (list->setq excluded)))) + (visited (fold commit-closure + (setq) + (cons old excluded)))) (match commits (() (reverse result)) diff --git a/tests/git.scm b/tests/git.scm index 4a806abcc3..aa4f03ca62 100644 --- a/tests/git.scm +++ b/tests/git.scm @@ -119,8 +119,7 @@ (define-module (test-git) (list commit3 commit4)) (lset= eq? (commit-difference commit4 commit1 (list commit3)) (list commit4)) - (lset= eq? (commit-difference commit4 commit1 (list commit5)) - (list commit2 commit3 commit4))))))) + (null? (commit-difference commit4 commit1 (list commit5)))))))) (unless (which (git-command)) (test-skip 1)) (test-equal "commit-relation" -- cgit v1.2.3 From eef859e8538a74f7dd743bf294f9c32a62a52381 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 8 Jun 2020 22:25:59 +0200 Subject: git-authenticate: 'commit-authorized-keys' properly handles orphan commits. Previously it would trigger a wrong-number-of-arguments error for 'lset-intersection'. * guix/git-authenticate.scm (commit-authorized-keys): Add case for when 'commit-parents' returns the empty list. --- guix/git-authenticate.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index 00d22ef479..c333717136 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -184,8 +184,11 @@ (define (commit-authorizations commit) default-authorizations) (throw key error))))) - (apply lset-intersection bytevector=? - (map commit-authorizations (commit-parents commit)))) + (match (commit-parents commit) + (() default-authorizations) + (parents + (apply lset-intersection bytevector=? + (map commit-authorizations parents))))) (define* (authenticate-commit repository commit keyring #:key (default-authorizations '())) -- cgit v1.2.3 From 535a6be2e59e02585548194ab82b80012d8a9714 Mon Sep 17 00:00:00 2001 From: Royce Strange Date: Mon, 8 Jun 2020 20:12:24 -0500 Subject: system: Fix typo that breaks grub.cfg generation. * gnu/system.scm (boot-parameters->menu-entry): Delete quote to evalutate and get kernel boot parameters. Signed-off-by: Maxim Cournoyer --- gnu/system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index 21d0fbd190..081e0f2fb3 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -400,7 +400,7 @@ (define (boot-parameters->menu-entry conf) (device (boot-parameters-store-device conf)) (device-mount-point (boot-parameters-store-mount-point conf)) (linux (and (not multiboot?) kernel)) - (linux-arguments (if (not multiboot?) ' + (linux-arguments (if (not multiboot?) (boot-parameters-kernel-arguments conf) '())) (initrd (boot-parameters-initrd conf)) -- cgit v1.2.3 From 23567138f842136f83f318b5915457af882ca38a Mon Sep 17 00:00:00 2001 From: Royce Strange Date: Mon, 8 Jun 2020 20:13:10 -0500 Subject: system: vm: Add missing imported module. * gnu/system/vm.scm (qemu-image): Import missing (gnu build hurd-boot) module. Signed-off-by: Maxim Cournoyer --- gnu/system/vm.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 686e56348d..f2b6b71b4d 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -337,6 +337,7 @@ (define inputs* (with-extensions gcrypt-sqlite3&co (with-imported-modules `(,@(source-module-closure '((gnu build vm) (gnu build bootloader) + (gnu build hurd-boot) (guix store database) (guix build utils)) #:select? not-config?) -- cgit v1.2.3 From 1b5d26c967b17b635c88a094e010cd42a9afb220 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 24 May 2020 17:06:11 +0200 Subject: doc: Add note to 'udisks-service'. * doc/guix.texi (Desktop Services): Specify how to add file-systems utilities to 'udisks-service'. --- doc/guix.texi | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 13e3c017d3..15e077a41c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -16523,9 +16523,14 @@ Possible values are: @deffn {Scheme Procedure} udisks-service [#:udisks @var{udisks}] Return a service for @uref{https://udisks.freedesktop.org/docs/latest/, -UDisks}, a @dfn{disk management} daemon that provides user interfaces with -notifications and ways to mount/unmount disks. Programs that talk to UDisks -include the @command{udisksctl} command, part of UDisks, and GNOME Disks. +UDisks}, a @dfn{disk management} daemon that provides user interfaces +with notifications and ways to mount/unmount disks. Programs that talk +to UDisks include the @command{udisksctl} command, part of UDisks, and +GNOME Disks. Note that Udisks relies on the @command{mount} command, so +it will only be able to use the file-system utilities installed in the +system profile. For example if you want to be able to mount NTFS +file-systems in read and write fashion, you'll need to have +@code{ntfs-3g} installed system-wide. @end deffn @deffn {Scheme Variable} colord-service-type -- cgit v1.2.3 From 8423c2d3097da2d9d25b6f56c1971ac7147d3ad9 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 9 Jun 2020 10:23:15 +0200 Subject: build: image: Do not call make-essential-device-nodes by default. Calling "mknod" without root permissions fails. Plus those device nodes do not appear to be needed to boot. * gnu/build/image.scm (initialize-root-partition): Do not use make-essential-device-nodes as default make-device-nodes procedure. --- gnu/build/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index fb85bd4bb8..893b846976 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -161,8 +161,7 @@ (define* (initialize-root-partition root references-graphs (register-closures? #t) system-directory - (make-device-nodes - make-essential-device-nodes) + make-device-nodes #:allow-other-keys) "Initialize the given ROOT directory. Use BOOTCFG and BOOTCFG-LOCATION to install the bootloader configuration. @@ -175,7 +174,8 @@ (define* (initialize-root-partition root (populate-store references-graphs root) ;; Populate /dev. - (make-device-nodes root) + (when make-device-nodes + (make-device-nodes root)) (when register-closures? (for-each (lambda (closure) -- cgit v1.2.3 From f73ed5579157a074093bae7a2ffb59a85412be0d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 8 Jun 2020 15:14:49 +0200 Subject: installer: utils: Dump command output to syslog when testing. When debugging the installation tests, it can be very handy to be able to read "run-command" output, for instance when executing "guix system init". Introduce a new "invoke-with-log" procedure that is able to log a command standard and error outputs to the syslog. Use it, only when running the installation tests, to dump "run-command" output. * gnu/installer/utils.scm (open-pipe-with-stderr, invoke-with-log): New procedures, (invoke-log-port): new variable, (run-command): move to the end of the file and use invoke-with-log when running the installation tests. --- gnu/installer/utils.scm | 164 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 120 insertions(+), 44 deletions(-) diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm index 5f8fe8ca01..d73698df15 100644 --- a/gnu/installer/utils.scm +++ b/gnu/installer/utils.scm @@ -22,8 +22,13 @@ (define-module (gnu installer utils) #:use-module (guix build utils) #:use-module (guix i18n) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) + #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:use-module (ice-9 match) + #:use-module (ice-9 popen) #:use-module (ice-9 rdelim) #:use-module (ice-9 regex) #:use-module (ice-9 format) @@ -68,50 +73,6 @@ (define (read-percentage percentage) (and result (string->number (match:substring result 1))))) -(define* (run-command command #:key locale) - "Run COMMAND, a list of strings, in the given LOCALE. Return true if -COMMAND exited successfully, #f otherwise." - (define env (environ)) - - (define (pause) - (format #t (G_ "Press Enter to continue.~%")) - (send-to-clients '(pause)) - (environ env) ;restore environment variables - (match (select (cons (current-input-port) (current-clients)) - '() '()) - (((port _ ...) _ _) - (read-line port)))) - - (setenv "PATH" "/run/current-system/profile/bin") - - (when locale - (let ((supported? (false-if-exception - (setlocale LC_ALL locale)))) - ;; If LOCALE is not supported, then set LANGUAGE, which might at - ;; least give us translated messages. - (if supported? - (setenv "LC_ALL" locale) - (setenv "LANGUAGE" - (string-take locale - (or (string-index locale #\_) - (string-length locale))))))) - - (guard (c ((invoke-error? c) - (newline) - (format (current-error-port) - (G_ "Command failed with exit code ~a.~%") - (invoke-error-exit-status c)) - (syslog "command ~s failed with exit code ~a" - command (invoke-error-exit-status c)) - (pause) - #f)) - (syslog "running command ~s~%" command) - (apply invoke command) - (syslog "command ~s succeeded~%" command) - (newline) - (pause) - #t)) - ;;; ;;; Logging. @@ -219,3 +180,118 @@ (define remainder (current-clients (reverse remainder)) exp) + + +;;; +;;; Run commands. +;;; + +;; XXX: This is taken from (guix build utils) and could be factorized. +(define (open-pipe-with-stderr program . args) + "Run PROGRAM with ARGS in an input pipe, but, unlike 'open-pipe*', redirect +both its standard output and standard error to the pipe. Return two value: +the pipe to read PROGRAM's data from, and the PID of the child process running +PROGRAM." + ;; 'open-pipe*' doesn't attempt to capture stderr in any way, which is why + ;; we need to roll our own. + (match (pipe) + ((input . output) + (match (primitive-fork) + (0 + (dynamic-wind + (const #t) + (lambda () + (close-port input) + (close-port (syslog-port)) + (dup2 (fileno output) 1) + (dup2 (fileno output) 2) + (apply execlp program program args)) + (lambda () + (primitive-exit 127)))) + (pid + (close-port output) + (values input pid)))))) + +(define invoke-log-port + ;; Port used by INVOKE-WITH-LOG for logging. + (make-parameter #f)) + +(define* (invoke-with-log program . args) + "Invoke PROGRAM with ARGS and log PROGRAM's standard output and standard +error to INVOKE-LOG-PORT. If PROGRAM succeeds, print nothing and return the +unspecified value; otherwise, raise a '&message' error condition with the +status code. This procedure is very similar to INVOKE/QUIET with the +noticeable difference that the program output, that can be quite heavy, is not +stored but directly sent to INVOKE-LOG-PORT if defined." + (let-values (((pipe pid) + (apply open-pipe-with-stderr program args))) + (let loop () + (match (read-line pipe) + ((? eof-object?) + (close-port pipe) + (match (waitpid pid) + ((_ . status) + (unless (zero? status) + (raise + (condition (&invoke-error + (program program) + (arguments args) + (exit-status (status:exit-val status)) + (term-signal (status:term-sig status)) + (stop-signal (status:stop-sig status))))))))) + (line + (and=> (invoke-log-port) (cut format <> "~a~%" line)) + (loop)))))) + +(define* (run-command command #:key locale) + "Run COMMAND, a list of strings, in the given LOCALE. Return true if +COMMAND exited successfully, #f otherwise." + (define env (environ)) + + (define (pause) + (format #t (G_ "Press Enter to continue.~%")) + (send-to-clients '(pause)) + (environ env) ;restore environment variables + (match (select (cons (current-input-port) (current-clients)) + '() '()) + (((port _ ...) _ _) + (read-line port)))) + + (setenv "PATH" "/run/current-system/profile/bin") + + (when locale + (let ((supported? (false-if-exception + (setlocale LC_ALL locale)))) + ;; If LOCALE is not supported, then set LANGUAGE, which might at + ;; least give us translated messages. + (if supported? + (setenv "LC_ALL" locale) + (setenv "LANGUAGE" + (string-take locale + (or (string-index locale #\_) + (string-length locale))))))) + + (guard (c ((invoke-error? c) + (newline) + (format (current-error-port) + (G_ "Command failed with exit code ~a.~%") + (invoke-error-exit-status c)) + (syslog "command ~s failed with exit code ~a" + command (invoke-error-exit-status c)) + (pause) + #f)) + (syslog "running command ~s~%" command) + ;; If there are any connected clients, assume that we are running + ;; installation tests. In that case, dump the standard and error outputs + ;; to syslog. + (let ((testing? (not (null? (current-clients))))) + (if testing? + (parameterize ((invoke-log-port (syslog-port))) + (apply invoke-with-log command)) + (apply invoke command))) + (syslog "command ~s succeeded~%" command) + (newline) + (pause) + #t)) + +;;; utils.scm ends here -- cgit v1.2.3 From 5f7c4416b5afb95ece26bdb1d000e026387d002f Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 9 Jun 2020 10:33:04 +0200 Subject: Revert "installer: utils: Dump command output to syslog when testing." This reverts commit f73ed5579157a074093bae7a2ffb59a85412be0d. This was pushed by error, as this is not reviewed yet. --- gnu/installer/utils.scm | 164 +++++++++++++----------------------------------- 1 file changed, 44 insertions(+), 120 deletions(-) diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm index d73698df15..5f8fe8ca01 100644 --- a/gnu/installer/utils.scm +++ b/gnu/installer/utils.scm @@ -22,13 +22,8 @@ (define-module (gnu installer utils) #:use-module (guix build utils) #:use-module (guix i18n) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) - #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) - #:use-module (srfi srfi-34) - #:use-module (srfi srfi-35) #:use-module (ice-9 match) - #:use-module (ice-9 popen) #:use-module (ice-9 rdelim) #:use-module (ice-9 regex) #:use-module (ice-9 format) @@ -73,6 +68,50 @@ (define (read-percentage percentage) (and result (string->number (match:substring result 1))))) +(define* (run-command command #:key locale) + "Run COMMAND, a list of strings, in the given LOCALE. Return true if +COMMAND exited successfully, #f otherwise." + (define env (environ)) + + (define (pause) + (format #t (G_ "Press Enter to continue.~%")) + (send-to-clients '(pause)) + (environ env) ;restore environment variables + (match (select (cons (current-input-port) (current-clients)) + '() '()) + (((port _ ...) _ _) + (read-line port)))) + + (setenv "PATH" "/run/current-system/profile/bin") + + (when locale + (let ((supported? (false-if-exception + (setlocale LC_ALL locale)))) + ;; If LOCALE is not supported, then set LANGUAGE, which might at + ;; least give us translated messages. + (if supported? + (setenv "LC_ALL" locale) + (setenv "LANGUAGE" + (string-take locale + (or (string-index locale #\_) + (string-length locale))))))) + + (guard (c ((invoke-error? c) + (newline) + (format (current-error-port) + (G_ "Command failed with exit code ~a.~%") + (invoke-error-exit-status c)) + (syslog "command ~s failed with exit code ~a" + command (invoke-error-exit-status c)) + (pause) + #f)) + (syslog "running command ~s~%" command) + (apply invoke command) + (syslog "command ~s succeeded~%" command) + (newline) + (pause) + #t)) + ;;; ;;; Logging. @@ -180,118 +219,3 @@ (define remainder (current-clients (reverse remainder)) exp) - - -;;; -;;; Run commands. -;;; - -;; XXX: This is taken from (guix build utils) and could be factorized. -(define (open-pipe-with-stderr program . args) - "Run PROGRAM with ARGS in an input pipe, but, unlike 'open-pipe*', redirect -both its standard output and standard error to the pipe. Return two value: -the pipe to read PROGRAM's data from, and the PID of the child process running -PROGRAM." - ;; 'open-pipe*' doesn't attempt to capture stderr in any way, which is why - ;; we need to roll our own. - (match (pipe) - ((input . output) - (match (primitive-fork) - (0 - (dynamic-wind - (const #t) - (lambda () - (close-port input) - (close-port (syslog-port)) - (dup2 (fileno output) 1) - (dup2 (fileno output) 2) - (apply execlp program program args)) - (lambda () - (primitive-exit 127)))) - (pid - (close-port output) - (values input pid)))))) - -(define invoke-log-port - ;; Port used by INVOKE-WITH-LOG for logging. - (make-parameter #f)) - -(define* (invoke-with-log program . args) - "Invoke PROGRAM with ARGS and log PROGRAM's standard output and standard -error to INVOKE-LOG-PORT. If PROGRAM succeeds, print nothing and return the -unspecified value; otherwise, raise a '&message' error condition with the -status code. This procedure is very similar to INVOKE/QUIET with the -noticeable difference that the program output, that can be quite heavy, is not -stored but directly sent to INVOKE-LOG-PORT if defined." - (let-values (((pipe pid) - (apply open-pipe-with-stderr program args))) - (let loop () - (match (read-line pipe) - ((? eof-object?) - (close-port pipe) - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (raise - (condition (&invoke-error - (program program) - (arguments args) - (exit-status (status:exit-val status)) - (term-signal (status:term-sig status)) - (stop-signal (status:stop-sig status))))))))) - (line - (and=> (invoke-log-port) (cut format <> "~a~%" line)) - (loop)))))) - -(define* (run-command command #:key locale) - "Run COMMAND, a list of strings, in the given LOCALE. Return true if -COMMAND exited successfully, #f otherwise." - (define env (environ)) - - (define (pause) - (format #t (G_ "Press Enter to continue.~%")) - (send-to-clients '(pause)) - (environ env) ;restore environment variables - (match (select (cons (current-input-port) (current-clients)) - '() '()) - (((port _ ...) _ _) - (read-line port)))) - - (setenv "PATH" "/run/current-system/profile/bin") - - (when locale - (let ((supported? (false-if-exception - (setlocale LC_ALL locale)))) - ;; If LOCALE is not supported, then set LANGUAGE, which might at - ;; least give us translated messages. - (if supported? - (setenv "LC_ALL" locale) - (setenv "LANGUAGE" - (string-take locale - (or (string-index locale #\_) - (string-length locale))))))) - - (guard (c ((invoke-error? c) - (newline) - (format (current-error-port) - (G_ "Command failed with exit code ~a.~%") - (invoke-error-exit-status c)) - (syslog "command ~s failed with exit code ~a" - command (invoke-error-exit-status c)) - (pause) - #f)) - (syslog "running command ~s~%" command) - ;; If there are any connected clients, assume that we are running - ;; installation tests. In that case, dump the standard and error outputs - ;; to syslog. - (let ((testing? (not (null? (current-clients))))) - (if testing? - (parameterize ((invoke-log-port (syslog-port))) - (apply invoke-with-log command)) - (apply invoke command))) - (syslog "command ~s succeeded~%" command) - (newline) - (pause) - #t)) - -;;; utils.scm ends here -- cgit v1.2.3 From ea80cdbcea3763ded87d2fc3b5e97a427a6bb1d4 Mon Sep 17 00:00:00 2001 From: Royce Strange Date: Mon, 8 Jun 2020 21:53:30 -0500 Subject: activation: Fix function call for system activation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/build/activation.scm (boot-time-system): Evaluate the linux-command-line thunk for linux systems to boot Signed-off-by: Ludovic Courtès --- gnu/build/activation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index b915e6bb67..4b67926e88 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -321,7 +321,7 @@ (define %current-system (define (boot-time-system) "Return the '--system' argument passed on the kernel command line." (find-long-option "--system" (if (string-contains %host-type "linux-gnu") - linux-command-line + (linux-command-line) (command-line)))) (define* (activate-current-system -- cgit v1.2.3 From 7a45b5d5ba892e82fba836df94a6c6889e08c959 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 5 Jun 2020 10:38:32 +0200 Subject: store: Use buffered I/O for all protocol writes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/store.scm (run-gc) Use buffered output port. (export-path) Same. (add-file-tree-to-store) Same. (set-build-options): Same. Add explicit flush. Signed-off-by: Ludovic Courtès --- guix/store.scm | 70 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/guix/store.scm b/guix/store.scm index 014d08aaec..9b3879b4a7 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Jan Nieuwenhuizen ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2020 Florian Pelz +;;; Copyright © 2020 Lars-Dominik Braun ;;; ;;; This file is part of GNU Guix. ;;; @@ -821,8 +822,8 @@ (define* (set-build-options server (locale (false-if-exception (setlocale LC_ALL)))) ;; Must be called after `open-connection'. - (define socket - (store-connection-socket server)) + (define buffered + (store-connection-output-port server)) (unless (unspecified? use-build-hook?) (warn-about-deprecation #:use-build-hook? #f @@ -831,9 +832,9 @@ (define socket (let-syntax ((send (syntax-rules () ((_ (type option) ...) (begin - (write-arg type option socket) + (write-arg type option buffered) ...))))) - (write-int (operation-id set-options) socket) + (write-int (operation-id set-options) buffered) (send (boolean keep-failed?) (boolean keep-going?) (boolean fallback?) (integer verbosity)) (when (< (store-connection-minor-version server) #x61) @@ -896,6 +897,7 @@ (define socket `(("locale" . ,locale)) '())))) (send (string-pairs pairs)))) + (write-buffered-output server) (let loop ((done? (process-stderr server))) (or done? (process-stderr server))))) @@ -1108,13 +1110,14 @@ (define add-to-store ;; We don't use the 'operation' macro so we can pass SELECT? to ;; 'write-file'. (record-operation 'add-to-store) - (let ((port (store-connection-socket server))) - (write-int (operation-id add-to-store) port) - (write-string basename port) - (write-int 1 port) ;obsolete, must be #t - (write-int (if recursive? 1 0) port) - (write-string hash-algo port) - (write-file file-name port #:select? select?) + (let ((port (store-connection-socket server)) + (buffered (store-connection-output-port server))) + (write-int (operation-id add-to-store) buffered) + (write-string basename buffered) + (write-int 1 buffered) ;obsolete, must be #t + (write-int (if recursive? 1 0) buffered) + (write-string hash-algo buffered) + (write-file file-name buffered #:select? select?) (write-buffered-output server) (let loop ((done? (process-stderr server))) (or done? (loop (process-stderr server)))) @@ -1220,13 +1223,14 @@ (define cache ;; We don't use the 'operation' macro so we can use 'write-file-tree' ;; instead of 'write-file'. (record-operation 'add-to-store/tree) - (let ((port (store-connection-socket server))) - (write-int (operation-id add-to-store) port) - (write-string basename port) - (write-int 1 port) ;obsolete, must be #t - (write-int (if recursive? 1 0) port) - (write-string hash-algo port) - (write-file-tree basename port + (let ((port (store-connection-socket server)) + (buffered (store-connection-output-port server))) + (write-int (operation-id add-to-store) buffered) + (write-string basename buffered) + (write-int 1 buffered) ;obsolete, must be #t + (write-int (if recursive? 1 0) buffered) + (write-string hash-algo buffered) + (write-file-tree basename buffered #:file-type+size file-type+size #:file-port file-port #:symlink-target symlink-target @@ -1644,17 +1648,19 @@ (define (run-gc server action to-delete min-freed) #f. MIN-FREED is the minimum amount of disk space to be freed, in bytes, before the GC can stop. Return the list of store paths delete, and the number of bytes freed." - (let ((s (store-connection-socket server))) - (write-int (operation-id collect-garbage) s) - (write-int action s) - (write-store-path-list to-delete s) - (write-arg boolean #f s) ; ignore-liveness? - (write-long-long min-freed s) - (write-int 0 s) ; obsolete + (let ((s (store-connection-socket server)) + (buffered (store-connection-output-port server))) + (write-int (operation-id collect-garbage) buffered) + (write-int action buffered) + (write-store-path-list to-delete buffered) + (write-arg boolean #f buffered) ; ignore-liveness? + (write-long-long min-freed buffered) + (write-int 0 buffered) ; obsolete (when (>= (store-connection-minor-version server) 5) ;; Obsolete `use-atime' and `max-atime' parameters. - (write-int 0 s) - (write-int 0 s)) + (write-int 0 buffered) + (write-int 0 buffered)) + (write-buffered-output server) ;; Loop until the server is done sending error output. (let loop ((done? (process-stderr server))) @@ -1711,10 +1717,12 @@ (define (import-paths server port) (define* (export-path server path port #:key (sign? #t)) "Export PATH to PORT. When SIGN? is true, sign it." - (let ((s (store-connection-socket server))) - (write-int (operation-id export-path) s) - (write-store-path path s) - (write-arg boolean sign? s) + (let ((s (store-connection-socket server)) + (buffered (store-connection-output-port server))) + (write-int (operation-id export-path) buffered) + (write-store-path path buffered) + (write-arg boolean sign? buffered) + (write-buffered-output server) (let loop ((done? (process-stderr server port))) (or done? (loop (process-stderr server port)))) (= 1 (read-int s)))) -- cgit v1.2.3 From dacd126640bfcc5883b0ef618b8ac7a48c1f2d92 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sat, 6 Jun 2020 11:42:49 +0200 Subject: gnu: icedove: Update to 68.9.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnuzilla.scm (%icedove-build-id): Update. (icedove): Update version and corresponding hg changeset. Signed-off-by: Ludovic Courtès --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e00a09e989..1f5deb3302 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1135,11 +1135,11 @@ (define-public icecat (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20200505000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20200602000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "68.8.0") + (version "68.9.0") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1425,7 +1425,7 @@ (define-public icedove ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "4c022a34cd5dd776671721c44db89f693f59132c")) + ,(let ((changeset "787d887f43fcbfe254ff0c9650c5517710071b74")) (origin (method hg-fetch) (uri (hg-reference @@ -1434,7 +1434,7 @@ (define-public icedove (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "0k3653ic1g5pwcmf87a95lbzjah25l9qx0r49c4j04c21069fhad"))))) + "1z1k3r1jilwmsywiyp8gh49f61cl9n085k95x7ihyld3rvgcjm9f"))))) ("autoconf" ,autoconf-2.13) ("cargo" ,rust "cargo") ("clang" ,clang) -- cgit v1.2.3 From fbc1cbb527b4c0e953d19fee537188c748621977 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 16:25:37 -0500 Subject: gnu: Add apache-thrift. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/rpc.scm (apache-thrift): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/rpc.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index 28c61b54f9..de7d08ae4d 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -25,10 +25,16 @@ (define-module (gnu packages rpc) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages adns) + #:use-module (gnu packages autotools) + #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) + #:use-module (gnu packages flex) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -192,3 +198,46 @@ (define-public python-grpcio (description "This package provides a Python library for communicating with the HTTP/2-based RPC framework gRPC.") (license license:asl2.0))) + +(define-public apache-thrift + (package + (name "apache-thrift") + (version "0.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/thrift.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17ckl7p7s3ga33yrjisilsimp80ansqxl54wvpkv0j7vx2zvc13y")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:configure-flags + (list (string-append "--with-boost=" + (assoc-ref %build-inputs "boost"))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("flex" ,flex) + ("bison" ,bison))) + (inputs + `(("boost" ,boost) + ("libressl" ,libressl))) + (outputs '("out" "lib" "include")) + (home-page "https://thrift.apache.org/") + (synopsis + "Lightweight, language-independent software stack for point-to-point +RPC") + (description + "Thrift provides clean abstractions and implementations for data +transport, data serialization, and application level processing. The code +generation system takes a simple definition language as input and generates +code across programming languages that uses the abstracted stack to build +interoperable RPC clients and servers.") + (license license:asl2.0))) -- cgit v1.2.3 From a50628bbe0fa4ba3835e311098e4fdf7a1d8a29e Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 16:33:36 -0500 Subject: gnu: apache-arrow: Update to 0.17.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (apache-arrow): Update to 0.17.1. * gnu/packages/databases.scm (python-pyarrow): Update to 0.17.1. * gnu/packages/serialization.scm (python-feather-format): Update to 0.4.1. Signed-off-by: Ludovic Courtès --- gnu/packages/databases.scm | 145 ++++++++++++++++++++++++++++------------- gnu/packages/serialization.scm | 4 +- 2 files changed, 100 insertions(+), 49 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c8cbac5a07..e0634b7aca 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -88,7 +88,9 @@ (define-module (gnu packages databases) #:use-module (gnu packages language) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) + #:use-module (gnu packages logging) #:use-module (gnu packages man) + #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages parallel) @@ -98,6 +100,7 @@ (define-module (gnu packages databases) #:use-module (gnu packages perl-web) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) @@ -105,6 +108,8 @@ (define-module (gnu packages databases) #:use-module (gnu packages python-xyz) #:use-module (gnu packages rdf) #:use-module (gnu packages readline) + #:use-module (gnu packages regex) + #:use-module (gnu packages rpc) #:use-module (gnu packages ruby) #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) @@ -3216,20 +3221,22 @@ (define-public mongo-tools @end table") (license license:asl2.0))) +;; There are many wrappers for this in other languages. When touching, please +;; be sure to ensure all dependencies continue to build. (define-public apache-arrow (package (name "apache-arrow") - (version "0.10.0") + (version "0.17.1") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/apache/arrow") - (commit (string-append "apache-arrow-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04xkp922b8qrrnpvv9ixxnvk7151n1plzx6aqdff6frn9651zvxs")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/arrow") + (commit (string-append "apache-arrow-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02r6yx3yhywzikd3b0vfkjgddhfiriyx2vpm3jf5880wq59x798a")))) (build-system cmake-build-system) (arguments `(#:tests? #f @@ -3242,91 +3249,135 @@ (define-public apache-arrow (setenv "BOOST_ROOT" (assoc-ref %build-inputs "boost")) (setenv "BROTLI_HOME" (assoc-ref %build-inputs "brotli")) (setenv "FLATBUFFERS_HOME" (assoc-ref %build-inputs "flatbuffers")) - (setenv "JEMALLOC_HOME" (assoc-ref %build-inputs "jemalloc")) (setenv "RAPIDJSON_HOME" (assoc-ref %build-inputs "rapidjson")) #t))) #:build-type "Release" #:configure-flags (list "-DARROW_PYTHON=ON" - - ;; Install to PREFIX/lib (the default is - ;; PREFIX/lib64). - (string-append "-DCMAKE_INSTALL_LIBDIR=" - (assoc-ref %outputs "out") + "-DARROW_GLOG=ON" + ;; Parquet options + "-DARROW_PARQUET=ON" + "-DPARQUET_BUILD_EXECUTABLES=ON" + ;; The maintainers disallow using system versions of + ;; jemalloc: + ;; https://issues.apache.org/jira/browse/ARROW-3507. This + ;; is unfortunate because jemalloc increases performance: + ;; https://arrow.apache.org/blog/2018/07/20/jemalloc/. + "-DARROW_JEMALLOC=OFF" + + ;; The CMake option ARROW_DEPENDENCY_SOURCE is a global + ;; option that instructs the build system how to resolve + ;; each dependency. SYSTEM = Finding the dependency in + ;; system paths using CMake's built-in find_package + ;; function, or using pkg-config for packages that do not + ;; have this feature + "-DARROW_DEPENDENCY_SOURCE=SYSTEM" + + ;; Split output into its component packages. + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "lib")) + (string-append "-DCMAKE_INSTALL_RPATH=" + (assoc-ref %outputs "lib") "/lib") - - ;; XXX These Guix package offer static - ;; libraries that are not position independent, - ;; and ld fails to link them into the arrow .so - "-DARROW_WITH_SNAPPY=OFF" - "-DARROW_WITH_ZLIB=OFF" - "-DARROW_WITH_ZSTD=OFF" - "-DARROW_WITH_LZ4=OFF" + (string-append "-DCMAKE_INSTALL_BINDIR=" + (assoc-ref %outputs "out") + "/bin") + (string-append "-DCMAKE_INSTALL_INCLUDEDIR=" + (assoc-ref %outputs "include") + "/share/include") + + + "-DARROW_WITH_SNAPPY=ON" + "-DARROW_WITH_ZLIB=ON" + "-DARROW_WITH_ZSTD=ON" + "-DARROW_WITH_LZ4=ON" + "-DARROW_COMPUTE=ON" + "-DARROW_CSV=ON" + "-DARROW_DATASET=ON" + "-DARROW_FILESYSTEM=ON" + "-DARROW_HDFS=ON" + "-DARROW_JSON=ON" + ;; Arrow Python C++ integration library (required for + ;; building pyarrow). This library must be built against + ;; the same Python version for which you are building + ;; pyarrow. NumPy must also be installed. Enabling this + ;; option also enables ARROW_COMPUTE, ARROW_CSV, + ;; ARROW_DATASET, ARROW_FILESYSTEM, ARROW_HDFS, and + ;; ARROW_JSON. + "-DARROW_PYTHON=ON" ;; Building the tests forces on all the ;; optional features and the use of static ;; libraries. "-DARROW_BUILD_TESTS=OFF" + "-DBENCHMARK_ENABLE_GTEST_TESTS=OFF" + ;;"-DBENCHMARK_ENABLE_TESTING=OFF" "-DARROW_BUILD_STATIC=OFF"))) (inputs `(("boost" ,boost) - ("rapidjson" ,rapidjson) ("brotli" ,google-brotli) - ("flatbuffers" ,flatbuffers) - ("jemalloc" ,jemalloc) + ("double-conversion" ,double-conversion) + ("snappy" ,snappy) + ("gflags" ,gflags) + ("glog" ,glog) + ("apache-thrift" ,apache-thrift "lib") + ("protobuf" ,protobuf) + ("rapidjson" ,rapidjson) + ("zlib" ,zlib) + ("bzip2" ,bzip2) + ("lz4" ,lz4) + ("zstd" ,zstd "lib") + ("re2" ,re2) + ("grpc" ,grpc) ("python-3" ,python) ("python-numpy" ,python-numpy))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (outputs '("out" "lib" "include")) (home-page "https://arrow.apache.org/") (synopsis "Columnar in-memory analytics") (description "Apache Arrow is a columnar in-memory analytics layer -designed to accelerate big data. It houses a set of canonical in-memory +designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple -language-bindings for structure manipulation. It also provides IPC and common +language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.") (license license:asl2.0))) (define-public python-pyarrow (package + (inherit apache-arrow) (name "python-pyarrow") - (version "0.10.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/apache/arrow") - (commit (string-append "apache-arrow-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04xkp922b8qrrnpvv9ixxnvk7151n1plzx6aqdff6frn9651zvxs")))) (build-system python-build-system) (arguments - '(#:tests? #f ; XXX There are no tests in the "python" directory + '(#:tests? #f ; XXX There are no tests in the "python" directory #:phases (modify-phases %standard-phases (delete 'build) ; XXX the build is performed again during the install phase (add-after 'unpack 'enter-source-directory (lambda _ (chdir "python") #t)) - (add-after 'unpack 'set-env + (add-after 'unpack 'make-git-checkout-writable (lambda _ - (setenv "ARROW_HOME" (assoc-ref %build-inputs "apache-arrow")) + (for-each make-file-writable (find-files ".")) #t))))) (propagated-inputs - `(("apache-arrow" ,apache-arrow) + `(("apache-arrow" ,apache-arrow "lib") ("python-numpy" ,python-numpy) ("python-pandas" ,python-pandas) ("python-six" ,python-six))) (native-inputs `(("cmake" ,cmake-minimal) + ("pkg-config" ,pkg-config) ("python-cython" ,python-cython) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) ("python-setuptools-scm" ,python-setuptools-scm))) + (outputs '("out")) (home-page "https://arrow.apache.org/docs/python/") (synopsis "Python bindings for Apache Arrow") - (description "This library provides a Pythonic API wrapper for the reference -Arrow C++ implementation, along with tools for interoperability with pandas, -NumPy, and other traditional Python scientific computing packages.") + (description + "This library provides a Pythonic API wrapper for the reference Arrow C++ +implementation, along with tools for interoperability with pandas, NumPy, and +other traditional Python scientific computing packages.") (license license:asl2.0))) (define-public python2-pyarrow diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index bee7a2e917..be81715116 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -467,14 +467,14 @@ (define-public flatbuffers (define-public python-feather-format (package (name "python-feather-format") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (pypi-uri "feather-format" version)) (sha256 (base32 - "1adivm5w5ji4qv7hq7942vqlk8l2wgw87bdlsia771z14z3zp857")))) + "00w9hwz7sj3fkdjc378r066vdy6lpxmn6vfac3qx956k8lvpxxj5")))) (build-system python-build-system) (propagated-inputs `(("python-pandas" ,python-pandas) -- cgit v1.2.3 From 141b5c162048f5cb52e8c90ff7c16a2e98babcfb Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 9 Jun 2020 10:44:59 +0200 Subject: gnu: emacs-helm: Update to 3.6.2. * gnu/packages/emacs-xyz.scm (emacs-helm): Update to 3.6.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b44652fbba..946d01cba5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7780,7 +7780,7 @@ (define-public emacs-wgrep (define-public emacs-helm (package (name "emacs-helm") - (version "3.6.0") + (version "3.6.2") (source (origin (method git-fetch) @@ -7789,7 +7789,7 @@ (define-public emacs-helm (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0miq2q52pbicijp7pmj0widk252qixswywc03d120s4hya2b7vd7")))) + (base32 "0bf2glydc0vhp52z8zg8phmsglb63nac15zd82zr35dscc50bzrb")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit v1.2.3 From 536c53d347291dcc75e1073af6e6c5c614e0fff4 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 9 Jun 2020 14:16:59 +0200 Subject: gnu: grub: Support graphical gfxterm on all systems. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/bootloaders/grub.scm (eye-candy): Use gfxterm depending only on (bootloader-configuration (terminal-outputs …)), which defaults to '(gfxterm). This makes the system argument obsolete. Signed-off-by: Mathieu Othacehe --- gnu/bootloader/grub.scm | 47 ++++++++++++++--------------------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index d4dbb57131..fa391fd6b4 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020 Stefan ;;; ;;; This file is part of GNU Guix. ;;; @@ -135,41 +136,25 @@ (define* (grub-background-image config) (_ #f))))) (define* (eye-candy config store-device store-mount-point - #:key store-directory-prefix system port) + #:key store-directory-prefix port) "Return a gexp that writes to PORT (a port-valued gexp) the 'grub.cfg' part concerned with graphics mode, background images, colors, and all that. STORE-DEVICE designates the device holding the store, and STORE-MOUNT-POINT is its mount point; these are used to determine where the background image and -fonts must be searched for. SYSTEM must be the target system string---e.g., -\"x86_64-linux\". STORE-DIRECTORY-PREFIX is a directory prefix to prepend to -any store file name." - (define setup-gfxterm-body - (let ((gfxmode - (or (and-let* ((theme (bootloader-configuration-theme config)) - (gfxmode (grub-theme-gfxmode theme))) - (string-join gfxmode ";")) - "auto"))) - - ;; Intel and EFI systems need to be switched into graphics mode, whereas - ;; most other modern architectures have no other mode and therefore - ;; don't need to be switched. - - ;; XXX: Do we really need to restrict to x86 systems? We could imitate - ;; what the GRUB default configuration does and decide based on whether - ;; a user provided 'gfxterm' in the terminal-outputs field of their - ;; bootloader-configuration record. - (if (string-match "^(x86_64|i[3-6]86)-" system) - (format #f " - set gfxmode=~a - insmod all_video - insmod gfxterm~%" gfxmode) - ""))) - +fonts must be searched for. STORE-DIRECTORY-PREFIX is a directory prefix to +prepend to any store file name." (define (setup-gfxterm config font-file) (if (memq 'gfxterm (bootloader-configuration-terminal-outputs config)) - #~(format #f "if loadfont ~a; then - setup_gfxterm -fi~%" #+font-file) + #~(format #f " +if loadfont ~a; then + set gfxmode=~a + insmod all_video + insmod gfxterm +fi~%" + #$font-file + #$(string-join + (grub-theme-gfxmode (bootloader-theme config)) + ";")) "")) (define (theme-colors type) @@ -190,8 +175,6 @@ (define image (and image #~(format #$port " -function setup_gfxterm {~a} - # Set 'root' to the partition that contains /gnu/store. ~a @@ -206,7 +189,6 @@ (define image set menu_color_normal=cyan/blue set menu_color_highlight=white/blue fi~%" - #$setup-gfxterm-body #$(grub-root-search store-device font-file) #$(setup-gfxterm config font-file) #$(grub-setup-io config) @@ -380,7 +362,6 @@ (define (sugar) device mount-point #:store-directory-prefix store-directory-prefix - #:system system #:port #~port))) (define keyboard-layout-config -- cgit v1.2.3 From 5648ce07ff94ce9764de358c562423960a01988f Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 7 May 2020 18:25:26 +0200 Subject: gnu: guix: Update to 141b5c1620. * gnu/packages/package-management.scm (guix): Update to 1.1.0-1.141b5c1620. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b1c96f18e7..c1e6657dff 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "ab9e30039d9312285ea3f4ed43f81c9c2c0dae08") - (revision 9)) + (commit "141b5c162048f5cb52e8c90ff7c16a2e98babcfb") + (revision 10)) (package (name "guix") @@ -135,7 +135,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "0qb2haf5dyq5x1hcjyx58v455lzi6ffa68ldm0615jy25w5phmxq")) + "1j3vag994kj05b09a7w4lyas991a19hbbslcm9xvn5k2ilf4qskz")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From ce16b07d10ebda486d6e4cb6fd30fe797125aeac Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 9 Jun 2020 12:33:38 +0200 Subject: installer: final: Remove left-over pk call. * gnu/installer/final.scm (kill-cow-users): Remove pk call. --- gnu/installer/final.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index ece1aff95c..90c76e9d5f 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -127,7 +127,7 @@ (define %not-nul (lambda (port) (match (string-tokenize (read-string port) %not-nul) ((argv0 _ ...) - (unless (member (pk (basename argv0)) spare) + (unless (member (basename argv0) spare) (syslog "Killing process ~a (~a)~%" pid argv0) (kill pid SIGKILL))) (_ #f)))))) -- cgit v1.2.3 From 9392652e911b3963ef0f52f39677a6fc953f1e1e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 9 Jun 2020 17:29:23 +0200 Subject: installer: final: Dump "guix system init" command output when testing. When debugging the installation tests, it can be very handy to be able to read "guix system init" command output. * gnu/installer/final.scm (install-system): Dump installation command output to the console when running the installation tests. --- gnu/installer/final.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index 90c76e9d5f..e06b104d59 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -205,7 +205,18 @@ (define* (install-system locale #:key (users '())) (lambda () (start-service 'cow-store (list (%installer-target-dir)))) (lambda () - (run-command install-command #:locale locale)) + ;; If there are any connected clients, assume that we are running + ;; installation tests. In that case, dump the standard and error + ;; outputs to syslog. + (if (not (null? (current-clients))) + (with-output-to-file "/dev/console" + (lambda () + (with-error-to-file "/dev/console" + (lambda () + (setvbuf (current-output-port) 'none) + (setvbuf (current-error-port) 'none) + (run-command install-command #:locale locale))))) + (run-command install-command #:locale locale))) (lambda () (stop-service 'cow-store) ;; Remove the store overlay created at cow-store service start. -- cgit v1.2.3 From 5681ce50745203c4ee3a469f1b9bb0a24c4090fb Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 9 Jun 2020 17:44:52 +0200 Subject: services: etc: Add '/etc/ttys' symlink for the Hurd. Reported by Vitaliy Shatrov via IRC. * gnu/system.scm (operating-system-etc-service): For the Hurd, add '/etc/ttys' symlink. This fixes terminal behavior in the console by setting TERM=hurd. --- gnu/system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index 081e0f2fb3..d51691fe76 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -847,7 +847,8 @@ (define* (operating-system-etc-service os) ,@(if sudoers `(("sudoers" ,sudoers)) '()) ,@(if hurd `(("login" ,(file-append hurd "/etc/login")) - ("motd" ,(file-append hurd "/etc/motd"))) + ("motd" ,(file-append hurd "/etc/motd")) + ("ttys" ,(file-append hurd "/etc/ttys"))) '()))))) (define %root-account -- cgit v1.2.3 From 80352a2f6878a3a51c3e26cb768b9ae3d63a5de7 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 9 Jun 2020 18:47:13 +0200 Subject: bootloader: grub: Fix cross-compilation. This is a follow-up of 536c53d347291dcc75e1073af6e6c5c614e0fff4, that do not use the native version of "font-file", breaking cross-compilation. * gnu/bootloader/grub.scm (eye-candy): Use the native version of "font-file". --- gnu/bootloader/grub.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index fa391fd6b4..b905ae360c 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -151,7 +151,7 @@ (define (setup-gfxterm config font-file) insmod all_video insmod gfxterm fi~%" - #$font-file + #+font-file #$(string-join (grub-theme-gfxmode (bootloader-theme config)) ";")) -- cgit v1.2.3 From d7a341f8e186279a6be11fbc25c5347d6925145f Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 11 May 2020 12:00:16 +0200 Subject: gnu: Add yml2. * gnu/packages/pep.scm: New file. * gnu/locak.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/pep.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 gnu/packages/pep.scm diff --git a/gnu/local.mk b/gnu/local.mk index b4d7ba5174..8f39c1c036 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -413,6 +413,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/pcre.scm \ %D%/packages/pdf.scm \ %D%/packages/pem.scm \ + %D%/packages/pep.scm \ %D%/packages/perl.scm \ %D%/packages/perl-check.scm \ %D%/packages/perl-compression.scm \ diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm new file mode 100644 index 0000000000..9e5be66f78 --- /dev/null +++ b/gnu/packages/pep.scm @@ -0,0 +1,49 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016, 2020 Hartmut Goebel +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages pep) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix hg-download) + #:use-module (guix build-system python) + #:use-module (gnu packages) + #:use-module (gnu packages xml)) + +(define-public yml2 + (package + (name "yml2") + (version "2.6.3") + (source (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/yml2") + (changeset version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "10jjjyq1mz18zkzvxd62aba00h69gd9cglisqcvb81j67ml2v1bx")))) + (build-system python-build-system) + (propagated-inputs + `(("python-lxml" ,python-lxml))) + (home-page "https://fdik.org/yml/") + (synopsis "Use a Domain Specific Language for XML without defining +a grammar") + (description "The YML compiler is a small Python script. It +provides the command line front end yml2c. As default, it compiles +your script and outputs to stdout, that usually is the terminal. Your +shell provides options to redirect the output into a pipe or a file.") + (license license:gpl2))) -- cgit v1.2.3 From 221c514451917caa98060cdb285454bacfc25014 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 May 2020 23:48:40 +0200 Subject: gnu: Add pep-engine. * gnu/packages/pep.scm (fdik-libetpan, sequoia4pEp, pep-engine): New variables. --- gnu/packages/pep.scm | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index 9e5be66f78..d7121d6dd6 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -19,9 +19,19 @@ (define-module (gnu packages pep) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix git-download) #:use-module (guix hg-download) + #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages linux) + #:use-module (gnu packages mail) ; for libetpan + #:use-module (gnu packages nettle) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages sequoia) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages tls) #:use-module (gnu packages xml)) (define-public yml2 @@ -47,3 +57,99 @@ (define-public yml2 your script and outputs to stdout, that usually is the terminal. Your shell provides options to redirect the output into a pipe or a file.") (license license:gpl2))) + +(define fdik-libetpan + ;; pEp Engine requires libetpan with a set of patches that have not been + ;; upstreamed yet. + (let ((commit "210ba2b3b310b8b7a6ee4a4e35e50f7fa379643f") ; 2020-06-03 + (checksum "00000nij3ray7nssvq0lzb352wmnab8ffzk7dgff2c68mvjbh1l6") + (revision "5")) + (package + (inherit libetpan) + (name "fdik-libetpan") + (version (string-append "1.6-" revision "." (string-take commit 8))) + (source + (origin + (inherit (package-source libetpan)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/fdik/libetpan") + (commit commit))) + (file-name (string-append name "-" version)) + (sha256 (base32 checksum))))))) + +(define sequoia4pEp + ;; Currently pEp Engine requires sequoia in not-so-current version + (package/inherit sequoia + (name "sequoia") + (version "0.15.0-pEp") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/sequoia-pgp/sequoia.git") + (commit "0eb1b6cd846ea8c36b3dfdf01ec88383fc64f2fe"))) + (sha256 + (base32 "06dqs9whwp9lfibwp8dqm0aw4nm3s3v4jp2n4fz51zcvsld40nfh")) + (file-name (git-file-name name version)))))) + +(define-public pep-engine + (package + (name "pep-engine") + (version "2.0.6") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/pEpEngine") + (changeset "ebb62ba262dd"))) ;; r4721 + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "0ljf79j4ng7l8w6pbdcrfzb4yk51zslypvq0n72ib1d7grqvnagi")))) + (build-system gnu-build-system) + (arguments + '(#:parallel-build? #f + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; pEpEngie does not use autotools and configure, + ;; but a local.conf. We need to tweak the values there. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (yml2 (assoc-ref inputs "yml2"))) + (with-output-to-file "local.conf" + (lambda () + (format #t " +PREFIX=~a +PER_MACHINE_DIRECTORY=${PREFIX}/share/pEp +SYSTEM_DB=~a/share/pEp/system.db +ASN1C=~a +YML2_PATH=~a +OPENPGP=SEQUOIA +" + out out (which "asn1c") + (string-append yml2 "/bin")))) + #t))) + (delete 'check) + (add-after 'install 'install-db + (lambda _ + (invoke "make" "-C" "db" "install")))))) + (native-inputs + `(("asn1c" ,asn1c) ; >= 0.9.27 + ("pkg-config" ,pkg-config) + ("yml2" ,yml2))) + (inputs + `(("libetpan" ,fdik-libetpan) + ("libiconv" ,libiconv) + ("nettle" ,nettle) + ("openssl" ,openssl) + ("sequoia" ,sequoia4pEp) + ("sqlite3" ,sqlite) + ("util-linux" ,util-linux "lib"))) ;; uuid.h + (home-page "https://pep.foundation/") + (synopsis "Library for automatic key management and encryption of +messages") + (description "The p≡p engine is the core part of p≡p (pretty Easy +privacy).") + (license ;; code: GPL 3, docs: CC-BY-SA + (list license:gpl3 license:cc-by-sa3.0)))) -- cgit v1.2.3 From cfd15d96e612d0017da2f8e515da7af1ebd65231 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 May 2020 23:52:43 +0200 Subject: gnu: Add libpepadapter. * gnu/packages/pep.scm (libpepadapter): New variable. --- gnu/packages/pep.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index d7121d6dd6..27993d4f1b 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -153,3 +153,44 @@ (define-public pep-engine privacy).") (license ;; code: GPL 3, docs: CC-BY-SA (list license:gpl3 license:cc-by-sa3.0)))) + +(define-public libpepadapter + (package + (name "libpepadapter") + (version "2.0.2") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/libpEpAdapter") + (changeset "e8fe371c870a"))) ;; r168 + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "1mlpavjbnmslvmr5jxcvpjgb2x40nhmxjb10hza3kn4qzj0k1pjz")))) + (build-system gnu-build-system) + (arguments + '(#:test-target "test" + #:tests? #f ;; building the tests fails + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; libpEpAdapter does not use autotools and configure, + ;; but a local.conf. We need to tweak the values there. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (engine (assoc-ref inputs "pep-engine"))) + (with-output-to-file "local.conf" + (lambda _ ;() + (format #t " +PREFIX=~a +ENGINE_LIB_PATH=~a/lib +ENGINE_INC_PATH=~a/include +" out engine engine)))) + #t))))) + (inputs + `(("pep-engine" ,pep-engine))) + (home-page "https://pep.foundation/") + (synopsis "Library for building p≡p adapters") + (description "This C++ library provides common structures used in p≡p +(pretty Easy privacy) adapters.") + (license license:bsd-3))) -- cgit v1.2.3 From 9b72216630b3ba53eca1ca8031476c99c3579f34 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 May 2020 23:55:39 +0200 Subject: gnu: Add python-pep-adapter. * gnu/packages/pep.scm (python-pep-adapter): New variable. --- gnu/packages/pep.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index 27993d4f1b..e397cfd111 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -25,6 +25,7 @@ (define-module (gnu packages pep) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages boost) #:use-module (gnu packages linux) #:use-module (gnu packages mail) ; for libetpan #:use-module (gnu packages nettle) @@ -194,3 +195,55 @@ (define-public libpepadapter (description "This C++ library provides common structures used in p≡p (pretty Easy privacy) adapters.") (license license:bsd-3))) + +(define-public python-pep-adapter + (package + (name "python-pep-adapter") + (version "2.0.5") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/pEpPythonAdapter") + (changeset "66df0e5b9405"))) ;; r374 + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "107i1s8jf8gyhpmqcs64q9csxa3fwc8g7s57iyccqb4czw8gph6d")))) + (build-system python-build-system) + (arguments + `(;; Adding configure-flags does not work, running `build_ext` + ;; with these flags, neither does adding the options to + ;; `setup.cfg`: Either `build` or `install` fails (since + ;; flags are given or missing), or "command 'BuildExtCommand' + ;; has no such option 'pep_engine" + ;; '(#:configure-flags + ;; (list (string-append "--with-pEp-engine=" + ;; (assoc-ref inputs "pEpEngine")) + ;; (string-append "--with-pEp-libadapter=" + ;; (assoc-ref inputs "libpEpAdapter")) + ;; ;;(string-append "--boost=" + ;; (assoc-ref inputs "boost")) not supported + ;; (string-append "--with-asn1c-share=" + ;; (assoc-ref inputs "asn1c") "/share")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-setup.py + (lambda _ + (substitute* "setup.py" + (("^(\\s+SYS_INCLUDES = )\\['/usr.*" _ a) + (string-append a "os.getenv('CPATH', '').split(os.pathsep)\n")) + (("^(\\s+SYS_LIB_PREFIXES = )\\['/usr.*" _ a) + (string-append a "os.getenv('LIBRARY_PATH', '').split(os.pathsep)\n")) + (("^(\\s+SYS_SHARES = )\\['/usr.*" _ a) + (string-append a "['" (assoc-ref %build-inputs "asn1c") "/share']\n"))) + #t))))) + (inputs + `(("asn1c" ,asn1c) + ("boost-python" ,boost-with-python3) + ("libpepadapter" ,libpepadapter) + ("pep-engine" ,pep-engine))) + (home-page "https://pep.foundation/") + (synopsis "Python adapter for p≡p (pretty Easy Privacy)") + (description "The p≡p Python adapter is an adaptor interface to the p≡p +(pretty Easy privacy) engine.") + (license license:gpl3))) -- cgit v1.2.3 From 3cf7088fc646e07158914dea1314151123472ec2 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 May 2020 23:57:12 +0200 Subject: gnu: Add java-pep-adapter. * gnu/packages/pep.scm (java-pep-adapter): New variable. --- gnu/packages/pep.scm | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index e397cfd111..2bcedf9979 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -26,6 +26,8 @@ (define-module (gnu packages pep) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages boost) + #:use-module (gnu packages documentation) + #:use-module (gnu packages java) #:use-module (gnu packages linux) #:use-module (gnu packages mail) ; for libetpan #:use-module (gnu packages nettle) @@ -247,3 +249,101 @@ (define-public python-pep-adapter (description "The p≡p Python adapter is an adaptor interface to the p≡p (pretty Easy privacy) engine.") (license license:gpl3))) + +(define-public java-pep-adapter + (package + (name "java-pep-adapter") + (version "2.0.5") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/pEpJNIAdapter") + (changeset "534537c9cd50"))) ;; r763 + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "107ldpssc80bq8kndn2n000000gphj4lqagaiv3fddlfph4vji48")))) + (build-system gnu-build-system) + (outputs '("out" "doc")) + (arguments + `(#:test-target "test" + #:make-flags (list "doxy-all") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-includes + (lambda _ + (substitute* "src/jniutils.hh" + (("#pragma once\n" line) + (string-append line + "#include \n" + "#include \n" + "#include \n"))) + #t)) + (add-before 'configure 'pin-shared-lib-path + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/foundation/pEp/jniadapter/AbstractEngine.java" + (("System.loadLibrary\\(\"pEpJNI\"\\);") + (string-append "System.load(\"" + (assoc-ref outputs "out") + "/lib/libpEpJNI.so" "\");"))) + #t)) + (replace 'configure + ;; pEpJNIAdapter does not use autotools and configure, + ;; but a local.conf. We need to tweak the values there. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (engine (assoc-ref inputs "pep-engine")) + (libadapter (assoc-ref inputs "libpepadapter")) + (openjdk (assoc-ref inputs "openjdk"))) + (with-output-to-file "local.conf" + (lambda _ ;() + (format #t " +PREFIX=~a +ENGINE_LIB_PATH=~a/lib +ENGINE_INC_PATH=~a/include +AD_LIB_PATH=~a/lib +AD_INC_PATH=~a/include +YML2_PROC=~a +JAVA_HOME=~a +" + out engine engine libadapter libadapter + (which "yml2proc") openjdk))) + (substitute* "src/Makefile" ;; suppress some warnings + (("^\\s+OLD_JAVA=") " xxx_OLD_JAVA=")) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libout (string-append out "/lib/")) + (javaout (string-append out "/share/java/"))) + (mkdir-p libout) + (mkdir-p javaout) + (copy-file "src/libpEpJNI.so" + (string-append libout "/libpEpJNI.so")) + (copy-file "src/pEp.jar" (string-append javaout "/pEp.jar")) + #t))) + (add-after 'install 'install-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "doc")) + (docout (string-append out "/share/doc/pEp-JNI-adapter")) + (cxxout (string-append docout "/cxx")) + (javaout (string-append docout "/java"))) + (mkdir-p cxxout) + (mkdir-p javaout) + (copy-recursively "doc/doxygen/cxx/html" cxxout) + (copy-recursively "doc/doxygen/java/html" javaout) + #t)))))) + (native-inputs + `(("doxygen" ,doxygen) + ("openjdk" ,openjdk9 "jdk") + ("which" ,which) + ("yml2" ,yml2))) + (inputs + `(("libpepadapter" ,libpepadapter) + ("pep-engine" ,pep-engine) + ("util-linux" ,util-linux))) ;; uuid.h + (home-page "https://pep.foundation/") + (synopsis "Java adapter for p≡p (pretty Easy Privacy)") + (description "The p≡p JNI adapter is a Java adapter interface to the p≡p +(pretty Easy privacy) engine.") + (license license:gpl3))) -- cgit v1.2.3 From 2e08394b3c64ad77cebb94f54677130e4fdaf9e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jun 2020 21:13:46 +0200 Subject: import: stackage: Fix typo. * guix/import/stackage.scm (latest-lts-release): Fix spelling of "included". --- guix/import/stackage.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index 14150201b5..9572f8c26d 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -122,7 +122,7 @@ (define latest-lts-release (let ((pkgs-info (mlambda () (lts-info-packages (stackage-lts-info-fetch))))) (lambda* (package) "Return an for the latest Stackage LTS release of -PACKAGE or #f it the package is not inlucded in the Stackage LTS release." +PACKAGE or #f it the package is not included in the Stackage LTS release." (let* ((hackage-name (guix-package->hackage-name package)) (version (lts-package-version (pkgs-info) hackage-name)) (name-version (hackage-name-version hackage-name version))) -- cgit v1.2.3 From d32a3b395c4b9926316779aecec4e5e02ad571ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jun 2020 20:27:09 +0200 Subject: gnu: x265: Disable assembly optimizations on i686-linux. Fixes . * gnu/packages/video.scm (x265)[native-inputs]: Conditionally add NASM. --- gnu/packages/video.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c822075c57..18244c368a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -625,7 +625,11 @@ (define-public x265 (delete-file-recursively "source/compat/getopt") #t)))) (build-system cmake-build-system) - (native-inputs `(("nasm" ,nasm))) + (native-inputs + ;; XXX: ASM optimization fails on i686-linux, see . + (if (string-prefix? "i686" (%current-system)) + '() + `(("nasm" ,nasm)))) (arguments `(#:tests? #f ; tests are skipped if cpu-optimized code isn't built #:configure-flags -- cgit v1.2.3 From c178d5fa5a2cfc07f4a9ab9cadeb6218d6c64839 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jun 2020 20:45:33 +0200 Subject: gnu: Remove ganv-devel. * gnu/packages/gtk.scm (ganv-devel): Remove variable. * gnu/packages/music.scm (ingen)[inputs]: Change from GANV-DEVEL to GANV. --- gnu/packages/gtk.scm | 18 ------------------ gnu/packages/music.scm | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index eb1984fb20..0efbc3b3c6 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -353,24 +353,6 @@ (define-public ganv diagrams.") (license license:gpl3+))) -(define-public ganv-devel - (let ((commit "12f7d6b0438c94dd87f773a92eee3453d971846e") - (revision "1")) - (package - (inherit ganv) - (name "ganv") - (version (string-append "1.5.4-" revision "." - (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.drobilla.net/ganv.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1cr8w02lr6bk9mkxa12j3imq721b2an2yn4bj5wnwmpm91ddn2gi"))))))) - (define-public gtksourceview-2 (package (name "gtksourceview") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a26c4fc250..f22207579f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3691,7 +3691,7 @@ (define-public ingen ("lv2" ,lv2) ("lilv" ,lilv) ("raul" ,raul-devel) - ("ganv" ,ganv-devel) + ("ganv" ,ganv) ("suil" ,suil) ("serd" ,serd) ("sord" ,sord) -- cgit v1.2.3 From 152d50d903003e2e88ba6064d09a5ec1a0a7fc34 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 17:30:01 -0500 Subject: gnu: Add sbcl-clx-xembed. * gnu/packages/lisp-xyz.scm (sbcl-clx-xembed, cl-clx-xembed, ecl-clx-xembed): New variables. Signed-off-by: Oleg Pykhalov --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0bf2dec44d..025d1bc9ef 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11567,6 +11567,38 @@ (define-public sbcl-osicat (define-public cl-osicat (sbcl-package->cl-source-package sbcl-osicat)) +(define-public sbcl-clx-xembed + (let ((commit "a5c4b844d31ee68ffa58c933cc1cdddde6990743") + (revision "1")) + (package + (name "sbcl-clx-xembed") + (version (git-version "0.1" revision commit)) + (home-page "https://github.com/laynor/clx-xembed") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/laynor/clx-xembed.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1abx4v36ycmfjdwpjk4hh8058ya8whwia7ds9vd96q2qsrs57f12")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-system-name "xembed")) + (inputs + `(("sbcl-clx" ,sbcl-clx))) + (synopsis "CL(x) xembed protocol implementation ") + (description "CL(x) xembed protocol implementation") + ;; MIT License + (license license:expat)))) + +(define-public cl-clx-xembed + (sbcl-package->cl-source-package sbcl-clx-xembed)) + +(define-public ecl-clx-xembed + (sbcl-package->ecl-package sbcl-clx-xembed)) + (define-public sbcl-quantile-estimator (package (name "sbcl-quantile-estimator") -- cgit v1.2.3 From 81b045e149daffd113208601b764fdb47cf6c14b Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 17:32:55 -0500 Subject: gnu: stumpwm: Update contrib module package names. This also causes the contribution modules to inherit from a common base. * gnu/packages/wm.scm (stumpish, sbcl-stumpwm-ttf-fonts, sbcl-stumpwm-pass, sbcl-stumpwm-globalwindows, sbcl-stumpwm-swm-gaps): Bring package name in line with the Guix symbol name. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 220 ++++++++++++++++++++++------------------------------ 1 file changed, 91 insertions(+), 129 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 06d28e30c1..daeddc3c0f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1660,11 +1660,11 @@ (define-public stumpwm+slynk (delete 'cleanup) (delete 'create-symlinks))))))) -(define-public stumpish - (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") +(define stumpwm-contrib + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d63") (revision "2")) (package - (name "stumpish") + (name "stumpwm-contrib") (version (git-version "0.0.1" revision commit)) ;no upstream release (source (origin @@ -1672,154 +1672,116 @@ (define-public stumpish (uri (git-reference (url "https://github.com/stumpwm/stumpwm-contrib.git") (commit commit))) - (file-name (git-file-name name version)) (sha256 (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) + (build-system asdf-build-system/sbcl) (inputs - `(("bash" ,bash) - ("rlwrap" ,rlwrap))) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (copy-recursively (assoc-ref %build-inputs "source") ".") - (chdir "util/stumpish") - (substitute* "stumpish" - (("rlwrap") (string-append (assoc-ref %build-inputs "rlwrap") - "/bin/rlwrap")) - (("/bin/sh") (string-append (assoc-ref %build-inputs "bash") - "/bin/bash"))) - (install-file "stumpish" (string-append %output "/bin"))))) + `(("stumpwm" ,stumpwm "lib"))) (home-page "https://github.com/stumpwm/stumpwm-contrib") (synopsis "StumpWM interactive shell") (description "This package provides a StumpWM interactive shell.") (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) +(define-public stumpish + (package + (inherit stumpwm-contrib) + (name "stumpish") + (inputs + `(("bash" ,bash) + ("rlwrap" ,rlwrap))) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build utils)) + #:tests? #f + #:builder + (begin + (use-modules (guix build utils)) + (copy-recursively (assoc-ref %build-inputs "source") ".") + (chdir "util/stumpish") + (substitute* "stumpish" + (("rlwrap") (string-append (assoc-ref %build-inputs "rlwrap") + "/bin/rlwrap")) + (("/bin/sh") (string-append (assoc-ref %build-inputs "bash") + "/bin/bash"))) + (install-file "stumpish" (string-append %output "/bin"))))) + (home-page "https://github.com/stumpwm/stumpwm-contrib") + (synopsis "StumpWM interactive shell") + (description "This package provides a StumpWM interactive shell.") + (license (list license:gpl2+ license:gpl3+ license:bsd-2)))) + (define-public sbcl-stumpwm+slynk (deprecated-package "sbcl-stumpwm-with-slynk" stumpwm+slynk)) (define-public sbcl-stumpwm-ttf-fonts - (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") - (revision "2")) - (package - (name "sbcl-ttf-fonts") - (version (git-version "0.0.1" revision commit)) ;no upstream release - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stumpwm/stumpwm-contrib.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) - (inputs - `(("stumpwm" ,stumpwm "lib") - ("clx-truetype" ,sbcl-clx-truetype))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "util/ttf-fonts")))))) - (home-page "https://github.com/stumpwm/stumpwm-contrib") - (synopsis "Implementation of TTF font rendering for Lisp") - (description "This package provides a Lisp implementation of TTF font + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-ttf-fonts") + (inputs + `(("stumpwm" ,stumpwm "lib") + ("clx-truetype" ,sbcl-clx-truetype))) + (arguments + '(#:asd-system-name "ttf-fonts" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "util/ttf-fonts") #t))))) + (home-page "https://github.com/stumpwm/stumpwm-contrib") + (synopsis "Implementation of TTF font rendering for Lisp") + (description "This package provides a Lisp implementation of TTF font rendering.") - (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) + (license (list license:gpl2+ license:gpl3+ license:bsd-2)))) (define-public sbcl-stumpwm-pass - (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") - (revision "2")) - (package - (name "sbcl-pass") - (version (git-version "0.0.1" revision commit)) ;no upstream release - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stumpwm/stumpwm-contrib.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) - (inputs - `(("stumpwm" ,stumpwm "lib"))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "util/pass")))))) - (home-page "https://github.com/stumpwm/stumpwm-contrib") - (synopsis "Integrate @code{pass} wih StumpWM") - (description "This package provides an interface which integrates + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-pass") + (arguments + '(#:asd-system-name "pass" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "util/pass") #t))))) + (home-page "https://github.com/stumpwm/stumpwm-contrib") + (synopsis "Integrate @code{pass} wih StumpWM") + (description "This package provides an interface which integrates password-store into StumpWM.") - (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) + (license (list license:gpl2+ license:gpl3+ license:bsd-2)))) (define-public sbcl-stumpwm-globalwindows - (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") - (revision "2")) - (package - (name "sbcl-globalwindows") - (version (git-version "0.0.1" revision commit)) ;no upstream release - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stumpwm/stumpwm-contrib.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) - (inputs - `(("stumpwm" ,stumpwm "lib"))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "util/globalwindows")))))) - (home-page "https://github.com/stumpwm/stumpwm-contrib") - (synopsis "Manipulate all windows in the current X session") - (description "This package provides a StumpWM module to manipulate all + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-globalwindows") + (arguments + '(#:asd-system-name "globalwindows" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "util/globalwindows") #t))))) + (home-page "https://github.com/stumpwm/stumpwm-contrib") + (synopsis "Manipulate all windows in the current X session") + (description "This package provides a StumpWM module to manipulate all windows in the current X session.") - (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) + (license (list license:gpl2+ license:gpl3+ license:bsd-2)))) (define-public sbcl-stumpwm-swm-gaps - (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") - (revision "2")) - (package - (name "sbcl-swm-gaps") - (version (git-version "0.0.1" revision commit)) ;no upstream release - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stumpwm/stumpwm-contrib.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) - (inputs - `(("stumpwm" ,stumpwm "lib"))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "util/swm-gaps")))))) - (home-page "https://github.com/stumpwm/stumpwm-contrib") - (synopsis "Gaps between windows for StumpWM") - (description "This package provides a StumpWM module which adds gaps + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-swm-gaps") + (arguments + '(#:asd-system-name "swm-gaps" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "util/swm-gaps") #t))))) + (home-page "https://github.com/stumpwm/stumpwm-contrib") + (synopsis "Gaps between windows for StumpWM") + (description "This package provides a StumpWM module which adds gaps between windows.") - (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) + (license (list license:gpl2+ license:gpl3+ license:bsd-2)))) (define-public lemonbar (let ((commit "35183ab81d2128dbb7b6d8e119cc57846bcefdb4") -- cgit v1.2.3 From ea94e4d38eec38ead58492907a2b14321e986bd1 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 17:40:56 -0500 Subject: gnu: Add sbcl-stumpwm-net. * gnu/packages/wm.scm (sbcl-stumpwm-net): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index daeddc3c0f..6165c805da 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1783,6 +1783,24 @@ (define-public sbcl-stumpwm-swm-gaps between windows.") (license (list license:gpl2+ license:gpl3+ license:bsd-2)))) +(define-public sbcl-stumpwm-net + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-net") + (arguments + '(#:asd-system-name "net" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir (lambda _ (chdir "modeline/net") #t))))) + (home-page + "https://github.com/stumpwm/stumpwm-contrib/tree/master/modeline/net") + (synopsis "Modeline support for network connectivity") + (description "Modeline support for network connectivity.") + (supported-systems + (filter (lambda (a) (string-contains a "linux")) %supported-systems)) + (license license:gpl3+))) + (define-public lemonbar (let ((commit "35183ab81d2128dbb7b6d8e119cc57846bcefdb4") (revision "1")) -- cgit v1.2.3 From 86ee8d15aa4950b52a148153e8fa0eeb826afdec Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 17:41:21 -0500 Subject: gnu: Add sbcl-stumpwm-wifi. * gnu/packages/wm.scm (sbcl-stumpwm-wifi): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6165c805da..b1747d6c58 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1801,6 +1801,24 @@ (define-public sbcl-stumpwm-net (filter (lambda (a) (string-contains a "linux")) %supported-systems)) (license license:gpl3+))) +(define-public sbcl-stumpwm-wifi + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-wifi") + (arguments + '(#:asd-system-name "wifi" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir (lambda _ (chdir "modeline/wifi") #t))))) + (home-page + "https://github.com/stumpwm/stumpwm-contrib/tree/master/modeline/wifi") + (synopsis "Modeline support for wifi connectivity") + (description "Modeline support for wifi connectivity.") + (supported-systems + (filter (lambda (a) (string-contains a "linux")) %supported-systems)) + (license license:gpl3+))) + (define-public lemonbar (let ((commit "35183ab81d2128dbb7b6d8e119cc57846bcefdb4") (revision "1")) -- cgit v1.2.3 From 1afe58e47f181729d06f44f127468ea05a28d035 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 17:41:43 -0500 Subject: gnu: Add sbcl-stumpwm-stumptray. * gnu/packages/wm.scm (sbcl-stumpwm-stumptray): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index b1747d6c58..723c0dda1f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1819,6 +1819,28 @@ (define-public sbcl-stumpwm-wifi (filter (lambda (a) (string-contains a "linux")) %supported-systems)) (license license:gpl3+))) +(define-public sbcl-stumpwm-stumptray + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-stumptray") + (arguments + '(#:asd-system-name "stumptray" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir (lambda _ (chdir "modeline/stumptray") #t))))) + (inputs + `(("stumpwm" ,stumpwm "lib") + ("xembed" ,sbcl-clx-xembed) + ("alexandria" ,sbcl-alexandria))) + (home-page + "https://github.com/stumpwm/stumpwm-contrib/tree/master/modeline/stumptray") + (synopsis "Modeline support for stumptray connectivity") + (description "Modeline support for stumptray connectivity.") + (supported-systems + (filter (lambda (a) (string-contains a "linux")) %supported-systems)) + (license license:gpl3+))) + (define-public lemonbar (let ((commit "35183ab81d2128dbb7b6d8e119cc57846bcefdb4") (revision "1")) -- cgit v1.2.3 From b70e612b9a1d1943dfed2a7b27af37deb10a83ca Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 17:41:53 -0500 Subject: gnu: Add sbcl-stumpwm-kbd-layouts. * gnu/packages/wm.scm (sbcl-stumpwm-kbd-layouts): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 723c0dda1f..46ac1dcadc 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1841,6 +1841,22 @@ (define-public sbcl-stumpwm-stumptray (filter (lambda (a) (string-contains a "linux")) %supported-systems)) (license license:gpl3+))) +(define-public sbcl-stumpwm-kbd-layouts + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-kbd-layouts") + (arguments + '(#:asd-system-name "kbd-layouts" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir (lambda _ (chdir "util/kbd-layouts") #t))))) + (home-page + "https://github.com/stumpwm/stumpwm-contrib/tree/master/util/kbd-layouts") + (synopsis "Keyboard layout switcher for StumpWM") + (description "Keyboard layout switcher for StumpWM") + (license license:gpl3+))) + (define-public lemonbar (let ((commit "35183ab81d2128dbb7b6d8e119cc57846bcefdb4") (revision "1")) -- cgit v1.2.3 From 35b00d4caa798ca03a0d4c01ca02c656590ccaa5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 22:29:38 +0200 Subject: import: stackage: Fix typo. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/stackage.scm (latest-lts-release): Fix spelling of ‘if’. --- guix/import/stackage.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index 9572f8c26d..e04073d193 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -122,7 +122,7 @@ (define latest-lts-release (let ((pkgs-info (mlambda () (lts-info-packages (stackage-lts-info-fetch))))) (lambda* (package) "Return an for the latest Stackage LTS release of -PACKAGE or #f it the package is not included in the Stackage LTS release." +PACKAGE or #f if the package is not included in the Stackage LTS release." (let* ((hackage-name (guix-package->hackage-name package)) (version (lts-package-version (pkgs-info) hackage-name)) (name-version (hackage-name-version hackage-name version))) -- cgit v1.2.3 From 14adb59ab0ff4aa44ee949a0b0626a8e88037df2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 15:00:23 +0200 Subject: gnu: borg: Update to 1.1.13. * gnu/packages/backup.scm (borg): Update to 1.1.13. [arguments]: Skip a new FUSE test. --- gnu/packages/backup.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 950dbc55ff..74acd791ac 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -563,14 +563,13 @@ (define-public libchop (define-public borg (package (name "borg") - (version "1.1.11") + (version "1.1.13") (source (origin (method url-fetch) (uri (pypi-uri "borgbackup" version)) (sha256 - (base32 - "190gjzx83b6p64nqj840x382dgz9gfv0gm7wj585lnkrpa90j29n")) + (base32 "089q3flmwbz7dc28zlscwylf64kgck3jf1n6lqpwww8hlrk8cjhn")) (modules '((guix build utils))) (snippet '(begin @@ -653,7 +652,8 @@ (define-public borg ;; These tests assume the kernel supports FUSE. "and not test_fuse " "and not test_fuse_allow_damaged_files " - "and not test_mount_hardlinks"))))) + "and not test_mount_hardlinks " + "and not test_readonly_mount "))))) (add-after 'install 'install-doc (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 3320966068027c8a61faf3202074dd6fe306ab62 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 15:00:40 +0200 Subject: gnu: singular: Update to 4.1.3p2. * gnu/packages/algebra.scm (singular): Update to 4.1.3p2. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 1008d24cd3..b78e6ef304 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -609,7 +609,7 @@ (define-public ntl (define-public singular (package (name "singular") - (version "4.1.3p1") + (version "4.1.3p2") (source (origin (method url-fetch) @@ -623,7 +623,7 @@ (define-public singular #\.) "-") "/singular-" version ".tar.gz")) (sha256 (base32 - "1f02mrjwh7pd3pydfvjxsw5rph2qmkg1idwqrdsax924sa77sljw")))) + "1524yrni7gh0hir5ckridq671q5s6avfjdsdyahj51kzdl3wcypf")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From 583fcb27ae491039b608623250db23240e969d94 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 15:00:50 +0200 Subject: gnu: thunar: Update to 1.8.15. * gnu/packages/xfce.scm (thunar): Update to 1.8.15. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 7a6784b928..89a4206363 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -661,7 +661,7 @@ (define-public xfce4-settings (define-public thunar (package (name "thunar") - (version "1.8.14") + (version "1.8.15") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -669,7 +669,7 @@ (define-public thunar "thunar-" version ".tar.bz2")) (sha256 (base32 - "17r1z8cyp709lz38w7b5vqi1zbgm2i3sqvdvicsbvma2b0gppica")))) + "14vw4yaf9fff24zmj4dp8r8hf8mb19hl4w4l0jc8c4qzy865c93n")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 9bb102dc1c47275d2906a9f4e0b813e1940176d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 23:32:33 +0200 Subject: gnu: stumpish: Remove bogus keyword. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This follows up on commit 81b045e149daffd113208601b764fdb47cf6c14b. ‘#:tests’ is not supported by the trivial build system and broke ‘guix pull’. * gnu/packages/wm.scm (stumpish)[argument]: Remove #:tests?. --- gnu/packages/wm.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 46ac1dcadc..3ed19c35a7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1692,7 +1692,6 @@ (define-public stumpish (build-system trivial-build-system) (arguments '(#:modules ((guix build utils)) - #:tests? #f #:builder (begin (use-modules (guix build utils)) -- cgit v1.2.3 From 96484ab9f740a06993e251fc4c5a9edc27161237 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 15:17:19 +0200 Subject: gnu: python-pylint: Update to 2.5.3. * gnu/packages/check.scm (python-pylint): Update to 2.5.3. --- gnu/packages/check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 3edb79d55b..6ae4273738 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1889,7 +1889,7 @@ (define-public python2-coverage-test-runner (define-public python-pylint (package (name "python-pylint") - (version "2.5.2") + (version "2.5.3") (source (origin (method git-fetch) @@ -1898,8 +1898,7 @@ (define-public python-pylint (commit (string-append "pylint-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "150x679mrlgm1s4ym7irf9mnsjilqyaakss4spc4pbrzkl11agnh")))) + (base32 "04cgbh2z1mygar63plzziyz34yg6bdr4i0g63jp256fgnqwb1bi3")))) (build-system python-build-system) ;; FIXME: Tests are failing since version 2.4.3, see: ;; https://github.com/PyCQA/pylint/issues/3198. -- cgit v1.2.3 From 840857bf48237d15d1608b9272cae480cd28874f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 15:20:47 +0200 Subject: gnu: minisign: Update to 0.9. * gnu/packages/crypto.scm (minisign): Update to 0.9. --- gnu/packages/crypto.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index ccf1c2875f..99b23b7b7e 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1031,7 +1031,7 @@ (define-public hpenc (define-public minisign (package (name "minisign") - (version "0.8") + (version "0.9") (source (origin (method url-fetch) @@ -1039,8 +1039,7 @@ (define-public minisign (string-append "https://github.com/jedisct1/minisign/releases/download/" version "/minisign-" version ".tar.gz")) (sha256 - (base32 - "10hhgwxf9rcdlr00shrkcyxndrc22dh5lj8k5z27xg3nc0jba3hk")))) + (base32 "1h9cfvvm6lqq33b2wdar1x3w4k7zyrscavllyb0l5dmcdabq60r2")))) (build-system cmake-build-system) (arguments ; No test suite -- cgit v1.2.3 From d2d7be35fe01d8913afc593782574bf6e5b91163 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 15:32:47 +0200 Subject: gnu: rust-yaml-rust: Update to 0.4.4. * gnu/packages/crates-io.scm (rust-yaml-rust): Update to 0.4.4. [arguments]: Update rust-quickcheck to 0.9. --- gnu/packages/crates-io.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 788ec02654..05bc85395e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27477,22 +27477,20 @@ (define-public rust-y4m-0.5 (define-public rust-yaml-rust-0.4 (package (name "rust-yaml-rust") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (crate-uri "yaml-rust" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0ka3qhqc5lvk3hz14wmsj32jhmh44blcbfrx5hfxli2gg38kv4k5")))) + (base32 "038byay0dxsz6isckviz4qshfpyjqmyvda7pq96i6d53y4ickw1r")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-linked-hash-map" ,rust-linked-hash-map-0.5)) #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.7)))) + (("rust-quickcheck" ,rust-quickcheck-0.9)))) (home-page "https://chyh1990.github.io/yaml-rust/") (synopsis "The missing YAML 1.2 parser for rust") (description -- cgit v1.2.3 From 7a358c7886c33790d80417bed814545ab0736bf3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 16:53:16 +0200 Subject: gnu: perl-sql-abstract: Update to 1.87. * gnu/packages/databases.scm (perl-sql-abstract): Update to 1.87. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e0634b7aca..08577a9f3b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1753,14 +1753,14 @@ (define-public perl-mysql-config (define-public perl-sql-abstract (package (name "perl-sql-abstract") - (version "1.86") + (version "1.87") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/I/IL/ILMARI/" "SQL-Abstract-" version ".tar.gz")) (sha256 - (base32 "1pwcm8hwxcgidyyrak37lx69d85q728jxsb0b14jz93gbvdgg9z7")))) + (base32 "0jhw91b23wc9bkfwcgvka4x5ddxk58m9bcp5ay7a3vx77nla09p9")))) (build-system perl-build-system) (native-inputs `(("perl-module-install" ,perl-module-install) -- cgit v1.2.3 From 3a629d36e92edd3452b69d556b6e8ac91618b157 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 17:19:36 +0200 Subject: gnu: rocksdb: Update to 6.10.1. * gnu/packages/databases.scm (rocksdb): Update to 6.10.1. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 08577a9f3b..33c3e37427 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1147,7 +1147,7 @@ (define-public emacs-recutils (define-public rocksdb (package (name "rocksdb") - (version "6.8.1") + (version "6.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -1156,7 +1156,7 @@ (define-public rocksdb (file-name (git-file-name name version)) (sha256 (base32 - "0i6qglyrcqwxnrvq67zm7ln79a4sj8mzgij9h0nz5zkxax8v1zg1")) + "0rp8q73dx5f1nkcf2qp6fljm4dpj281y6cqckqgv976kvwvqdgz1")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 5e7daec9b4bfd2a3a430fc800ab6b1b527a5fa27 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 18:10:16 +0200 Subject: gnu: dhall: Disable network tests differently. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/dhall.scm (dhall)[source]: Remove patch. [arguments]: Rename ‘remove-more-tests’ phase to ‘remove-network-tests’. Identify the tests by name instead of by content. * gnu/packages/patches/dhall-remove-network-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/dhall.scm | 22 ++++- .../patches/dhall-remove-network-tests.patch | 97 ---------------------- 3 files changed, 18 insertions(+), 102 deletions(-) delete mode 100644 gnu/packages/patches/dhall-remove-network-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8f39c1c036..76d6b5deba 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -867,7 +867,6 @@ dist_patch_DATA = \ %D%/packages/patches/desmume-gcc6-fixes.patch \ %D%/packages/patches/desmume-gcc7-fixes.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ - %D%/packages/patches/dhall-remove-network-tests.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ diff --git a/gnu/packages/dhall.scm b/gnu/packages/dhall.scm index bbe2d271d7..86cbe764c6 100644 --- a/gnu/packages/dhall.scm +++ b/gnu/packages/dhall.scm @@ -1,4 +1,5 @@ ;;; Copyright © 2020 John Soo +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,8 +40,7 @@ (define-public dhall ".tar.gz")) (sha256 (base32 - "18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc")) - (patches (search-patches "dhall-remove-network-tests.patch")))) + "18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) @@ -99,9 +99,23 @@ (define-public dhall (arguments `(#:phases (modify-phases %standard-phases - ;; Remove tests that require network - (add-after 'unpack 'remove-more-tests + (add-after 'unpack 'remove-network-tests (lambda _ + (with-directory-excursion "dhall-lang/tests" + (for-each + delete-file + '("import/failure/referentiallyInsane.dhall" + "import/success/customHeadersA.dhall" + "import/success/noHeaderForwardingA.dhall" + "import/success/unit/RemoteAsTextA.dhall" + "import/success/unit/SimpleRemoteA.dhall" + "import/success/unit/asLocation/RemoteChain1A.dhall" + "import/success/unit/asLocation/RemoteChain2A.dhall" + "import/success/unit/asLocation/RemoteChain3A.dhall" + "import/success/unit/asLocation/RemoteChainEnvA.dhall" + "import/success/unit/asLocation/RemoteChainMissingA.dhall" + "type-inference/success/CacheImportsA.dhall" + "type-inference/success/CacheImportsCanonicalizeA.dhall"))) (substitute* "src/Dhall/Tutorial.hs" (((string-append "-- >>> input auto " diff --git a/gnu/packages/patches/dhall-remove-network-tests.patch b/gnu/packages/patches/dhall-remove-network-tests.patch deleted file mode 100644 index c260e7844d..0000000000 --- a/gnu/packages/patches/dhall-remove-network-tests.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff a/dhall-lang/tests/import/failure/referentiallyInsane.dhall b/dhall-lang/tests/import/failure/referentiallyInsane.dhall ---- a/dhall-lang/tests/import/failure/referentiallyInsane.dhall -+++ /dev/null -@@ -1,13 +0,0 @@ --{- The following remote import attempts to import an environment variable, which -- must be disallowed by the referential sanity check -- -- One reason for doing this is to protect against remote imports exfiltrating -- environment variables (such as via custom headers). Only referentially -- opaque imports (i.e. local imports) have permission to refer to other -- referentially opaque imports in order to protect against this attack. -- -- The referential sanity check also ensures that remote imports are -- referentially transparent. Or in other words, any import that is globally -- addressable must have a meaning that is not context-sensitive. ---} --https://raw.githubusercontent.com/dhall-lang/dhall-lang/master/tests/import/data/referentiallyOpaque.dhall -diff a/dhall-lang/tests/import/success/customHeadersA.dhall b/dhall-lang/tests/import/success/customHeadersA.dhall ---- a/dhall-lang/tests/import/success/customHeadersA.dhall -+++ /dev/null -@@ -1,3 +0,0 @@ --https://httpbin.org/user-agent -- using [ { mapKey = "User-Agent", mapValue = "Dhall" } ] -- as Text -diff a/dhall-lang/tests/import/success/noHeaderForwardingA.dhall b/dhall-lang/tests/import/success/noHeaderForwardingA.dhall ---- a/dhall-lang/tests/import/success/noHeaderForwardingA.dhall -+++ /dev/null -@@ -1,6 +0,0 @@ --{- The purpose of this test is to verify that the custom headers supplied to -- this import are not forwarded to the transitive import of -- https://httpbin.org/user-agent ---} --https://raw.githubusercontent.com/dhall-lang/dhall-lang/master/tests/import/success/customHeadersA.dhall -- using [ { mapKey = "User-Agent", mapValue = "Secret" } ] -diff a/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall b/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall ---- a/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall -+++ /dev/null -@@ -1 +0,0 @@ --https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/example.txt as Text -diff a/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall b/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall ---- a/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall -+++ /dev/null -@@ -1 +0,0 @@ --https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simple.dhall -diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall ---- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall -+++ /dev/null -@@ -1 +0,0 @@ --https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simpleLocation.dhall -diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall ---- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall -+++ /dev/null -@@ -1 +0,0 @@ --https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall -diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall ---- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall -+++ /dev/null -@@ -1 +0,0 @@ --https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall -diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall ---- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall -+++ /dev/null -@@ -1,5 +0,0 @@ --{- -- This test verifies that `env:VAR as Location` isn't rejected as referentially opaque, -- as `env:VAR` on its own would. ---} --https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/EnvA.dhall -diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall ---- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall -+++ /dev/null -@@ -1,6 +0,0 @@ --{- This test verifies that `missing as Location` succeeds when chained since: -- * The `missing` is never actually resolved (due to the `as Location`) -- * The `missing` should be treated as referentially transparent (and therefore -- be a valid transitive dependency of a remote import) ---} --https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/MissingA.dhall -diff a/dhall-lang/tests/type-inference/success/CacheImportsA.dhall b/dhall-lang/tests/type-inference/success/CacheImportsA.dhall ---- a/dhall-lang/tests/type-inference/success/CacheImportsA.dhall -+++ /dev/null -@@ -1,6 +0,0 @@ --{- -- This URL returns (probably) a different result for each request. This test -- ensures that import results for a given URL are correctly cached within an -- execution of dhall. ---} --let _ = assert : https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text === https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text in 0 -diff a/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall b/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall ---- a/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall -+++ /dev/null -@@ -1,5 +0,0 @@ --{- -- This URL returns (probably) a different result for each request. This test -- ensures that import locations are canonicalized before being cached. ---} --let _ = assert : https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text === https://csrng.net/csrng/../csrng/csrng.php?min=0&max=1000 as Text in 0 -- cgit v1.2.3 From 2971ed57345ee4e00058efeaf27c6a0790fdc9dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 23:10:47 +0200 Subject: gnu: dhall: Update to 1.32.0. * gnu/packages/dhall.scm (dhall): Update to 1.32.0. [inputs]: Add ghc-half. --- gnu/packages/dhall.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/dhall.scm b/gnu/packages/dhall.scm index 86cbe764c6..c0776902e7 100644 --- a/gnu/packages/dhall.scm +++ b/gnu/packages/dhall.scm @@ -30,17 +30,14 @@ (define-module (gnu packages dhall) (define-public dhall (package (name "dhall") - (version "1.31.1") + (version "1.32.0") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/dhall/dhall-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/dhall/dhall-" + version ".tar.gz")) (sha256 - (base32 - "18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc")))) + (base32 "1imj0bh5365pdizvjbw2wqz0g9hakigf1zm4fr6379qdchxpp90p")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) @@ -56,6 +53,7 @@ (define-public dhall ("ghc-dotgen" ,ghc-dotgen) ("ghc-either" ,ghc-either) ("ghc-exceptions" ,ghc-exceptions) + ("ghc-half" ,ghc-half) ("ghc-hashable" ,ghc-hashable) ("ghc-lens-family-core" ,ghc-lens-family-core) ("ghc-megaparsec" ,ghc-megaparsec) @@ -131,10 +129,8 @@ (define-public dhall "examples/True\" :: IO Bool")) "")) #t))))) - (home-page - "https://dhall-lang.org/") - (synopsis - "Configuration language guaranteed to terminate") + (home-page "https://dhall-lang.org/") + (synopsis "Configuration language guaranteed to terminate") (description "Dhall is an explicitly typed configuration language that is not Turing complete. Despite being Turing incomplete, Dhall is a real programming -- cgit v1.2.3 From e6c2a88f3d9717be183a0346766cd65d10a904f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 00:33:03 +0200 Subject: gnu: djview: Update to 4.11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/djvu.scm (djview): Update to 4.11. [source]: Use GIT-FETCH and add a FILE-NAME. [native-inputs]: Add autoconf, automake, and libtool. [arguments]: Add a ‘make-files-writable’ phase. --- gnu/packages/djvu.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 1fb5b5267e..f5ea9bd332 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +23,9 @@ (define-module (gnu packages djvu) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (gnu packages autotools) #:use-module (gnu packages glib) #:use-module (gnu packages image) #:use-module (gnu packages pkg-config) @@ -59,18 +62,22 @@ (define-public djvulibre (define-public djview (package (name "djview") - (version "4.10.6") + (version "4.11") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/djvu/DjView/" - (version-major+minor version) "/" - "djview-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://git.code.sf.net/p/djvu/djview-git") + (commit (string-append "release." version)))) (sha256 - (base32 "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4")))) + (base32 "0qlhd0xlxn8i869m0hwdjvwivi2vigqm88wliyr1h7s84zl3qhsy")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs `(("djvulibre" ,djvulibre) @@ -86,6 +93,11 @@ (define-public djview (lambda _ (substitute* "desktopfiles/djvulibre-djview4.desktop" (("Exec=djview4 %f") "Exec=djview %f")) + #t)) + (add-after 'unpack 'make-files-writable + (lambda _ + (for-each make-file-writable + (find-files ".")) #t))))) (home-page "http://djvu.sourceforge.net/djview4.html") (synopsis "Viewer for the DjVu image format") -- cgit v1.2.3 From 3f352df035539cea0219ef08cd79a3b5f7607b74 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 00:41:07 +0200 Subject: gnu: simple-scan: Update to 3.36.3. * gnu/packages/gnome.scm (simple-scan): Update to 3.36.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6a3ff8709b..b4a1fbae76 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5400,7 +5400,7 @@ (define-public gusb (define-public simple-scan (package (name "simple-scan") - (version "3.36.2.1") + (version "3.36.3") (source (origin (method url-fetch) @@ -5408,7 +5408,7 @@ (define-public simple-scan (version-major+minor version) "/" "simple-scan-" version ".tar.xz")) (sha256 - (base32 "0aq1pf0wk536b91as54684xgmhl7lps0k2xcwha5wh6h1isyb35v")))) + (base32 "0gsz7jqk0fdj0mama3cnss9i1adw18cpdnlcjcjh4r5qijmvx0vh")))) (build-system meson-build-system) ;; TODO: Fix icons in home screen, About dialogue, and scan menu. (arguments -- cgit v1.2.3 From 02cb4ca75750c117906537296b8b38c880b5e283 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 00:42:06 +0200 Subject: gnu: mm-common: Don't use NAME in source URI. * gnu/packages/gnome.scm (mm-common)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b4a1fbae76..514f8e6fc8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -292,9 +292,9 @@ (define-public mm-common (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/mm-common/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "mm-common-" version ".tar.xz")) (sha256 (base32 "1m4w33da9f4rx2d6kdj3ix3kl0gn16ml82v2mdn4hljr3q29nzdr")))) -- cgit v1.2.3 From 553f2f3f54c358a144b3571d217cca21c463a128 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 00:42:12 +0200 Subject: gnu: mm-common: Update to 1.0.1. * gnu/packages/gnome.scm (mm-common): Update to 1.0.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 514f8e6fc8..e1b21c37db 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -289,7 +289,7 @@ (define-public notification-daemon (define-public mm-common (package (name "mm-common") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/mm-common/" @@ -297,7 +297,7 @@ (define-public mm-common "mm-common-" version ".tar.xz")) (sha256 (base32 - "1m4w33da9f4rx2d6kdj3ix3kl0gn16ml82v2mdn4hljr3q29nzdr")))) + "1jasx9a9g7nqf7jcv3mrg4qh5cp9sq724jxjaz4wa1dzmxsxg8i8")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From ed4447236d6aa490854561b4e6e343222da15d9c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 00:55:20 +0200 Subject: gnu: smb4k: Update to 3.0.6. * gnu/packages/kde-utils.scm (smb4k): Update to 3.0.6. --- gnu/packages/kde-utils.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 38bdfbfaba..fad308c86f 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2019 Hartmut Goebel +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -403,14 +404,14 @@ (define-public rsibreak (define-public smb4k (package (name "smb4k") - (version "3.0.2") + (version "3.0.6") (source (origin (method url-fetch) (uri (string-append "https://sourceforge.net/projects/smb4k/files/" version "/smb4k-" version ".tar.xz/download")) (sha256 - (base32 "1daajaj8qhxkzz8dsaracwi49z4i57466h6qnqnh2ir2l54q00ir")))) + (base32 "0hz6nfd845bykf78s4g2qs77szl96gy6g8rpg44pqd39a0k0xbh7")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 088e186b3558d4a78a654f7d741851cf42361ae6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:20:02 +0200 Subject: gnu: gtkspell3: Update to 3.0.10. * gnu/packages/gtk.scm (gtkspell3): Update to 3.0.10. [propagated-inputs]: Replace enchant-1.6 with default version 2. --- gnu/packages/gtk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0efbc3b3c6..889f4eb014 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1707,14 +1707,14 @@ (define-public murrine (define-public gtkspell3 (package (name "gtkspell3") - (version "3.0.9") + (version "3.0.10") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gtkspell/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54")))) + "0cjp6xdcnzh6kka42w9g0w2ihqjlq8yl8hjm9wsfnixk6qwgch5h")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) @@ -1725,7 +1725,7 @@ (define-public gtkspell3 ("gtk+" ,gtk+) ("pango" ,pango))) (propagated-inputs - `(("enchant" ,enchant-1.6))) ;gtkspell3-3.0.pc refers to it + `(("enchant" ,enchant))) ; gtkspell3-3.0.pc refers to it (home-page "http://gtkspell.sourceforge.net") (synopsis "Spell-checking addon for GTK's TextView widget") (description -- cgit v1.2.3 From 67e890ec182129873f44de66b0e5219d1b588645 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:26:48 +0200 Subject: gnu: libnftnl: Update to 1.1.7. * gnu/packages/linux.scm (libnftnl): Update to 1.1.7. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b3329c92c6..2baa8b27cc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6068,14 +6068,14 @@ (define-public libmnl (define-public libnftnl (package (name "libnftnl") - (version "1.1.6") + (version "1.1.7") (source (origin (method url-fetch) (uri (string-append "mirror://netfilter.org/libnftnl/" "libnftnl-" version ".tar.bz2")) (sha256 - (base32 "1jhyxsfrfqjascrm5lnxlcyzj6n0gc0qc1bp2asb7m61dxlmmsy1")))) + (base32 "13zd90bfrr0q3j0l0cbc8kiizccw6n8gp727kqnfljh024zw3nr0")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 2d63cca1460fbd3798cacd95bb75e5a0005e7c36 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:36:25 +0200 Subject: gnu: nftables: Update to 0.9.5. * gnu/packages/linux.scm (nftables): Update to 0.9.5. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2baa8b27cc..db83069eaf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6092,7 +6092,7 @@ (define-public libnftnl (define-public nftables (package (name "nftables") - (version "0.9.3") + (version "0.9.5") (source (origin (method url-fetch) @@ -6101,7 +6101,7 @@ (define-public nftables (string-append "https://www.nftables.org/projects/nftables" "/files/nftables-" version ".tar.bz2"))) (sha256 - (base32 "0y6vbqp6x8w165q65h4n9sba1406gaz0d4744gqszbm7w9f92swm")))) + (base32 "05kyri19q776mymkbcxq3786l6nrf4xg7f3n8my0aw63mdz9bhgj")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-man-doc"))) ; FIXME: Needs docbook2x. -- cgit v1.2.3 From 0cafb90d15658f7f69af251d25f9a55ca8098520 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:37:13 +0200 Subject: gnu: iptables: Update to 1.8.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (iptables): Update to 1.8.5. [source]: Add URL. [arguments]: Add an ‘install-missing-script’ phase. --- gnu/packages/linux.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index db83069eaf..fc781727ee 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2073,15 +2073,17 @@ (define-public alsa-plugins (define-public iptables (package (name "iptables") - (version "1.8.4") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://netfilter.org/iptables/iptables-" - version ".tar.bz2")) - (sha256 - (base32 - "0z0mgs1ghvn3slc868mgbf2g26njgrzcy5ggyb5w4i55j1a3lflr")))) + ;; XXX When updating, remove the ‘install-missing-script’ phase. + (version "1.8.5") + (source + (origin + (method url-fetch) + (uri (list (string-append "mirror://netfilter.org/iptables/iptables-" + version ".tar.bz2") + (string-append "https://www.netfilter.org/projects/iptables/" + "files/iptables-" version ".tar.bz2"))) + (sha256 + (base32 "02a3575ypdpg6a2x752mhk3f7h1381ymkq1n0gss6fp6292xfmyl")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -2093,7 +2095,19 @@ (define-public iptables (arguments '(#:tests? #f ; no test suite #:configure-flags ; add $libdir to the RUNPATH of executables - (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")))) + (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-missing-script + ;; A typo prevents installation of /sbin/iptables-apply. It's been + ;; fixed upstream (d4ed0c741fc789bb09d977d74d30875fdd50d08b), but + ;; a patch would require bootstrapping and more inputs. Simply copy + ;; the file ourselves. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (sbin (string-append out "/sbin"))) + (install-file "iptables/iptables-apply" sbin) + #t)))))) (home-page "https://www.netfilter.org/projects/iptables/index.html") (synopsis "Programs to configure Linux IP packet filtering rules") (description -- cgit v1.2.3 From 5bc22ba81ee1f605b4ddfa041e5db3a0eeb33707 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:37:23 +0200 Subject: gnu: nvme-cli: Update to 1.11.2. * gnu/packages/linux.scm (nvme-cli): Update to 1.11.2. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fc781727ee..08b5b69d16 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3947,7 +3947,7 @@ (define-public hdparm (define-public nvme-cli (package (name "nvme-cli") - (version "1.10.1") + (version "1.11.2") (home-page "https://github.com/linux-nvme/nvme-cli") (source (origin (method git-fetch) @@ -3955,7 +3955,7 @@ (define-public nvme-cli (url home-page) (commit (string-append "v" version)))) (sha256 - (base32 "12wp2wxmsw2v8m9bhvwvdbhdgx1md8iilhbl19sfzz2araiwi2x8")) + (base32 "0ngh7zffjf6ac8b22hdi4ry7hjlafih172hrbpw8j17r7c0wjy9i")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From bfdce9ffdae2b3e42f46955caee4de1a3e4c1d33 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:39:45 +0200 Subject: gnu: mpop: Update to 1.4.10. * gnu/packages/mail.scm (mpop): Update to 1.4.10. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 0c683f0c92..728d242c71 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2159,14 +2159,14 @@ (define-public mb2md (define-public mpop (package (name "mpop") - (version "1.4.9") + (version "1.4.10") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/mpop/releases/" "mpop-" version ".tar.xz")) (sha256 - (base32 "0hinmyd4lipy9wi3grwm72vv6xrpf4m08i9g9nlxzxnwfanw885q")))) + (base32 "1243hazpiwgvz2m3p48cdh0yw1019i6xjxgc7qyhmxcdy0inb6wy")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls))) -- cgit v1.2.3 From 56e1cc0c34f5634563cfb6e0c188827551de0539 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:41:12 +0200 Subject: gnu: msmtp: Update to 1.8.11. * gnu/packages/mail.scm (msmtp): Update to 1.8.11. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 728d242c71..485dd1db1d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1209,14 +1209,14 @@ (define-public claws-mail (define-public msmtp (package (name "msmtp") - (version "1.8.10") + (version "1.8.11") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/msmtp/releases/" "/msmtp-" version ".tar.xz")) (sha256 - (base32 "041g921rdjiv8bapp61gp4rylq8cckfkcwzyh8bs7xwxs4wpzfna")))) + (base32 "0q0fg235qk448l1xjcwyxr7vcpzk6w57jzhjbkb0m7nffyhhypzj")))) (build-system gnu-build-system) (inputs `(("libsecret" ,libsecret) -- cgit v1.2.3 From 7801e9f2d4c6761593a9078d5ef019be8f350396 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 03:25:59 +0200 Subject: gnu: libnumbertext: Update to 1.0.6. * gnu/packages/libreoffice.scm (libnumbertext): Update to 1.0.6. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 34579a776c..a98ae152f6 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -599,7 +599,7 @@ (define-public libmspub (define-public libnumbertext (package (name "libnumbertext") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) @@ -607,7 +607,7 @@ (define-public libnumbertext "releases/download/" version "/libnumbertext-" version ".tar.xz")) (sha256 - (base32 "1xzlwhwwhvr76kfdsw5gvfjfdayz803z65h331gv5dpc9imhijg1")))) + (base32 "0mxf22gpbr818ib4av17zmyx6i6nf4br5qlxq0qvfz5z6h5j57vk")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From 98f08a99c6a0fefeca043cfac1fd89be8deebe5f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 03:38:28 +0200 Subject: gnu: pd: Don't hard-code Tk version. * gnu/packages/music.scm (pd)[arguments]: Construct the wish file name from the tk package version. --- gnu/packages/music.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f22207579f..beecdcc670 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1892,20 +1892,22 @@ (define-public pd "0dz6r6jy0zfs1xy1xspnrxxks8kddi9c7pxz4vpg2ygwv83ghpg5")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no "check" target - #:configure-flags - (list - "--enable-jack" - (string-append "--with-wish=" (string-append - (assoc-ref %build-inputs "tk") - "/bin/wish8.6"))) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-with-path - (lambda _ - (substitute* "tcl/pd-gui.tcl" - (("exec wish ") (string-append "exec " (which "wish8.6") " "))) - #t))))) + (let ((wish (string-append "wish" (version-major+minor + (package-version tk))))) + `(#:tests? #f ; no "check" target + #:configure-flags + (list + "--enable-jack" + (string-append "--with-wish=" (string-append + (assoc-ref %build-inputs "tk") + "/bin/" ,wish))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-with-path + (lambda _ + (substitute* "tcl/pd-gui.tcl" + (("exec wish ") (string-append "exec " (which ,wish) " "))) + #t)))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 8c5b29c7960e308bc11e887d742effa46a6a6b85 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 03:38:40 +0200 Subject: gnu: pd: Use HTTPS home page. * gnu/packages/music.scm (pd)[home-page]: Use HTTPS. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index beecdcc670..c9b6c94dd7 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1918,7 +1918,7 @@ (define-public pd `(("tk" ,tk) ("alsa-lib" ,alsa-lib) ("jack" ,jack-1))) - (home-page "http://puredata.info") + (home-page "https://puredata.info") (synopsis "Visual programming language for artistic performances") (description "Pure Data (aka Pd) is a visual programming language. Pd enables -- cgit v1.2.3 From f6b8b1817e31f72c654398cc7014e36a5d2bcf53 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 03:38:52 +0200 Subject: gnu: pd: Update to 0.51-0. * gnu/packages/music.scm (pd): Update to 0.51-0. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c9b6c94dd7..49f784f529 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1881,7 +1881,7 @@ (define-public tuxguitar (define-public pd (package (name "pd") - (version "0.50-2") + (version "0.51-0") (source (origin (method url-fetch) (uri @@ -1889,7 +1889,7 @@ (define-public pd version ".src.tar.gz")) (sha256 (base32 - "0dz6r6jy0zfs1xy1xspnrxxks8kddi9c7pxz4vpg2ygwv83ghpg5")))) + "0qzv4hjf4h7xx00ihnbl43pxa0fia9qkc8nwgzhqrs12jiljz6ps")))) (build-system gnu-build-system) (arguments (let ((wish (string-append "wish" (version-major+minor -- cgit v1.2.3 From d2a7cb46a62f55ce8de6dc3c963aee176a1d7684 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 03:58:57 +0200 Subject: gnu: dlib: Update to 19.20. * gnu/packages/machine-learning.scm (dlib): Update to 19.20. --- gnu/packages/machine-learning.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 4be165f390..0e11da41ca 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2020 Efraim Flashner ;;; Copyright © 2016, 2017, 2020 Marius Bakke ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2018 Mark Meyer ;;; Copyright © 2018 Ben Woodcroft @@ -715,14 +715,14 @@ (define-public gemmlowp-for-tensorflow (define-public dlib (package (name "dlib") - (version "19.7") + (version "19.20") (source (origin (method url-fetch) (uri (string-append "http://dlib.net/files/dlib-" version ".tar.bz2")) (sha256 (base32 - "1mljz02kwkrbggyncxv5fpnyjdybw2qihaacb3js8yfkw12vwpc2")) + "139jyi19qz37wwmmy48gil9d1kkh2r3w3bwdzabha6ayxmba96nz")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 01979fafb327cbd502ce290d7439791a80dfcaa6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 04:45:04 +0200 Subject: gnu: haproxy: Update to 2.1.6. * gnu/packages/networking.scm (haproxy): Update to 2.1.6. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3ad68ad070..2ed4b4d767 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3106,7 +3106,7 @@ (define-public vde2 (define-public haproxy (package (name "haproxy") - (version "2.1.5") + (version "2.1.6") (source (origin (method url-fetch) (uri (string-append "https://www.haproxy.org/download/" @@ -3114,7 +3114,7 @@ (define-public haproxy "/src/haproxy-" version ".tar.gz")) (sha256 (base32 - "188ff33610jj11knjwjqwxci4p0i63n9k0l8bdb47ckahg2ll5s2")))) + "1pyz4gckdn8982vpb1iiw9agwp2s5p8wc0nn1qh1ic0wq3lrnpg6")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 75d493aea1f8c38e67ebcec21ea2ca114ae05326 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 04:45:12 +0200 Subject: gnu: ethtool: Update to 5.7. * gnu/packages/networking.scm (ethtool): Update to 5.7. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 2ed4b4d767..11344216aa 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -589,14 +589,14 @@ (define-public libndp (define-public ethtool (package (name "ethtool") - (version "5.6") + (version "5.7") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/network/" "ethtool/ethtool-" version ".tar.xz")) (sha256 (base32 - "159r0hwax0qs5diayw2glxshqxrigk0v67hgmbq56ldddm91n3ya")))) + "0f9w0pqkvwn540rasmj6c8897g9gj2hmjnbkhpi9yf1s7jyvhkkj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From d87c9fc50682f4509f66f0e54b11d8d94c382325 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 05:09:10 +0200 Subject: gnu: herbstluftwm: Update to 0.8.3. * gnu/packages/wm.scm (herbstluftwm): Update to 0.8.3. --- gnu/packages/wm.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3ed19c35a7..615ac788ed 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -151,15 +151,14 @@ (define-public bspwm (define-public herbstluftwm (package (name "herbstluftwm") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (string-append "https://herbstluftwm.org/tarballs/herbstluftwm-" version ".tar.gz")) (sha256 - (base32 - "0wbl1s1gwdc61ll6qmkwb56swjxv99by1dhi080bdqn0w8p75804")) + (base32 "1qmb4pjf2f6g0dvcg11cw9njwmxblhqzd70ai8qnlgqw1iz3nkm1")) (file-name (string-append "herbstluftwm-" version ".tar.gz")))) (build-system cmake-build-system) (inputs -- cgit v1.2.3 From 88e1d36ba6413fe3c2414178b0916ee7a5892354 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 05:15:40 +0200 Subject: gnu: mu: Update to 1.4.10. * gnu/packages/mail.scm (mu): Update to 1.4.10. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 485dd1db1d..ec1233f83b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -711,7 +711,7 @@ (define-public emacs-mew (define-public mu (package (name "mu") - (version "1.4.9") + (version "1.4.10") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" @@ -719,7 +719,7 @@ (define-public mu "mu-" version ".tar.xz")) (sha256 (base32 - "0dgmwdaszh5m7v1py3f9n9f6avb30vrl93g58a1k225iwdsv01d5")))) + "0vbyrmv3d2bja4vx86za93gq46vxg18j12g0lca3x1dl8d5g2xa6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From e1e9baf22f57b2926859a6d3d29ecb6875233162 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Jun 2020 16:19:57 +0300 Subject: gnu: qtpass: Update to 1.3.2. * gnu/packages/password-utils.scm (qtpass): Update to 1.3.2. --- gnu/packages/password-utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index a59fb9dc75..8e1339eb85 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -581,7 +581,7 @@ (define-public pass-otp (define-public qtpass (package (name "qtpass") - (version "1.2.3") + (version "1.3.2") (source (origin (method git-fetch) @@ -591,7 +591,7 @@ (define-public qtpass (file-name (git-file-name name version)) (sha256 (base32 - "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky")))) + "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 73d9caba79b63e8ac714b8b851b7ae92a3878eca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Jun 2020 16:21:18 +0300 Subject: gnu: qtpass: Wrap binary. * gnu/packages/password-utils.scm (qtpass)[arguments]: Import qt-utils modules. Add phase to wrap qtpass binary. --- gnu/packages/password-utils.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 8e1339eb85..6bd1e94c91 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -594,7 +594,12 @@ (define-public qtpass "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:modules ((guix build gnu-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build qt-utils)) + #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) @@ -630,6 +635,10 @@ (define-public qtpass (string-append icons "/qtpass-icon.svg")) (install-file "qtpass.1" man) #t))) + (add-after 'install 'wrap-qt + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") "qtpass") + #t)) (add-before 'check 'check-setup ;; Make Qt render "offscreen", required for tests. (lambda _ -- cgit v1.2.3 From b26ad6dbe2ac53f1d42f22a4e62c99d90e937078 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:04:25 +0200 Subject: gnu: grammalecte: Update to 1.10.0. * gnu/packages/dictionaries.scm (grammalecte): Update to 1.10.0. --- gnu/packages/dictionaries.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index c13dbc2454..aee8799c98 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -205,14 +205,14 @@ (define-public ding (define-public grammalecte (package (name "grammalecte") - (version "1.9.0") + (version "1.10.0") (source (origin (method url-fetch/zipbomb) (uri (string-append "https://grammalecte.net/grammalecte/zip/" "Grammalecte-fr-v" version ".zip")) (sha256 - (base32 "1dmbmvf27dy0cnq2x7ldp9xmni8fl1p7vflgpy0yrgifgrjvnxzr")))) + (base32 "0lyngnvg995qdm9bhqj8vd8aywpcdqmzv3j4j77wxhsfa9k0pz08")))) (build-system python-build-system) (home-page "https://grammalecte.net") (synopsis "French spelling and grammar checker") -- cgit v1.2.3 From 42d1159335747f1dafa6d733f6326895dbb4b165 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:19:02 +0200 Subject: gnu: asciidoc: Use HTTPS home page URI. * gnu/packages/documentation.scm (asciidoc)[home-page]: Use HTTPS URI. --- gnu/packages/documentation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index dcacdb456f..a3a07f56db 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -111,7 +111,7 @@ (define-public asciidoc ("docbook-xsl" ,docbook-xsl) ("libxml2" ,libxml2) ("libxslt" ,libxslt))) - (home-page "http://asciidoc.org/") + (home-page "https://asciidoc.org/") (synopsis "Text-based document generation system") (description "AsciiDoc is a text document format for writing notes, documentation, -- cgit v1.2.3 From bf8e10051be091fdb81576fdcf58aee8f5afe6b2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:25:17 +0200 Subject: gnu: fsarchiver: Use HTTPS home page URI. * gnu/packages/file-systems.scm (fsarchiver)[home-page]: Use HTTPS URI. --- gnu/packages/file-systems.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index ca02a1e593..dd72152c51 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -103,7 +103,7 @@ (define-public fsarchiver Each file in the archive is protected by a checksum. If part of the archive is corrupted you'll lose the affected file(s) but not the whole back-up.") - (home-page "http://www.fsarchiver.org/") + (home-page "https://www.fsarchiver.org/") (license license:gpl2))) (define-public gphotofs -- cgit v1.2.3 From 0661638f5ef2b874769720a2109a8499aef3ae34 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:26:07 +0200 Subject: gnu: grfcodec: Use HTTPS home page URI. * gnu/packages/game-development.scm (grfcodec)[home-page]: Use HTTPS URI. --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index fae5d591aa..785447644c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -240,7 +240,7 @@ (define-public grfcodec @item @code{nforenum} checks NFO code for errors, making corrections when necessary. @end enumerate") - (home-page "http://dev.openttdcoop.org/projects/grfcodec") + (home-page "https://dev.openttdcoop.org/projects/grfcodec") ;; GRFCodec, GRFID, and GRFStrip are exclusively under the GPL2. ;; NFORenum is under the GPL2+. ;; The MD5 implementation contained in GRFID is under the zlib license. -- cgit v1.2.3 From d5fd9c72235cfe5302edf9a5bed01edd1288c5b7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:27:41 +0200 Subject: gnu: ipopt: Use HTTPS home page URI. * gnu/packages/maths.scm (ipopt)[home-page]: Use HTTPS URI. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9a24625a52..fe1dfdcb67 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1601,7 +1601,7 @@ (define-public ipopt (inputs ;; TODO: Maybe add dependency on COIN-MUMPS, ASL, and HSL. `(("lapack" ,lapack))) ;for both libblas and liblapack - (home-page "http://www.coin-or.org") + (home-page "https://www.coin-or.org") (synopsis "Large-scale nonlinear optimizer") (description "The Interior Point Optimizer (IPOPT) is a software package for -- cgit v1.2.3 From c0f297e85f37034e6fc8249966d3a7167951a3dd Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Jun 2020 17:31:08 +0200 Subject: gnu: cuirass: Update to 0.0.1-2280ae18. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-2280ae18. --- gnu/packages/ci.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index b74e73ceea..317136e38f 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2017 Mathieu Lirzin -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018 Clément Lassieur ;;; @@ -47,8 +47,8 @@ (define-module (gnu packages ci) #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "9559fd18d4b89bf797216fbe187f2b26b0a2d165") - (revision "30")) + (let ((commit "2280ae18eb25aa7034636c58bf288c9bd5a8fa3b") + (revision "31")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -60,7 +60,7 @@ (define-public cuirass (file-name (git-file-name name version)) (sha256 (base32 - "026cpcws8mb483mywwx2znpy9i7lw5n3lyqa9k6d87kxmw59060c")))) + "1gbmpwgiwy740d936b052gfivzw52pgrny7j7lbl56wi9wnawkc9")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 127c7fba1aee2a547cd4653cb548c3eed9a699ee Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:33:58 +0200 Subject: gnu: grfcodec: Fix source URL. * gnu/packages/game-development.scm (grfcodec)[source]: Use HTTPS for URL. Re-indent package. --- gnu/packages/game-development.scm | 60 +++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 785447644c..b899c2fe6c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -191,39 +191,39 @@ (define-public grfcodec (package (name "grfcodec") (version "6.0.6") - (source (origin - (method url-fetch) - (uri (string-append "http://binaries.openttd.org/extra/" - name "/" version "/" name "-" version - "-source.tar.xz")) - (sha256 - (base32 - "08admgnpqcsifpicbm56apgv360fxapqpbbsp10qyk8i22w1ivsk")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://binaries.openttd.org/extra/" + name "/" version "/" name "-" version + "-source.tar.xz")) + (sha256 + (base32 "08admgnpqcsifpicbm56apgv360fxapqpbbsp10qyk8i22w1ivsk")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no check target + '(#:tests? #f ;no check target #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'install ; no install target - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (doc (string-append out "/share/doc")) - (man (string-append out "/share/man/man1"))) - (for-each (lambda (file) - (install-file file bin)) - '("grfcodec" "grfid" "grfstrip" "nforenum")) - (install-file "COPYING" doc) - (with-directory-excursion "docs" - (for-each (lambda (file) - (install-file (string-append file ".txt") doc)) - '("auto_correct" "commands" "grf" "grfcodec" "grftut" - "readme" "readme.rpn")) - (for-each (lambda (file) - (install-file file man)) - (find-files "." "\\.1")))) - #t))))) + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (replace 'install ;no install target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc")) + (man (string-append out "/share/man/man1"))) + (for-each (lambda (file) + (install-file file bin)) + '("grfcodec" "grfid" "grfstrip" "nforenum")) + (install-file "COPYING" doc) + (with-directory-excursion "docs" + (for-each (lambda (file) + (install-file (string-append file ".txt") doc)) + '("auto_correct" "commands" "grf" "grfcodec" "grftut" + "readme" "readme.rpn")) + (for-each (lambda (file) + (install-file file man)) + (find-files "." "\\.1")))) + #t))))) (inputs `(("boost" ,boost) ("libpng" ,libpng) -- cgit v1.2.3 From 58cb52a31d5fd6c303440bf2fb900a267734d106 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:34:41 +0200 Subject: gnu: ipopt: Fix source URI. * gnu/packages/maths.scm (ipopt)[source]: Fix URI. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fe1dfdcb67..45d699e39c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1567,7 +1567,7 @@ (define-public ipopt (source (origin (method url-fetch) (uri (string-append - "http://www.coin-or.org/download/source/Ipopt/Ipopt-" + "https://www.coin-or.org/download/source/Ipopt/Ipopt-" version".tgz")) (sha256 (base32 -- cgit v1.2.3 From a474999c260c8afa8ebb114f65ada3aeb0d7c17c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 17:27:41 +0200 Subject: gnu: man-pages: Update to 5.07. * gnu/packages/man.scm (man-pages): Update to 5.07. --- gnu/packages/man.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 779781f822..2d059baddc 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -164,7 +164,7 @@ (define-public man-db (define-public man-pages (package (name "man-pages") - (version "5.06") + (version "5.07") (source (origin (method url-fetch) @@ -174,7 +174,7 @@ (define-public man-pages (string-append "mirror://kernel.org/linux/docs/man-pages/Archive/" "man-pages-" version ".tar.xz"))) (sha256 - (base32 "0l7ypgl36jswa077qvdh1rcsvnwr64vja6cc32bab86sm41akf3h")))) + (base32 "13b3q7c67r0wkla4pdihl1qh09k67ms2z5jgzfqgpdqqy6mgziwd")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From c90730aefef8906d4a3c2056695d79fd44946247 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 20:36:23 +0200 Subject: gnu: progress: Update to 0.15. * gnu/packages/admin.scm (progress): Update to 0.15. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bcbdf9b395..1a0e19b19a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -213,7 +213,7 @@ (define-public aide (define-public progress (package (name "progress") - (version "0.14") + (version "0.15") (source (origin (method git-fetch) @@ -221,7 +221,7 @@ (define-public progress (url "https://github.com/Xfennec/progress.git") (commit (string-append "v" version)))) (sha256 - (base32 "1lk2v4b767klib93an4g3f7z5qrv9kdk9jf7545vw1immc4kamrl")) + (base32 "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From a8c8b8904840d492f5f46c0f85abfae7c767e37d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 21:53:48 +0200 Subject: gnu: thinkfan: Update to 1.2. * gnu/packages/linux.scm (thinkfan): Update to 1.2. [home-page]: Switch to an up-to-date home page. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 08b5b69d16..73d99be48c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4988,7 +4988,7 @@ (define-public freefall (define-public thinkfan (package (name "thinkfan") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) @@ -4997,7 +4997,7 @@ (define-public thinkfan (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1fxd1w3z65glw6y04myn7ihgswkx6sqnkky159mik4n96pfrsvr5")))) + (base32 "0vmkpj575a1w52zx1jn6kdrk8rc9vp0f1bldi1bajicpgbs6rjd3")))) (build-system cmake-build-system) (arguments `(#:modules ((guix build cmake-build-system) @@ -5033,7 +5033,7 @@ (define-public thinkfan (inputs `(("libatasmart" ,libatasmart) ("yaml-cpp" ,yaml-cpp))) - (home-page "http://thinkfan.sourceforge.net/") + (home-page "https://github.com/vmatare/thinkfan") (synopsis "Simple fan control program") (description "Thinkfan is a simple fan control program. It reads temperatures, -- cgit v1.2.3 From 4ee117d56bde738189cb75dc745e309169f27289 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 21:57:40 +0200 Subject: gnu: scintilla: Update to 4.4.3. * gnu/packages/text-editors.scm (scintilla): Update to 4.4.3. --- gnu/packages/text-editors.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 1740404709..2edc9820a8 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -743,14 +743,14 @@ (define-public texmacs (define-public scintilla (package (name "scintilla") - (version "4.4.0") + (version "4.4.3") (source (origin (method url-fetch) (uri (let ((v (apply string-append (string-split version #\.)))) (string-append "https://www.scintilla.org/scintilla" v ".tgz"))) (sha256 - (base32 "10qnab10gfkzdfyqpmsl4c3mhh7533l4q6jrdfy5ssvj4da6hawd")))) + (base32 "080v9l7dn3qgkdg0nc0kwpj6warwpi904zjgz9kzg1l6pknxf21s")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") -- cgit v1.2.3 From a4620c019b8d5e9b24f3ea8470cd20b9a0bebb70 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 22:17:11 +0200 Subject: gnu: fet: Update to 5.45.0. * gnu/packages/education.scm (fet): Update to 5.45.0. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 2ccda4b7a0..0a186736d4 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -609,14 +609,14 @@ (define-public omnitux (define-public fet (package (name "fet") - (version "5.44.8") + (version "5.45.0") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "1i59xpkdnrd3qzgqs11vsws57g33zvkad5q3an56vd94aw7z3kpw")))) + (base32 "04jns6wc20rz6cp410znsllknhp4zlf4rn8wgv712855nffs42c6")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 3cd92a855e8f6768a4470cd5522749a39d5f9047 Mon Sep 17 00:00:00 2001 From: Caleb Ristvedt Date: Mon, 1 Jun 2020 18:50:07 -0500 Subject: database: work around guile-sqlite3 bug preventing statement reset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit guile-sqlite3 provides statement caching, making it unnecessary for sqlite to keep re-preparing statements that are frequently used. Unfortunately it doesn't quite emulate the semantics of sqlite_finalize properly, because it doesn't cause a commit if the statement being finalized is the last "active" statement (see https://notabug.org/guile-sqlite3/guile-sqlite3/issues/12). We work around this by wrapping sqlite-finalize with our own version that ensures sqlite-reset is called, which does The Right Thing™. * guix/store/database.scm (sqlite-finalize): new procedure that shadows the sqlite-finalize from (sqlite3). --- guix/store/database.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/guix/store/database.scm b/guix/store/database.scm index ef52036ede..ae7e96df2f 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -130,6 +130,17 @@ (define-syntax-rule (with-database file db exp ...) If FILE doesn't exist, create it and initialize it as a new database." (call-with-database file (lambda (db) exp ...))) +(define (sqlite-finalize stmt) + ;; As of guile-sqlite3 0.1.0, cached statements aren't reset when + ;; sqlite-finalize is invoked on them (see + ;; https://notabug.org/guile-sqlite3/guile-sqlite3/issues/12). This can + ;; cause problems with automatically-started transactions, so we work around + ;; it by wrapping sqlite-finalize so that sqlite-reset is always called. + ;; This always works, because resetting a statement twice has no adverse + ;; effects. We can remove this once the fixed guile-sqlite3 is widespread. + (sqlite-reset stmt) + ((@ (sqlite3) sqlite-finalize) stmt)) + (define (last-insert-row-id db) ;; XXX: (sqlite3) currently lacks bindings for 'sqlite3_last_insert_rowid'. ;; Work around that. -- cgit v1.2.3 From 5d6e2255286e591def122ec2f4a3cbda497fea21 Mon Sep 17 00:00:00 2001 From: Caleb Ristvedt Date: Mon, 1 Jun 2020 19:21:43 -0500 Subject: database: rewrite query procedures in terms of with-statement. Most of our queries would fail to finalize their statements properly if sqlite returned an error during their execution. This resolves that, and also makes them somewhat more concise as a side-effect. This also makes some small changes to improve certain queries where behavior was strange or overly verbose. * guix/store/database.scm (call-with-statement): new procedure. (with-statement): new macro. (last-insert-row-id, path-id, update-or-insert, add-references): rewrite to use with-statement. (update-or-insert): factor last-insert-row-id out of the end of both branches. (add-references): remove pointless last-insert-row-id call. * .dir-locals.el (with-statement): add indenting information. --- .dir-locals.el | 1 + guix/store/database.scm | 53 +++++++++++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index dc8bc0e437..77c12f9411 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -89,6 +89,7 @@ (eval . (put 'with-database 'scheme-indent-function 2)) (eval . (put 'call-with-transaction 'scheme-indent-function 2)) + (eval . (put 'with-statement 'scheme-indent-function 3)) (eval . (put 'call-with-container 'scheme-indent-function 1)) (eval . (put 'container-excursion 'scheme-indent-function 1)) diff --git a/guix/store/database.scm b/guix/store/database.scm index ae7e96df2f..e74c4ba991 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -141,14 +141,26 @@ (define (sqlite-finalize stmt) (sqlite-reset stmt) ((@ (sqlite3) sqlite-finalize) stmt)) +(define (call-with-statement db sql proc) + (let ((stmt (sqlite-prepare db sql #:cache? #t))) + (dynamic-wind + (const #t) + (lambda () + (proc stmt)) + (lambda () + (sqlite-finalize stmt))))) + +(define-syntax-rule (with-statement db sql stmt exp ...) + "Run EXP... with STMT bound to a prepared statement corresponding to the sql +string SQL for DB." + (call-with-statement db sql + (lambda (stmt) exp ...))) + (define (last-insert-row-id db) ;; XXX: (sqlite3) currently lacks bindings for 'sqlite3_last_insert_rowid'. ;; Work around that. - (let* ((stmt (sqlite-prepare db "SELECT last_insert_rowid();" - #:cache? #t)) - (result (sqlite-fold cons '() stmt))) - (sqlite-finalize stmt) - (match result + (with-statement db "SELECT last_insert_rowid();" stmt + (match (sqlite-fold cons '() stmt) ((#(id)) id) (_ #f)))) @@ -158,13 +170,11 @@ (define path-id-sql (define* (path-id db path) "If PATH exists in the 'ValidPaths' table, return its numerical identifier. Otherwise, return #f." - (let ((stmt (sqlite-prepare db path-id-sql #:cache? #t))) + (with-statement db path-id-sql stmt (sqlite-bind-arguments stmt #:path path) - (let ((result (sqlite-fold cons '() stmt))) - (sqlite-finalize stmt) - (match result - ((#(id) . _) id) - (_ #f))))) + (match (sqlite-fold cons '() stmt) + ((#(id) . _) id) + (_ #f)))) (define update-sql "UPDATE ValidPaths SET hash = :hash, registrationTime = :time, deriver = @@ -181,20 +191,17 @@ (define* (update-or-insert db #:key path deriver hash nar-size time) of course. Returns the row id of the row that was modified or inserted." (let ((id (path-id db path))) (if id - (let ((stmt (sqlite-prepare db update-sql #:cache? #t))) + (with-statement db update-sql stmt (sqlite-bind-arguments stmt #:id id #:deriver deriver #:hash hash #:size nar-size #:time time) - (sqlite-fold cons '() stmt) - (sqlite-finalize stmt) - (last-insert-row-id db)) - (let ((stmt (sqlite-prepare db insert-sql #:cache? #t))) + (sqlite-fold cons '() stmt)) + (with-statement db insert-sql stmt (sqlite-bind-arguments stmt #:path path #:deriver deriver #:hash hash #:size nar-size #:time time) - (sqlite-fold cons '() stmt) ;execute it - (sqlite-finalize stmt) - (last-insert-row-id db))))) + (sqlite-fold cons '() stmt))) + (last-insert-row-id db))) (define add-reference-sql "INSERT OR REPLACE INTO Refs (referrer, reference) VALUES (:referrer, :reference);") @@ -202,15 +209,13 @@ (define add-reference-sql (define (add-references db referrer references) "REFERRER is the id of the referring store item, REFERENCES is a list ids of items referred to." - (let ((stmt (sqlite-prepare db add-reference-sql #:cache? #t))) + (with-statement db add-reference-sql stmt (for-each (lambda (reference) (sqlite-reset stmt) (sqlite-bind-arguments stmt #:referrer referrer #:reference reference) - (sqlite-fold cons '() stmt) ;execute it - (last-insert-row-id db)) - references) - (sqlite-finalize stmt))) + (sqlite-fold cons '() stmt)) + references))) (define* (sqlite-register db #:key path (references '()) deriver hash nar-size time) -- cgit v1.2.3 From 37545de4a3bf59611c184b31506fe9a16abe4c8b Mon Sep 17 00:00:00 2001 From: Caleb Ristvedt Date: Mon, 1 Jun 2020 21:43:14 -0500 Subject: database: ensure update-or-insert is run within a transaction update-or-insert can break if an insert occurs between when it decides whether to update or insert and when it actually performs that operation. Putting the check and the update/insert operation in the same transaction ensures that the update/insert will only succeed if no other write has occurred in the middle. * guix/store/database.scm (call-with-savepoint): new procedure. (update-or-insert): use call-with-savepoint to ensure the read and the insert/update occur within the same transaction. --- .dir-locals.el | 1 + guix/store/database.scm | 68 +++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 56 insertions(+), 13 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 77c12f9411..d9c81b2a48 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -90,6 +90,7 @@ (eval . (put 'with-database 'scheme-indent-function 2)) (eval . (put 'call-with-transaction 'scheme-indent-function 2)) (eval . (put 'with-statement 'scheme-indent-function 3)) + (eval . (put 'call-with-savepoint 'scheme-indent-function 1)) (eval . (put 'call-with-container 'scheme-indent-function 1)) (eval . (put 'container-excursion 'scheme-indent-function 1)) diff --git a/guix/store/database.scm b/guix/store/database.scm index e74c4ba991..3193dcf23c 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -120,6 +120,26 @@ (define (call-with-transaction db proc) (begin (sqlite-exec db "rollback;") (throw 'sqlite-error who error description)))))) +(define* (call-with-savepoint db proc + #:optional (savepoint-name "SomeSavepoint")) + "Call PROC after creating a savepoint named SAVEPOINT-NAME. If PROC exits +abnormally, rollback to that savepoint. In all cases, remove the savepoint +prior to returning." + (define (exec sql) + (with-statement db sql stmt + (sqlite-fold cons '() stmt))) + + (dynamic-wind + (lambda () + (exec (string-append "SAVEPOINT " savepoint-name ";"))) + (lambda () + (catch #t + proc + (lambda args + (exec (string-append "ROLLBACK TO " savepoint-name ";")) + (apply throw args)))) + (lambda () + (exec (string-append "RELEASE " savepoint-name ";"))))) (define %default-database-file ;; Default location of the store database. @@ -189,19 +209,41 @@ (define* (update-or-insert db #:key path deriver hash nar-size time) doesn't exactly have... they've got something close, but it involves deleting and re-inserting instead of updating, which causes problems with foreign keys, of course. Returns the row id of the row that was modified or inserted." - (let ((id (path-id db path))) - (if id - (with-statement db update-sql stmt - (sqlite-bind-arguments stmt #:id id - #:deriver deriver - #:hash hash #:size nar-size #:time time) - (sqlite-fold cons '() stmt)) - (with-statement db insert-sql stmt - (sqlite-bind-arguments stmt - #:path path #:deriver deriver - #:hash hash #:size nar-size #:time time) - (sqlite-fold cons '() stmt))) - (last-insert-row-id db))) + + ;; It's important that querying the path-id and the insert/update operation + ;; take place in the same transaction, as otherwise some other + ;; process/thread/fiber could register the same path between when we check + ;; whether it's already registered and when we register it, resulting in + ;; duplicate paths (which, due to a 'unique' constraint, would cause an + ;; exception to be thrown). With the default journaling mode this will + ;; prevent writes from occurring during that sensitive time, but with WAL + ;; mode it will instead arrange to return SQLITE_BUSY when a write occurs + ;; between the start of a read transaction and its upgrading to a write + ;; transaction (see https://sqlite.org/rescode.html#busy_snapshot). + ;; Experimentally, it seems this SQLITE_BUSY will ignore a busy_timeout and + ;; immediately return (makes sense, since waiting won't change anything). + + ;; Note that when that kind of SQLITE_BUSY error is returned, it will keep + ;; being returned every time we try to upgrade the same outermost + ;; transaction to a write transaction. So when retrying, we have to restart + ;; the *outermost* write transaction. We can't inherently tell whether + ;; we're the outermost write transaction, so we leave the retry-handling to + ;; the caller. + (call-with-savepoint db + (lambda () + (let ((id (path-id db path))) + (if id + (with-statement db update-sql stmt + (sqlite-bind-arguments stmt #:id id + #:deriver deriver + #:hash hash #:size nar-size #:time time) + (sqlite-fold cons '() stmt)) + (with-statement db insert-sql stmt + (sqlite-bind-arguments stmt + #:path path #:deriver deriver + #:hash hash #:size nar-size #:time time) + (sqlite-fold cons '() stmt))) + (last-insert-row-id db))))) (define add-reference-sql "INSERT OR REPLACE INTO Refs (referrer, reference) VALUES (:referrer, :reference);") -- cgit v1.2.3 From 8971f626f2e69987bea729307adb93a0be243234 Mon Sep 17 00:00:00 2001 From: Caleb Ristvedt Date: Mon, 1 Jun 2020 22:15:21 -0500 Subject: database: separate transaction-handling and retry-handling. Previously call-with-transaction would both retry when SQLITE_BUSY errors were thrown and do what its name suggested (start and rollback/commit a transaction). This changes it to do only what its name implies, which simplifies its implementation. Retrying is provided by the new call-with-SQLITE_BUSY-retrying procedure. * guix/store/database.scm (call-with-transaction): no longer restarts, new #:restartable? argument controls whether "begin" or "begin immediate" is used. (call-with-SQLITE_BUSY-retrying, call-with-retrying-transaction, call-with-retrying-savepoint): new procedures. (register-items): use call-with-retrying-transaction to preserve old behavior. * .dir-locals.el (call-with-retrying-transaction, call-with-retrying-savepoint): add indentation information. --- .dir-locals.el | 2 ++ guix/store/database.scm | 69 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index d9c81b2a48..b88ec7a795 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -90,7 +90,9 @@ (eval . (put 'with-database 'scheme-indent-function 2)) (eval . (put 'call-with-transaction 'scheme-indent-function 2)) (eval . (put 'with-statement 'scheme-indent-function 3)) + (eval . (put 'call-with-retrying-transaction 'scheme-indent-function 2)) (eval . (put 'call-with-savepoint 'scheme-indent-function 1)) + (eval . (put 'call-with-retrying-savepoint 'scheme-indent-function 1)) (eval . (put 'call-with-container 'scheme-indent-function 1)) (eval . (put 'container-excursion 'scheme-indent-function 1)) diff --git a/guix/store/database.scm b/guix/store/database.scm index 3193dcf23c..ad9ca68efe 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -99,27 +99,44 @@ (define (call-with-database file proc) ;; XXX: missing in guile-sqlite3@0.1.0 (define SQLITE_BUSY 5) -(define (call-with-transaction db proc) - "Start a transaction with DB (make as many attempts as necessary) and run -PROC. If PROC exits abnormally, abort the transaction, otherwise commit the -transaction after it finishes." +(define (call-with-SQLITE_BUSY-retrying thunk) + "Call THUNK, retrying as long as it exits abnormally due to SQLITE_BUSY +errors." (catch 'sqlite-error + thunk + (lambda (key who code errmsg) + (if (= code SQLITE_BUSY) + (call-with-SQLITE_BUSY-retrying thunk) + (throw key who code errmsg))))) + + + +(define* (call-with-transaction db proc #:key restartable?) + "Start a transaction with DB and run PROC. If PROC exits abnormally, abort +the transaction, otherwise commit the transaction after it finishes. +RESTARTABLE? may be set to a non-#f value when it is safe to run PROC multiple +times. This may reduce contention for the database somewhat." + (define (exec sql) + (with-statement db sql stmt + (sqlite-fold cons '() stmt))) + ;; We might use begin immediate here so that if we need to retry, we figure + ;; that out immediately rather than because some SQLITE_BUSY exception gets + ;; thrown partway through PROC - in which case the part already executed + ;; (which may contain side-effects!) might have to be executed again for + ;; every retry. + (exec (if restartable? "begin;" "begin immediate;")) + (catch #t (lambda () - ;; We use begin immediate here so that if we need to retry, we - ;; figure that out immediately rather than because some SQLITE_BUSY - ;; exception gets thrown partway through PROC - in which case the - ;; part already executed (which may contain side-effects!) would be - ;; executed again for every retry. - (sqlite-exec db "begin immediate;") - (let ((result (proc))) - (sqlite-exec db "commit;") - result)) - (lambda (key who error description) - (if (= error SQLITE_BUSY) - (call-with-transaction db proc) - (begin - (sqlite-exec db "rollback;") - (throw 'sqlite-error who error description)))))) + (let-values ((result (proc))) + (exec "commit;") + (apply values result))) + (lambda args + ;; The roll back may or may not have occurred automatically when the + ;; error was generated. If it has occurred, this does nothing but signal + ;; an error. If it hasn't occurred, this needs to be done. + (false-if-exception (exec "rollback;")) + (apply throw args)))) + (define* (call-with-savepoint db proc #:optional (savepoint-name "SomeSavepoint")) "Call PROC after creating a savepoint named SAVEPOINT-NAME. If PROC exits @@ -141,6 +158,18 @@ (define (exec sql) (lambda () (exec (string-append "RELEASE " savepoint-name ";"))))) +(define* (call-with-retrying-transaction db proc #:key restartable?) + (call-with-SQLITE_BUSY-retrying + (lambda () + (call-with-transaction db proc #:restartable? restartable?)))) + +(define* (call-with-retrying-savepoint db proc + #:optional (savepoint-name + "SomeSavepoint")) + (call-with-SQLITE_BUSY-retrying + (lambda () + (call-with-savepoint db proc savepoint-name)))) + (define %default-database-file ;; Default location of the store database. (string-append %store-database-directory "/db.sqlite")) @@ -412,7 +441,7 @@ (define real-file-name (mkdir-p db-dir) (parameterize ((sql-schema schema)) (with-database (string-append db-dir "/db.sqlite") db - (call-with-transaction db + (call-with-retrying-transaction db (lambda () (let* ((prefix (format #f "registering ~a items" (length items))) (progress (progress-reporter/bar (length items) -- cgit v1.2.3 From 7a7a29445ced24af0dcdabfe8011538711fe05d9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Jun 2020 18:02:01 +0300 Subject: gnu: lyx: Wrap binary. Fixes . * gnu/packages/tex.scm (lyx)[arguments]: Import qt-utils. Add phase to wrap the lyx2.3 binary. --- gnu/packages/tex.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 6f6ea73ffc..16c80324fd 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Roel Janssen -;;; Copyright © 2016, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Federico Beffa ;;; Copyright © 2016 Thomas Danckaert ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus @@ -6140,6 +6140,11 @@ (define-public lyx (assoc-ref %outputs "out") ;; Exact name and level is necessary. "/lyx" ,(version-major+minor version))) + #:modules ((guix build cmake-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%cmake-build-system-modules + (guix build qt-utils)) #:phases (modify-phases %standard-phases ;; See ;; https://www.lyx.org/trac/changeset/3a123b90af838b08680471d87170c38e56787df9/lyxgit @@ -6177,6 +6182,14 @@ (define-public lyx ,(version-major+minor version) #\-)) "x") (string-append (getcwd) "/../lyx-" ,version "/lib")) #t)) + (add-after 'install 'wrap-qt + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") + (string-append "../lyx" + ,(version-major+minor version) + "/bin/lyx" + ,(version-major+minor version))) + #t)) (add-after 'install 'install-symlinks (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From 03a7b67b314286a9185535f5ecbb7cde97ae2c97 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Jun 2020 21:42:14 +0300 Subject: gnu: lyx: Update to 2.3.5.1. * gnu/packages/tex.scm (lyx): Update to 2.3.5.1. [arguments]: Remove 'fix-compilation-with-boost-1.69 phase. In 'patch-python phase patch more files, substitute with python3. Split 'setenv-check and create empty file after 'unpack. --- gnu/packages/tex.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 16c80324fd..cd8270634c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6116,15 +6116,15 @@ (define-public teximpatient (define-public lyx (package (name "lyx") - (version "2.3.3") + (version "2.3.5.1") (source (origin (method url-fetch) (uri (string-append "https://ftp.lyx.org/pub/lyx/stable/" (version-major+minor version) ".x/" - "lyx-" version ".tar.gz")) + "lyx-" version ".tar.xz")) (sha256 (base32 - "0j3xincwmsscfgv13g3z6h4kx1qfzgg8x71fs393akcdxsh2g07c")) + "0mv32s26igm0pd8vs7d2mk1240dpr83y0a2wyh3xz6b67ph0w157")) (modules '((guix build utils))) (snippet '(begin @@ -6147,19 +6147,17 @@ (define-public lyx (guix build qt-utils)) #:phases (modify-phases %standard-phases - ;; See ;; https://www.lyx.org/trac/changeset/3a123b90af838b08680471d87170c38e56787df9/lyxgit - (add-after 'unpack 'fix-compilation-with-boost-1.69 - (lambda _ - (substitute* "src/support/FileName.cpp" - (("^template struct boost::detail::crc_table_t.*") "")) - #t)) (add-after 'unpack 'patch-python (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("src/support/os.cpp") + (substitute* '("lib/configure.py" + "src/support/ForkedCalls.cpp" + "src/support/Systemcall.cpp" + "src/support/os.cpp" + "src/support/filetools.cpp") (("\"python ") (string-append "\"" (assoc-ref inputs "python") - "/bin/python "))) + "/bin/python3 "))) #t)) (add-after 'patch-python 'patch-desktop-file (lambda* (#:key outputs #:allow-other-keys) @@ -6169,13 +6167,14 @@ (define-public lyx (assoc-ref outputs "out") "/"))) #t)) - (add-before 'check 'setenv-check + (add-after 'unpack 'add-missing-test-file (lambda _ ;; Create missing file that would cause tests to fail. - (with-output-to-file (string-append "../lyx-" - ,version - "/src/tests/check_layout.cmake") + (with-output-to-file "src/tests/check_layout.cmake" (const #t)) + #t)) + (add-before 'check 'setenv-check + (lambda _ (setenv (string-append "LYX_DIR_" (string-join (string-split -- cgit v1.2.3 From dadf97952d574e6e44d10a2eb0e2afef86a96818 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 09:26:38 +0300 Subject: gnu: lyx: Don't install to custom directory. * gnu/packages/tex.scm (lyx)[arguments]: Adjust configure-flags to not add the version to the binary's suffix. Remove custom 'patch-desktop-file, 'setenv-check and 'install-symlink phases. --- gnu/packages/tex.scm | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index cd8270634c..f7d5fd1506 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6136,10 +6136,9 @@ (define-public lyx "-DLYX_EXTERNAL_BOOST=1" "-DLYX_INSTALL=1" "-DLYX_RELEASE=1" + "-DLYX_PROGRAM_SUFFIX=OFF" ,(string-append "-DLYX_INSTALL_PREFIX=" - (assoc-ref %outputs "out") - ;; Exact name and level is necessary. - "/lyx" ,(version-major+minor version))) + (assoc-ref %outputs "out"))) #:modules ((guix build cmake-build-system) (guix build qt-utils) (guix build utils)) @@ -6159,44 +6158,16 @@ (define-public lyx (assoc-ref inputs "python") "/bin/python3 "))) #t)) - (add-after 'patch-python 'patch-desktop-file - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "lib/lyx.desktop.in" - (("Exec=") - (string-append "Exec=" - (assoc-ref outputs "out") - "/"))) - #t)) (add-after 'unpack 'add-missing-test-file (lambda _ ;; Create missing file that would cause tests to fail. (with-output-to-file "src/tests/check_layout.cmake" (const #t)) #t)) - (add-before 'check 'setenv-check - (lambda _ - (setenv (string-append "LYX_DIR_" - (string-join - (string-split - ,(version-major+minor version) #\-)) "x") - (string-append (getcwd) "/../lyx-" ,version "/lib")) - #t)) (add-after 'install 'wrap-qt (lambda* (#:key outputs #:allow-other-keys) - (wrap-qt-program (assoc-ref outputs "out") - (string-append "../lyx" - ,(version-major+minor version) - "/bin/lyx" - ,(version-major+minor version))) - #t)) - (add-after 'install 'install-symlinks - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/bin")) - (symlink (string-append "../lyx" ,(version-major+minor version) - "/bin/lyx" ,(version-major+minor version)) - (string-append out "/bin/lyx" ,(version-major+minor version))) - #t)))))) + (wrap-qt-program (assoc-ref outputs "out") "lyx") + #t))))) (inputs `(("boost" ,boost) ("hunspell" ,hunspell) ; Note: Could also use aspell instead. -- cgit v1.2.3 From e192b9e02d7cf6f063b6fe0895a0d3f7b34cc9b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 09:49:45 +0300 Subject: gnu: lyx: Use qt-build-system. * gnu/packages/tex.scm (lyx)[build-system]: Switch to qt-build-system. [arguments]: Remove imported modules. Remove custom 'wrap-qt phase. --- gnu/packages/tex.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index f7d5fd1506..47645a3e34 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -33,9 +33,9 @@ (define-module (gnu packages tex) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) + #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (guix build-system texlive) #:use-module (guix utils) @@ -6130,7 +6130,7 @@ (define-public lyx '(begin (delete-file-recursively "3rdparty") #t)))) - (build-system cmake-build-system) + (build-system qt-build-system) (arguments `(#:configure-flags `("-DLYX_USE_QT=QT5" "-DLYX_EXTERNAL_BOOST=1" @@ -6139,11 +6139,6 @@ (define-public lyx "-DLYX_PROGRAM_SUFFIX=OFF" ,(string-append "-DLYX_INSTALL_PREFIX=" (assoc-ref %outputs "out"))) - #:modules ((guix build cmake-build-system) - (guix build qt-utils) - (guix build utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build qt-utils)) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-python @@ -6163,10 +6158,6 @@ (define-public lyx ;; Create missing file that would cause tests to fail. (with-output-to-file "src/tests/check_layout.cmake" (const #t)) - #t)) - (add-after 'install 'wrap-qt - (lambda* (#:key outputs #:allow-other-keys) - (wrap-qt-program (assoc-ref outputs "out") "lyx") #t))))) (inputs `(("boost" ,boost) -- cgit v1.2.3 From 3d79fd59fee6716fcb457b17b5c54208ad789cbb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:34:59 +0300 Subject: gnu: subversion: Use a mirror URL. * gnu/packages/version-control.scm (subversion)[source]: Use an apache mirror:// URL. --- gnu/packages/version-control.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 60a31fb16c..bac51e3181 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2014, 2016, 2019 Eric Bavier -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015, 2018 Kyle Meyer ;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari @@ -1572,12 +1572,8 @@ (define-public subversion (version "1.10.6") (source (origin (method url-fetch) - (uri - (list - (string-append "https://archive.apache.org/dist/subversion/" - "subversion-" version ".tar.bz2") - (string-append "https://www-eu.apache.org/dist/subversion/" - "subversion-" version ".tar.bz2"))) + (uri (string-append "mirror://apache/dist/subversion/" + "subversion-" version ".tar.bz2")) (sha256 (base32 "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q")))) -- cgit v1.2.3 From 1c32eb95af304800b65c0bdebe0ea81f70b90080 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:46:51 +0300 Subject: gnu: serf: Use a mirror URL. * gnu/packages/web.scm (serf)[source]: Use an apache mirror:// URL. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 30ef341fa3..82174c0033 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1575,7 +1575,7 @@ (define-public serf (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/serf/serf-" + (uri (string-append "mirror://apache/dist/serf/serf-" version ".tar.bz2")) (sha256 (base32 "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l")))) -- cgit v1.2.3 From a00687427d89321fd796d3cdc657d134374aae56 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:48:08 +0300 Subject: gnu: maven-shared-utils: Use a mirror URL. * gnu/packages/maven.scm (maven-shared-utils)[source]: Use an apache mirror:// URL. --- gnu/packages/maven.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index c18850bb26..13091edd5b 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Björn Höfling +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -339,7 +340,7 @@ (define-public maven-shared-utils (version "3.2.1") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/maven/shared/" + (uri (string-append "mirror://apache/dist/maven/shared/" "maven-shared-utils-" version "-source-release.zip")) (sha256 (base32 -- cgit v1.2.3 From 623aa56402b257d01169a375420f13f80f8a57df Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:48:58 +0300 Subject: gnu: maven-plugin-annotations: Use a mirror URL. * gnu/packages/maven.scm (maven-plugin-annotations)[source]: Use an apache mirror:// URL. --- gnu/packages/maven.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 13091edd5b..5c7e49b3a1 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -380,7 +380,7 @@ (define-public maven-plugin-annotations (version "3.5") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/maven/" + (uri (string-append "mirror://apache/dist/maven/" "plugin-tools/maven-plugin-tools-" version "-source-release.zip")) (sha256 (base32 "1ryqhs62j5pas93brhf5dsnvp99hxbvssf681yj5rk3r9h24hqm2")))) -- cgit v1.2.3 From 67b1257775d8b42b60d57627888fa385631eb570 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:49:41 +0300 Subject: gnu: maven-wagon-provider-api: Use a mirror URL. * gnu/packages/maven.scm (maven-wagon-provider-api)[source]: Use an apache mirror:// URL. --- gnu/packages/maven.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 5c7e49b3a1..fe960ec9ef 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -404,7 +404,7 @@ (define-public maven-wagon-provider-api (version "3.1.0") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/maven/wagon/" + (uri (string-append "mirror://apache/dist/maven/wagon/" "wagon-" version "-source-release.zip")) (sha256 (base32 "0r07j6xdzdnrvqnv8ida7dx1m05pznh5qgmcfcfpyvg9nxbj3l1n")))) (build-system ant-build-system) -- cgit v1.2.3 From 21d3307875e1e515739306aa4cff0ff0f7f4c4b5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:50:29 +0300 Subject: gnu: maven-artifact: Use a mirror URL. * gnu/packages/maven.scm (maven-artifact)[source]: Use an apache mirror:// URL. --- gnu/packages/maven.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index fe960ec9ef..a62eb7469e 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -691,7 +691,7 @@ (define-public maven-artifact (version "3.6.1") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/maven/" + (uri (string-append "mirror://apache/dist/maven/" "maven-3/" version "/source/" "apache-maven-" version "-src.tar.gz")) (sha256 (base32 "0grw9zp166ci53rd7qkyy2qmwmik37xhiz1z84jpm0msyvzj2n82")) -- cgit v1.2.3 From f4bb881abda8f3cf3312b2da86ba93c8fdb13a7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:52:18 +0300 Subject: gnu: ant-bootstrap: Use a mirror URL. * gnu/packages/java.scm (ant-bootstrap)[source]: Use an apache mirror:// URL. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 43f0f37b91..2d778d98cc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -276,7 +276,7 @@ (define ant-bootstrap (version "1.8.4") (source (origin (method url-fetch) - (uri (string-append "http://archive.apache.org/dist/" + (uri (string-append "mirror://apache/dist/" "ant/source/apache-ant-" version "-src.tar.bz2")) (sha256 -- cgit v1.2.3 From 894d6a085dc47f767efa43520b524e0f6c53d224 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:53:39 +0300 Subject: gnu: java-commons-httpclient: Use a mirror URL. * gnu/packages/java.scm (java-commons-httpclient)[source]: Use an apache mirror:// URL. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2d778d98cc..d36e3b0f92 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10832,7 +10832,7 @@ (define-public java-commons-httpclient (version "3.1") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/httpcomponents/" + (uri (string-append "mirror://apache/dist/httpcomponents/" "commons-httpclient/source/commons-httpclient-" version "-src.tar.gz")) (sha256 -- cgit v1.2.3 From bb0d840b7dffac94f8be298cfa4846f12157ad5b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:54:31 +0300 Subject: gnu: java-jakarta-oro: Use a mirror URL. * gnu/packages/java.scm (java-jakarta-oro)[source]: Download using an apache mirror:// URL. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d36e3b0f92..885086fe30 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10928,7 +10928,7 @@ (define-public java-jakarta-oro (version "2.0.8") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/jakarta/oro/" + (uri (string-append "mirror://apache/dist/jakarta/oro/" "jakarta-oro-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From f65adfa445b7e061cbff9b699b9dd4eaa66e3b19 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 11 Jun 2020 14:08:07 +0200 Subject: gnu: sameboy: Update to 0.13.2. * gnu/packages/emulators.scm (sameboy): Update to 0.13.2. [arguments]: Specify NATIVE_CC to avoid requiring the `cc' program. --- gnu/packages/emulators.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 9798ac370e..59240f17c4 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -470,7 +470,7 @@ (define-public mgba (define-public sameboy (package (name "sameboy") - (version "0.13.1") + (version "0.13.2") (source (origin (method git-fetch) @@ -479,7 +479,7 @@ (define-public sameboy (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1il2bpbc3xyvvhbs2bgid64svjxcdl4dbqz6jy1azfmvzdp7jkrn")))) + (base32 "19qb1ib9sk5bjdv4arbwkv8l2afpll5axrif3wi7p2yhvpba10c0")))) (build-system gnu-build-system) (native-inputs `(("rgbds" ,rgbds) @@ -489,7 +489,7 @@ (define-public sameboy `(("sdl2" ,sdl2))) (arguments `(#:tests? #f ; There are no tests - #:make-flags `("CC=gcc" "CONF=release" + #:make-flags `("CC=gcc" "NATIVE_CC=gcc" "CONF=release" ,(string-append "DATA_DIR=" (assoc-ref %outputs "out") "/share/sameboy/")) -- cgit v1.2.3 From 82b9ed4eae78cd9dd672c4ecea16c9270e2a95a4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 11 Jun 2020 15:44:21 +0200 Subject: gnu: php: Update to 7.4.7. * gnu/packages/php.scm (php): Update to 7.4.7. --- gnu/packages/php.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 8cd8cace8c..6d9f46e960 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -60,7 +60,7 @@ (define-module (gnu packages php) (define-public php (package (name "php") - (version "7.4.6") + (version "7.4.7") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ (define-public php "php-" version ".tar.xz")) (sha256 (base32 - "0ck8s3zlqnkswwmz3p1bgma7ddjsx9j9sdlz5di1jc7nhhpk4h6p")) + "1brgnp11vpy1619cx0cncih02rg2k20wllm21vxbd2nd4j7qymak")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" -- cgit v1.2.3 From 0b684d087d4b50ea276761ac36ee5f01a84a2547 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:29:29 +0200 Subject: gnu: r-foreign: Update to 0.8-80. * gnu/packages/statistics.scm (r-foreign): Update to 0.8-80. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index fd898a32c5..a15baf2c92 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -513,14 +513,14 @@ (define-public r-codetools (define-public r-foreign (package (name "r-foreign") - (version "0.8-79") + (version "0.8-80") (source (origin (method url-fetch) (uri (cran-uri "foreign" version)) (sha256 (base32 - "1d5rk4k3khjrir1b4ciridd6vdpcgzi35r7p7ra4ky7vbaabcdmg")))) + "0wjdi3qn9famsxmpdyyahidaid0yhxlpx4ad9k8vrxhxd6xspasp")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/foreign") (synopsis "Read data stored by other statistics software") -- cgit v1.2.3 From 06dfe35322406bb3f995331e49df5070e1fb7b3e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:29:39 +0200 Subject: gnu: r-nlme: Update to 3.1-148. * gnu/packages/statistics.scm (r-nlme): Update to 3.1-148. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a15baf2c92..94794560ae 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -599,13 +599,13 @@ (define-public r-matrix (define-public r-nlme (package (name "r-nlme") - (version "3.1-147") + (version "3.1-148") (source (origin (method url-fetch) (uri (cran-uri "nlme" version)) (sha256 - (base32 "1rqc3wy3lmy0wczsvsn8yszzsxhppfwg4iznb1j6ki2qawpdij7g")))) + (base32 "1cmf43r82kar1hpj9dhqfi3rbjka0z5s6cbdy7fklwh99xj3phkp")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From 015a7455a88c05c080aa5771c716bad9d2bfebfc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:29:48 +0200 Subject: gnu: r-ggplot2: Update to 3.3.1. * gnu/packages/statistics.scm (r-ggplot2): Update to 3.3.1. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 94794560ae..8f29abde66 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1097,13 +1097,13 @@ (define-public r-reshape2 (define-public r-ggplot2 (package (name "r-ggplot2") - (version "3.3.0") + (version "3.3.1") (source (origin (method url-fetch) (uri (cran-uri "ggplot2" version)) (sha256 - (base32 "0j21am605kqqzlwhm45kaj0m2irnmy2vz0j7kzi9f0qdzrv3q3ij")))) + (base32 "04wvswadlry2n9gnfqlpdqsav1wllnlzb5c9w9ydynllv4vkwfm0")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) @@ -1117,6 +1117,8 @@ (define-public r-ggplot2 ("r-scales" ,r-scales) ("r-svglite" ,r-svglite) ; Needed for 'ggsave' ("r-withr" ,r-withr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://ggplot2.tidyverse.org") (synopsis "An implementation of the grammar of graphics") (description -- cgit v1.2.3 From b2c29827557893214cf02169b9865bfa707dbb3d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:30:11 +0200 Subject: gnu: r-dplyr: Update to 1.0.0. * gnu/packages/statistics.scm (r-dplyr): Update to 1.0.0. [propagated-inputs]: Remove r-assertthat, r-bh, r-pkgconfig, r-plogr, and r-rcpp; add r-generics, r-lifecycle, and r-vctrs. --- gnu/packages/statistics.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8f29abde66..4c2e75a8ae 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1667,27 +1667,25 @@ (define-public r-tibble (define-public r-dplyr (package (name "r-dplyr") - (version "0.8.5") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "dplyr" version)) (sha256 (base32 - "0602b4a9nffxx67q57csqp87nkrv33nn9wlaw1458yys9fzx6l2p")))) + "1wxi7pzw1mqkgay2s9hwlkpkxfzydngf56wrf7k93n14rlqm3dmz")))) (build-system r-build-system) (propagated-inputs - `(("r-assertthat" ,r-assertthat) - ("r-bh" ,r-bh) - ("r-ellipsis" ,r-ellipsis) + `(("r-ellipsis" ,r-ellipsis) + ("r-generics" ,r-generics) ("r-glue" ,r-glue) + ("r-lifecycle" ,r-lifecycle) ("r-magrittr" ,r-magrittr) - ("r-pkgconfig" ,r-pkgconfig) - ("r-plogr" ,r-plogr) ("r-r6" ,r-r6) - ("r-rcpp" ,r-rcpp) ("r-rlang" ,r-rlang) ("r-tibble" ,r-tibble) - ("r-tidyselect" ,r-tidyselect))) + ("r-tidyselect" ,r-tidyselect) + ("r-vctrs" ,r-vctrs))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://github.com/hadley/dplyr") -- cgit v1.2.3 From 91428c3611ad5c91b5149af9564d269afcaab220 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:31:06 +0200 Subject: gnu: r-dbplyr: Update to 1.4.4. * gnu/packages/statistics.scm (r-dbplyr): Update to 1.4.4. [propagated-inputs]: Add r-blob and r-magrittr. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4c2e75a8ae..a0a7446d7d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1703,21 +1703,23 @@ (define-public r-dplyr (define-public r-dbplyr (package (name "r-dbplyr") - (version "1.4.3") + (version "1.4.4") (source (origin (method url-fetch) (uri (cran-uri "dbplyr" version)) (sha256 (base32 - "1si8sahr1kwq1xgjzi9klkahad07pyrsngy75y1f74f64907pb39")))) + "1v0p0557n6bz84nq9jc4182k00mdd1hvz7h4w3bbg81z0fmpj0d8")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) + ("r-blob" ,r-blob) ("r-dbi" ,r-dbi) ("r-dplyr" ,r-dplyr) ("r-glue" ,r-glue) ("r-lifecycle" ,r-lifecycle) + ("r-magrittr" ,r-magrittr) ("r-purrr" ,r-purrr) ("r-r6" ,r-r6) ("r-rlang" ,r-rlang) -- cgit v1.2.3 From 17788c8c2ff09192ff0d99b15fe4c30319cf9f63 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:31:32 +0200 Subject: gnu: r-backports: Update to 1.1.7. * gnu/packages/statistics.scm (r-backports): Update to 1.1.7. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a0a7446d7d..1869ff1a60 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2094,14 +2094,14 @@ (define-public r-whisker (define-public r-backports (package (name "r-backports") - (version "1.1.6") + (version "1.1.7") (source (origin (method url-fetch) (uri (cran-uri "backports" version)) (sha256 (base32 - "170rphqq28j0pcr28g6dxv3isp436ajhyzkpri31pn0lfm3szs6h")))) + "02vfkqm1kw54y1qax8cmiyg2nk6bmh8j87fc3j22k7852s3y4xxj")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/backports") (synopsis "Reimplementations of functions introduced since R 3.0.0") -- cgit v1.2.3 From 8637b77a9fbc63c1c7a173ce6c5fb50472a35977 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:31:41 +0200 Subject: gnu: r-rcpparmadillo: Update to 0.9.900.1.0. * gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.9.900.1.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1869ff1a60..f5fcceb7c2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2591,13 +2591,13 @@ (define-public r-latticeextra (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.9.870.2.0") + (version "0.9.900.1.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "1r7iajxvbyvslsy16rqacc95azmjciw9lvcq31xl97fl09kmsq5v")))) + "1zisw2yrb9qmmrs7q8y83mrm7lh1c2786h70gs8jwc0si16x0lq5")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d41b944938b184309f57727f42130cd620d47416 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:31:50 +0200 Subject: gnu: r-rmarkdown: Update to 2.2. * gnu/packages/statistics.scm (r-rmarkdown): Update to 2.2. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f5fcceb7c2..2670c425b2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2683,13 +2683,13 @@ (define-public r-rprojroot (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 - (base32 "0pa5xs0vzwn9vsgysjqbks9v5lbqphxh5agciskllibc40hhwigg")))) + (base32 "196r3hq1gcr6iamxllq4k40cb109b16ng24ky0q68bwrll80q1mh")))) (properties `((upstream-name . "rmarkdown"))) (build-system r-build-system) (propagated-inputs @@ -2704,6 +2704,8 @@ (define-public r-rmarkdown ("r-xfun" ,r-xfun) ("r-yaml" ,r-yaml) ("ghc-pandoc" ,ghc-pandoc))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://rmarkdown.rstudio.com") (synopsis "Convert R Markdown documents into a variety of formats") (description -- cgit v1.2.3 From ba8ebc96c2f9e6481e09b9435fb46b075e8c46d6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:32:03 +0200 Subject: gnu: r-glmnet: Update to 4.0. * gnu/packages/statistics.scm (r-glmnet): Update to 4.0. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2670c425b2..854cde3bd1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3233,16 +3233,17 @@ (define-public r-irlba (define-public r-glmnet (package (name "r-glmnet") - (version "3.0-2") + (version "4.0") (source (origin (method url-fetch) (uri (cran-uri "glmnet" version)) (sha256 - (base32 "0b3nnfzp8dxcdkvxr0yvy6d58yk3xg4kz1wqa42bxqppbakmd2gl")))) + (base32 "1vy8v6filhw9sflk8wwnbgz2mryg70ml4iq4y1c34dlwxczcbzv8")))) (build-system r-build-system) (native-inputs - `(("gfortran" ,gfortran))) + `(("gfortran" ,gfortran) + ("r-knitr" ,r-knitr))) (propagated-inputs `(("r-foreach" ,r-foreach) ("r-matrix" ,r-matrix) -- cgit v1.2.3 From f208a5ecc5ba70158df97abceb0839e0c613eae5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:32:26 +0200 Subject: gnu: r-mvtnorm: Update to 1.1-1. * gnu/packages/statistics.scm (r-mvtnorm): Update to 1.1-1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 854cde3bd1..2724c7069a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3577,13 +3577,13 @@ (define-public r-r-rsp (define-public r-mvtnorm (package (name "r-mvtnorm") - (version "1.1-0") + (version "1.1-1") (source (origin (method url-fetch) (uri (cran-uri "mvtnorm" version)) (sha256 (base32 - "0pfb6qk4yb6xaya8i1wvx6dnc3jj4s2g94sq2kzv4p8zn4pf24l1")))) + "1pj51mi0g6ip7a2nhzc93yv9289kaayvspjvsbgbgarvx7axlrg9")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 7518244343f9773670bbb5dc19e8eb3229caa90a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:32:33 +0200 Subject: gnu: r-tidyr: Update to 1.1.0. * gnu/packages/statistics.scm (r-tidyr): Update to 1.1.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2724c7069a..02773995ff 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3704,14 +3704,14 @@ (define-public r-tidyselect (define-public r-tidyr (package (name "r-tidyr") - (version "1.0.3") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "tidyr" version)) (sha256 (base32 - "18ypk63nifp5jj5d9880m49zdv7n4a18gac59wj5z5xk6qr7vfal")))) + "0vqj5dakb35axv4l0yrihpa16vnz2b5bhaaqg7l0gsqbb04qcb00")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) -- cgit v1.2.3 From 51dd48b0bd6040a10874e1d320fd9dc8fb1c14d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:32:40 +0200 Subject: gnu: r-cardata: Update to 3.0-4. * gnu/packages/statistics.scm (r-cardata): Update to 3.0-4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 02773995ff..f450ef320f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5220,13 +5220,13 @@ (define-public r-pbkrtest (define-public r-cardata (package (name "r-cardata") - (version "3.0-3") + (version "3.0-4") (source (origin (method url-fetch) (uri (cran-uri "carData" version)) (sha256 - (base32 "0cg2yxzn0pdjqykr60my1fzpfkqac21fll5hv3m9w5c9sayq8swq")))) + (base32 "09270j39n4jpswxqps20b12zaj8dz4rrqpk2l2j5bnf1xzizb9nd")))) (properties `((upstream-name . "carData"))) (build-system r-build-system) (home-page "https://r-forge.r-project.org/projects/car/") -- cgit v1.2.3 From 8c9474ad6dde0d0116f2d086776ce62880e9ae68 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:32:49 +0200 Subject: gnu: r-car: Update to 3.0-8. * gnu/packages/statistics.scm (r-car): Update to 3.0-8. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f450ef320f..30a0d44392 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5239,13 +5239,13 @@ (define-public r-cardata (define-public r-car (package (name "r-car") - (version "3.0-7") + (version "3.0-8") (source (origin (method url-fetch) (uri (cran-uri "car" version)) (sha256 - (base32 "11sfk1l41j27mrfy16g7b02c570n3gy9icvpcrfjh1biykqa565d")))) + (base32 "0ig1691kxbzkrsq8xi5a6fq2f0vq22j1dn54jxdkldqr5vri1m57")))) (build-system r-build-system) (propagated-inputs `(("r-abind" ,r-abind) -- cgit v1.2.3 From 5c6e70346efc6a581a4acbec16d0b228d1bddb82 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:33:01 +0200 Subject: gnu: Add r-tmvnsim. * gnu/packages/statistics.scm (r-tmvnsim): New variable. --- gnu/packages/statistics.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 30a0d44392..2a878a44e2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5289,6 +5289,35 @@ (define-public r-rcppprogress even in multithreaded code, typically using OpenMP.") (license license:gpl3+))) +(define-public r-tmvnsim + (package + (name "r-tmvnsim") + (version "1.0-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "tmvnsim" version)) + (sha256 + (base32 + "03xsvsg9bqvgl98ywid3h91mmlhax5s6wvmypp3hq91vmc5kvxlp")))) + (properties `((upstream-name . "tmvnsim"))) + (build-system r-build-system) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://www.r-project.org") + (synopsis "Truncated multivariate normal simulation") + (description + "This package implements importance sampling from the truncated +multivariate normal using the @dfn{Geweke-Hajivassiliou-Keane} (GHK) +simulator. Unlike Gibbs sampling which can get stuck in one truncation +sub-region depending on initial values, this package allows truncation based +on disjoint regions that are created by truncation of absolute values. The +GHK algorithm uses simple Cholesky transformation followed by recursive +simulation of univariate truncated normals hence there are also no convergence +issues. Importance sample is returned along with sampling weights, based on +which, one can calculate integrals over truncated regions for multivariate +normals.") + (license license:gpl2))) + (define-public r-mnormt (package (name "r-mnormt") -- cgit v1.2.3 From bbf495d59fe07973e6232f2dbffb7bb34cb0f35a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:36:19 +0200 Subject: gnu: r-mnormt: Update to 2.0.0. * gnu/packages/statistics.scm (r-mnormt): Update to 2.0.0. [propagated-inputs]: Add r-tmvnsim. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2a878a44e2..4a1d35a210 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5321,15 +5321,17 @@ (define-public r-tmvnsim (define-public r-mnormt (package (name "r-mnormt") - (version "1.5-7") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "mnormt" version)) (sha256 (base32 - "1y0vlvh02wza2wvfd29wxjlw3jg9rnwnx3kph5qz4179kz87fgfg")))) + "1gxhma0zqsx5pkc0871vszq1y7akwdmpm8rhws5b3gr6w9mx4agf")))) (build-system r-build-system) + (propagated-inputs + `(("r-tmvnsim" ,r-tmvnsim))) (native-inputs `(("gfortran" ,gfortran))) (home-page "http://azzalini.stat.unipd.it/SW/Pkg-mnormt") -- cgit v1.2.3 From b5613d63a205adc23e154166e178b21949e2540c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:36:40 +0200 Subject: gnu: r-sn: Update to 1.6-2. * gnu/packages/statistics.scm (r-sn): Update to 1.6-2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4a1d35a210..09f6695cb5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5366,14 +5366,14 @@ (define-public r-numderiv (define-public r-sn (package (name "r-sn") - (version "1.6-1") + (version "1.6-2") (source (origin (method url-fetch) (uri (cran-uri "sn" version)) (sha256 (base32 - "0snri2k8qslb7478c5jz4a5xxmmb1ipmp8x1jizi8mhj2cjic1w0")))) + "179xb7yb8br99aa5awm2yxsy0v5w1kdhv6a7ifaliz2y64677m1g")))) (build-system r-build-system) (propagated-inputs `(("r-mnormt" ,r-mnormt) -- cgit v1.2.3 From 249f082806cfda225200f8eb3373aaf2e5ece338 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:36:46 +0200 Subject: gnu: r-lubridate: Update to 1.7.9. * gnu/packages/statistics.scm (r-lubridate): Update to 1.7.9. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 09f6695cb5..7e88e1e54a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5497,14 +5497,14 @@ (define-public r-cairo (define-public r-lubridate (package (name "r-lubridate") - (version "1.7.8") + (version "1.7.9") (source (origin (method url-fetch) (uri (cran-uri "lubridate" version)) (sha256 (base32 - "0g2m9dyhgds4shdrk76w7rqdl9msam4rii2qrhz12gipzhi9k89x")))) + "0wnjzvfkrgp2hkr8g5r5vcgcxmsq8bhdmkzkk0m93wr3fgh5xyfb")))) (build-system r-build-system) (propagated-inputs `(("r-generics" ,r-generics) -- cgit v1.2.3 From 280fbacf78e6665be5ba200b669c388253ed3a92 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:37:05 +0200 Subject: gnu: r-ggpmisc: Update to 0.3.5. * gnu/packages/cran.scm (r-ggpmisc): Update to 0.3.5. [propagated-inputs]: Add r-magrittr, r-rlang, r-scales, and r-stringr. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b27dd40871..0e2825d82a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -124,13 +124,13 @@ (define-public r-clipr (define-public r-ggpmisc (package (name "r-ggpmisc") - (version "0.3.4") + (version "0.3.5") (source (origin (method url-fetch) (uri (cran-uri "ggpmisc" version)) (sha256 (base32 - "0xc1yp0kphipq23ri4ij93garx1x2nrf4i0lhs6m10pp9yz7fbmj")))) + "0ma2d3a3v8n85sghxr9anl6vgbs8gi82i1dllw99n81gsm59wgin")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) @@ -138,13 +138,19 @@ (define-public r-ggpmisc ("r-ggplot2" ,r-ggplot2) ("r-gridextra" ,r-gridextra) ("r-lubridate" ,r-lubridate) + ("r-magrittr" ,r-magrittr) ("r-mass" ,r-mass) ("r-plyr" ,r-plyr) ("r-polynom" ,r-polynom) + ("r-rlang" ,r-rlang) + ("r-scales" ,r-scales) ("r-splus2r" ,r-splus2r) + ("r-stringr" ,r-stringr) ("r-tibble" ,r-tibble) ("r-xts" ,r-xts) ("r-zoo" ,r-zoo))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://www.r4photobiology.info/") (synopsis "Miscellaneous Extensions to @code{ggplot2}") (description "This package provides extensions to @code{ggplot2}, -- cgit v1.2.3 From b0e813f65a3f3b9be4fdcd6cfb5920b241a56207 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:37:41 +0200 Subject: gnu: r-ellipsis: Update to 0.3.1. * gnu/packages/cran.scm (r-ellipsis): Update to 0.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0e2825d82a..c5843c7cf7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -259,14 +259,14 @@ (define-public r-ecp (define-public r-ellipsis (package (name "r-ellipsis") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "ellipsis" version)) (sha256 (base32 - "01z9gq311nzwv3a0sa49jhm5ylqd59srip4vjkrf23hzgb5i9y0b")))) + "1nvmkcca57d9067rcggw1gby80ibx5hplk2myz0cs9zwilaib2jg")))) (build-system r-build-system) (propagated-inputs `(("r-rlang" ,r-rlang))) -- cgit v1.2.3 From 55d34bf2161701004ed4adda4863163944410f59 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:37:51 +0200 Subject: gnu: r-modelr: Update to 0.1.8. * gnu/packages/cran.scm (r-modelr): Update to 0.1.8. [propagated-inputs]: Remove r-dplyr; add r-vctrs. --- gnu/packages/cran.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c5843c7cf7..01adb0bae9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -602,24 +602,24 @@ (define-public r-readxl (define-public r-modelr (package (name "r-modelr") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) (uri (cran-uri "modelr" version)) (sha256 (base32 - "1nln33ajad0c917hmal4v6fbw8rncsch9xz5sifqfw6wgqjx9yy6")))) + "1i31nff7bqibk6r4hhd4j1vzwbyaf8493v0bjaagn36njmysfnw2")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) - ("r-dplyr" ,r-dplyr) ("r-magrittr" ,r-magrittr) ("r-purrr" ,r-purrr) ("r-rlang" ,r-rlang) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) - ("r-tidyselect" ,r-tidyselect))) + ("r-tidyselect" ,r-tidyselect) + ("r-vctrs" ,r-vctrs))) (home-page "https://github.com/tidyverse/modelr") (synopsis "Helper functions for modelling in pipelines") (description -- cgit v1.2.3 From 340c40b70138a820c8898ba1b94b96ca9a294097 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:38:14 +0200 Subject: gnu: r-httpuv: Update to 1.5.4. * gnu/packages/cran.scm (r-httpuv): Update to 1.5.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 01adb0bae9..068edc67c9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -630,13 +630,13 @@ (define-public r-modelr (define-public r-httpuv (package (name "r-httpuv") - (version "1.5.2") + (version "1.5.4") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "13ax0hs2lc39ilznh1zarwqdzahcbhb8adilrfik3xg0fkljpcwk")))) + "066rprqvz9qln6xd85x1yh1wbbmzd157xjl8zq1zbgr8l6347inm")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) -- cgit v1.2.3 From 1812ff93fc9e1da7568af19266aa02feaabac497 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:38:24 +0200 Subject: gnu: r-servr: Update to 0.17. * gnu/packages/cran.scm (r-servr): Update to 0.17. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 068edc67c9..aaaa16abd0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -683,13 +683,13 @@ (define-public r-jsonlite (define-public r-servr (package (name "r-servr") - (version "0.16") + (version "0.17") (source (origin (method url-fetch) (uri (cran-uri "servr" version)) (sha256 (base32 - "106skz04iq4dkblr17idxsxfcfqic6rcaz8mahydkwjjppnhp5fc")))) + "0lxkjr7mwdk96cdpx66j92nn4w2vkgn2j2bbg7kd4238jsk9srs7")))) (build-system r-build-system) (propagated-inputs `(("r-httpuv" ,r-httpuv) -- cgit v1.2.3 From 130134b6b5b17853f507cc3d23ad8005ee4d927b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:02:36 +0200 Subject: gnu: r-d3r: Update to 0.9.0. * gnu/packages/cran.scm (r-d3r): Update to 0.9.0. [propagated-inputs]: Add r-rlang. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index aaaa16abd0..9d441109cb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1182,14 +1182,14 @@ (define-public r-shinythemes (define-public r-d3r (package (name "r-d3r") - (version "0.8.7") + (version "0.9.0") (source (origin (method url-fetch) (uri (cran-uri "d3r" version)) (sha256 (base32 - "0xl3im76lp7pd5lhp8jfyqdm4j4zvjrx5a5fl81xv2cf7x3n4f2a")))) + "0vd1qk8yr18xdfkv5ybhqvf0mmccpi721wqa7c881nzm9nnlzc4y")))) (build-system r-build-system) (arguments `(#:modules ((guix build utils) @@ -1224,6 +1224,7 @@ (define-public r-d3r (propagated-inputs `(("r-dplyr" ,r-dplyr) ("r-htmltools" ,r-htmltools) + ("r-rlang" ,r-rlang) ("r-tidyr" ,r-tidyr))) (native-inputs `(("uglify-js" ,uglify-js) -- cgit v1.2.3 From 6b2126f3329736cda0ffe8fdeb540531cbd938a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:03:06 +0200 Subject: gnu: r-haven: Update to 2.3.1. * gnu/packages/cran.scm (r-haven): Update to 2.3.1. [native-inputs]: Add r-knitr. [propagated-inputs]: Add r-vctrs. --- gnu/packages/cran.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9d441109cb..09d53030ee 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1536,17 +1536,19 @@ (define-public r-ggmap (define-public r-haven (package (name "r-haven") - (version "2.2.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (cran-uri "haven" version)) (sha256 (base32 - "0g9d6mxqmrw2zdms78jpx2sx73pczlyy771v1h5hmxqz9sqyk7hr")))) + "03cypgqhdkrfbfpl1yx2wb7flczrbak1w654wkicmd5ajwr9zvkf")))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) + (native-inputs + `(("r-knitr" ,r-knitr))) (propagated-inputs `(("r-forcats" ,r-forcats) ("r-hms" ,r-hms) @@ -1554,7 +1556,8 @@ (define-public r-haven ("r-rlang" ,r-rlang) ("r-readr" ,r-readr) ("r-tibble" ,r-tibble) - ("r-tidyselect" ,r-tidyselect))) + ("r-tidyselect" ,r-tidyselect) + ("r-vctrs" ,r-vctrs))) (home-page "https://haven.tidyverse.org") (synopsis "Import and Export 'SPSS', 'Stata' and 'SAS' Files") (description -- cgit v1.2.3 From e671034cf4c51d495ef64eec765119d76b3f6430 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:03:28 +0200 Subject: gnu: r-ape: Update to 5.4. * gnu/packages/cran.scm (r-ape): Update to 5.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 09d53030ee..b30b2911e8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1587,14 +1587,14 @@ (define-public r-amap (define-public r-ape (package (name "r-ape") - (version "5.3") + (version "5.4") (source (origin (method url-fetch) (uri (cran-uri "ape" version)) (sha256 (base32 - "08wbk1kxhs32bmmvqlqanbdg1w235amd35k8m00fngsj9h9xzc08")))) + "0f74x9vx9sxpns2hlq4w2x80cd2gw42isfgncvs9pqbjf4hiyqnr")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice) -- cgit v1.2.3 From 75766c8e7812e40598160b3aa8b71eed4ddb9f66 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:03:38 +0200 Subject: gnu: r-glue: Update to 1.4.1. * gnu/packages/cran.scm (r-glue): Update to 1.4.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b30b2911e8..3a38d7d000 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1663,14 +1663,14 @@ (define-public r-colorspace (define-public r-glue (package (name "r-glue") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (cran-uri "glue" version)) (sha256 (base32 - "1hb9j2519jv9zgkgjb25hnqi22i7zxnaksqd16m4nxa1f6gl0v7a")))) + "1j1va4vi3g9sl0cyjdwxvh5lvh10x8k9qvnsr9zyxddcbk9qgdpq")))) (build-system r-build-system) ;; knitr depends on glue, so we can't add knitr here to build the ;; vignettes. -- cgit v1.2.3 From 9de5f92a1047b100c4cd4c1efd305ada2795460e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:03:49 +0200 Subject: gnu: r-pkgload: Update to 1.1.0. * gnu/packages/cran.scm (r-pkgload): Update to 1.1.0. [propagated-inputs]: Add r-cli and r-crayon. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3a38d7d000..f12868e6eb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1809,17 +1809,19 @@ (define-public r-pkgbuild (define-public r-pkgload (package (name "r-pkgload") - (version "1.0.2") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "pkgload" version)) (sha256 (base32 - "0z7jvharafahi2gv5547mk1n499isjzw06kfwymmxc0gd575d1ii")))) + "03bv8xq4s6s7m34y1kjs99jzlb95vwrfi76mbnhmzcx2pc6ld78q")))) (build-system r-build-system) (propagated-inputs - `(("r-desc" ,r-desc) + `(("r-cli" ,r-cli) + ("r-crayon" ,r-crayon) + ("r-desc" ,r-desc) ("r-pkgbuild" ,r-pkgbuild) ("r-rlang" ,r-rlang) ("r-rprojroot" ,r-rprojroot) -- cgit v1.2.3 From dcfdf2def6bbf20483a32a89c5509ed31616b0a2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:04:05 +0200 Subject: gnu: r-globaloptions: Update to 0.1.2. * gnu/packages/cran.scm (r-globaloptions): Update to 0.1.2. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f12868e6eb..29b52c74de 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1967,15 +1967,17 @@ (define-public r-shape (define-public r-globaloptions (package (name "r-globaloptions") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) (uri (cran-uri "GlobalOptions" version)) (sha256 - (base32 "0x89hfz80avq4zcskxl71i4zi0mgniqqxfrvz050aa2189wfyja2")))) + (base32 "0gkm77w6db9ajyncy1xdcivplap06a51zi99m009kylccschd2a7")))) (properties `((upstream-name . "GlobalOptions"))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/jokergoo/GlobalOptions") (synopsis "Generate functions to get or set global options") (description -- cgit v1.2.3 From d828ed59a3b187e8c4a1a5fad78b801a83153c2c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:04:21 +0200 Subject: gnu: r-getoptlong: Update to 1.0.0. * gnu/packages/cran.scm (r-getoptlong): Update to 1.0.0. [propagated-inputs]: Add r-crayon. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 29b52c74de..f0a8e2cf3f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2094,21 +2094,24 @@ (define-public r-dendextend (define-public r-getoptlong (package (name "r-getoptlong") - (version "0.1.8") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "GetoptLong" version)) (sha256 (base32 - "1l8xkvyl152bsyvxazsvx2sm1vkygn75x0lsg3sbg7xp6drdn3kc")))) + "1fswgy5j4xaipqs7nk7nzrl66vrchhxrk0w7hcsbyij3sxgn3z9j")))) (properties `((upstream-name . "GetoptLong"))) (build-system r-build-system) (inputs `(("perl" ,perl))) (propagated-inputs - `(("r-globaloptions" ,r-globaloptions) + `(("r-crayon" ,r-crayon) + ("r-globaloptions" ,r-globaloptions) ("r-rjson" ,r-rjson))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/jokergoo/GetoptLong") (synopsis "Parsing command-line arguments and variable interpolation") (description -- cgit v1.2.3 From ac5dbcfd496cd351a80d54c2c5afe8687bc3ce30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:04:46 +0200 Subject: gnu: r-ggally: Update to 2.0.0. * gnu/packages/cran.scm (r-ggally): Update to 2.0.0. [propagated-inputs]: Add r-lifecycle and r-scales. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f0a8e2cf3f..6d04f4bd63 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2257,14 +2257,14 @@ (define-public r-progress (define-public r-ggally (package (name "r-ggally") - (version "1.5.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "GGally" version)) (sha256 (base32 - "082s321zspg5al6acigwrhg4fsrmkkk5caabg662qbcy8v6n34h6")))) + "1gkmpzh1yvwvypkw0nwqv3gsf6za3220wig3rfv8g23kss60rl1s")))) (properties `((upstream-name . "GGally"))) (build-system r-build-system) (inputs @@ -2272,11 +2272,13 @@ (define-public r-ggally (propagated-inputs `(("r-ggplot2" ,r-ggplot2) ("r-gtable" ,r-gtable) + ("r-lifecycle" ,r-lifecycle) ("r-plyr" ,r-plyr) ("r-progress" ,r-progress) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-reshape" ,r-reshape) - ("r-rlang" ,r-rlang))) + ("r-rlang" ,r-rlang) + ("r-scales" ,r-scales))) (home-page "https://ggobi.github.io/ggally") (synopsis "Extension to ggplot2") (description -- cgit v1.2.3 From 6aa54116c6dc97738b1872ab279e347ee7931cd6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:05:09 +0200 Subject: gnu: r-sp: Update to 1.4-2. * gnu/packages/cran.scm (r-sp): Update to 1.4-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6d04f4bd63..bab2c5d86f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2313,13 +2313,13 @@ (define-public r-proxy (define-public r-sp (package (name "r-sp") - (version "1.4-1") + (version "1.4-2") (source (origin (method url-fetch) (uri (cran-uri "sp" version)) (sha256 - (base32 "0fbh865r4py89g6ln8bslig2vbxxwa642p5k5g02rskyhajg35lg")))) + (base32 "02jxsd30apzjbdbssirysq70d4svdwzn931jhxr0ladl72g9bqvk")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From e88411168c1a2543d771ddd9f384153f8894aa1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:05:20 +0200 Subject: gnu: r-fitdistrplus: Update to 1.1-1. * gnu/packages/cran.scm (r-fitdistrplus): Update to 1.1-1. [propagated-inputs]: Remove r-npsurv. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bab2c5d86f..eba0b36f8b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2672,19 +2672,20 @@ (define-public r-limsolve (define-public r-fitdistrplus (package (name "r-fitdistrplus") - (version "1.0-14") + (version "1.1-1") (source (origin (method url-fetch) (uri (cran-uri "fitdistrplus" version)) (sha256 (base32 - "10q08wsv8v3w7797jdvvv60bgrf1bi6438wf0jcqv81ays82a245")))) + "1rnfnwmxa495fql7q0h9018cnwygwhj8gfh6ryz1vbf474570vjl")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) - ("r-npsurv" ,r-npsurv) ("r-survival" ,r-survival))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "http://riskassessment.r-forge.r-project.org") (synopsis "Fitting a parametric distribution from data") (description -- cgit v1.2.3 From b69ff7ac56e5dd6b3bcce024ad7c092469a4daa9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:05:43 +0200 Subject: gnu: r-squarem: Update to 2020.3. * gnu/packages/cran.scm (r-squarem): Update to 2020.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index eba0b36f8b..ce7ae364a7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2814,14 +2814,14 @@ (define-public r-cvst (define-public r-squarem (package (name "r-squarem") - (version "2020.2") + (version "2020.3") (source (origin (method url-fetch) (uri (cran-uri "SQUAREM" version)) (sha256 (base32 - "1j6sa93xjvynnzx9jx79a3fysbykmbqyknknsqif5bcha6xp6cvf")))) + "17l05i87vwvcsk79fbg52zrx04zdlwiiyl3ga8qafs7mqx0j976q")))) (properties `((upstream-name . "SQUAREM"))) (build-system r-build-system) (home-page "https://coah.jhu.edu/people/Faculty_personal_Pages/Varadhan.html") -- cgit v1.2.3 From ac04a9ec0453b6bbb9debdd338496eb7bbd3752c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:05:52 +0200 Subject: gnu: r-jomo: Update to 2.7-1. * gnu/packages/cran.scm (r-jomo): Update to 2.7-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ce7ae364a7..cba03b348d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3468,14 +3468,14 @@ (define-public r-ordinal (define-public r-jomo (package (name "r-jomo") - (version "2.6-10") + (version "2.7-1") (source (origin (method url-fetch) (uri (cran-uri "jomo" version)) (sha256 (base32 - "1k9l4290g350zbw1pjs871q9bxj3j2h1dilxpp06v4wy4n7d8qs0")))) + "0cdy9m4ylarkk9d0v1s61k2d877l4bbxly8a4jwhfy43fdvskz1w")))) (build-system r-build-system) (propagated-inputs `(("r-lme4" ,r-lme4) -- cgit v1.2.3 From 6446ef1ce4a99aceb3d4ecd74c7455cb985071a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:02 +0200 Subject: gnu: r-mice: Update to 3.9.0. * gnu/packages/cran.scm (r-mice): Update to 3.9.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cba03b348d..18df62e70b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3541,14 +3541,14 @@ (define-public r-mitml (define-public r-mice (package (name "r-mice") - (version "3.8.0") + (version "3.9.0") (source (origin (method url-fetch) (uri (cran-uri "mice" version)) (sha256 (base32 - "1ibybvigqkkla4xwhqs2w4m6c68alfcdsljx99nn4p92rzb1ig04")))) + "1wycbc2iqp68gfzvqx1gsn5n1k1h4bg79dy8m5msqf226hy83ncn")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) -- cgit v1.2.3 From 9cd9132b10ed666281369637a6b9cee0bd6ad472 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:11 +0200 Subject: gnu: r-xfun: Update to 0.14. * gnu/packages/cran.scm (r-xfun): Update to 0.14. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 18df62e70b..fe52c97366 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4188,13 +4188,13 @@ (define-public r-seriation (define-public r-xfun (package (name "r-xfun") - (version "0.13") + (version "0.14") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "03iyqgx9mmdbd3qih70qzijjqcdg7k7ps5r1y6q8praanx9qvnm3")))) + (base32 "183f6d7lr116f90j37a8hfr6ni1x9xkqj79s8lnky1jwr6zj3ha9")))) (build-system r-build-system) ;; knitr itself depends on xfun #; -- cgit v1.2.3 From ba12564e7723d4e63282e2ee737484b37b7a3611 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:20 +0200 Subject: gnu: r-vctrs: Update to 0.3.1. * gnu/packages/cran.scm (r-vctrs): Update to 0.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fe52c97366..12916b7cb3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4251,14 +4251,14 @@ (define-public r-zeallot (define-public r-vctrs (package (name "r-vctrs") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "vctrs" version)) (sha256 (base32 - "0ay1fk05mk6cnpfbzqwx6pjxmjk3ipx5xx6k0sbh81r5bqj17vpn")))) + "025si8gqwsj79lna3s0hdzxmymjyzbjq3ddan7n6chah6n3kbrhp")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From ad0f5067f1bf52f9c84217c4578c77f876385623 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:27 +0200 Subject: gnu: r-tinytex: Update to 0.23. * gnu/packages/cran.scm (r-tinytex): Update to 0.23. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 12916b7cb3..d9c57b7b30 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4336,14 +4336,14 @@ (define-public r-uuid (define-public r-tinytex (package (name "r-tinytex") - (version "0.22") + (version "0.23") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "0s9f62v3ps5f8903ar6kxlf1z3b4v78vlw1nb05bq55dgj8brg3b")))) + "084jd1m2i3zyxxlls7skq3jxv3b5cgps3yk60q1yzyy9sxslab7m")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) -- cgit v1.2.3 From 734e29b59fecf5c431cab5d66f89a279fb25cc32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:35 +0200 Subject: gnu: r-arules: Update to 1.6-6. * gnu/packages/cran.scm (r-arules): Update to 1.6-6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d9c57b7b30..2803c32dde 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5539,14 +5539,14 @@ (define-public r-catdap (define-public r-arules (package (name "r-arules") - (version "1.6-5") + (version "1.6-6") (source (origin (method url-fetch) (uri (cran-uri "arules" version)) (sha256 (base32 - "0bcvfn8lvcv74vv9z3kgg7yq5hm7wjqhmzadi55cbm8zxd76g84v")))) + "1pk3jjizn2m5rwi7qkdkbq9f07acgpy0qdzzqmx0agg47cwahlkm")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit v1.2.3 From 7775f234532a814e1a69774e3835fe14bbf40e5a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:44 +0200 Subject: gnu: r-maptools: Update to 1.0-1. * gnu/packages/cran.scm (r-maptools): Update to 1.0-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2803c32dde..a5e4ff1232 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5718,14 +5718,14 @@ (define-public r-rio (define-public r-maptools (package (name "r-maptools") - (version "0.9-9") + (version "1.0-1") (source (origin (method url-fetch) (uri (cran-uri "maptools" version)) (sha256 (base32 - "0v4llkxk8qs61vq4ykvaim4k23aagdaz0p62ns7zfq02sln3pfk9")))) + "0fs1y3cbymcq4f76wd27h5a7ihdmxii3ca8x29x32xgxhmasni4l")))) (build-system r-build-system) (propagated-inputs `(("r-foreign" ,r-foreign) -- cgit v1.2.3 From f8e5a65a7f33ed0fffb557a2676efa263e7409a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:52 +0200 Subject: gnu: r-later: Update to 1.1.0.1. * gnu/packages/cran.scm (r-later): Update to 1.1.0.1. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a5e4ff1232..b00628851b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5746,19 +5746,21 @@ (define-public r-maptools (define-public r-later (package (name "r-later") - (version "1.0.0") + (version "1.1.0.1") (source (origin (method url-fetch) (uri (cran-uri "later" version)) (sha256 (base32 - "11xjavj7siz0xv2ffq1ld4bwl35jyrcfpvvs4p3ilpifxx49hyr7")))) + "1k9n2j7zxw9gfclnx8zfqp6w64c5d6apn7g02yhkajkpmszagfki")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) ("r-rcpp" ,r-rcpp) ("r-rlang" ,r-rlang))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/r-lib/later") (synopsis "Utilities for delaying function execution") (description -- cgit v1.2.3 From 34a0a2412be851c92152ebde6065039923804b05 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:07:10 +0200 Subject: gnu: r-promises: Update to 1.1.1. * gnu/packages/cran.scm (r-promises): Update to 1.1.1. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b00628851b..d2b28811c8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5771,14 +5771,14 @@ (define-public r-later (define-public r-promises (package (name "r-promises") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "promises" version)) (sha256 (base32 - "01l0ydjvvy6afcg5d6pzvk1ikd3djq8n2flv8c831ksn68z0zsn8")))) + "002qkhcn3ri6a3w5fizjvdvrjgvqiw8i7rl9jglcnqik5kmwc61p")))) (build-system r-build-system) (propagated-inputs `(("r-later" ,r-later) @@ -5786,6 +5786,8 @@ (define-public r-promises ("r-r6" ,r-r6) ("r-rcpp" ,r-rcpp) ("r-rlang" ,r-rlang))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://rstudio.github.io/promises") (synopsis "Abstractions for promise-based asynchronous programming") (description -- cgit v1.2.3 From 9a8079290289852aae02c420eb07a7d118173f0d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:07:25 +0200 Subject: gnu: r-reticulate: Update to 1.16. * gnu/packages/cran.scm (r-reticulate): Update to 1.16. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d2b28811c8..01c28f7256 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5962,14 +5962,14 @@ (define-public r-analytics (define-public r-reticulate (package (name "r-reticulate") - (version "1.15") + (version "1.16") (source (origin (method url-fetch) (uri (cran-uri "reticulate" version)) (sha256 (base32 - "03dmnx9jhxx6vfbv2i5n6sln38kb9zkshz982pg3l9i4jjf3xns7")))) + "0ddx3xrlw55d8d3w7pxap618w2c5pd1n2jw4xsa185s8mf1zifkl")))) (build-system r-build-system) (inputs `(("python" ,python))) (propagated-inputs -- cgit v1.2.3 From ff7d4d56edba0831174a686334f5557fa3fc6dd1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:07:33 +0200 Subject: gnu: r-ellipse: Update to 0.4.2. * gnu/packages/cran.scm (r-ellipse): Update to 0.4.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 01c28f7256..4789eabe24 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6159,14 +6159,14 @@ (define-public r-ggpubr (define-public r-ellipse (package (name "r-ellipse") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) (uri (cran-uri "ellipse" version)) (sha256 (base32 - "0g82vc51m3c1k0hnpp2zla6amxxgk2mmkl8ssnsc49jv3599r6hs")))) + "1wm5v7zdv2drgdba7z96jwsx74mqhlq80qgrvdb4vb5r02dcw68p")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/ellipse/") (synopsis "Functions for drawing ellipses and ellipse-like confidence regions") -- cgit v1.2.3 From 79d23a02c6b7ca4a2ea632ce9434a6707af4bda3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:07:42 +0200 Subject: gnu: r-officer: Update to 0.3.11. * gnu/packages/cran.scm (r-officer): Update to 0.3.11. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4789eabe24..9300fe3583 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6461,14 +6461,14 @@ (define-public r-rdpack (define-public r-officer (package (name "r-officer") - (version "0.3.9") + (version "0.3.11") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "0kp8rmab917zimnyc0rz37czf5f044z9naiyq0yxw68i990ikxf7")))) + "0nwasra2kb5wplcim7n57kynwhyg4vsk3fz42mbpm0hig1lzl9pp")))) (build-system r-build-system) (propagated-inputs `(("r-magrittr" ,r-magrittr) -- cgit v1.2.3 From ee19cc9a4b9dc93b836918db55625a6b35f66c64 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:07:50 +0200 Subject: gnu: r-overlap: Update to 0.3.3. * gnu/packages/cran.scm (r-overlap): Update to 0.3.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9300fe3583..572f44304f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6578,14 +6578,14 @@ (define-public r-acdm (define-public r-overlap (package (name "r-overlap") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "overlap" version)) (sha256 (base32 - "1j3m6ir1chdz0si2fhcw6gs7c9h09bv0chz18rpzxsywww6d4rzy")))) + "17cnr4qin1qy0df4k491267acna12gpbbps6w3gi8nccqxfrb1pd")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/overlap/") (synopsis "Estimates of coefficient of overlapping for animal activity patterns") -- cgit v1.2.3 From 2ab00525dfb09635f7ff6ba179d6f4fa804ee61b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:07:59 +0200 Subject: gnu: r-insight: Update to 0.8.5. * gnu/packages/cran.scm (r-insight): Update to 0.8.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 572f44304f..893894d3d8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6645,14 +6645,14 @@ (define-public r-prediction (define-public r-insight (package (name "r-insight") - (version "0.8.3") + (version "0.8.5") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "0lm5a4r368mq1pwmxjk2xnz25lb9j4v7mdkl1bahk2alklxgb8yj")))) + "0ggczjd112kclknyxxqvjkzwzazfhjwglchafzamk4zb08ww7y7k")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From ffb5225fd1b584080a1a54684424b82c04203962 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:08:08 +0200 Subject: gnu: r-sjlabelled: Update to 1.1.5. * gnu/packages/cran.scm (r-sjlabelled): Update to 1.1.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 893894d3d8..b68dea3cce 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6673,14 +6673,14 @@ (define-public r-insight (define-public r-sjlabelled (package (name "r-sjlabelled") - (version "1.1.4") + (version "1.1.5") (source (origin (method url-fetch) (uri (cran-uri "sjlabelled" version)) (sha256 (base32 - "00dnrvwf7zbaq07hkh4rx24pvi5bwkl4npf6ycg101s63633dq5m")))) + "0grskmd7wrw31lkf85z6xz0bv246m6grvqkijvqi4q8zkl6p5vb3")))) (build-system r-build-system) (propagated-inputs `(("r-insight" ,r-insight))) -- cgit v1.2.3 From 38ea73aaf2df2ba135d2491504b5c81af3156a32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:08:15 +0200 Subject: gnu: r-sjmisc: Update to 2.8.5. * gnu/packages/cran.scm (r-sjmisc): Update to 2.8.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b68dea3cce..d0d6e83597 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6699,14 +6699,14 @@ (define-public r-sjlabelled (define-public r-sjmisc (package (name "r-sjmisc") - (version "2.8.4") + (version "2.8.5") (source (origin (method url-fetch) (uri (cran-uri "sjmisc" version)) (sha256 (base32 - "1ad7ca71w0v9ja4wb47aygczc987zz1lnjljhh2n497nzrpzzv64")))) + "0xl0s56d13bia89ai619rcr0fzbvc2k8f7hjxik4qp0g4v87zzlk")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) -- cgit v1.2.3 From 400d0c96d0156bb49c6eee7afc874c43706de7cc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:08:26 +0200 Subject: gnu: r-flextable: Update to 0.5.10. * gnu/packages/cran.scm (r-flextable): Update to 0.5.10. [propagated-inputs]: Add r-uuid. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d0d6e83597..dfdf01a6ab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6779,14 +6779,14 @@ (define-public r-moonbook (define-public r-flextable (package (name "r-flextable") - (version "0.5.9") + (version "0.5.10") (source (origin (method url-fetch) (uri (cran-uri "flextable" version)) (sha256 (base32 - "1rkz0nhwjy1l8sb0kmna5v492n2ydnk7gydswnmf88r8vfyjczhw")))) + "1j7yvjiavar21ywck6nyz0p6bd66fnj99bq8lljdz4rrl3314yb8")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) @@ -6797,6 +6797,7 @@ (define-public r-flextable ("r-officer" ,r-officer) ("r-rlang" ,r-rlang) ("r-rmarkdown" ,r-rmarkdown) + ("r-uuid" ,r-uuid) ("r-xml2" ,r-xml2))) (home-page "https://davidgohel.github.io/flextable") (synopsis "Functions for tabular reporting") -- cgit v1.2.3 From 4223df8af101bd71d4e60dea8ce891df169010d9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:08:41 +0200 Subject: gnu: r-doby: Update to 4.6.6. * gnu/packages/cran.scm (r-doby): Update to 4.6.6. [propagated-inputs]: Remove r-dplyr and r-plyr. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dfdf01a6ab..17b0614f26 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7023,26 +7023,26 @@ (define-public r-deriv (define-public r-doby (package (name "r-doby") - (version "4.6.5") + (version "4.6.6") (source (origin (method url-fetch) (uri (cran-uri "doBy" version)) (sha256 (base32 - "1ckazh701b4ilg8bj17ji903538jmb49d997gm49ah5j5jc1x0g7")))) + "0wz1vmsf1545r1m42q88s675ncwvm8figjn7kzbngjn9aqck9qbq")))) (properties `((upstream-name . "doBy"))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) ("r-deriv" ,r-deriv) - ("r-dplyr" ,r-dplyr) ("r-magrittr" ,r-magrittr) ("r-mass" ,r-mass) ("r-matrix" ,r-matrix) - ("r-plyr" ,r-plyr) ("r-pbkrtest" ,r-pbkrtest) ("r-tibble" ,r-tibble))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "http://people.math.aau.dk/~sorenh/software/doBy/") (synopsis "Groupwise statistics, LSmeans, linear contrasts, and utilities") (description -- cgit v1.2.3 From 0220c89e969409b9291bc2c8691d44d3531b5eba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:09:07 +0200 Subject: gnu: r-mosaicdata: Update to 0.18.0. * gnu/packages/cran.scm (r-mosaicdata): Update to 0.18.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 17b0614f26..dae3ac52c0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7485,13 +7485,13 @@ (define-public r-ggformula (define-public r-mosaicdata (package (name "r-mosaicdata") - (version "0.17.0") + (version "0.18.0") (source (origin (method url-fetch) (uri (cran-uri "mosaicData" version)) (sha256 - (base32 "04z0mdm52mykqsxsinhmsihn181zf6cw321gayk2rjp7lj7mwdq9")))) + (base32 "0cx5dg26ha7nzkdyghkbbd6ikncj60qv1538az77lfgn2jylvkbz")))) (properties `((upstream-name . "mosaicData"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/mosaicData/") -- cgit v1.2.3 From a4a34d3ea8f4386b8e7416468ad43e55da9526cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:09:17 +0200 Subject: gnu: r-emmeans: Update to 1.4.7. * gnu/packages/cran.scm (r-emmeans): Update to 1.4.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dae3ac52c0..50948185ef 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8515,14 +8515,14 @@ (define-public r-multcomp (define-public r-emmeans (package (name "r-emmeans") - (version "1.4.6") + (version "1.4.7") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "0mxk7ghlv4r6sna4897q1la2xgyn1dw3r9srhm9x4h5l4701avfa")))) + "0jh7l1rzsb2ihbnh4r4388kwm629z17rcapvdws1hnkklhr8j74k")))) (build-system r-build-system) (propagated-inputs `(("r-estimability" ,r-estimability) -- cgit v1.2.3 From 9908ec56cd246ac66d79c3aa2aafe26c5b9c8fd6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:09:25 +0200 Subject: gnu: r-bayesplot: Update to 1.7.2. * gnu/packages/cran.scm (r-bayesplot): Update to 1.7.2. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 50948185ef..baa2938dc1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8613,18 +8613,20 @@ (define-public r-coin (define-public r-bayesplot (package (name "r-bayesplot") - (version "1.7.1") + (version "1.7.2") (source (origin (method url-fetch) (uri (cran-uri "bayesplot" version)) (sha256 (base32 - "0sq0ajnm96hmlqf1cv5n2gshh3qdij4n1zbm7qrniz2q6b5aj342")))) + "0aqy4bfjq1fmds0vpacsmqih528cp8wk4v4w0balzkph6zqzpwcl")))) (build-system r-build-system) (inputs `(("pandoc" ,ghc-pandoc) ("pandoc-citeproc" ,ghc-pandoc-citeproc))) + (native-inputs + `(("r-knitr" ,r-knitr))) (propagated-inputs `(("r-dplyr" ,r-dplyr) ("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From 4a0fbb779935050ed147069b1f83d175ff4656f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:09:40 +0200 Subject: gnu: r-effectsize: Update to 0.3.1. * gnu/packages/cran.scm (r-effectsize): Update to 0.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index baa2938dc1..15b534ff58 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8836,14 +8836,14 @@ (define-public r-ggeffects (define-public r-effectsize (package (name "r-effectsize") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "effectsize" version)) (sha256 (base32 - "0kijp4wamkidaxysc11dd4vhvnm4wnbi87871wcbwn27k5b6i5dg")))) + "1n5b5434sd8f1v95bfjwg92v879rkaj8zpm6ldnrg0kgfb0gy6q4")))) (properties `((upstream-name . "effectsize"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From fc1db3fcf55c8128b977c774681e8df8e4be430e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:09:47 +0200 Subject: gnu: r-sjplot: Update to 2.8.4. * gnu/packages/cran.scm (r-sjplot): Update to 2.8.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 15b534ff58..5606d18940 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8863,13 +8863,13 @@ (define-public r-effectsize (define-public r-sjplot (package (name "r-sjplot") - (version "2.8.3") + (version "2.8.4") (source (origin (method url-fetch) (uri (cran-uri "sjPlot" version)) (sha256 - (base32 "0ip1rkjlhyf3axlc8qqss1qq1f0xrda890c1jmcbhm98wwjw264f")))) + (base32 "0b7k0mshkk8k26w11xbxkb5v0klhq279zn2xdz83cn8k791xkqyd")))) (properties `((upstream-name . "sjPlot"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From f71791c501a13ae34fd61e9be0590538a88be1b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:09:54 +0200 Subject: gnu: r-iso: Update to 0.0-18.1. * gnu/packages/cran.scm (r-iso): Update to 0.0-18.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5606d18940..cb9c69a55a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10707,14 +10707,14 @@ (define-public r-nnls (define-public r-iso (package (name "r-iso") - (version "0.0-18") + (version "0.0-18.1") (source (origin (method url-fetch) (uri (cran-uri "Iso" version)) (sha256 (base32 - "014mm5b1f7i6nwlz3kyg1biph0y542kcx5bd13p68cv5a928qzid")))) + "0vy6jdyvp751430sf2f690yhasjr70cpk3p3lnaaxjq3fs5gg99g")))) (properties `((upstream-name . "Iso"))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From d6df7299d33e32c669b78af10da6ed171b0c51b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:01 +0200 Subject: gnu: r-bigrquery: Update to 1.3.1. * gnu/packages/cran.scm (r-bigrquery): Update to 1.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cb9c69a55a..269479b813 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10904,14 +10904,14 @@ (define-public r-gargle (define-public r-bigrquery (package (name "r-bigrquery") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "bigrquery" version)) (sha256 (base32 - "0j8asipnb4fg4kk3apy37ywqq78ncmqh9wq015xpww2zb9shnbvf")))) + "0mq03sqv5lkyn3dlxvyd6lqqwnryfdaqh05pjvngzp194fxmd9cy")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From 4c96ee1c407070614e7272a30844212fabc3278b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:07 +0200 Subject: gnu: r-gmp: Update to 0.6-0. * gnu/packages/cran.scm (r-gmp): Update to 0.6-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 269479b813..c912d0cb48 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10937,14 +10937,14 @@ (define-public r-bigrquery (define-public r-gmp (package (name "r-gmp") - (version "0.5-13.6") + (version "0.6-0") (source (origin (method url-fetch) (uri (cran-uri "gmp" version)) (sha256 (base32 - "0j2sz2nw41y9306rl1b8hbn0spz7453z5iawcq0bvslyrhc1d9ir")))) + "1c9vpr6j6h5f6dm9l535nscl66rvr8sba5az2kswjhmzwb9xpjxc")))) (build-system r-build-system) (arguments '(#:phases -- cgit v1.2.3 From 52d7306100a0af2b503ef8a6561eb6ec502d1fcd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:15 +0200 Subject: gnu: r-cmprsk: Update to 2.2-10. * gnu/packages/cran.scm (r-cmprsk): Update to 2.2-10. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c912d0cb48..cbd565eb0e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11699,13 +11699,13 @@ (define-public r-protviz (define-public r-cmprsk (package (name "r-cmprsk") - (version "2.2-9") + (version "2.2-10") (source (origin (method url-fetch) (uri (cran-uri "cmprsk" version)) (sha256 - (base32 "0xhgfg5b4i9skkaxp7gzkafgg5bqs5q1rp4hpw2jjmykg2nifn99")))) + (base32 "1xnx2zanw548prxsw2zw5cddkkg6kj97jgyzw67achq5mnsvfbg8")))) (build-system r-build-system) (propagated-inputs `(("r-survival" ,r-survival))) -- cgit v1.2.3 From e27fc23b07acbcfaa531d503ed86921a9828e141 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:22 +0200 Subject: gnu: r-lavaan: Update to 0.6-6. * gnu/packages/cran.scm (r-lavaan): Update to 0.6-6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cbd565eb0e..31aa07b59f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12601,14 +12601,14 @@ (define-public r-pbivnorm (define-public r-lavaan (package (name "r-lavaan") - (version "0.6-5") + (version "0.6-6") (source (origin (method url-fetch) (uri (cran-uri "lavaan" version)) (sha256 (base32 - "04kvsh2m6mnzlhv83phr3hjzy4sx1ck6f7dgsm7xb8cs84dnxszy")))) + "0sfv58r2kxinax62bx6j3kkfx07qm16ddwf5qz392q33h9zs009h")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) -- cgit v1.2.3 From 2de55fbab90e76f6058ae2194c87420d3275ac45 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:28 +0200 Subject: gnu: r-picante: Update to 1.8.2. * gnu/packages/cran.scm (r-picante): Update to 1.8.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 31aa07b59f..707f2983fe 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12977,14 +12977,14 @@ (define-public r-rematch2 (define-public r-picante (package (name "r-picante") - (version "1.8.1") + (version "1.8.2") (source (origin (method url-fetch) (uri (cran-uri "picante" version)) (sha256 (base32 - "1b16zm8zjjsl181b8krkdcrbcw347kf772c4w7y5332qmfi7jhz0")))) + "19savjzj44b7ifdxcp02ynj22z4n4ikq2aipc74ljzy3yykmqmjn")))) (build-system r-build-system) (propagated-inputs `(("r-ape" ,r-ape) -- cgit v1.2.3 From 5130c454ddd64fa5cddf61a0ea3c36a989164f33 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:39 +0200 Subject: gnu: r-lemon: Update to 0.4.5. * gnu/packages/cran.scm (r-lemon): Update to 0.4.5. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 707f2983fe..cabcae43bf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13032,14 +13032,14 @@ (define-public r-reinforcelearn (define-public r-lemon (package (name "r-lemon") - (version "0.4.4") + (version "0.4.5") (source (origin (method url-fetch) (uri (cran-uri "lemon" version)) (sha256 (base32 - "0m9hqwi709j9iwsxn8jh63741jiyr7ppwgqaw2zkv285p3m5wvd5")))) + "1y3ljidhqdakxlya2npj2w0az820g8kw6gl1cfm4f0cxvzgd1ly4")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) @@ -13050,6 +13050,8 @@ (define-public r-lemon ("r-plyr" ,r-plyr) ("r-rlang" ,r-rlang) ("r-scales" ,r-scales))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/stefanedwards/lemon") (synopsis "Freshen up your ggplot2 plots") (description -- cgit v1.2.3 From d263b2d67b9fb23bbeace2995c61bfa3c65d1ec8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:55 +0200 Subject: gnu: r-polspline: Update to 1.1.19. * gnu/packages/cran.scm (r-polspline): Update to 1.1.19. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cabcae43bf..49f1ea4040 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13652,13 +13652,13 @@ (define-public r-snp-plotter (define-public r-polspline (package (name "r-polspline") - (version "1.1.18") + (version "1.1.19") (source (origin (method url-fetch) (uri (cran-uri "polspline" version)) (sha256 - (base32 "00h1xg89wncfj2nk68zv7vphfcc68s7k0l5s9511bzxz8khhw9fz")))) + (base32 "0rhzf735hmbqfn2xbgcln4sqx7m9far72g5gq9mghgkw016kqglm")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) (home-page "https://cran.r-project.org/web/packages/polspline/") -- cgit v1.2.3 From 5547b4360f8759e719915887ab3b4e130c0bb292 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:11:05 +0200 Subject: gnu: r-rms: Update to 6.0-0. * gnu/packages/cran.scm (r-rms): Update to 6.0-0. [propagated-inputs]: Add r-cluster, r-digest, and r-mass. --- gnu/packages/cran.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 49f1ea4040..fc831e0dc0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13672,20 +13672,23 @@ (define-public r-polspline (define-public r-rms (package (name "r-rms") - (version "5.1-4") + (version "6.0-0") (source (origin (method url-fetch) (uri (cran-uri "rms" version)) (sha256 - (base32 "19knh1sw0icw6jh9wfb2hq5jf49i2qfvp9myvqm5paa495689x9q")))) + (base32 "0m88m63d19qz03x8v56h4rrblln3d2943spi1v4wxxnbcdk22np9")))) (build-system r-build-system) (propagated-inputs - `(("r-ggplot2" ,r-ggplot2) + `(("r-cluster" ,r-cluster) + ("r-digest" ,r-digest) + ("r-ggplot2" ,r-ggplot2) ("r-hmisc" ,r-hmisc) ("r-htmltable" ,r-htmltable) ("r-htmltools" ,r-htmltools) ("r-lattice" ,r-lattice) + ("r-mass" ,r-mass) ("r-multcomp" ,r-multcomp) ("r-nlme" ,r-nlme) ("r-polspline" ,r-polspline) -- cgit v1.2.3 From a50246f455ea9f41a4623f0c3e1cd616d898fc72 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:11:21 +0200 Subject: gnu: r-bookdown: Update to 0.19. * gnu/packages/cran.scm (r-bookdown): Update to 0.19. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fc831e0dc0..b0185ca4a8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13910,13 +13910,13 @@ (define-public r-sparql (define-public r-bookdown (package (name "r-bookdown") - (version "0.18") + (version "0.19") (source (origin (method url-fetch) (uri (cran-uri "bookdown" version)) (sha256 (base32 - "1my6g16phx21v5cvfqcnjibh3zcv02xkix347aafd6a7r3hnxpq5")))) + "137l0cyzw9ij2l3zyk3mm1k2db9vhbax6c9y4rydvh4i9gka5vlq")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) -- cgit v1.2.3 From 93043ba3377eb7c5565ec354a4875413f3a1e92d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:11:30 +0200 Subject: gnu: r-msigdbr: Update to 7.1.1. * gnu/packages/cran.scm (r-msigdbr): Update to 7.1.1. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b0185ca4a8..88fa31891e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14304,20 +14304,22 @@ (define-public r-xkcd (define-public r-msigdbr (package (name "r-msigdbr") - (version "7.0.1") + (version "7.1.1") (source (origin (method url-fetch) (uri (cran-uri "msigdbr" version)) (sha256 (base32 - "19p8z617m3my8la7n1qgb1s2msf940r372im3q30qkbcx3qxg3sd")))) + "0jvi49qa7616s58p0rx66pcw7h12rc8kgcg9225jk7pc3934hnzh")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) ("r-magrittr" ,r-magrittr) ("r-rlang" ,r-rlang) ("r-tibble" ,r-tibble))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/igordot/msigdbr") (synopsis "MSigDB gene sets for multiple organisms") (description -- cgit v1.2.3 From ed7fa0af07f7fa2f395e5c2eb07f9897844525c9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:11:48 +0200 Subject: gnu: r-europepmc: Update to 0.4. * gnu/packages/cran.scm (r-europepmc): Update to 0.4. [propagated-inputs]: Add r-rlang, r-tibble, and r-tidyr. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 88fa31891e..d4a4c5d553 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14546,14 +14546,14 @@ (define-public r-ggforce (define-public r-europepmc (package (name "r-europepmc") - (version "0.3") + (version "0.4") (source (origin (method url-fetch) (uri (cran-uri "europepmc" version)) (sha256 (base32 - "1ngqs1sqzkbwv98dd5z4cxj8bnz41wyd0g060a2vpqi3s99s4i2h")))) + "174nnyc2mbgqxb5kgqabn1vf71c2mps7ig2bclq4is0f7nb64pym")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) @@ -14562,8 +14562,13 @@ (define-public r-europepmc ("r-plyr" ,r-plyr) ("r-progress" ,r-progress) ("r-purrr" ,r-purrr) + ("r-rlang" ,r-rlang) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr) ("r-urltools" ,r-urltools) ("r-xml2" ,r-xml2))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/ropensci/europepmc/") (synopsis "R Interface to the Europe PubMed Central RESTful Web Service") (description -- cgit v1.2.3 From 4c4c34a15460d4f8993bf0578a7f4cf104c8ce73 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:12:15 +0200 Subject: gnu: r-ggraph: Update to 2.0.3. * gnu/packages/cran.scm (r-ggraph): Update to 2.0.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d4a4c5d553..20d089d81e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14586,14 +14586,14 @@ (define-public r-europepmc (define-public r-ggraph (package (name "r-ggraph") - (version "2.0.2") + (version "2.0.3") (source (origin (method url-fetch) (uri (cran-uri "ggraph" version)) (sha256 (base32 - "1ckq82hg52vr2wydkqv2wrppgjyvddd6bwqzrngqlm7j71xapjl0")))) + "1pz06j0za4p6dc3fqjzcw8bpym70bmnfcvpv1q34r74rnwzjdyvq")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From 897ed4a76fd25ad2b04d03c50d25e45be309d36c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:12:24 +0200 Subject: gnu: r-rhpcblasctl: Update to 0.20-137. * gnu/packages/cran.scm (r-rhpcblasctl): Update to 0.20-137. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 20d089d81e..6557c43d5a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15845,14 +15845,14 @@ (define-public r-glasso (define-public r-rhpcblasctl (package (name "r-rhpcblasctl") - (version "0.20-17") + (version "0.20-137") (source (origin (method url-fetch) (uri (cran-uri "RhpcBLASctl" version)) (sha256 (base32 - "0iwc06blr5sx7rylwczi2jrha8sk8qs0jklflwpidl0zj1jxdggp")))) + "0vv144sgjhf7fazk633i16fc06g9k43syyxj1g34pi9gsgdcn0nv")))) (properties `((upstream-name . "RhpcBLASctl"))) (build-system r-build-system) (home-page "https://prs.ism.ac.jp/~nakama/Rhpc/") -- cgit v1.2.3 From 53bf76c574960659016f792c5f8c71b07fb1962f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:12:30 +0200 Subject: gnu: r-systemfonts: Update to 0.2.3. * gnu/packages/cran.scm (r-systemfonts): Update to 0.2.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6557c43d5a..983504f02c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16116,14 +16116,14 @@ (define-public r-covr (define-public r-systemfonts (package (name "r-systemfonts") - (version "0.2.1") + (version "0.2.3") (source (origin (method url-fetch) (uri (cran-uri "systemfonts" version)) (sha256 (base32 - "0dna00xai0pw76b4830yy4r5j1hq7f7kla67v0iz39cjm4rq4ygq")))) + "0wf62mfam5zlrck0wrdbyi4hi7pn5j0739rihgp8sj2cjypm2lnb")))) (properties `((upstream-name . "systemfonts"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From dfd0b55f9e5462607efa99beb3c06f8a1d4fd5ec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:12:37 +0200 Subject: gnu: r-parameters: Update to 0.8.0. * gnu/packages/cran.scm (r-parameters): Update to 0.8.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 983504f02c..5baad5cc5e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16262,14 +16262,14 @@ (define-public r-assertr (define-public r-parameters (package (name "r-parameters") - (version "0.6.1") + (version "0.8.0") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "0mylxkf1y6mk4kf6c57x102sf4c800pfasjcfbf1hnsh6ya0m6dy")))) + "1cmb2hc6f4qdx9aj586zhllckzs6s5sznbqrywvgmhp6a2saaqax")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 7262c1ff183ff1e707de0edc8a8735c916eebfc3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:12:46 +0200 Subject: gnu: r-rgdal: Update to 1.5-10. * gnu/packages/cran.scm (r-rgdal): Update to 1.5-10. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5baad5cc5e..19fefa9845 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16291,13 +16291,13 @@ (define-public r-parameters (define-public r-rgdal (package (name "r-rgdal") - (version "1.4-8") + (version "1.5-10") (source (origin (method url-fetch) (uri (cran-uri "rgdal" version)) (sha256 - (base32 "1jd691amf3ghznq5im15gvhl6v6k25klpl75m4ngrqf9xlxaa3as")))) + (base32 "02z7rhpizzmymiqpi90nm15bjdz0411bqlavlk0lhwxb42ilhif6")))) (properties `((upstream-name . "rgdal"))) (build-system r-build-system) (inputs @@ -16307,7 +16307,8 @@ (define-public r-rgdal (propagated-inputs `(("r-sp" ,r-sp))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("r-knitr" ,r-knitr))) (home-page "http://rgdal.r-forge.r-project.org") (synopsis "Bindings for the Geospatial Data Abstraction Library") (description -- cgit v1.2.3 From b99ed8e6e5ceab44ec86fc8b423f2a7b5f08ccce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:12:58 +0200 Subject: gnu: r-abcrlda: Update to 1.0.3. * gnu/packages/cran.scm (r-abcrlda): Update to 1.0.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 19fefa9845..c1a8b72953 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16799,14 +16799,14 @@ (define-public r-abcdefba (define-public r-abcrlda (package (name "r-abcrlda") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) (uri (cran-uri "abcrlda" version)) (sha256 (base32 - "0zjdrbg3zx0znqnh0dvmifs9c12b8vjhbaf3nbwab9xh25nsmg75")))) + "04pcdnk2szfpc2ylcw5ds7y895ivy03bycal03kxw7cwylzxasks")))) (properties `((upstream-name . "abcrlda"))) (build-system r-build-system) (home-page "https://ieeexplore.ieee.org/document/8720003/") -- cgit v1.2.3 From 8957a336f7bd5811b97ce98fc20d7c80179a5c78 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:06 +0200 Subject: gnu: r-showtextdb: Update to 3.0. * gnu/packages/cran.scm (r-showtextdb): Update to 3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c1a8b72953..167572ccac 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16935,14 +16935,14 @@ (define-public r-sysfonts (define-public r-showtextdb (package (name "r-showtextdb") - (version "2.0") + (version "3.0") (source (origin (method url-fetch) (uri (cran-uri "showtextdb" version)) (sha256 (base32 - "1qwwj9x2jvadvwn60h75k99c9xi7yhqjsgaakahz5paxgj583bsh")))) + "0hlnc3fhgrdkd46n7hb6id0gg1v0bf8s4679nrr7rchyp455szq2")))) (properties `((upstream-name . "showtextdb"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From bb714ae79fd9d9a9fac3292c64e1bf0faf3534e9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:13 +0200 Subject: gnu: r-showtext: Update to 0.8-1. * gnu/packages/cran.scm (r-showtext): Update to 0.8-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 167572ccac..1c379d9ca0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16957,14 +16957,14 @@ (define-public r-showtextdb (define-public r-showtext (package (name "r-showtext") - (version "0.8") + (version "0.8-1") (source (origin (method url-fetch) (uri (cran-uri "showtext" version)) (sha256 (base32 - "15v90s061iz9i655xin7kqb6ahnski55pgz3329wcz60bnbjb82x")))) + "1n1cd9f4zrv45k5953akclqh1jh7fy122dqkgmbfi5h122v6p2h0")))) (properties `((upstream-name . "showtext"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 30031516d19a16211281e413e5ec28ab79685b86 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:19 +0200 Subject: gnu: r-elasticnet: Update to 1.3. * gnu/packages/cran.scm (r-elasticnet): Update to 1.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1c379d9ca0..2b5f1cf849 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17286,14 +17286,14 @@ (define-public r-mda (define-public r-elasticnet (package (name "r-elasticnet") - (version "1.1.1") + (version "1.3") (source (origin (method url-fetch) (uri (cran-uri "elasticnet" version)) (sha256 (base32 - "0p9dplnsp28z4s2fl6afbwrgd0aj339fak8mmndicmrh7bb7rpmb")))) + "0nxcw06d0cp2mbqzg2fm9yys5xm6xx7bfcfvr0avcs8afkvz29j8")))) (properties `((upstream-name . "elasticnet"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 242fae8edf450e21bdf8417f2b2408e4db4666b2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:28 +0200 Subject: gnu: r-seewave: Update to 2.1.6. * gnu/packages/cran.scm (r-seewave): Update to 2.1.6. [inputs]: Add libsndfile. --- gnu/packages/cran.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2b5f1cf849..af653f9eb8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -75,6 +75,7 @@ (define-module (gnu packages cran) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) ;libsndfile #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages statistics) @@ -17905,16 +17906,18 @@ (define-public r-tuner (define-public r-seewave (package (name "r-seewave") - (version "2.1.5") + (version "2.1.6") (source (origin (method url-fetch) (uri (cran-uri "seewave" version)) (sha256 (base32 - "1qg8f5gik9pw6f9mcxqmrc9x3003s8vdm6g01pjjpyc9qaqiz2vi")))) + "123h3q0gps0vy9sikr7gjphnv9m3l4h4mykiydjllmrpaw1s1844")))) (properties `((upstream-name . "seewave"))) (build-system r-build-system) + (inputs + `(("libsndfile" ,libsndfile))) (propagated-inputs `(("r-tuner" ,r-tuner))) (home-page "http://rug.mnhn.fr/seewave") -- cgit v1.2.3 From 8050cce35d5d34c06447d16c8f5a7227acf0364b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:40 +0200 Subject: gnu: r-gdina: Update to 2.8.0. * gnu/packages/cran.scm (r-gdina): Update to 2.8.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index af653f9eb8..6df7c7b41f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18309,14 +18309,14 @@ (define-public r-alabama (define-public r-gdina (package (name "r-gdina") - (version "2.7.9") + (version "2.8.0") (source (origin (method url-fetch) (uri (cran-uri "GDINA" version)) (sha256 (base32 - "13pmj069r04h38hg61ibyn1ab15zdy9m0qv60vi25ahgsmg6ccvx")))) + "0chxnhp37xfd78gafkgwqrmc0jf3pvpdyrkc438kl0l53fb7dld7")))) (properties `((upstream-name . "GDINA"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8ddf3be097a378241477c3d48ba352d80a6ccbcf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:47 +0200 Subject: gnu: r-actuar: Update to 3.0-0. * gnu/packages/cran.scm (r-actuar): Update to 3.0-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6df7c7b41f..e020ff62f2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18667,14 +18667,14 @@ (define-public r-expint (define-public r-actuar (package (name "r-actuar") - (version "2.3-3") + (version "3.0-0") (source (origin (method url-fetch) (uri (cran-uri "actuar" version)) (sha256 (base32 - "0aw3hlan5y22mdqk1wvnw9ksqhwp4yy5hi0dpv21p7s0hyxhphih")))) + "0dkp1sczldzy7kj70qvh1q59jhsq1brjybmxdz43jnx63y45llpz")))) (properties `((upstream-name . "actuar"))) (build-system r-build-system) (propagated-inputs `(("r-expint" ,r-expint))) -- cgit v1.2.3 From de26ce7265504f17d169f60ac00f1ebaeaf7e2a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:54 +0200 Subject: gnu: r-rsvg: Update to 2.1. * gnu/packages/cran.scm (r-rsvg): Update to 2.1. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e020ff62f2..62be117ef4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19407,21 +19407,22 @@ (define-public r-shinycssloaders (define-public r-rsvg (package (name "r-rsvg") - (version "2.0") + (version "2.1") (source (origin (method url-fetch) (uri (cran-uri "rsvg" version)) (sha256 (base32 - "0r066lvyfvhsjjpiad259f1m3qk5w7hxhbyjzhlryzf3fy0hvh29")))) + "0bxnwa9sbzx6jlxrzh3ymjq81vkxil2qx7kk7wp13a0cql7dhxcn")))) (properties `((upstream-name . "rsvg"))) (build-system r-build-system) (inputs `(("librsvg" ,librsvg) ("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("r-knitr" ,r-knitr))) (home-page "https://github.com/jeroen/rsvg#readme") (synopsis "Render SVG images into PDF, PNG, PostScript, or Bitmap arrays") (description -- cgit v1.2.3 From db4d3b25811e8928674011b1a03e784cd79cf86e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:14:06 +0200 Subject: gnu: r-emplik: Update to 1.1-1. * gnu/packages/cran.scm (r-emplik): Update to 1.1-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 62be117ef4..dc7897d28d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19464,14 +19464,14 @@ (define-public r-influencer (define-public r-emplik (package (name "r-emplik") - (version "1.0-4.3") + (version "1.1-1") (source (origin (method url-fetch) (uri (cran-uri "emplik" version)) (sha256 (base32 - "1g4hz85bvw29c77zs0ig487z92jjl682vv457x81l077h0psvk7c")))) + "1kw8g8j075bsicdvgkjf4870rfv5c30gvmw6qkkaz3ki22x74w77")))) (properties `((upstream-name . "emplik"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From bd76f9561d639726a96873d4c1b081862ea9eb15 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:14:12 +0200 Subject: gnu: r-sem: Update to 3.1-11. * gnu/packages/cran.scm (r-sem): Update to 3.1-11. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dc7897d28d..fc15b42fc3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20144,14 +20144,14 @@ (define-public r-matrixcalc (define-public r-sem (package (name "r-sem") - (version "3.1-9") + (version "3.1-11") (source (origin (method url-fetch) (uri (cran-uri "sem" version)) (sha256 (base32 - "1f9c6g6pfx66gd2pappcsqh484ah6a0x4z47hpd46rah0817hcsa")))) + "03j3ig6fy34pi6nwfq9w8f5m555lilw5skr1vn6ay4yvjmvavc9k")))) (properties `((upstream-name . "sem"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 3a9a69525597c7560d88869801f3c065f78602e3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:14:18 +0200 Subject: gnu: r-semtools: Update to 0.5-3. * gnu/packages/cran.scm (r-semtools): Update to 0.5-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fc15b42fc3..ad859de0ed 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20171,14 +20171,14 @@ (define-public r-sem (define-public r-semtools (package (name "r-semtools") - (version "0.5-2") + (version "0.5-3") (source (origin (method url-fetch) (uri (cran-uri "semTools" version)) (sha256 (base32 - "1zj841pszfsikzp82cmh463qyc4xhdrqjqcnhc2r8mcflv12irv6")))) + "0k3w10fnq0l89inhxvnypyrfhlrm921mfn0kwyyfpndvbqizky1d")))) (properties `((upstream-name . "semTools"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From b34ba0649ab8c64b80c8ad53dc182b65ea269a98 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:14:24 +0200 Subject: gnu: r-stanheaders: Update to 2.21.0-5. * gnu/packages/cran.scm (r-stanheaders): Update to 2.21.0-5. [propagated-inputs]: Add r-rcppeigen and r-rcppparallel. --- gnu/packages/cran.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ad859de0ed..3b5ea1d35e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20220,17 +20220,20 @@ (define-public r-regsem (define-public r-stanheaders (package (name "r-stanheaders") - (version "2.19.2") + (version "2.21.0-5") (source (origin (method url-fetch) (uri (cran-uri "StanHeaders" version)) (sha256 (base32 - "0cmk0fzczx7dcywcw1dhm6gfq84qlsx77qrsk4z3bf3dhr4bznam")))) + "1zyph2x47x9a5baj5d79a1lzj7gajirisajvkrcngrjvw8bq7810")))) (properties `((upstream-name . "StanHeaders"))) (build-system r-build-system) (inputs `(("pandoc" ,ghc-pandoc))) + (propagated-inputs + `(("r-rcppeigen" ,r-rcppeigen) + ("r-rcppparallel" ,r-rcppparallel))) (native-inputs `(("gfortran" ,gfortran) ("r-knitr" ,r-knitr))) ; for vignettes -- cgit v1.2.3 From e5884ce4c787eb81d6d58509fffd3e811e5252db Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:14:42 +0200 Subject: gnu: r-openmx: Update to 2.17.4. * gnu/packages/cran.scm (r-openmx): Update to 2.17.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3b5ea1d35e..369c2f8ea1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20291,14 +20291,14 @@ (define-public r-rpf (define-public r-openmx (package (name "r-openmx") - (version "2.17.3") + (version "2.17.4") (source (origin (method url-fetch) (uri (cran-uri "OpenMx" version)) (sha256 (base32 - "1s2pcg281ag3qz2wz8yi826f2d3kj3qg916js7zz0nsrljcyv5bc")))) + "07y4w7xdb63p5kkrj6sdx1kabbsgbbj7nw9hc690jy84r15aryal")))) (properties `((upstream-name . "OpenMx"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 20702ad9a3faa02bf58ed314cc58f75af1b193b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:14:48 +0200 Subject: gnu: r-crochet: Update to 2.3.0. * gnu/packages/cran.scm (r-crochet): Update to 2.3.0. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 369c2f8ea1..8e1325b775 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21241,15 +21241,17 @@ (define-public r-hrbrthemes (define-public r-crochet (package (name "r-crochet") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "crochet" version)) (sha256 (base32 - "1cbv79nyycxk6f8ldcsnn2pvgxqlnrj0qs19nhafnq2clxy863k6")))) + "0zvjaf6cv0nrjb4l4llkr0mmgha7ig31p4ri2rlnqyjlxi5l8hyq")))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/agrueneberg/crochet") (synopsis "Implementation Helper for Matrix-Like Types") (description -- cgit v1.2.3 From 67ee20fbd297f4ec3f932714e94b9488310d8c58 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:15:00 +0200 Subject: gnu: r-brms: Update to 2.13.0. * gnu/packages/cran.scm (r-brms): Update to 2.13.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8e1325b775..7fa47aee1c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21779,14 +21779,14 @@ (define-public r-rserve (define-public r-brms (package (name "r-brms") - (version "2.12.0") + (version "2.13.0") (source (origin (method url-fetch) (uri (cran-uri "brms" version)) (sha256 (base32 - "1699lwkklfhjz7fddawlig552g2zvrc34mqwrzqjgl35r9fm08gs")))) + "0vdncdawxawi16f326qrgy9jjjipmqdjxh741y9p7xdzd4fwaxx3")))) (properties `((upstream-name . "brms"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From cbd9581acc41cd49eb81c2432452cad4de805cbd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 17:02:01 +0200 Subject: gnu: r-with-tests, r-minimal: Update to 4.0.1. * gnu/packages/statistics.scm (r-with-tests, r-minimal): Update to 4.0.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 7e88e1e54a..cd60ce87b0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -184,7 +184,7 @@ (define-public libxls (define r-with-tests (package (name "r-with-tests") - (version "4.0.0") + (version "4.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" @@ -192,7 +192,7 @@ (define r-with-tests version ".tar.gz")) (sha256 (base32 - "0h1995smlyiyhx7gpg9paxsfqrcn6g9bbp5h9r47i6an3clv1gh6")))) + "0ckgpihkih4b44rx48hpg9p6bv0w67j5z3qc8s4giy6qv2j29zlm")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,tzdata-for-tests) -- cgit v1.2.3 From 03a70e4c190420e87c0b535285caf8f77260d4ff Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 11 Jun 2020 18:24:59 +0200 Subject: packages: 'package-grafts' returns grafts for all the relevant outputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Jakub Kądziołka . * guix/packages.scm (input-graft): Add 'output' parameter and honor it. Add OUTPUT to the cache key. (input-cross-graft): Likewise. (fold-bag-dependencies): Operate on inputs instead of nodes. Turn VISITED into a vhash instead of a set. Pass PROC HEAD and OUTPUT instead of just HEAD. (bag-grafts): Adjust accordingly. * tests/packages.scm ("package-grafts, dependency on several outputs"): New test. --- guix/packages.scm | 81 +++++++++++++++++++++++++----------------------------- tests/packages.scm | 24 ++++++++++++++++ 2 files changed, 62 insertions(+), 43 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 0ccd31a7a9..1e0ec41b76 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1194,39 +1194,39 @@ (define %graft-cache (make-weak-key-hash-table 200)) (define (input-graft store system) - "Return a procedure that, given a package with a graft, returns a graft, and -#f otherwise." - (match-lambda - ((? package? package) + "Return a procedure that, given a package with a replacement and an output name, +returns a graft, and #f otherwise." + (match-lambda* + (((? package? package) output) (let ((replacement (package-replacement package))) (and replacement - (cached (=> %graft-cache) package system + (cached (=> %graft-cache) package (cons output system) (let ((orig (package-derivation store package system #:graft? #f)) (new (package-derivation store replacement system #:graft? #t))) (graft (origin orig) - (replacement new))))))) - (x - #f))) + (origin-output output) + (replacement new) + (replacement-output output))))))))) (define (input-cross-graft store target system) "Same as 'input-graft', but for cross-compilation inputs." - (match-lambda - ((? package? package) - (let ((replacement (package-replacement package))) - (and replacement - (let ((orig (package-cross-derivation store package target system - #:graft? #f)) - (new (package-cross-derivation store replacement - target system - #:graft? #t))) - (graft - (origin orig) - (replacement new)))))) - (_ - #f))) + (match-lambda* + (((? package? package) output) + (let ((replacement (package-replacement package))) + (and replacement + (let ((orig (package-cross-derivation store package target system + #:graft? #f)) + (new (package-cross-derivation store replacement + target system + #:graft? #t))) + (graft + (origin orig) + (origin-output output) + (replacement new) + (replacement-output output)))))))) (define* (fold-bag-dependencies proc seed bag #:key (native? #t)) @@ -1243,26 +1243,21 @@ (define bag-direct-inputs* (bag-host-inputs bag)))) bag-host-inputs)) - (define nodes - (match (bag-direct-inputs* bag) - (((labels things _ ...) ...) - things))) - - (let loop ((nodes nodes) + (let loop ((inputs (bag-direct-inputs* bag)) (result seed) - (visited (setq))) - (match nodes + (visited vlist-null)) + (match inputs (() result) - (((? package? head) . tail) - (if (set-contains? visited head) - (loop tail result visited) - (let ((inputs (bag-direct-inputs* (package->bag head)))) - (loop (match inputs - (((labels things _ ...) ...) - (append things tail))) - (proc head result) - (set-insert head visited))))) + (((label (? package? head) . rest) . tail) + (let ((output (match rest (() "out") ((output) output))) + (outputs (vhash-foldq* cons '() head visited))) + (if (member output outputs) + (loop tail result visited) + (let ((inputs (bag-direct-inputs* (package->bag head)))) + (loop (append inputs tail) + (proc head output result) + (vhash-consq head output visited)))))) ((head . tail) (loop tail result visited))))) @@ -1279,8 +1274,8 @@ (define native-grafts (let ((->graft (input-graft store system))) (parameterize ((%current-system system) (%current-target-system #f)) - (fold-bag-dependencies (lambda (package grafts) - (match (->graft package) + (fold-bag-dependencies (lambda (package output grafts) + (match (->graft package output) (#f grafts) (graft (cons graft grafts)))) '() @@ -1291,8 +1286,8 @@ (define target-grafts (let ((->graft (input-cross-graft store target system))) (parameterize ((%current-system system) (%current-target-system target)) - (fold-bag-dependencies (lambda (package grafts) - (match (->graft package) + (fold-bag-dependencies (lambda (package output grafts) + (match (->graft package output) (#f grafts) (graft (cons graft grafts)))) '() diff --git a/tests/packages.scm b/tests/packages.scm index 72e87dbfb7..c7b6f669b5 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -900,6 +900,30 @@ (define read-at (replacement #f)))) (replacement (package-derivation %store new))))))) +(test-assert "package-grafts, dependency on several outputs" + ;; Make sure we get one graft per output; see . + (letrec* ((p0 (dummy-package "p0" + (version "1.0") + (replacement p0*) + (arguments '(#:implicit-inputs? #f)) + (outputs '("out" "lib")))) + (p0* (package (inherit p0) (version "1.1"))) + (p1 (dummy-package "p1" + (arguments '(#:implicit-inputs? #f)) + (inputs `(("p0" ,p0) + ("p0:lib" ,p0 "lib")))))) + (lset= equal? (pk (package-grafts %store p1)) + (list (graft + (origin (package-derivation %store p0)) + (origin-output "out") + (replacement (package-derivation %store p0*)) + (replacement-output "out")) + (graft + (origin (package-derivation %store p0)) + (origin-output "lib") + (replacement (package-derivation %store p0*)) + (replacement-output "lib")))))) + (test-assert "replacement also grafted" ;; We build a DAG as below, where dotted arrows represent replacements and ;; solid arrows represent dependencies: -- cgit v1.2.3 From ecf92194a55188a9c217d76617378749db063453 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 11 Jun 2020 18:54:15 +0200 Subject: gnu: nghttp2: Replace with version 1.41 [fixes CVE-2020-11080]. * gnu/packages/web.scm (nghttp2-1.41): New variable. (nghttp2)[replacement]: New field. --- gnu/packages/web.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 82174c0033..a04d755a83 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7193,6 +7193,7 @@ (define-public nghttp2 (package (name "nghttp2") (version "1.40.0") + (replacement nghttp2-1.41) (source (origin (method url-fetch) @@ -7272,6 +7273,20 @@ (define-public nghttp2 @end itemize\n") (license license:expat))) +(define-public nghttp2-1.41 ;fixes CVE-2020-11080 + (package + (inherit nghttp2) + (version "1.41.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/nghttp2/nghttp2/" + "releases/download/v" version "/" + "nghttp2-" version ".tar.xz")) + (sha256 + (base32 + "1hk77vngjmvvzb5y1gi1aqwf6qywrc7yak08zvzb7x81qs6mphmb")))))) + (define-public hpcguix-web (let ((commit "9de63562b06b4aef3a3afe5ecb18d3c91e57ee74") (revision "5")) -- cgit v1.2.3 From 4908ba058f63488af776f64293f425576ebeed6f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 15:06:48 +0300 Subject: gnu: subversion: Update to 1.14.0. * gnu/packages/version-control.scm (subversion): Update to 1.14.0. [source]: Update source URI. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index bac51e3181..99e1a8ccd1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1569,14 +1569,14 @@ (define-public neon (define-public subversion (package (name "subversion") - (version "1.10.6") + (version "1.14.0") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/subversion/" + (uri (string-append "mirror://apache/subversion/" "subversion-" version ".tar.bz2")) (sha256 (base32 - "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q")))) + "00i1f88snlpcnsycpn6r315h6792l5nkr2p5k6kq6yprz4cf5a3b")))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f ; TODO Seems to cause test failures on -- cgit v1.2.3 From e73a016df2dca6ffc2a5b736c8d507005e9b7126 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 23:13:40 +0300 Subject: gnu: adns: Update to 1.6.0. * gnu/packages/adns.scm (adns): Update to 1.6.0. [source]: Use https. [native-inputs]: Add m4. --- gnu/packages/adns.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index 5d8c6fdc91..57f34942d5 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Ludovic Courtès -;;; Copyright © 2015, 2016, 2018 Efraim Flashner +;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Marius Bakke ;;; @@ -25,22 +25,23 @@ (define-module (gnu packages adns) #:use-module (guix download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (gnu packages m4) #:use-module (gnu packages pkg-config)) (define-public adns (package (name "adns") - (version "1.5.1") + (version "1.6.0") (source (origin (method url-fetch) (uri (list (string-append "mirror://gnu/adns/adns-" version ".tar.gz") (string-append - "http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-" - version ".tar.gz"))) + "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-" + version ".tar.gz"))) (sha256 (base32 - "1ssfh94ck6kn98nf2yy6743srpgqgd167va5ja3bwx42igqjc42v")))) + "1pi0xl07pav4zm2jrbrfpv43s1r1q1y12awgak8k7q41m5jp4hpv")))) (build-system gnu-build-system) (arguments ;; Make sure the programs under bin/ fine libadns.so. @@ -50,6 +51,8 @@ (define-public adns ;; XXX: Tests expect real name resolution to work. #:tests? #f)) + (native-inputs + `(("m4" ,m4))) (home-page "https://www.gnu.org/software/adns/") (synopsis "Asynchronous DNS client library and utilities") (description -- cgit v1.2.3 From 59feeb96e442bbd3da0bc530067de703f89437da Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:06:41 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.227. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.227. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 73d99be48c..8c59533e88 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -424,10 +424,10 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.226") +(define-public linux-libre-4.4-version "4.4.227") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1dwvm81i62b06jsl38spfn719zrsbwq5z8viwckrpw4ma4w9k0j1"))) + (hash (base32 "196x57w740firg8zchypq4vq6a83ymmwn9amqrscym9zr0pcgm40"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 523d63638a1c0b598d6417b5b56863f91e2c4864 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:07:38 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.227. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.227. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8c59533e88..396a5a532c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -416,10 +416,10 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.226") +(define-public linux-libre-4.9-version "4.9.227") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1jj5ydz5cy87z7hrv54bkyl9739lpzja8580ngjhrip5iwb8q2j6"))) + (hash (base32 "0pqc0wld4s4zjas95xm54mrkk00l9zkc59b6i9gq4km126s8bi1q"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From e5630f5d3cacbb5c27bb27e0160e24b79e08fe75 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:08:10 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.184. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.184. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 396a5a532c..7ad9a049e3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -408,10 +408,10 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.183") +(define-public linux-libre-4.14-version "4.14.184") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "11c0vd2pwplm8wafich4zg2mnp10vvnap987c5jh96w1avpsyra2"))) + (hash (base32 "0h6r06c1d7amkfglsr66ic89p0zxpmk7jkq1ylcbknmkiwkixx9g"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From e37aff92e2c8c30a1eedfe0fe6ae2db0e6949560 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:08:48 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.128. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.128. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7ad9a049e3..431f81ecf2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -400,10 +400,10 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.127") +(define-public linux-libre-4.19-version "4.19.128") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0vsq5vjyh6n8acjnldfs0zny63l12fn2pssb8zbwidc8qmmqibw2"))) + (hash (base32 "0g31ad3wziy4xqna0yvwjcnza3jhd93syjpfvmwh0b4pkj2adar9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 1c02643a06f807175ee6a8418cd824a0ac7ec9a4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:11:35 -0400 Subject: gnu: linux-libre@5.6: Remove. Users of linux-libre-5.6 should migrate to version 5.7. * gnu/packages/linux.scm (deblob-scripts-5.6, linux-libre-5.6-version) (linux-libre-5.6-pristine-source, linux-libre-5.6-source) (linux-libre-headers-5.6, linux-libre-arm-generic-5.6) (linux-libre-arm64-generic-5.6): Remove variables. --- gnu/packages/linux.scm | 51 -------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 431f81ecf2..6b861d5ff6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -199,12 +199,6 @@ (define deblob-scripts-5.7 (base32 "1c0n39wg6xij4x63ppg0m80kfcffkn3iilm3chyiix09n9g7vb78") (base32 "02is246xaql1br3kizqicrkp982nw4gdwpn7nlzjazvsmyd1hcv2"))) -(define deblob-scripts-5.6 - (linux-libre-deblob-scripts - "5.6.7" - (base32 "196fdbfy1f8zbmnv0ik720snig2bacsh7hfyvgbmlsfk3cil2zgv") - (base32 "1g0bi3c8xzy1vz6w1xbpkb3a26bqn9d1yphcqz2ki4aikra81wid"))) - (define deblob-scripts-5.4 (linux-libre-deblob-scripts "5.4.37" @@ -384,14 +378,6 @@ (define-public linux-libre-5.7-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.7))) -(define-public linux-libre-5.6-version "5.6.17") -(define-public linux-libre-5.6-pristine-source - (let ((version linux-libre-5.6-version) - (hash (base32 "17kzalz8z6svv6nwa3dbmf7nyvpb2wwwyabj19vdwf6v05a28fn3"))) - (make-linux-libre-source version - (%upstream-linux-source version hash) - deblob-scripts-5.6))) - (define-public linux-libre-5.4-version "5.4.45") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) @@ -465,15 +451,6 @@ (define-public linux-libre-5.7-source (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch))) -(define-public linux-libre-5.6-source - (source-with-patches linux-libre-5.6-pristine-source - (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch - ;; Pinebook Pro patch from linux-next, - ;; can be dropped for linux-libre 5.7 - (search-patch - "linux-libre-support-for-Pinebook-Pro.patch")))) - (define-public linux-libre-5.4-source (source-with-patches linux-libre-5.4-pristine-source (list %boot-logo-patch @@ -577,10 +554,6 @@ (define-public linux-libre-headers-5.7 (make-linux-libre-headers* linux-libre-5.7-version linux-libre-5.7-source)) -(define-public linux-libre-headers-5.6 - (make-linux-libre-headers* linux-libre-5.6-version - linux-libre-5.6-source)) - (define-public linux-libre-headers-5.4 (make-linux-libre-headers* linux-libre-5.4-version linux-libre-5.4-source)) @@ -882,18 +855,6 @@ (define-public linux-libre-arm-generic ("CONFIG_RTC_DRV_RK808" . #t)) %default-extra-linux-options))) -(define-public linux-libre-arm-generic-5.6 - (make-linux-libre* linux-libre-5.6-version - linux-libre-5.6-source - '("armhf-linux") - #:defconfig "multi_v7_defconfig" - #:extra-version "arm-generic" - #:extra-options - (append - `(;; needed to fix the RTC on rockchip platforms - ("CONFIG_RTC_DRV_RK808" . #t)) - %default-extra-linux-options))) - (define-public linux-libre-arm-generic-5.7 (make-linux-libre* linux-libre-5.7-version linux-libre-5.7-source @@ -956,18 +917,6 @@ (define-public linux-libre-arm64-generic ("CONFIG_RTC_DRV_RK808" . #t)) %default-extra-linux-options))) -(define-public linux-libre-arm64-generic-5.6 - (make-linux-libre* linux-libre-5.6-version - linux-libre-5.6-source - '("aarch64-linux") - #:defconfig "defconfig" - #:extra-version "arm64-generic" - #:extra-options - (append - `(;; needed to fix the RTC on rockchip platforms - ("CONFIG_RTC_DRV_RK808" . #t)) - %default-extra-linux-options))) - (define-public linux-libre-arm64-generic-5.7 (make-linux-libre* linux-libre-5.7-version linux-libre-5.7-source -- cgit v1.2.3 From 48f3631b0f68612ede0d96a4d17bba849535ba32 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:14:49 -0400 Subject: gnu: linux-libre@5.7: Update to 5.7.2. * gnu/packages/linux.scm (linux-libre-5.7-version): Update to 5.7.128. (linux-libre-5.7-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6b861d5ff6..2ee4edf942 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,10 +370,10 @@ (define (%upstream-linux-source version hash) (sha256 hash))) -(define-public linux-libre-5.7-version "5.7.1") +(define-public linux-libre-5.7-version "5.7.2") (define-public linux-libre-5.7-pristine-source (let ((version linux-libre-5.7-version) - (hash (base32 "1vcxrrb2i4366iciw0mfahwbdrzmhrrsr7gi4vdkzznfv2niils0"))) + (hash (base32 "02brxm78n0kg4mh48acvjsr7mpvaqd279ycyaixaflid1s1awrb0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.7))) -- cgit v1.2.3 From 437e64b7d31e198915daac0c5ef9f0915cd2c503 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:15:35 -0400 Subject: gnu: linux-libre: Update to 5.4.46. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.46. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2ee4edf942..0d7f60ca82 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -378,10 +378,10 @@ (define-public linux-libre-5.7-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.7))) -(define-public linux-libre-5.4-version "5.4.45") +(define-public linux-libre-5.4-version "5.4.46") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0bpy2lb3bqmkaqxzdmssgmhbjsys7d3lyfv4x919q0596jgh6gqh"))) + (hash (base32 "13hvnfdcbcb9a21zizq8d90mc8maxz03zmzsj6iqsjd2y7r4y1rh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 648ae62112f62bc2106fb36d45c83fda787d3bed Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Tue, 26 May 2020 16:24:44 +0200 Subject: gnu: Add exercism and dependencies. * gnu/packages/education.scm (exercism): New variable. * gnu/packages/patches/exercism-disable-self-update.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/golang.scm (go-github-com-spf13-afero) (go-github-com-spf13-cast) (go-github-com-spf13-cobra) (go-github-com-spf13-jwalterweatherman) (go-github-com-spf13-viper) (go-github-com-fsnotify-fsnotify) (go-github-com-magiconair-properties) (go-github-com-pelletier-go-toml) (go-github-com-subosito-gotenv) (go-gopkg-in-ini-v1) (go-github-com-mitchellh-mapstructure): New variables. --- gnu/local.mk | 1 + gnu/packages/education.scm | 35 +++ gnu/packages/golang.scm | 285 ++++++++++++++++++++- .../patches/exercism-disable-self-update.patch | 79 ++++++ 4 files changed, 398 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/exercism-disable-self-update.patch diff --git a/gnu/local.mk b/gnu/local.mk index 76d6b5deba..de4b2e158f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -904,6 +904,7 @@ dist_patch_DATA = \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ %D%/packages/patches/evolution-data-server-locales.patch \ %D%/packages/patches/evolution-data-server-libical-compat.patch \ + %D%/packages/patches/exercism-disable-self-update.patch \ %D%/packages/patches/exiv2-CVE-2017-14860.patch \ %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \ %D%/packages/patches/extempore-unbundle-external-dependencies.patch \ diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 0a186736d4..cba061f195 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2020 Robert Smith ;;; Copyright © 2020 Guy Fleury Iteriteka +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,6 +40,7 @@ (define-module (gnu packages education) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages golang) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages javascript) @@ -68,6 +70,7 @@ (define-module (gnu packages education) #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (guix build-system trivial) @@ -978,3 +981,35 @@ (define-public mdk The package includes a compiler, a virtual machine, a GUI for the virtual machine, and more.") (license license:gpl3+))) + +(define-public exercism + (package + (name "exercism") + (version "3.0.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/exercism/cli") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17gvz9a0sn4p36hf4l77bxhhfipf4x998iay31layqwbnzmb4xy7")) + (patches (search-patches "exercism-disable-self-update.patch")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/exercism/cli/exercism" + #:unpack-path "github.com/exercism/cli")) + (inputs + `(("github.com/blang/semver" ,go-github-com-blang-semver) + ("github.com/spf13/cobra" ,go-github-com-spf13-cobra) + ("github.com/spf13/pflag" ,go-github-com-spf13-pflag) + ("github.com/spf13/viper" ,go-github-com-spf13-viper) + ("golang.org/x/net" ,go-golang-org-x-net) + ("golang.org/x/text" ,go-golang-org-x-text))) + (home-page "https://exercism.io") + (synopsis "Mentored learning for programming languages") + (description "Commandline client for exercism.io, a free service providing +mentored learning for programming languages.") + (license license:expat))) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d95e195ba5..a631ad4285 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -17,6 +17,7 @@ ;;; Copyright @ 2019, 2020 Alex Griffin ;;; Copyright © 2019, 2020 Arun Isaac ;;; Copyright © 2020 Jack Hill +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -1179,6 +1180,103 @@ (define-public go-github-com-jonboulle-clockwork @code{clockwork.Clock} interface instead.") (license license:asl2.0)))) +(define-public go-github-com-spf13-afero + (package + (name "go-github-com-spf13-afero") + (version "1.2.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spf13/afero") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/spf13/afero")) + (propagated-inputs + `(("golang.org/x/text" ,go-golang-org-x-text))) + (home-page "https://github.com/spf13/afero") + (synopsis "Filesystem abstraction for Go") + (description "Filesystem abstraction for Go") + (license license:asl2.0))) + +(define-public go-github-com-spf13-cast + (package + (name "go-github-com-spf13-cast") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spf13/cast") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lb84788glr0qzrq2ifi36rgvp96qrgywvxrr3ggq5hrbr38hgn1")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/spf13/cast")) + (native-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) + (home-page "https://github.com/spf13/cast") + (synopsis "Safe and easy casting from one type to another in Go") + (description "Safe and easy casting from one type to another in Go") + (license license:expat))) + +(define-public go-github-com-spf13-cobra + (package + (name "go-github-com-spf13-cobra") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spf13/cobra") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vbppqqhby302a5ayn0296jqr71qkcd4c9am7wzsk6z71fwdsa7h")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/spf13/cobra")) + (propagated-inputs + `(("github.com/spf13/pflag" ,go-github-com-spf13-pflag))) + (home-page "https://github.com/spf13/cobra") + (synopsis "Go library for creating CLI applications") + (description "Cobra is both a library for creating powerful modern CLI +applications as well as a program to generate applications and command files.") + (license license:asl2.0))) + +(define-public go-github-com-spf13-jwalterweatherman + (package + (name "go-github-com-spf13-jwalterweatherman") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spf13/jwalterweatherman") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/spf13/jwalterweatherman")) + (native-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) + (home-page "https://github.com/spf13/jwalterweatherman") + (synopsis "Go logging library") + (description "Go logging library") + (license license:expat))) + (define-public go-github-com-spf13-pflag (package (name "go-github-com-spf13-pflag") @@ -1191,8 +1289,8 @@ (define-public go-github-com-spf13-pflag (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31")))) + (base32 + "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31")))) (build-system go-build-system) (arguments '(#:import-path "github.com/spf13/pflag")) @@ -1206,6 +1304,143 @@ (define-public go-github-com-spf13-pflag GNU extensions} to the POSIX recommendations for command-line options.") (license license:bsd-3))) +(define-public go-github-com-spf13-viper + (package + (name "go-github-com-spf13-viper") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spf13/viper.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "099n2g7fg6r8hqyszqw2axr775qyhyvwhsykvgw0f0s16ql48h5c")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/spf13/viper")) + (propagated-inputs + `(("github.com/spf13/afero" ,go-github-com-spf13-afero) + ("github.com/spf13/cast" ,go-github-com-spf13-cast) + ("github.com/spf13/pflag" ,go-github-com-spf13-pflag) + ("github.com/spf13/jwalterweatherman" ,go-github-com-spf13-jwalterweatherman) + ("github.com/fsnotify/fsnotify" ,go-github-com-fsnotify-fsnotify) + ("github.com/hashicorp/hcl" ,go-github-com-hashicorp-hcl) + ("github.com/magiconair/properties" ,go-github-com-magiconair-properties) + ("github.com/mitchellh/mapstructure" ,go-github-com-mitchellh-mapstructure) + ("github.com/pelletier/go-toml" ,go-github-com-pelletier-go-toml) + ("github.com/subosito/gotenv" ,go-github-com-subosito-gotenv) + + ("gopkg.in/ini.v1" ,go-gopkg-in-ini-v1) + ("gopkg.in/yaml.v2" ,go-gopkg-in-yaml-v2))) + (native-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) + (home-page "https://github.com/spf13/viper") + (synopsis "Go configuration with fangs") + (description + "Viper is a complete configuration solution for Go applications including +12-Factor apps. It is designed to work within an application, and can handle +all types of configuration needs and formats.") + (license license:expat))) + +(define-public go-github-com-fsnotify-fsnotify + (package + (name "go-github-com-fsnotify-fsnotify") + (version "1.4.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fsnotify/fsnotify") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1i1r72knpbfwwql9frn9bqc3nhfc2ai5m6qllcyr6wban62lr40x")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/fsnotify/fsnotify")) + (propagated-inputs + `(("golang.org/x/sys" ,go-golang-org-x-sys))) + (home-page "https://github.com/fsnotify/fsnotify") + (synopsis "File system notifications for Go") + (description "File system notifications for Go") + (license license:bsd-3))) + +(define-public go-github-com-magiconair-properties + (package + (name "go-github-com-magiconair-properties") + (version "1.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magiconair/properties") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19zqw1x0w0crh8zc84yy82nkcc5yjz72gviaf2xjgfm5a8np7nyb")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/magiconair/properties")) + (home-page "https://github.com/magiconair/properties") + (synopsis "Java properties scanner for Go") + (description "Java properties scanner for Go") + (license license:bsd-2))) + +(define-public go-github-com-pelletier-go-toml + (package + (name "go-github-com-pelletier-go-toml") + (version "1.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pelletier/go-toml") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fxmjm85c9h43lvqz71wr93fcc63bhj82nwby80222xx8ja63g7y")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/pelletier/go-toml")) + (native-inputs + `(("github.com/BurntSushi/toml" ,go-github-com-burntsushi-toml) + ("github.com/davecgh/go-spew" ,go-github-com-davecgh-go-spew) + ("gopkg.in/yaml.v2" ,go-gopkg-in-yaml-v2))) + (home-page "https://github.com/pelletier/go-toml") + (synopsis "Go library for the TOML configuration language") + (description "Go library for the TOML configuration language") + (license license:expat))) + +(define-public go-github-com-subosito-gotenv + (package + (name "go-github-com-subosito-gotenv") + (version "1.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/subosito/gotenv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mav91j7r4arjkpq5zcf9j74f6pww8ic53x43wy7kg3ibw31yjs5")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/subosito/gotenv")) + (native-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) + (home-page "https://github.com/subosito/gotenv") + (synopsis "Go library for loading environment variables from files") + (description "Go library for loading environment variables from files") + (license license:expat))) + (define-public go-github-com-sirupsen-logrus (package (name "go-github-com-sirupsen-logrus") @@ -1474,6 +1709,30 @@ (define-public go-gopkg-in-check-v1 (description "This package provides a test library for the Go language.") (license license:asl2.0)))) +(define-public go-gopkg-in-ini-v1 + (package + (name "go-gopkg-in-ini-v1") + (version "1.56.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-ini/ini") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j5z0cngg6mq2f9id083jcdi7k6r2h35714pashv6sdv2q7bmfc5")))) + (build-system go-build-system) + (arguments + '(#:import-path "gopkg.in/ini.v1" + ;; Requires large unpackaged test framework + #:tests? #f)) + (home-page "https://gopkg.in/ini.v1") + (synopsis "Go library for ini files") + (description "Go library for ini files") + (license license:asl2.0))) + (define-public go-gopkg-in-yaml-v2 (package (name "go-gopkg-in-yaml-v2") @@ -2404,6 +2663,28 @@ (define-public go-github-com-mitchellh-go-homedir cross-compilation.") (license license:expat)))) +(define-public go-github-com-mitchellh-mapstructure + (package + (name "go-github-com-mitchellh-mapstructure") + (version "1.1.2") ;; NOTE: Updating to 1.3.1 breaks tests on viper-1.7.0 + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mitchellh/mapstructure") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/mitchellh/mapstructure")) + (home-page "https://github.com/mitchellh/mapstructure") + (synopsis "Go library for decoding generic map values") + (description "Go library for decoding generic map values") + (license license:expat))) + (define-public go-github-com-multiformats-go-multiaddr (let ((commit "fe1c46f8be5af4aff4db286e08839295bd922efb") (revision "0")) diff --git a/gnu/packages/patches/exercism-disable-self-update.patch b/gnu/packages/patches/exercism-disable-self-update.patch new file mode 100644 index 0000000000..a96cbfbc55 --- /dev/null +++ b/gnu/packages/patches/exercism-disable-self-update.patch @@ -0,0 +1,79 @@ +From bc22f7d43c12c5f79c71b0319666e71f29d61322 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= +Date: Mon, 25 May 2020 18:53:04 +0200 +Subject: [PATCH] Disable self-update. + +Based on a Fedora patch by Elliott Sales de Andrade. +--- + cli/cli.go | 44 +------------------------------------------- + 1 file changed, 1 insertion(+), 43 deletions(-) + +diff --git a/cli/cli.go b/cli/cli.go +index 4312eb0..5f62297 100644 +--- a/cli/cli.go ++++ b/cli/cli.go +@@ -10,13 +10,10 @@ import ( + "io" + "io/ioutil" + "net/http" +- "runtime" + "strings" + "time" + + "github.com/blang/semver" +- "github.com/exercism/cli/debug" +- update "github.com/inconshreveable/go-update" + ) + + var ( +@@ -95,46 +92,7 @@ func (c *CLI) IsUpToDate() (bool, error) { + + // Upgrade allows the user to upgrade to the latest version of the CLI. + func (c *CLI) Upgrade() error { +- var ( +- OS = osMap[runtime.GOOS] +- ARCH = archMap[runtime.GOARCH] +- ) +- +- if OS == "" || ARCH == "" { +- return fmt.Errorf("unable to upgrade: OS %s ARCH %s", OS, ARCH) +- } +- +- buildName := fmt.Sprintf("%s-%s", OS, ARCH) +- if BuildARCH == "arm" { +- if BuildARM == "" { +- return fmt.Errorf("unable to upgrade: arm version not found") +- } +- buildName = fmt.Sprintf("%s-v%s", buildName, BuildARM) +- } +- +- var downloadRC *bytes.Reader +- for _, a := range c.LatestRelease.Assets { +- if strings.Contains(a.Name, buildName) { +- debug.Printf("Downloading %s\n", a.Name) +- var err error +- downloadRC, err = a.download() +- if err != nil { +- return fmt.Errorf("error downloading executable: %s", err) +- } +- break +- } +- } +- if downloadRC == nil { +- return fmt.Errorf("no executable found for %s/%s%s", BuildOS, BuildARCH, BuildARM) +- } +- +- bin, err := extractBinary(downloadRC, OS) +- if err != nil { +- return err +- } +- defer bin.Close() +- +- return update.Apply(bin, update.Options{}) ++ return fmt.Errorf("Please use Guix to update Exercism") + } + + func (c *CLI) fetchLatestRelease() error { +-- +2.26.2 + -- cgit v1.2.3