From cd5b5439b4de10cf84798069eca790e9d0c22c7f Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 11 Aug 2021 22:26:06 +0100 Subject: gnu: gpodder: Update to 3.10.21. * gnu/packages/gpodder.scm (gpodder): Update to 3.10.21. --- gnu/packages/gpodder.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 5a18a16753..07df1da2f2 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -49,7 +49,7 @@ (define-public gpodder (package (name "gpodder") - (version "3.10.20") + (version "3.10.21") (source (origin (method git-fetch) @@ -57,7 +57,7 @@ (url "https://github.com/gpodder/gpodder") (commit version))) (sha256 - (base32 "0lwf1lm20q6i8xbbva1g4arbinyxca10865dn19p5kr1b3gvmxqh")) + (base32 "0n73jm5ypsj962gpr0dk10lqh83giqsczm63wchyhmrkyf1wgga1")) (file-name (git-file-name name version)) (patches (search-patches "gpodder-disable-updater.patch")))) (build-system python-build-system) -- cgit v1.2.3 From 3d27dfff9a9fbb5ef140732e69c2249e00bc45fd Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 11 Aug 2021 22:39:50 +0100 Subject: gnu: ardour: Update to 6.8. * gnu/packages/audio.scm (ardour): Update to 6.8. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b9ac034f36..951e13fbff 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -571,7 +571,7 @@ streams from live audio.") (define-public ardour (package (name "ardour") - (version "6.6") + (version "6.8") (source (origin (method git-fetch) (uri (git-reference @@ -589,7 +589,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \ #t))) (sha256 (base32 - "0k5rxh8b3d8si3lj01gfqj0pmd448d8sj4asnb205mwhwbfgn0cp")) + "16x7bkzbrk0rgywq5vrkhf2z3jj08jw1bvaq9vwlf2b4h4sd7i4s")) (file-name (string-append name "-" version)))) (build-system waf-build-system) (arguments -- cgit v1.2.3 From c71acf60c4b934f8c02fd3882bfbd19c52d428d0 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 11 Aug 2021 22:34:03 +0100 Subject: gnu: qjackctl: Update to 0.9.4. * gnu/packages/audio.scm (qjackctl): Update to 0.9.4. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 951e13fbff..5e1c6df6c3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2829,14 +2829,14 @@ different audio devices such as ALSA or PulseAudio.") (define-public qjackctl (package (name "qjackctl") - (version "0.9.3") + (version "0.9.4") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" version "/qjackctl-" version ".tar.gz")) (sha256 (base32 - "065x66rr1mb2bkqr88l50rcn5c8rsiq4hp5hrlyqqg46371gzhp9")))) + "186rg3j67rac9ds1r7gnrib2d0smgv15cmr5gwb7v83mywcp1gzy")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no check target -- cgit v1.2.3 From 842301667fdc2fca0cc4a7c6d640c158f19a1da9 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 11 Aug 2021 22:36:10 +0100 Subject: gnu: sakura: Update to 3.8.3. * gnu/packages/terminals.scm (sakura): Update to 3.8.3. --- gnu/packages/terminals.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 9377e5622b..1cdf0e1831 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2018, 2019 Eric Bavier ;;; Copyright © 2019 Julien Lepiller -;;; Copyright © 2019 Pierre Langlois +;;; Copyright © 2019, 2021 Pierre Langlois ;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Valentin Ignatev @@ -740,7 +740,7 @@ a server/client mode.") (define-public sakura (package (name "sakura") - (version "3.7.1") + (version "3.8.3") (source (origin (method url-fetch) (uri (string-append "https://launchpad.net/sakura/trunk/" @@ -748,7 +748,7 @@ a server/client mode.") ".tar.bz2")) (sha256 (base32 - "12wjmckf03qbnm8cb7qma0980anzajn3l92rj2yr8hhafl74x6kj")))) + "1r2kpvxx21r407s07m5p5x0dam6x863991nmcv6k5ap873fxqh2h")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no check phase -- cgit v1.2.3 From 1c5de6f455cfba29cf4f7e45191db1069443dc30 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 12 Aug 2021 00:36:10 +0000 Subject: gnu: markets: Update to 0.5.2. * gnu/packages/gnome-xyz.scm (markets): Update to 0.5.2. [arguments]<#:phases>: Don't return #t. [inputs]: Use libhandy-1. [license]: Use gpl3+. Signed-off-by: Efraim Flashner --- gnu/packages/gnome-xyz.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index d8997ac538..9b1829de85 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Ellis Kenyo ;;; Copyright © 2020 Stefan Reichör +;;; Copyright © 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -848,7 +849,7 @@ variants.") (define-public markets (package (name "markets") - (version "0.4.0") + (version "0.5.2") (source (origin (method git-fetch) @@ -858,7 +859,7 @@ variants.") (file-name (git-file-name name version)) (sha256 (base32 - "1jzv74l2jkdiqy1hp0ww5yla50dmrvjw7fgkmb26ynblr1nb3rrb")))) + "0nk1bs7i6b7r90g5qwd3s2m462vk3kvza0drq7rzb5sdaiz9ccnz")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -868,19 +869,17 @@ variants.") ;; Don't create 'icon-theme.cache'. (lambda _ (substitute* "build-aux/meson/postinstall.py" - (("gtk-update-icon-cache") "true")) - #t)) + (("gtk-update-icon-cache") "true")))) (add-after 'unpack 'skip-update-desktop-database ;; Don't update desktop file database. (lambda _ (substitute* "build-aux/meson/postinstall.py" - (("update-desktop-database") "true")) - #t))))) + (("update-desktop-database") "true"))))))) (inputs `(("gtk3" ,gtk+) ("gettext" ,gettext-minimal) ("libgee" ,libgee) - ("libhandy0" ,libhandy-0.0) + ("libhandy" ,libhandy) ("libsoup" ,libsoup) ("json-glib" ,json-glib) ("vala" ,vala))) @@ -892,7 +891,7 @@ variants.") (description "Markets is a GTK application that displays financial data, helping users track stocks, currencies and cryptocurrencies.") - (license license:gpl3))) + (license license:gpl3+))) (define-public vala-language-server (package -- cgit v1.2.3 From e543ebf9dcb620356fb28d37177c8a316a6866d8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Aug 2021 09:56:49 +0300 Subject: gnu: markets: Fix running on non-Gnome desktops. * gnu/packages/gnome-xyz.scm (markets)[inputs]: Add gsettings-desktop-schemas. --- gnu/packages/gnome-xyz.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 9b1829de85..b9f7afcaf8 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -878,6 +878,7 @@ variants.") (inputs `(("gtk3" ,gtk+) ("gettext" ,gettext-minimal) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("libgee" ,libgee) ("libhandy" ,libhandy) ("libsoup" ,libsoup) -- cgit v1.2.3 From 1d6be1c9d72c9e4d6bafcaa16f1e1a206d81be5a Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 11 Aug 2021 19:01:36 -0500 Subject: gnu: cl-plump: Update to 2.0.0-2.3584275. * gnu/packages/lisp-xyz.scm (sbcl-plump): Update to 2.0.0-2.3584275. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b630e2e4aa..38cc7d6695 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8136,8 +8136,8 @@ functions for arrays and vectors. Originally from Plump.") (sbcl-package->ecl-package sbcl-array-utils)) (define-public sbcl-plump - (let ((commit "34f890fe46efdebe7bb70d218f1937e98f632bf9") - (revision "1")) + (let ((commit "3584275f0be9d06c0c51b5c08f89005deafc4ada") + (revision "2")) (package (name "sbcl-plump") (version (git-version "2.0.0" revision commit)) @@ -8151,7 +8151,7 @@ functions for arrays and vectors. Originally from Plump.") (file-name (git-file-name name version)) (sha256 (base32 - "0a0x8wn6vv1ylxcwck12k18gy0a366kdm6ddxxk7yynl4mwnqgkh")))) + "1w4wz7f6dc2ckdq9wq9r5014bg2nxjifj9yz1zzn41r8h1h5xfcd")))) (build-system asdf-build-system/sbcl) (inputs `(("array-utils" ,sbcl-array-utils) -- cgit v1.2.3 From 9f544c631f9739ac1f33b241e8d9c446fa63cfca Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 12 Aug 2021 10:58:28 +0200 Subject: gnu: cuirass: Update to 1.1.0-2.830817a. * gnu/packages/ci.scm (cuirass): Update to 1.1.0-2.830817a. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 0bcde0fad5..d809ed0119 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -73,8 +73,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "f9a5dbd54eaa7fa8ac173fd5e68209f937840d90") - (revision "1")) + (let ((commit "830817aaac1516eb86092ee0204dee1017d71cec") + (revision "2")) (package (name "cuirass") (version (git-version "1.1.0" revision commit)) @@ -87,7 +87,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0wrx2bf1gdnbkfgmmqr46s1fhvv3568yi7hxb24plf4xx5jq5yg8")))) + "1bxfjz35hv3m2ij9mc9pphjd6n5kwqk9sx0kdxkp75kp4jzkcykr")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From 0dc9e58929252f249efc8b51e1171f940adda3d0 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 2 Aug 2021 16:07:08 +0200 Subject: gnu: Add jsonnet. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (jsonnet): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cpp.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 42e9d50687..8c8109fb83 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -45,6 +45,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix modules) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) @@ -1211,3 +1212,40 @@ of reading and writing XML.") ;; incompatible with the GPL v2. Refer to the file named FLOSSE for the ;; details. (license license:gpl2+))) + +(define-public jsonnet + (package + (name "jsonnet") + (version "0.17.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/jsonnet") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim")) + (modules '((guix build utils))) + (snippet + #~(begin + (rename-file "third_party/md5" ".md5") + (delete-file-recursively "third_party") + (delete-file-recursively "doc/third_party") + (substitute* '("core/vm.cpp") + (("#include \"json.hpp\"") "#include ")) + (mkdir "third_party") + (rename-file ".md5" "third_party/md5"))))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DUSE_SYSTEM_GTEST=ON" "-DUSE_SYSTEM_JSON=ON"))) + (native-inputs + `(("googletest" ,googletest) + ("pkg-config" ,pkg-config))) + (inputs + `(("json-modern-cxx" ,json-modern-cxx))) + (home-page "https://jsonnet.org/") + (synopsis "Data templating language") + (description "Jsonnet is a templating language extending JSON +syntax with variables, conditions, functions and more.") + (license license:asl2.0))) -- cgit v1.2.3 From 1ad0da60d81f4ba59f5f97af930e9b09f561d277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 12 Aug 2021 09:55:58 +0200 Subject: gnu: jsonnet: Do not build static libraries. * gnu/packages/cpp.scm (jsonnet)[arguments]: Pass "-DBUILD_STATIC_LIBS=OFF". --- gnu/packages/cpp.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 8c8109fb83..ba921fac11 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017 Ethan R. Jones ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial -;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018, 2021 Ludovic Courtès ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Jan Wielkiewicz @@ -1238,7 +1238,8 @@ of reading and writing XML.") (rename-file ".md5" "third_party/md5"))))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DUSE_SYSTEM_GTEST=ON" "-DUSE_SYSTEM_JSON=ON"))) + `(#:configure-flags '("-DUSE_SYSTEM_GTEST=ON" "-DUSE_SYSTEM_JSON=ON" + "-DBUILD_STATIC_LIBS=OFF"))) (native-inputs `(("googletest" ,googletest) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 1314761bbec40d1370d4b038fbfa1fc91a3d1a2c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 12 Aug 2021 14:22:54 +0200 Subject: gnu: cuirass: Update to 1.1.0-3.91e8b2e. * gnu/packages/ci.scm (cuirass): Update to 1.1.0-3.91e8b2e. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index d809ed0119..189c7d1c23 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -73,8 +73,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "830817aaac1516eb86092ee0204dee1017d71cec") - (revision "2")) + (let ((commit "91e8b2ec2c2dbb87089b0c98a29bba427ba7b7bb") + (revision "3")) (package (name "cuirass") (version (git-version "1.1.0" revision commit)) @@ -87,7 +87,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1bxfjz35hv3m2ij9mc9pphjd6n5kwqk9sx0kdxkp75kp4jzkcykr")))) + "00xkxvghfgnmbs182s0q67habxjkv9sh7q8acsiy66m0z4f57y39")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From 1872dce57814eb0a80d9d0163e427b0644554554 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 12 Aug 2021 19:39:20 +0200 Subject: gnu: drones: Remove it. Remove this file as the ardupilot packages are broken for a long time and no one complained. * gnu/packages/drones.scm: Remove it. * gnu/local.mk (GNU_SYSTEM_MODULES): Ditto. --- gnu/packages/drones.scm | 199 ------------------------------------------------ 1 file changed, 199 deletions(-) delete mode 100644 gnu/packages/drones.scm (limited to 'gnu/packages') diff --git a/gnu/packages/drones.scm b/gnu/packages/drones.scm deleted file mode 100644 index 1bc096293e..0000000000 --- a/gnu/packages/drones.scm +++ /dev/null @@ -1,199 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Mathieu Othacehe -;;; -;;; 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 drones) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (gnu packages cross-base) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages xml) - #:use-module (guix download) - #:use-module (guix utils) - #:use-module (guix git-download) - #:use-module (guix build-system gnu)) - -(define (ardupilot-type->tag type) - (case type - ((copter) "Copter") - ((plane) "ArduPlane") - ((rover) "Rover") - (else #f))) - -(define (ardupilot-type->waf-cmd type) - (symbol->string type)) - -(define* (make-ardupilot-firmware #:key name version base32 type board target) - (package - (name (string-append name "-" board)) - (version version) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ArduPilot/ardupilot") - (commit (string-append - (ardupilot-type->tag type) "-" version)) - ;; XXX: Ardupilot includes several git submodules. They should be - ;; avoided but as this is not supported upstream, and not trivial - ;; to fix, keep it this way for now. - (recursive? #t))) - (file-name (git-file-name name version)) - (sha256 base32))) - - ;; Could also be waf-build-system but every phase has to be rewritten - ;; anyway. - (build-system gnu-build-system) - (arguments - `(#:imported-modules ((gnu build cross-toolchain) - ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (delete 'bootstrap) - - ;; Remove the root waf script that relies on waf git submodule. - (add-before 'configure 'setup-waf - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let ((waf (assoc-ref (or native-inputs inputs) "waf"))) - (delete-file "waf") - (copy-file (string-append waf "/bin/waf") "waf")) - #t)) - - ;; When cross-compiling, we do not want to use the default gnu - ;; cross-compiler, so set CROSS_CPATH and CROSS_LIBRARY_PATH - ;; variables ourselves instead. - (delete 'set-cross-path) - (add-before 'configure 'set-custom-cross-cpath - (lambda* (#:key native-inputs inputs #:allow-other-keys) - ((@@ (gnu build cross-toolchain) set-cross-path) - #:inputs - `(("libc" . ,(assoc-ref (or native-inputs inputs) - "ardupilot-cross-libc")) - ("xkernel-headers" . - ,(assoc-ref (or native-inputs inputs) - "ardupilot-cross-kernel-headers")))) - ;; We need to produce a static binary, so that it can works on - ;; other systems than Guix System. Add a static version of the - ;; cross libc to CROSS_LIBRARY_PATH variable. - (setenv "CROSS_LIBRARY_PATH" - (string-append - (getenv "CROSS_LIBRARY_PATH") ":" - (assoc-ref (or native-inputs inputs) - "ardupilot-cross-libc-static") "/lib")) - #t)) - - ;; Remove dependencies to 'git'. - (add-before 'configure 'remove-git - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "wscript" - (("^.*cfg\\.load\\('git_submodule.*$") - "")) - (substitute* "Tools/ardupilotwaf/boards.py" - (("^.*GIT_VERSION.*$") - "")) - #t)) - - ;; Configure for the given BOARD, and force a static build for - ;; reasons exposed above. - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (invoke "./waf" "configure" "--board" ,board "--static") - #t)) - - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (invoke "./waf" ,(ardupilot-type->waf-cmd type)) - #t)) - - ;; Do not run tests as we are always cross-compiling. - (delete 'check) - - ;; Install the produced firmware. - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (copy-recursively - (string-append "build/" ,board "/bin") bin)) - #t))))) - (native-inputs - `(("waf" ,python-waf) - ("python" ,python) - ("python-future" ,python-future) - ("python-lxml" ,python-lxml) - - ;; Packages needed for cross-compiling the firmware. - ("ardupilot-cross-gcc" ,(cross-gcc target - #:xbinutils - (cross-binutils target) - #:libc - (cross-libc target))) - ("ardupilot-cross-libc" ,(cross-libc target)) - ("ardupilot-cross-libc-static" ,(cross-libc target) "static") - ("ardupilot-cross-kernel-headers" - ,@(assoc-ref (package-propagated-inputs - (cross-libc target)) - "kernel-headers")) - ("ardupilot-cross-binutils" ,(cross-binutils target)) - ("ardupilot-cross-pkg-config" ,(parameterize ((%current-target-system - target)) - pkg-config)))) - (home-page "https://ardupilot.org/") - (synopsis "Unmanned vehicle autopilot software suite") - (description "@code{ardupilot} is an unmanned vehicle autopilot software -suite capable of controlling autonomous: -@itemize -@item multirotor drones -@item fixed-wing and vtol aircraft -@item helicopters -@item ground rovers -@item boats -@item submarines -@item antenna trackers -@end itemize") - (license gpl3+))) - -(define (make-arducopter-firmware board target) - (make-ardupilot-firmware - #:name "arducopter" - #:version "3.6.11" - #:base32 (base32 "1zkr2nhkksmrriirs2dnp8a0gcf9rfqw1x86pzhh6w4ciqwpidqn") - #:type 'copter - #:board board - #:target target)) - -(define (make-arduplane-firmware board target) - (make-ardupilot-firmware - #:name "arduplane" - #:version "4.0.1" - #:base32 (base32 "0awafvrppg4ilwpbhw88r5xkbgqrmqypsn6lbzyi6bz0zy5cfhb5") - #:type 'plane - #:board board - #:target target)) - -(define-public arducopter-bbbmini - (make-arducopter-firmware "bbbmini" "arm-linux-gnueabihf")) - -(define-public arduplane-bbbmini - (make-arduplane-firmware "bbbmini" "arm-linux-gnueabihf")) - -;; Firmware for Bebop and Bebop2 drones. -(define-public arducopter-bebop - (make-arducopter-firmware "bebop" "arm-linux-gnueabihf")) -- cgit v1.2.3 From d87d6d68128c53a95fe09c3a4381575646c0f368 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 12 Aug 2021 21:37:34 -0400 Subject: gnu: khal: Update to 0.10.4. * gnu/packages/calendar.scm (khal): Update to 0.10.4. --- gnu/packages/calendar.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 0dff4fc362..8ec36d4fa2 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -180,13 +180,13 @@ data units.") (define-public khal (package (name "khal") - (version "0.10.3") + (version "0.10.4") (source (origin (method url-fetch) (uri (pypi-uri "khal" version)) (sha256 (base32 - "0cm4xn871w3i99l3qmhv0bnv8q6rd1w3rip9sskyb5z59z0qzp9g")))) + "17qj1n2l39pnzk4vjrmql90z7908nivnzcc2g9nj1h31k859inrz")))) (build-system python-build-system) (arguments `(#:tests? #f ; The test suite is unreliable. See -- cgit v1.2.3 From d56a29edb7e5ab24ae04869aea68befa4625c11d Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 12 Aug 2021 19:03:25 +0100 Subject: gnu: python-pygmsh: Update snippet for Gmsh > 4.7.0. The old field option name is not needed after commit 78595fe3650057f258109c6599f4bae1d0e72e (Gmsh 4.8.4). * gnu/packages/simulation.scm (python-pygmsh)[source]: Remove option name substitution. --- gnu/packages/simulation.scm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 96928dfa07..929399c86c 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -863,13 +863,6 @@ tools and a collection of Python modules for programmatic use.") ;; The extra reference is unnecessary and is removed. (substitute* "setup.cfg" (("^[[:blank:]]+setuptools>=42\n") "")) - ;; FIXME: gmsh version 4.7.0 introduces new field option - ;; names. See gmsh commit 6eab8028. pygmsh needs to use - ;; one of the old option names for compatibility with gmsh - ;; version 4.6.0. - (with-directory-excursion "pygmsh/common" - (substitute* "size_field.py" - (("NumPointsPerCurve") "NNodesByEdge"))) #t)))) (build-system python-build-system) (native-inputs -- cgit v1.2.3 From 74b82ecd0eca64fe11728e286cabbd4da07b8391 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Fri, 13 Aug 2021 01:19:30 +0100 Subject: gnu: python-pygmsh: Change source to 'git-fetch'. * gnu/packages/simulation.scm (python-pygmsh)[source]: Change to 'git-fetch'. --- gnu/packages/simulation.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 929399c86c..7a313621d1 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -846,11 +846,14 @@ tools and a collection of Python modules for programmatic use.") (version "7.1.9") (source (origin - (method url-fetch) - (uri (pypi-uri "pygmsh" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/nschloe/pygmsh") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1q7nr0cq581wlif537y6awj7vz9jywxg14c8znmsx5ip8x24754j")) + "1lq16v31sifd9n1bb8yxnp3vhafrxz1rvydk9hh1add96fbjgj29")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2caf9eafb6f4703d8f1af42123093f4a7f7a32ce Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Fri, 13 Aug 2021 09:22:32 +0100 Subject: gnu: python-pygmesh: Update to 7.1.10. * gnu/packages/simulation.scm (python-pygmah): Update to 7.1.10. [arguments]<#:phases>: Tests have moved to the 'tests' directory. The test_readme.py file has been removed. --- gnu/packages/simulation.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 7a313621d1..a2c65b73c8 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -843,7 +843,7 @@ tools and a collection of Python modules for programmatic use.") (define-public python-pygmsh (package (name "python-pygmsh") - (version "7.1.9") + (version "7.1.10") (source (origin (method git-fetch) @@ -853,7 +853,7 @@ tools and a collection of Python modules for programmatic use.") (file-name (git-file-name name version)) (sha256 (base32 - "1lq16v31sifd9n1bb8yxnp3vhafrxz1rvydk9hh1add96fbjgj29")) + "03a949nl99ny9h0ni8lqgaljgkgicd305ls6zy1vkwgfa4mzsgqh")) (modules '((guix build utils))) (snippet '(begin @@ -883,10 +883,7 @@ tools and a collection of Python modules for programmatic use.") (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? (add-installed-pythonpath inputs outputs) - ;; The readme test is skipped. It requires the exdown - ;; module which is not available. - (invoke "python" "-m" "pytest" "-v" "test" - "--ignore" "test/test_readme.py")) + (invoke "python" "-m" "pytest" "-v" "tests")) #t))))) (home-page "https://github.com/nschloe/pygmsh") (synopsis "Python frontend for Gmsh") -- cgit v1.2.3 From 6835d3e79072b11d94a77b1797aa14cefb7fff11 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 13 Aug 2021 14:27:45 +0200 Subject: gnu: emacs-parsebib: Update to 3.0.1. * gnu/packages/emacs-xyz.scm (emacs-parsebib): Update to 3.0.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 403f89a19e..5f9be4c2bb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17354,7 +17354,7 @@ files to be expanded upon opening them.") (define-public emacs-parsebib (package (name "emacs-parsebib") - (version "2.4.1") + (version "3.0.1") (source (origin (method git-fetch) @@ -17363,7 +17363,7 @@ files to be expanded upon opening them.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1d3ysh82gh5mg07hlz3ll782lldnaj0xmyabv18jln4y2xd7ncni")))) + (base32 "1hd6izpb4irinjmfy7zxy8fqnr1fm4iw2sipvl9261nm68dzha6z")))) (build-system emacs-build-system) (home-page "https://github.com/joostkremers/parsebib") (synopsis "Library for parsing @file{.bib} files") -- cgit v1.2.3 From 241eff01f72a6dd00380dd07a0aabdb732c3ce62 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 13 Aug 2021 14:31:43 +0200 Subject: gnu: emacs-ebib: Update to 2.32.2. * gnu/packages/emacs-xyz.scm (emacs-ebib): Update to 2.32.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5f9be4c2bb..95a9d991f3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17374,7 +17374,7 @@ files to be expanded upon opening them.") (define-public emacs-ebib (package (name "emacs-ebib") - (version "2.32.1") + (version "2.32.2") (source (origin (method git-fetch) @@ -17383,7 +17383,7 @@ files to be expanded upon opening them.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1xgpdw0sxl2c9dn6x6fk0rqpqlqxsjlj0vyag611blj600br7dqr")))) + (base32 "04kw0akp35r2ibrcav4kaf34d1xs8pckjiygv7h1nqpv6dmrgfq7")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-biblio" ,emacs-biblio) -- cgit v1.2.3 From c9bcf8f736757cebbc2ed59830c4589eacf26dbc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 13 Aug 2021 15:20:22 +0200 Subject: gnu: emacs-crux: Update to 0.4.0. * gnu/packages/emacs-xyz.scm (emacs-crux): Update to 0.4.0. --- gnu/packages/emacs-xyz.scm | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 95a9d991f3..00e6da487a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17982,27 +17982,25 @@ mode.") (license license:gpl3+)))) (define-public emacs-crux - (let ((commit "308f17d914e2cd79cbc809de66d02b03ceb82859") - (revision "2")) - (package - (name "emacs-crux") - (version (git-version "0.3.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bbatsov/crux") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0rf84finwlvmy0xpgyljjvnrijlmkzjyw9rh97svgxp9c1rzfk0x")))) - (build-system emacs-build-system) - (home-page "https://github.com/bbatsov/crux") - (synopsis "Collection of useful functions for Emacs") - (description - "@code{crux} provides a collection of useful functions for Emacs.") - (license license:gpl3+)))) + (package + (name "emacs-crux") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bbatsov/crux") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1h28chpyq61k72qh749r5kqq1y70wx3xw9c3zyfzmy750wlw6nyj")))) + (build-system emacs-build-system) + (home-page "https://github.com/bbatsov/crux") + (synopsis "Collection of useful functions for Emacs") + (description + "@code{crux} provides a collection of useful functions for Emacs.") + (license license:gpl3+))) (define-public emacs-edit-server (package -- cgit v1.2.3 From 2202909d172b00251e11e2d500cc1c2ea3ae48b2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 13 Aug 2021 15:21:37 +0200 Subject: gnu: emacs-find-file-in-project: Update to 6.1.1. * gnu/packages/emacs-xyz.scm (emacs-find-file-in-project): Update to 6.1.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 00e6da487a..d420def21e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10239,7 +10239,7 @@ maximizes flexibility (at the expense of conciseness).") (define-public emacs-find-file-in-project (package (name "emacs-find-file-in-project") - (version "6.0.7") + (version "6.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -10248,7 +10248,7 @@ maximizes flexibility (at the expense of conciseness).") (file-name (git-file-name name version)) (sha256 (base32 - "1qkfijqr839y605ssyalr2v9n6b86hr64mxikc96lx6nzdyjyyl0")))) + "13vsmi02v1rv5h2m62s36dw21781nxsj9dj4hlaxfz2v5avmp00c")))) (build-system emacs-build-system) (arguments `(#:tests? #t -- cgit v1.2.3 From a79ad5fce57c271f22441df8a21c04d95fc772d5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 13 Aug 2021 15:23:20 +0200 Subject: gnu: pigx-rnaseq: Update to 0.0.19. * gnu/packages/bioinformatics.scm (pigx-rnaseq): Update to 0.0.19. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4ac9a99b41..5785e27a85 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10447,7 +10447,7 @@ once. This package provides tools to perform Drop-seq analyses.") (define-public pigx-rnaseq (package (name "pigx-rnaseq") - (version "0.0.18") + (version "0.0.19") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_rnaseq/" @@ -10455,7 +10455,7 @@ once. This package provides tools to perform Drop-seq analyses.") "/pigx_rnaseq-" version ".tar.gz")) (sha256 (base32 - "1622l6grmsk0wm859rvllngx29q3v16jjvzcdq2bmrlamccrj82y")))) + "1ja3bda1appxrzbfy7wp7khy30mm7lic8xbq3gkbpc5bld3as9cm")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f ; not supported -- cgit v1.2.3 From f16e4d85dd044d7d8875b863c2fb8a990f1de70a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 13 Aug 2021 15:30:37 +0200 Subject: gnu: emacs-geiser: Update to 0.17. * gnu/packages/emacs-xyz.scm (emacs-geiser): Update to 0.17. [arguments]<#:phases>: Fix a typo prior to generating the documentation. --- gnu/packages/emacs-xyz.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d420def21e..59612c1235 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -231,7 +231,7 @@ (define-public emacs-geiser (package (name "emacs-geiser") - (version "0.16") + (version "0.17") (source (origin (method git-fetch) @@ -240,7 +240,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "18gx7ak2ldpmqbimnq221dn2qg7qwm5n1mj6ajymwkgvqwcrsl2r")))) + (base32 "07g1zlf9kmfish2wa6m376xba0nv6n4spw8wbmr90a56xj0qpswc")))) (build-system emacs-build-system) (arguments '(#:phases @@ -252,10 +252,12 @@ (let ((el-files (find-files "./elisp" ".*\\.el$"))) (for-each (lambda (f) (rename-file f (basename f))) - el-files)) - #t)) + el-files)))) (add-before 'install 'make-info (lambda _ + ;; XXX: Fix a typo in the ".texi" file below. + (substitute* "doc/install.texi" + (("\\}\\{NonGNU ELPA\\}") ",NonGNU ELPA}")) (with-directory-excursion "doc" (invoke "makeinfo" "--no-split" "-o" "geiser.info" "geiser.texi"))))))) -- cgit v1.2.3 From 338f34d8797b9f1c58cdcd591105d9cc9939599b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 13 Aug 2021 15:32:34 +0200 Subject: gnu: emacs-projectile: Update to 2.5.0. * gnu/packages/emacs-xyz.scm (emacs-projectile): Update to 2.5.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 59612c1235..22e754f7e4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9984,7 +9984,7 @@ like @code{org-edit-src-code} but for arbitrary regions.") (define-public emacs-projectile (package (name "emacs-projectile") - (version "2.4.0") + (version "2.5.0") (source (origin (method url-fetch) (uri (string-append "https://raw.githubusercontent.com/bbatsov" @@ -9992,7 +9992,7 @@ like @code{org-edit-src-code} but for arbitrary regions.") (file-name (string-append "projectile-" version ".el")) (sha256 (base32 - "1vawbngfdcp6isqf74kwvk438wh6da2liqqxgzilw1qbhqg7z7aw")))) + "1wy2kpli90z7p4dqr4b7f1fv99g6lfxi1kzy2bfl0p8qi40rpmyv")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From 776346fcdad5135769a47fb0e922d8b31c6a2d22 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Tue, 10 Aug 2021 13:42:57 +0200 Subject: gnu: Add emacs-filladapt. * gnu/packages/emacs-xyz.scm (emacs-filladapt): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 22e754f7e4..3fea334e3b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4420,6 +4420,40 @@ time. This information can be reviewed to determine what is causing the user interface to pause.") (license license:gpl3+)))) +(define-public emacs-filladapt + (package + (name "emacs-filladapt") + (version "2.12.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://elpa.gnu.org/packages/filladapt-" + version ".el")) + (sha256 + (base32 + "1cxyxfdjg1dsmn1jrl6b7xy03xr42fb6vyggh27s4dk417ils6yg")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/filladapt.html") + (synopsis "Adaptive fill for Emacs") + (description + "This package provides funtions which enhance the default behavior of +Emacs' Auto Fill mode and the commands @code{fill-paragraph}, +@code{lisp-fill-paragraph}, @code{fill-region-as-paragraph}, and +@code{fill-region}. + +The chief improvement is that the beginning of a line to be +filled is examined and, based on information gathered, an +appropriate value for fill-prefix is constructed. Also the +boundaries of the current paragraph are located. This occurs +only if the fill prefix is not already non-nil. + +The net result of this is that blurbs of text that are offset +from left margin by asterisks, dashes, and/or spaces, numbered +examples, included text from USENET news articles, etc. are +generally filled correctly with no fuss.") + (license license:gpl3+))) + (define-public emacs-fill-column-indicator (package (name "emacs-fill-column-indicator") -- cgit v1.2.3 From 90b4abe36e4f842f5137e7be47565ad5fed1e534 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Fri, 6 Aug 2021 11:45:59 +0200 Subject: gnu: Add emacs-epithet. * gnu/packages/emacs-xyz.scm (emacs-epithet): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3fea334e3b..2145668262 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10244,6 +10244,32 @@ provide the historic behavior of @code{flet}, as well as @code{declare-function} stub for older Emacs.") (license license:gpl2+))) +(define-public emacs-epithet + ;; No tags. + (let ((commit "cc42338376c2c58da561214c554be8e8856f6a2b")) + (package + (name "emacs-epithet") + (version "0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oantolin/epithet") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06irgshgcgmm09nswrny8mam6l660ai71rgn0l3rmyp9li8n97j0")))) + (build-system emacs-build-system) + (home-page "https://github.com/oantolin/epithet") + (synopsis "Rename Emacs buffers with descriptive names") + (description + "This package provides a function---@code{epithet-rename-buffer}---to rename +the current buffer with a descriptive name. The name suggestion is governed by +the @code{epithet-suggesters} hook variable: each hook should return either a +name suggestion or @code{nil}, they are called in turn and the first non-nil +suggestion is taken.") + (license license:gpl3+)))) + (define-public emacs-mocker (package (name "emacs-mocker") -- cgit v1.2.3 From bd3a4db8cb9283fbbc0263d9d9c9ea60d11f78a8 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Fri, 6 Aug 2021 11:54:13 +0200 Subject: gnu: Add emacs-placeholder. * gnu/packages/emacs-xyz.scm (emacs-placeholder): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2145668262..03cc5cbf3f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28251,6 +28251,35 @@ provides a simple but convenient user interface to manage those trashed files.") (license license:gpl3+))) +(define-public emacs-placeholder + ;; No tags. + (let ((commit "b80cb152ddd63db40cc581eafee9d2ac08328df8")) + (package + (name "emacs-placeholder") + (version "0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oantolin/placeholder") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ifiaxrp7inj70a3zf5137dih4b1sw38zmkp3h7dj79k2bv7h34h")))) + (build-system emacs-build-system) + (home-page "https://github.com/oantolin/placeholder") + (synopsis "Treat any buffer as a template with placeholders to fill-in") + (description + "This package provides a simple way to treat text in a buffer as a template +with placeholders where text needs to be filled in. Any occurrence of +@code{<++>} in the buffer is a placeholder. You can navigate among the +placeholder with the placeholder-forward and placeholder-backward commands. +They move the point to the next placeholder in the specified direction and +delete the placeholder so you can immediately start typing the text that +should replace it. However, if you call them again immediately after, they +restore that occurrence of the placeholder and move to the next.") + (license license:gpl3+)))) + (define-public emacs-plantuml-mode (package (name "emacs-plantuml-mode") -- cgit v1.2.3 From 0bfbd2ac8b04e6f0a555ee5612f6970b8bc99965 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 Aug 2021 12:15:45 -0400 Subject: gnu: opendht: Update to 2.3.0. * gnu/packages/networking.scm (opendht): Update to 2.3.0. --- gnu/packages/networking.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f1f84f986b..3fe5f2f2ed 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3401,12 +3401,11 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (license license:bsd-3))) (define-public opendht - ;; Jami requires unreleased features of OpenDHT. - (let ((commit "c8a0b443f3117e2fa1343d2cb3c091f502b1a24e") + (let ((commit "6c58d4f2e9b7f1de15db8d3a736c8cf1ea5f2886") (revision "1")) (package (name "opendht") - (version (git-version "2.2.0rc7" revision commit)) + (version (git-version "2.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3415,7 +3414,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (file-name (git-file-name name version)) (sha256 (base32 - "062irb9yii66n2fzbpsjf7v2v53zzvakr1wjmi4l1jaz33fwx5by")))) + "06l0z1dmxyjh8gdrmxyq4vnfnv3x400bhx0lxm7l90f8zc5r2bim")))) ;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream bug? (outputs '("out" "tools" "debug")) (build-system cmake-build-system) -- cgit v1.2.3 From ccbeb7ef0e1cac02d98f186406e0d2aeaadefe7c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 12 Aug 2021 00:35:25 +0100 Subject: gnu: re2c: Update to 2.2. * gnu/packages/re2c.scm (re2c): Update to 2.2. [native-inputs]: Add python. Signed-off-by: Arun Isaac --- gnu/packages/re2c.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/re2c.scm b/gnu/packages/re2c.scm index e13d15e97a..ba96727d56 100644 --- a/gnu/packages/re2c.scm +++ b/gnu/packages/re2c.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2020 Sergei Trofimovich +;;; Copyright © 2021 Sergei Trofimovich ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -20,13 +21,14 @@ (define-module (gnu packages re2c) #:use-module (guix licenses) #:use-module (guix packages) + #:use-module (gnu packages python) #:use-module (guix download) #:use-module (guix build-system gnu)) (define-public re2c (package (name "re2c") - (version "2.1.1") + (version "2.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/skvadrik/" name @@ -34,9 +36,11 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1y0iwxpkdmw5fcqacs209ix49aasfy88hqmx3qa26m7xz9jf4vh3")))) + "1nkbv3bxz1kwwql1pdlnj3lxy5h2vsaif393ivb5b9d8610mxi0g")))) (build-system gnu-build-system) (home-page "https://re2c.org/") + (native-inputs + `(("python" ,python))) ; for the test driver (synopsis "Lexer generator for C/C++") (description "@code{re2c} generates minimalistic hard-coded state machine (as opposed -- cgit v1.2.3 From bccfcef473da6d91f2c2cd444227721013570918 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sat, 12 Jun 2021 22:39:20 +0200 Subject: gnu: icecat: Add WebAuthn support. * gnu/packages/gnuzilla.scm (icecat)[inputs]: Add eudev. [phases]: Add eudev to the wrapper. --- gnu/packages/gnuzilla.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e063b2f89d..576bc2586f 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019, 2020 Adrian Malacoda ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -910,6 +911,7 @@ from forcing GEXP-PROMISE." ;; UNBUNDLE-ME! ("nss" ,nss) ("shared-mime-info" ,shared-mime-info) ;; UNBUNDLE-ME! ("sqlite" ,sqlite) + ("eudev" ,eudev) ("unzip" ,unzip) ("zip" ,zip) ;; UNBUNDLE-ME! ("zlib" ,zlib) @@ -1271,24 +1273,21 @@ from forcing GEXP-PROMISE." (lib (string-append out "/lib")) (gtk (assoc-ref inputs "gtk+")) (gtk-share (string-append gtk "/share")) - (mesa (assoc-ref inputs "mesa")) - (mesa-lib (string-append mesa "/lib")) - (pulseaudio (assoc-ref inputs "pulseaudio")) - (pulseaudio-lib (string-append pulseaudio "/lib")) - (libxscrnsaver (assoc-ref inputs "libxscrnsaver")) - (libxscrnsaver-lib (string-append libxscrnsaver "/lib")) - (mit-krb5 (assoc-ref inputs "mit-krb5")) - (mit-krb5-lib (string-append mit-krb5 "/lib"))) + (ld-libs (map (lambda (lib) + (string-append (assoc-ref inputs lib) + "/lib")) + '("libxscrnsaver" + "mesa" + "mit-krb5" + "eudev" + "pulseaudio")))) (wrap-program (car (find-files lib "^icecat$")) `("XDG_DATA_DIRS" prefix (,gtk-share)) ;; The following line is commented out because the icecat ;; package on guix has been observed to be unstable when ;; using wayland, and the bundled extensions stop working. ;; `("MOZ_ENABLE_WAYLAND" = ("1")) - `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib - ,mesa-lib - ,libxscrnsaver-lib - ,mit-krb5-lib))) + `("LD_LIBRARY_PATH" prefix ,ld-libs)) #t)))))) (home-page "https://www.gnu.org/software/gnuzilla/") (synopsis "Entirely free browser derived from Mozilla Firefox") -- cgit v1.2.3 From 8bd68bd2209cb4e5fa43208730d29bd7cd15c184 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 13 Aug 2021 11:33:29 +0200 Subject: gnu: Add gnss-sdr. * gnu/packages/radio.scm (gnss-sdr): New variable. --- gnu/packages/radio.scm | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index b0c5d960ed..ed1c3d8ceb 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -72,7 +72,9 @@ #:use-module (gnu packages networking) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages popt) #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) @@ -2288,3 +2290,74 @@ To install the rfcat udev rules, you must extend @code{udev-service-type} with this package. E.g.: @code{(udev-rules-service 'rfcat rfcat)}") (license (list license:bsd-3 license:gpl2))))) + +(define-public gnss-sdr + (package + (name "gnss-sdr") + (version "0.0.14") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gnss-sdr/gnss-sdr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kjh9bnf6h9q71bnn8nrwlc80wcnkib97ylzvb102acii4p0fm08")))) + (build-system cmake-build-system) + (native-inputs + `(("gfortran" ,gfortran) + ("googletest-source" ,(package-source googletest)) + ("orc" ,orc) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("python-mako" ,python-mako))) + (inputs + `(("armadillo" ,armadillo) + ("boost" ,boost) + ("gflags" ,gflags) + ("glog" ,glog) + ("gmp" ,gmp) + ("gnuradio" ,gnuradio) + ("gr-osmosdr" ,gr-osmosdr) + ("lapack" ,lapack) + ("libpcap" ,libpcap) + ("log4cpp" ,log4cpp) + ("matio" ,matio) + ("openblas" ,openblas) + ("openssl" ,openssl) + ("protobuf" ,protobuf) + ("pugixml" ,pugixml) + ("volk" ,volk))) + (arguments + `(#:configure-flags + (list "-DENABLE_GENERIC_ARCH=ON" + "-DENABLE_OSMOSDR=ON" + (string-append "-DGFLAGS_ROOT=" + (assoc-ref %build-inputs "gflags")) + (string-append "-DGLOG_ROOT=" + (assoc-ref %build-inputs "glog")) + (string-append "-DGTEST_DIR=" + (assoc-ref %build-inputs "googletest-source"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + ;; Some tests fail to compile when the FILESYSTEM package is + ;; available, so we disable it (and the tests will use Boost + ;; Filesystem instead). + (substitute* "CMakeLists.txt" + (("find_package\\(FILESYSTEM COMPONENTS Final Experimental\\)") + "")))) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp")))))) + (home-page "https://gnss-sdr.org/") + (synopsis "Global Navigation Satellite Systems software-defined receiver") + (description + "This program is a software-defined receiver which is able to process +(that is, to perform detection, synchronization, demodulation and decoding of +the navigation message, computation of observables and, finally, computation of +position fixes) the signals of the BeiDou, Galileo, GLONASS and GPS Global +Navigation Satellite System.") + (license license:gpl3+))) -- cgit v1.2.3 From c0e782f0dad914109f04f2554b9842ff1f51ee1b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 14 Aug 2021 14:30:13 +0200 Subject: gnu: linux-libre: Add perf probe support. * gnu/packages/aux-files/linux-libre/5.10-i686.conf: Enable CONFIG_UPROBE_EVENTS option. * gnu/packages/aux-files/linux-libre/5.10-x86_64.conf: Ditto. * gnu/packages/aux-files/linux-libre/5.13-i686.conf: Ditto. * gnu/packages/aux-files/linux-libre/5.13-x86_64.conf: Ditto. * gnu/packages/aux-files/linux-libre/5.4-i686.conf: Ditto. * gnu/packages/aux-files/linux-libre/5.4-x86_64.conf: Ditto. --- gnu/packages/aux-files/linux-libre/5.10-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/5.10-x86_64.conf | 2 +- gnu/packages/aux-files/linux-libre/5.13-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/5.13-x86_64.conf | 2 +- gnu/packages/aux-files/linux-libre/5.4-i686.conf | 2 +- gnu/packages/aux-files/linux-libre/5.4-x86_64.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/aux-files/linux-libre/5.10-i686.conf b/gnu/packages/aux-files/linux-libre/5.10-i686.conf index e400c42362..cb1fdc37ad 100644 --- a/gnu/packages/aux-files/linux-libre/5.10-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.10-i686.conf @@ -10612,7 +10612,7 @@ CONFIG_BRANCH_PROFILE_NONE=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set -# CONFIG_UPROBE_EVENTS is not set +CONFIG_UPROBE_EVENTS=y CONFIG_BPF_EVENTS=y CONFIG_DYNAMIC_EVENTS=y CONFIG_PROBE_EVENTS=y diff --git a/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf index bf4451c994..cd61860af9 100644 --- a/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf @@ -10620,7 +10620,7 @@ CONFIG_BRANCH_PROFILE_NONE=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set -# CONFIG_UPROBE_EVENTS is not set +CONFIG_UPROBE_EVENTS=y CONFIG_BPF_EVENTS=y CONFIG_DYNAMIC_EVENTS=y CONFIG_PROBE_EVENTS=y diff --git a/gnu/packages/aux-files/linux-libre/5.13-i686.conf b/gnu/packages/aux-files/linux-libre/5.13-i686.conf index d123117716..209c597464 100644 --- a/gnu/packages/aux-files/linux-libre/5.13-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.13-i686.conf @@ -10765,7 +10765,7 @@ CONFIG_BRANCH_PROFILE_NONE=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set -# CONFIG_UPROBE_EVENTS is not set +CONFIG_UPROBE_EVENTS=y CONFIG_BPF_EVENTS=y CONFIG_DYNAMIC_EVENTS=y CONFIG_PROBE_EVENTS=y diff --git a/gnu/packages/aux-files/linux-libre/5.13-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.13-x86_64.conf index e268705a71..b07a37a85d 100644 --- a/gnu/packages/aux-files/linux-libre/5.13-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.13-x86_64.conf @@ -10831,7 +10831,7 @@ CONFIG_BRANCH_PROFILE_NONE=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set -# CONFIG_UPROBE_EVENTS is not set +CONFIG_UPROBE_EVENTS=y CONFIG_BPF_EVENTS=y CONFIG_DYNAMIC_EVENTS=y CONFIG_PROBE_EVENTS=y diff --git a/gnu/packages/aux-files/linux-libre/5.4-i686.conf b/gnu/packages/aux-files/linux-libre/5.4-i686.conf index 898c66ebf9..4e2d7795c7 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-i686.conf @@ -10214,7 +10214,7 @@ CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set -# CONFIG_UPROBE_EVENTS is not set +CONFIG_UPROBE_EVENTS=y CONFIG_BPF_EVENTS=y CONFIG_DYNAMIC_EVENTS=y CONFIG_PROBE_EVENTS=y diff --git a/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf index 19fdeb7e70..5815caa770 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-x86_64.conf @@ -10164,7 +10164,7 @@ CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set -# CONFIG_UPROBE_EVENTS is not set +CONFIG_UPROBE_EVENTS=y CONFIG_BPF_EVENTS=y CONFIG_DYNAMIC_EVENTS=y CONFIG_PROBE_EVENTS=y -- cgit v1.2.3 From 98b47af0ad69cb5c29c84c6c27bd1b37fa3cfdb0 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 14 Aug 2021 15:01:38 +0200 Subject: gnu: Add python-btchip-python. * gnu/packages/finance.scm (python-btchip-python): New variable. --- gnu/packages/finance.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 430552c3a3..807f2c1074 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -936,6 +936,30 @@ Ledger Blue/Nano S.") (define-public python2-ledgerblue (package-with-python2 python-ledgerblue)) +(define-public python-btchip-python + (package + (name "python-btchip-python") + (version "0.1.32") + (source + (origin + (method url-fetch) + (uri (pypi-uri "btchip-python" version)) + (sha256 + (base32 + "0mcg3gfd0qk8lhral3vy9cfd4pii9kzs42q71pf6b3y0c70y1x9l")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; those require PyQt4 + (propagated-inputs + `(("python-ecdsa" ,python-ecdsa) + ("python-hidapi" ,python-hidapi))) + (home-page "https://github.com/LedgerHQ/btchip-python") + (synopsis "Python library to communicate with Ledger Nano dongle") + (description + "This package provides a Python library to communicate with Ledger +Nano dongle.") + (license license:asl2.0))) + (define-public python-trezor (package (name "python-trezor") -- cgit v1.2.3 From a47ecef2f1cdf283c5039ef83006b0e892aec6e7 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 14 Aug 2021 15:02:14 +0200 Subject: gnu: electrum: Add Ledger support. * gnu/packages/finance.scm (electrum)[inputs]: Add python-hidapi, python-ledgerblue, python-btchip-python. --- gnu/packages/finance.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 807f2c1074..bae56d9735 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -530,6 +530,9 @@ do so.") ("python-cryptography" ,python-cryptography) ("python-qdarkstyle" ,python-qdarkstyle) ("python-dnspython" ,python-dnspython) + ("python-hidapi" ,python-hidapi) + ("python-ledgerblue" ,python-ledgerblue) + ("python-btchip-python" ,python-btchip-python) ("libsecp256k1" ,libsecp256k1))) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From a7ba5b6b47c87796fcd8efbf6d9c5b2ad701e320 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 14 Aug 2021 12:09:37 -0400 Subject: gnu: linux-libre: Update to 5.13.10. * gnu/packages/linux.scm (linux-libre-5.13-version): Update to 5.13.10. (linux-libre-5.13-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index de03e98887..de6b37b9c0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -356,7 +356,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.13-version "5.13.9") +(define-public linux-libre-5.13-version "5.13.10") (define deblob-scripts-5.13 (linux-libre-deblob-scripts linux-libre-5.13-version @@ -364,7 +364,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "153jf5l5x4438zgxwggaky2ahjlfl48j438vhpzks6h77lzc51a5"))) (define-public linux-libre-5.13-pristine-source (let ((version linux-libre-5.13-version) - (hash (base32 "16hm6sb64f1hlr0qmf2w81zv55s6flj1x8jr2q326d9ny30przkj"))) + (hash (base32 "01fpj02q4vdn7i6f6710lly0w33cd5gfvn6avgrjglcbiwdzbjih"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.13))) -- cgit v1.2.3 From c4c1856dd251bcc2b8a2d26987bc065073074ffb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 14 Aug 2021 12:10:13 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.58. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.58. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index de6b37b9c0..7066989cb4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -372,7 +372,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.57") +(define-public linux-libre-5.10-version "5.10.58") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -380,7 +380,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0c9x07gplzajm0h5if3fpw2rvfb7psw3yp7i2n6ws7ggq1dvmki2"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0b8lwfjlyd6j0csk71v07bxb5lrrzp545g1wv6kdk0kzq6maxfq0"))) + (hash (base32 "047j51w4yyvfva19nc8pvbsqqzar80k6nfqwcaa5irirwmmwab3k"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From eb2a5115ec6ffb2db666d005301d7397382dc9a3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 14 Aug 2021 12:11:12 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.140. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.140. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7066989cb4..10a9ab4e9a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -385,7 +385,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.139") +(define-public linux-libre-5.4-version "5.4.140") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -393,7 +393,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0zx3hj8fc0qpdmkn56cna5438wjxmj42a69msbkxlg4mnz6d0w84"))) + (hash (base32 "0hvygxc6nj0lzpm1bkvz3r8b2k0ybp7rxcxfa2n0bs7jyhnplr9c"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 6da9f44a8751a790b65f57f74b9152b20f508832 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 14 Aug 2021 12:11:36 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.203. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.203. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 10a9ab4e9a..7af9fc220b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -398,7 +398,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.202") +(define-public linux-libre-4.19-version "4.19.203") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -406,7 +406,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "09ya7n0il8fipp8ksb8cyl894ihny2r75g70vbhclbv20q2pv0pj"))) + (hash (base32 "1ykahjymz12ayx7qgmrpndsdf61pb8gxfl2nadqrv02imr845c7z"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 5e240e4d94e87085687c2950e732731f61ffa0a0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 14 Aug 2021 17:23:30 -0400 Subject: gnu: rtl8812au-aircrack-ng-linux-module: Update to 5.6.4.2-5.b8167e6. Fixes the build with linux-libre 5.12. Reported by philipper905 on #guix. * gnu/packages/linux.scm (rtl8812au-aircrack-ng-linux-module): Update to 5.6.4.2-5.b8167e6. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7af9fc220b..12247fb217 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1298,8 +1298,8 @@ and the notification, WiFi, and Bluetooth LED.") (license license:gpl2))) (define-public rtl8812au-aircrack-ng-linux-module - (let ((commit "059e06a51be025fde5b2bec6565540b3d9981b0b") - (revision "4")) + (let ((commit "b8167e66b4ac046b3b76c2c40008d84528e91594") + (revision "5")) (package (name "rtl8812au-aircrack-ng-linux-module") (version (git-version "5.6.4.2" revision commit)) @@ -1311,7 +1311,7 @@ and the notification, WiFi, and Bluetooth LED.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0h6l2r3yj7j9zf11dw0zcdyn50ajnjw8yvv86dzlfj80dn75n98f")) + (base32 "1940f2yz5c4q2fhcd91zfzl32fhdsgr297vzamm7nd8kdk0gymi2")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 78007e12a28b6666c86dc66e6caa23f8d2dfa963 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 15 Aug 2021 07:45:12 +0200 Subject: gnu: emacs-auctex: Update to 13.0.13. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 13.0.13. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 03cc5cbf3f..8b170e0acf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2589,14 +2589,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "13.0.12") + (version "13.0.13") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "0fx3l6yyq63mlnapxiqpdhi5l314r3aj63404nly6hcdvc28g9nm")))) + (base32 "06cb9jphqd0nysc60b4x24zmdryljb168cw66adl7b2x7sdzpkmn")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). -- cgit v1.2.3 From ee467c853a184a7768ac171840357afde49c10e3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 15 Aug 2021 07:45:21 +0200 Subject: gnu: emacs-map: Update to 3.1. * gnu/packages/emacs-xyz.scm (emacs-map): Update to 3.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8b170e0acf..e5dd63c9e1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28872,7 +28872,7 @@ s-expression.") (define-public emacs-map (package (name "emacs-map") - (version "3.0") + (version "3.1") (source (origin (method url-fetch) @@ -28880,7 +28880,7 @@ s-expression.") version ".tar")) (sha256 (base32 - "00wf8lgh1b1i5l838y6di8194rf5gf5djklkhmxj1nlikz66j2ls")))) + "1akkp34psm71ylbf1i02m56ga1dkswhz069j98amixrhw20hq4nx")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/map.html") (synopsis "Map manipulation functions") -- cgit v1.2.3 From a5a8da3f2345fa476402ff8af340356a7d3b487a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 15 Aug 2021 07:47:29 +0200 Subject: gnu: emacs-editorconfig: Update to 0.8.2. * gnu/packages/emacs-xyz.scm (emacs-editorconfig): Update to 0.8.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e5dd63c9e1..6a9ac29d87 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21985,7 +21985,7 @@ backends, including the @command{wordnet} offline backend.") (define-public emacs-editorconfig (package (name "emacs-editorconfig") - (version "0.8.1") + (version "0.8.2") (source (origin (method git-fetch) @@ -21995,7 +21995,7 @@ backends, including the @command{wordnet} offline backend.") (file-name (git-file-name name version)) (sha256 (base32 - "1djlhkap7zddknzvjsjz0agpfsms1ih05zcpg1bikid2vs4gddyr")))) + "1lqxgc24gr67yhi64i9v4w2dcjhpx99jg1kr25gr2byqkkdldkz0")))) (build-system emacs-build-system) (home-page "https://github.com/editorconfig/editorconfig-emacs") (synopsis "Define and maintain consistent coding styles between different -- cgit v1.2.3 From 5058605d51e84c04aee6fc57a592c34e46eeffd9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 15 Aug 2021 07:48:44 +0200 Subject: gnu: wob: Update to 0.12. * gnu/packages/xdisorg.scm (wob): Update to 0.12. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 4d689a2c70..8c630f3ac8 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1087,14 +1087,14 @@ transparent text on your screen.") (define-public wob (package (name "wob") - (version "0.11") + (version "0.12") (source (origin (method url-fetch) (uri (string-append "https://github.com/francma/wob/releases/download/" version "/wob-" version ".tar.gz")) (sha256 - (base32 "1vgngcg8wxn6zfg34czn9w55ia0zmhlgnpzf0gh31dc72li9353k")))) + (base32 "080pwz8pvqqq068lavzz48dl350iszpdswjd86bjk6zra5h5d10q")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From d65bcea6e32104fa8d4136856e3d6cab620ff211 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Wed, 11 Aug 2021 12:05:34 +0200 Subject: gnu: Add emacs-ahg. * gnu/packages/emacs-xyz.scm (emacs-ahg): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6a9ac29d87..cbe830062b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1704,6 +1704,30 @@ view. This allows you to move to the character, word, or line almost directly.") (license license:gpl3+))) +(define-public emacs-ahg + ;; No tags; commit from 2021-04-12. + (let ((commit "77bc2a628df006dcd2dc359ac12acdf8091a1356") + (revision "0")) + (package + (name "emacs-ahg") + (version (git-version "1.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://bitbucket.org/agriggio/ahg") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wmvz9d40aznqh2y078v8k7n3l66m48vnf873vifi8rwg6158kqh")))) + (build-system emacs-build-system) + (home-page "https://bitbucket.org/agriggio/ahg") + (synopsis "Emacs front-end for the Mercurial SCM") + (description + "This packages provides a simple Emacs front-end for the Mercurial +Distributed @acronym{Source Control Management, SCM} system.") + (license license:gpl3+)))) + (define-public emacs-anaphora (package (name "emacs-anaphora") -- cgit v1.2.3 From e0feacfbad410ecb2f11e7ee86f18482c7413b3f Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Tue, 10 Aug 2021 19:50:28 +0200 Subject: gnu: ddcci-driver-linux: Update to 0.3.4. * gnu/packages/linux.scm (ddcci-driver-linux): Update to 0.3.4. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 12247fb217..0b7a7aa56a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1432,7 +1432,7 @@ graphics card on Optimus laptops.") (define-public ddcci-driver-linux (package (name "ddcci-driver-linux") - (version "0.3.3") + (version "0.3.4") (source (origin (method git-fetch) @@ -1443,7 +1443,7 @@ graphics card on Optimus laptops.") (file-name (git-file-name name version)) (sha256 (base32 - "0vkkja3ykjil783zjpwp0vz7jy2fp9ccazzi3afd4fjk8gldin7f")))) + "0b50hhkna6ika2vwahzb9za9b41g39ialgv5y1y0kakqi50qi0ld")))) (build-system linux-module-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 079b117a71f87109cd5642fcf87aa8893628fc1f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Aug 2021 10:05:49 +0300 Subject: gnu: exiv2: Update to 0.27.4. * gnu/packages/image.scm (exiv2): Update to 0.27.4. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 225a5c2d10..92f8783fb1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1342,14 +1342,14 @@ channels.") (define-public exiv2 (package (name "exiv2") - (version "0.27.3") + (version "0.27.4") (source (origin (method url-fetch) (uri (string-append "https://www.exiv2.org/builds/exiv2-" version "-Source.tar.gz")) (sha256 - (base32 "0y77wfadjsrcxijdqgkr3q88b6mm9y3rg8kqsmaig8iah49md7x7")))) + (base32 "0klhxkxvkzzzcqpzv8jb56pykq0gyhb6rk9vc2kzjahngjx6sdl4")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no test suite (propagated-inputs -- cgit v1.2.3 From 3b60f6ffd823051df796259b91a528c7355c4d84 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Aug 2021 10:15:45 +0300 Subject: gnu: exiv2: Enable tests. * gnu/packages/image.scm (exiv2)[arguments]: Don't skip tests. Add test-target, configure-flags to enable tests. [native-inputs]: Add googletest, python. --- gnu/packages/image.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 92f8783fb1..bbcf7d8aad 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Amirouche Boubekki ;;; Copyright © 2014, 2017 John Darrington ;;; Copyright © 2016, 2017, 2018, 2020 Leo Famulari -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016, 2017, 2020 Arun Isaac @@ -1351,10 +1351,15 @@ channels.") (sha256 (base32 "0klhxkxvkzzzcqpzv8jb56pykq0gyhb6rk9vc2kzjahngjx6sdl4")))) (build-system cmake-build-system) - (arguments '(#:tests? #f)) ; no test suite + (arguments + '(#:test-target "tests" + #:configure-flags (list "-DEXIV2_BUILD_UNIT_TESTS=ON"))) (propagated-inputs `(("expat" ,expat) ("zlib" ,zlib))) + (native-inputs + `(("googletest" ,googletest) + ("python" ,python))) (home-page "https://www.exiv2.org/") (synopsis "Library and command-line utility to manage image metadata") (description -- cgit v1.2.3 From 6ebba295038a84bdeb84adf7652c9a4409ca3d90 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Aug 2021 18:09:47 -0400 Subject: gnu: gnuradio: Don't include QtWebKit in the dependency graph. * gnu/packages/radio.scm (gnuradio)[inputs]: Replace python-pyqt with python-pyqt-without-qtwebkit. --- gnu/packages/radio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index ed1c3d8ceb..cc09f651da 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -533,7 +533,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") ("python-numpy" ,python-numpy) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) - ("python-pyqt" ,python-pyqt) + ("python-pyqt" ,python-pyqt-without-qtwebkit) ("python-pyyaml" ,python-pyyaml) ("qtbase" ,qtbase-5) ("qwt" ,qwt) -- cgit v1.2.3 From 94551439074f804f35970b08435aa02007edfb0b Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Sun, 15 Aug 2021 14:15:37 -0400 Subject: Update copyright/name notices for Christine Lemmer-Webber. * doc/guix-cookbook.texi: Update copyright/name for Christine Lemmer-Webber. * gnu/build/image.scm: Likewise. * gnu/build/vm.scm: Likewise. * gnu/packages/admin.scm: Likewise. * gnu/packages/assembly.scm: Likewise. * gnu/packages/audio.scm: Likewise. * gnu/packages/backup.scm: Likewise. * gnu/packages/check.scm: Likewise. * gnu/packages/databases.scm: Likewise. * gnu/packages/emacs-xyz.scm: Likewise. * gnu/packages/finance.scm: Likewise. * gnu/packages/gnupg.scm: Likewise. * gnu/packages/guile-xyz.scm: Likewise. * gnu/packages/guile.scm: Likewise. * gnu/packages/haskell-xyz.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/mail.scm: Likewise. * gnu/packages/password-utils.scm: Likewise. * gnu/packages/perl.scm: Likewise. * gnu/packages/python-web.scm: Likewise. * gnu/packages/python-xyz.scm: Likewise. * gnu/packages/python.scm: Likewise. * gnu/packages/sphinx.scm: Likewise. * gnu/packages/ssh.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/services/networking.scm: Likewise. * gnu/system/vm.scm: Likewise. --- gnu/packages/admin.scm | 2 +- gnu/packages/assembly.scm | 2 +- gnu/packages/audio.scm | 2 +- gnu/packages/backup.scm | 2 +- gnu/packages/check.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/finance.scm | 2 +- gnu/packages/gnupg.scm | 2 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/guile.scm | 2 +- gnu/packages/haskell-xyz.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/password-utils.scm | 2 +- gnu/packages/perl.scm | 2 +- gnu/packages/python-web.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/python.scm | 2 +- gnu/packages/sphinx.scm | 2 +- gnu/packages/ssh.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index eda269f148..007f15f9f5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2017 Ethan R. Jones -;;; Copyright © 2017 Christopher Allan Webber +;;; Copyright © 2017 Christine Lemmer-Webber ;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2018, 2019 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 51c0572674..c8576930ff 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2019 Andy Tai ;;; Copyright © 2020 Jakub Kądziołka -;;; Copyright © 2020 Christopher Lemmer Webber +;;; Copyright © 2020 Christine Lemmer-Webber ;;; Copyright © 2020 B. Wilson ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5e1c6df6c3..80cd521773 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2019, 2021 Arun Isaac ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019, 2020 Alexandros Theodotou -;;; Copyright © 2019 Christopher Lemmer Webber +;;; Copyright © 2019 Christine Lemmer-Webber ;;; Copyright © 2019 Jan Wielkiewicz ;;; Copyright © 2019 Hartmt Goebel ;;; Copyright © 2019, 2021 Nicolas Goaziou diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 7d7868ea17..74e3f2ce01 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017, 2020 Efraim Flashner -;;; Copyright © 2017 Christopher Allan Webber +;;; Copyright © 2017 Christine Lemmer-Webber ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2018 Oleg Pykhalov diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0d0229330e..894d8397e6 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017 Leo Famulari -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Sou Bunnbu diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index fbff9e8a7c..adb15c03ce 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2015 Leo Famulari ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2017, 2018 Roel Janssen diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cbe830062b..0b76b4e64e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018, 2019 Chris Marusich -;;; Copyright © 2015, 2016, 2018, 2020 Christopher Lemmer Webber +;;; Copyright © 2015, 2016, 2018, 2020 Christine Lemmer-Webber ;;; Copyright © 2016 Adriano Peluso ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 David Thompson diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index bae56d9735..0d398a5367 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2019 Sebastian Schott ;;; Copyright © 2020 Kei Kebreau -;;; Copyright © 2020 Christopher Lemmer Webber +;;; Copyright © 2020 Christine Lemmer-Webber ;;; Copyright © 2020 Tom Zander ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020, 2021 Vinicius Monego diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 0eb6aff6e6..f0e87a36bb 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016 Christopher Baines ;;; Copyright © 2016 Mike Gerwitz diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index f8be5559cb..db31ada7b9 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver -;;; Copyright © 2015, 2017 Christopher Allan Webber +;;; Copyright © 2015, 2017 Christine Lemmer-Webber ;;; Copyright © 2016 Alex Sassmannshausen ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016 Erik Edrosa diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f90ea85999..99372c4668 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Cyril Roelandt ;;; Copyright © 2014, 2016, 2018 David Thompson ;;; Copyright © 2014, 2017, 2018 Mark H Weaver -;;; Copyright © 2015, 2017 Christopher Allan Webber +;;; Copyright © 2015, 2017 Christine Lemmer-Webber ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2019, 2020 Ricardo Wurmus diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index bb59476795..c12f97802e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Carlo Holl -;;; Copyright © 2020 Christopher Lemmer Webber +;;; Copyright © 2020 Christine Lemmer-Webber ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0b7a7aa56a..b1f7ab3cb7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Alex Kost ;;; Copyright © 2016 Raymond Nicholson diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8917a49c93..ccf44b7cf3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari ;;; Copyright © 2016 Lukas Gradl diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index b969391ba9..a867fe1d94 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Steve Sprang ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2015 Aljosha Papsch -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016 Jessica Tallon ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2016 Lukas Gradl diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index db10c44a20..a01d904896 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017, 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2017 Christopher Allan Webber +;;; Copyright © 2017 Christine Lemmer-Webber ;;; Copyright © 2018, 2019 Oleg Pykhalov ;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 441af70f26..32b4aa4bf0 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016, 2019 Hartmut Goebel ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2015, 2017 Ben Woodcroft -;;; Copyright © 2015, 2016 Christopher Allan Webber +;;; Copyright © 2015, 2016 Christine Lemmer-Webber ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 295d158bd3..56920f68c3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Omar Radwan ;;; Copyright © 2015 Pierre-Antoine Rault ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus -;;; Copyright © 2015, 2016, 2020 Christopher Allan Webber +;;; Copyright © 2015, 2016, 2020 Christine Lemmer-Webber ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016 David Thompson ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4ff3200cc9..3bb57ee2bd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Omar Radwan ;;; Copyright © 2015 Pierre-Antoine Rault ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2015, 2016 Christopher Allan Webber +;;; Copyright © 2015, 2016 Christine Lemmer-Webber ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016 David Thompson ;;; Copyright © 2015, 2016, 2017, 2021 Leo Famulari diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 6f1656eb82..a7a3443707 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Danny Milosavljevic ;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Frederick M. Muriithi -;;; Copyright © 2017 Christopher Allan Webber +;;; Copyright © 2017 Christine Lemmer-Webber ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019, 2021 Nicolas Goaziou diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 7429d4e956..4ceb437b26 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2019 Leo Famulari ;;; Copyright © 2016, 2021 Nicolas Goaziou -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Ricardo Wurmus diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8c630f3ac8..71c2ea4cbc 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2015 xd1le ;;; Copyright © 2015 Florian Paul Schmidt -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Leo Famulari -- cgit v1.2.3 From a81dd42465abed547b23245d0fa5f9ea260b06a5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 Aug 2021 16:35:22 -0400 Subject: Revert "gnu: syncthing: Prepare for cross-compiling." This commit broke splitting the package into multiple outputs. See . This reverts commit b33f5d7ff0627424a06fd0416761cd81c350e20a. --- gnu/packages/syncthing.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 5cb8449e44..d428099080 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -76,14 +76,6 @@ (("120s") "999s")) #t)) - (add-before 'build 'pre-build - (lambda _ - (with-directory-excursion "src/github.com/syncthing/syncthing" - ;; Don't set a local GOBIN, it breaks cross compiling. - (substitute* "build.go" - ((".*GOBIN.*") ""))) - #t)) - (replace 'build (lambda _ (with-directory-excursion "src/github.com/syncthing/syncthing" @@ -92,7 +84,7 @@ ;; "build syncthing" again with -no-upgrade. ;; https://github.com/syncthing/syncthing/issues/6118 (invoke "go" "run" "build.go") - (for-each delete-file (find-files "../../../../bin" "syncthing")) + (delete-file "bin/syncthing") (invoke "go" "run" "build.go" "-no-upgrade" "build" "syncthing")))) (replace 'check @@ -106,11 +98,15 @@ (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (utils (assoc-ref outputs "utils"))) - (with-directory-excursion "src/github.com/syncthing/syncthing" - (install-file "syncthing" (string-append out "/bin"))) - (for-each (cut install-file <> (string-append utils "/bin/")) - (find-files "bin")) - #t))) + (with-directory-excursion "src/github.com/syncthing/syncthing/bin" + (install-file "../syncthing" (string-append out "/bin")) + (for-each (cut install-file <> (string-append utils "/bin/")) + '("stcompdirs" "stcrashreceiver" + "stdisco" "stdiscosrv" "stevents" "stfileinfo" + "stfinddevice" "stfindignored" "stgenfiles" + "stindex" "strelaypoolsrv" "strelaysrv" "stsigtool" + "stvanity" "stwatchfile" "uraggregate" "ursrv")) + #t)))) (add-after 'install 'install-docs (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 8d80a708535546394deaea6489245ecc09b29131 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 Aug 2021 16:58:40 -0400 Subject: gnu: Syncthing: Update to 1.16.1. * gnu/packages/syncthing.scm (syncthing): Update to 1.16.1. [arguments]: Adjust the custom install phase to upstream changes. --- gnu/packages/syncthing.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index d428099080..4deb60bee2 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -45,9 +45,9 @@ (define-public syncthing (package (name "syncthing") - (version "1.15.1") + (version "1.16.1") ; XXX After the go-build-system can use "Go modules", stop using bundled - ; dependenices for Syncthing. + ; dependencies for Syncthing. (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -55,11 +55,11 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "04b90zwinl7frxrpjliq41mkbhpnkszmhdc5j2vbqwyhd82warxq")))) + "0m5k37sp3px8acs3y9an5wzy1wbcbdvqq74jy0pwzfk4bjbr999j")))) (build-system go-build-system) ;; The primary Syncthing executable goes to "out", while the auxiliary ;; server programs and utility tools go to "utils". This reduces the size - ;; of "out" by ~80 MiB. + ;; of "out" by ~144 MiB. (outputs '("out" "utils")) (arguments `(#:modules ((srfi srfi-26) ; for cut @@ -104,7 +104,7 @@ '("stcompdirs" "stcrashreceiver" "stdisco" "stdiscosrv" "stevents" "stfileinfo" "stfinddevice" "stfindignored" "stgenfiles" - "stindex" "strelaypoolsrv" "strelaysrv" "stsigtool" + "strelaypoolsrv" "strelaysrv" "stsigtool" "stvanity" "stwatchfile" "uraggregate" "ursrv")) #t)))) -- cgit v1.2.3 From d90bb7edca6b8a780c4d1ffc78c57d20f78b364e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 3 Aug 2021 21:05:50 -0400 Subject: gnu: Remove dillo. As discussed in , Dillo does not include a supported implementation of TLS / HTTPS, and there does not seem to be any activity upstream to improve that. * gnu/packages/web-browsers.scm (dillo): Remove variable. --- gnu/packages/web-browsers.scm | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 5a928d9b46..a0a5498039 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -147,37 +147,6 @@ management, extensions such as advertisement blocker and colorful tabs.") (home-page "https://www.midori-browser.org") (license license:lgpl2.1+))) -(define-public dillo - (package - (name "dillo") - (version "3.0.5") - (source (origin - (method url-fetch) - (uri (string-append "https://www.dillo.org/download/" - "dillo-" version ".tar.bz2")) - (sha256 - (base32 - "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv")))) - (build-system gnu-build-system) - (arguments `(#:configure-flags '("--enable-ssl" "--enable-ipv6"))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("fltk" ,fltk) - ("fontconfig" ,fontconfig) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libxcursor" ,libxcursor) - ("libxft" ,libxft) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("openssl" ,openssl-1.0) ;XXX try latest openssl for dillo > 3.0.5 - ("perl" ,perl) - ("zlib" ,zlib))) - (synopsis "Very small and fast graphical web browser") - (description "Dillo is a minimalistic web browser particularly intended for -older or slower computers and embedded systems.") - (home-page "https://www.dillo.org") - (license license:gpl3+))) - (define-public links (package (name "links") -- cgit v1.2.3 From 0652abcf3fde8b5e71c356bdd214454684655830 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 3 Aug 2021 21:11:57 -0400 Subject: gnu: Remove pidentd. As discussed in , pidentd does not support a current release of OpenSSL, and there does not seem to be any activity upstream to improve that. * gnu/packages/networking.scm (pidentd): Remove variable. --- gnu/packages/networking.scm | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3fe5f2f2ed..ec5e383b0e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2595,33 +2595,6 @@ enabled due to license conflicts between the BSD advertising clause and the GPL. ;; distribution for clarification. (license (list license:bsd-3 license:bsd-4)))) -(define-public pidentd - (package - (name "pidentd") - (version "3.0.19") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ptrrkssn/pidentd") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1k4rr0b4ygxssbnsykzjvz4hjhazzz4j5arlilyc1iq7b1wzsk7i")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f)) ; No tests are included - (inputs - `(("openssl" ,openssl-1.0))) ;for the DES library - (home-page "https://www.lysator.liu.se/~pen/pidentd/") - (synopsis "Small Ident Daemon") - (description - "@dfn{Pidentd} (Peter's Ident Daemon) is an identd, which implements a -identification server. Pidentd looks up specific TCP/IP connections and -returns the user name and other information about the connection.") - (license license:public-domain))) - (define-public spiped (package (name "spiped") -- cgit v1.2.3 From d89a5297605e6e6f541396eb756a70dd7d22ba63 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 3 Aug 2021 21:13:06 -0400 Subject: gnu: Remove cadaver. As discussed in , cadaver does not support a current release of OpenSSL. * gnu/packages/web.scm (cadaver): Remove variable. --- gnu/packages/web.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ff53333169..f0ac9ccee2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6611,38 +6611,6 @@ file links.") license:psfl ; linkcheck/gzip2.py license:expat)))) ; linkcheck/mem.py -(define-public cadaver - (package - (name "cadaver") - (version "0.23.3") - (source - (origin - (method url-fetch) - (uri (string-append "http://www.webdav.org/cadaver/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x")))) - (build-system gnu-build-system) - ;; TODO: Unbundle libneon and make build succeed with new neon. - (arguments - `(#:configure-flags (list "--with-ssl=openssl") - #:tests? #f)) ;No tests included - (native-inputs - `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("intltool" ,intltool))) - (inputs - `(("expat" ,expat) - ("openssl" ,openssl-1.0))) - (home-page "http://www.webdav.org/cadaver/") - (synopsis "Command-line WebDAV client") - (description - "Cadaver is a command-line WebDAV client for Unix. It supports -file upload, download, on-screen display, namespace operations (move/copy), -collection creation and deletion, and locking operations.") - (license license:gpl2))) - (define-public castor (package (name "castor") -- cgit v1.2.3 From 8e47a8e8a7fe85362b86b724443454222efa639c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 3 Aug 2021 21:15:43 -0400 Subject: gnu: Remove eschalot. As discussed in , eschalot does not support a current release of OpenSSL. * gnu/packages/crypto.scm (eschalot): Remove variable. --- gnu/packages/crypto.scm | 57 ------------------------------------------------- 1 file changed, 57 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index c545f47fcf..c511d0a711 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -398,63 +398,6 @@ secure operations. ") (license (list license:lgpl2.1+ ; the files keyutils.* license:gpl2+)))) ; the rest -;; There is no release candidate but commits point out a version number, -;; furthermore no tarball exists. -(define-public eschalot - (let ((commit "0bf31d88a11898c19b1ed25ddd2aff7b35dbac44") - (revision "1")) - (package - (name "eschalot") - (version (string-append "1.2.0-" revision "." (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/schnabear/eschalot") - (commit commit))) - (file-name (string-append name "-" version)) - (sha256 - (base32 - "0lj38ldh8vzi11wp4ghw4k0fkwp0s04zv8k8d473p1snmbh7mx98")))) - (inputs - `(("openssl" ,openssl-1.0))) ; for openssl/{bn,pem,rsa,sha}.h - (build-system gnu-build-system) - (arguments - `(#:make-flags (list (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" (assoc-ref %outputs "out")) - (string-append "INSTALL=" "install")) - ;; XXX: make test would run a !VERY! long hashing of names with the use - ;; of a wordlist, the amount of computing time this would waste on build - ;; servers is in no relation to the size or importance of this small - ;; application, therefore we run our own tests on eschalot and worgen. - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'check - (lambda _ - (invoke "./worgen" "8-12" "top1000.txt" "3-10" "top400nouns.txt" - "3-6" "top150adjectives.txt" "3-6") - (invoke "./eschalot" "-r" "^guix|^guixsd") - (invoke "./eschalot" "-r" "^gnu|^free") - (invoke "./eschalot" "-r" "^cyber|^hack") - (invoke "./eschalot" "-r" "^troll"))) - ;; Make install can not create the bin dir, create it. - (add-before 'install 'create-bin-dir - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - #t)))))) - (home-page "https://github.com/schnabear/eschalot") - (synopsis "Tor hidden service name generator") - (description - "Eschalot is a tor hidden service name generator, it allows one to -produce customized vanity .onion addresses using a brute-force method. Searches -for valid names can be run with regular expressions and wordlists. For the -generation of wordlists the included tool @code{worgen} can be used. There is -no man page, refer to the home page for usage details.") - (license (list license:isc license:expat))))) - (define-public ssss (package (name "ssss") -- cgit v1.2.3 From 314ad6435c3999535f7461ceaeb0b32295d0b6b1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 3 Aug 2021 21:16:41 -0400 Subject: gnu: Remove psyclpc. As discussed in , psyclpc does not support a current release of OpenSSL. * gnu/packages/messaging.scm (psyclpc): Remove variable. --- gnu/packages/messaging.scm | 73 ---------------------------------------------- 1 file changed, 73 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e5ecdb8894..3aa386ed6d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1839,79 +1839,6 @@ including psyced.") (synopsis "PSYC library in C") (license license:agpl3+))) -;; This commit removes the historic bundled pcre and makes psyclpc reproducible. -(define-public psyclpc - (let* ((commit "61cf9aa81297085e5c40170fd01221c752f8deba") - (revision "2")) - (package - (name "psyclpc") - (version (string-append "20160821-" revision "." (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "git://git.psyced.org/git/psyclpc") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1viwqymbhn3cwvx0zl58rlzl5gw47zxn0ldg2nbi55ghm5zxl1z5")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; There are no tests/checks. - #:configure-flags - ;; If you have questions about this part, look at - ;; "src/settings/psyced" and the ebuild. - (list - "--enable-use-tls=yes" - "--enable-use-mccp" ; Mud Client Compression Protocol, leave this enabled. - (string-append "--prefix=" - (assoc-ref %outputs "out")) - ;; src/Makefile: Set MUD_LIB to the directory which contains - ;; the mud data. defaults to MUD_LIB = @libdir@ - (string-append "--libdir=" - (assoc-ref %outputs "out") - "/opt/psyced/world") - (string-append "--bindir=" - (assoc-ref %outputs "out") - "/opt/psyced/bin") - ;; src/Makefile: Set ERQ_DIR to directory which contains the - ;; stuff which ERQ can execute (hopefully) savely. Was formerly - ;; defined in config.h. defaults to ERQ_DIR= @libexecdir@ - (string-append "--libexecdir=" - (assoc-ref %outputs "out") - "/opt/psyced/run")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'chdir-to-src - ;; We need to pass this as env variables - ;; and manually change the directory. - (lambda _ - (chdir "src") - (setenv "CONFIG_SHELL" (which "sh")) - (setenv "SHELL" (which "sh")) - #t))) - #:make-flags (list "install-all"))) - (inputs - `(("zlib" ,zlib) - ("openssl" ,openssl-1.0) - ("pcre" ,pcre))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("bison" ,bison) - ("gettext" ,gettext-minimal) - ("help2man" ,help2man) - ("autoconf" ,autoconf) - ("automake" ,automake))) - (home-page "http://lpc.psyc.eu/") - (synopsis "psycLPC is a multi-user network server programming language") - (description - "LPC is a bytecode language, invented to specifically implement -multi user virtual environments on the internet. This technology is used for -MUDs and also the psyced implementation of the Protocol for SYnchronous -Conferencing (PSYC). psycLPC is a fork of LDMud with some new features and -many bug fixes.") - (license license:gpl2)))) - (define-public loudmouth (package (name "loudmouth") -- cgit v1.2.3 From ef9dc9efa49a1db600805f3fbcd2dbfbabfb4ea4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 3 Aug 2021 21:17:25 -0400 Subject: gnu: Remove tlsdate. As discussed in , tlsdate does not support a current release of OpenSSL. * gnu/packages/ntp.scm (tlsdate): Remove variable. --- gnu/packages/ntp.scm | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index 191eedd158..55b9a73b22 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -216,54 +216,3 @@ secure, easy to configure, and accurate enough for most purposes, so it's more minimalist than ntpd.") ;; A few of the source files are under bsd-3. (license (list l:isc l:bsd-3)))) - -(define-public tlsdate - (package - (name "tlsdate") - (version "0.0.13") - (home-page "https://github.com/ioerror/tlsdate") - (source (origin - (method git-fetch) - (uri (git-reference - (commit (string-append "tlsdate-" version)) - (url home-page))) - (sha256 - (base32 - "0w3v63qmbhpqlxjsvf4k3zp90k6mdzi8cdpgshan9iphy1f44xgl")) - (file-name (string-append name "-" version "-checkout")))) - (build-system gnu-build-system) - (arguments - `(;; Disable seccomp when it's not supported--e.g., on aarch64. See - ;; 'src/seccomp.c' for the list of supported systems. - #:configure-flags ,(if (any (lambda (system) - (string-contains (or - (%current-target-system) - (%current-system)) - system)) - '("x86_64" "i686" "arm")) - ''() - ''("--disable-seccomp-filter")) - - #:phases (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - ;; The ancestor of 'SOURCE_DATE_EPOCH'; it contains the - ;; date that is recorded in binaries. It must be a - ;; "recent date" since it is used to detect bogus dates - ;; received from servers. - (setenv "COMPILE_DATE" (number->string 1530144000)) - (invoke "sh" "autogen.sh")))))) - (inputs `(("openssl" ,openssl-1.0) - ("libevent" ,libevent))) - (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) - (synopsis "Extract remote time from TLS handshakes") - (description - "@command{tlsdate} sets the local clock by securely connecting with TLS -to remote servers and extracting the remote time out of the secure handshake. -Unlike ntpdate, @command{tlsdate} uses TCP, for instance connecting to a -remote HTTPS or TLS enabled service, and provides some protection against -adversaries that try to feed you malicious time information.") - (license l:bsd-3))) -- cgit v1.2.3 From 05effbbfc2fc6223aafacf8a3cb2b2d970b6bb66 Mon Sep 17 00:00:00 2001 From: Giovanni Biscuolo Date: Thu, 12 Aug 2021 18:09:02 +0200 Subject: gnu: adb: Make compatible with OpenSSL 1.1. OpenSSL version 1.1 brought some API changes which broke the build here, fix that by accessing rsa->n (and e) directly, using RSA_get0_key instead. * gnu/packages/patches/adb-libssl_11-compatibility.patch: New file * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/android.scm (android-platform-system-core)[origin]: Use it. (adb)[inputs]: Replace openssl-1.0 with openssl. --- gnu/packages/android.scm | 3 +- .../patches/adb-libssl_11-compatibility.patch | 35 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/adb-libssl_11-compatibility.patch (limited to 'gnu/packages') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index eb538f6540..99c283dfaf 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -148,6 +148,7 @@ use their packages mostly unmodified in our Android NDK build system.") "libutils-remove-damaging-includes.patch" "libutils-add-includes.patch" "adb-add-libraries.patch" + "adb-libssl_11-compatibility.patch" "libziparchive-add-includes.patch")))) (define (android-platform-system-extras version) @@ -388,7 +389,7 @@ various Android core host applications.") `(("android-libbase" ,android-libbase) ("android-libcutils" ,android-libcutils) ("android-liblog" ,android-liblog) - ("openssl" ,openssl-1.0))) + ("openssl" ,openssl))) (home-page "https://developer.android.com/studio/command-line/adb.html") (synopsis "Android Debug Bridge") (description diff --git a/gnu/packages/patches/adb-libssl_11-compatibility.patch b/gnu/packages/patches/adb-libssl_11-compatibility.patch new file mode 100644 index 0000000000..9affe58b5d --- /dev/null +++ b/gnu/packages/patches/adb-libssl_11-compatibility.patch @@ -0,0 +1,35 @@ +This patch is taken from Debian +URL: https://sources.debian.org/data/main/a/android-platform-system-core/1%3A7.0.0%2Br33-1/debian/patches/adb_libssl_11.diff +Description: adb: Make compatible with openssl 1.1 + OpenSSL version 1.1 brought some API changes which broke the build here, + fix that by accessing rsa->n (and e) directly, using RSA_get0_key instead. +Author: Chirayu Desai n); ++ RSA_get0_key(rsa, &n, &e, NULL); + BN_set_bit(r, RSANUMWORDS * 32); + BN_mod_sqr(rr, r, n, ctx); + BN_div(NULL, rem, n, r32, ctx); +@@ -92,7 +93,7 @@ + BN_div(n, rem, n, r32, ctx); + pkey->n[i] = BN_get_word(rem); + } +- pkey->exponent = BN_get_word(rsa->e); ++ pkey->exponent = BN_get_word(e); + + out: + BN_free(n0inv); -- cgit v1.2.3 From 12099eac1b161d364be923451d27d7d739d0f14d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Aug 2021 14:23:29 -0400 Subject: gnu: OpenSSL 1.0.2: Hide this package. * gnu/packages/tls.scm (openssl-1.0): Wrap in 'hidden-package'. --- gnu/packages/tls.scm | 193 +++++++++++++++++++++++++++------------------------ 1 file changed, 104 insertions(+), 89 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 7a0a9bd9a9..fb7d364c94 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -509,98 +509,113 @@ required structures.") (base32 "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9")))))) +;; We will not add any new uses of this package. If you add new code that uses +;; this package, your change will be reverted! +;; +;; The only acceptable use for this package is to bootstrap Rust, in +;; ((gnu packages rust) rust-1.19). +;; +;; OpenSSL 1.0 is no longer suppported upstream [0] and has several security +;; vulnerabilities that will not be fixed [1]. +;; +;; For more information from the Guix point of view, see +;; . +;; +;; [0] https://www.openssl.org/policies/releasestrat.html +;; [1] https://www.openssl.org/news/vulnerabilities.html (define-public openssl-1.0 - (package - (inherit openssl) - (name "openssl") - (version "1.0.2u") - (source (origin - (method url-fetch) - (uri (list (string-append "https://www.openssl.org/source/openssl-" - version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/" - "openssl-" version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/old/" - (string-trim-right version char-set:letter) - "/openssl-" version ".tar.gz"))) - (sha256 - (base32 - "05lxcs4hzyfqd5jn0d9p0fvqna62v2s4pc9qgmq0dpcknkzwdl7c")) - (patches (search-patches "openssl-runpath.patch" - "openssl-c-rehash-in.patch")))) - (outputs '("out" - "doc" ;1.5MiB of man3 pages - "static")) ;6MiB of .a files - (arguments - (substitute-keyword-arguments (package-arguments openssl) - ;; Parallel build is not supported in 1.0.x. - ((#:parallel-build? _ #f) #f) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'patch-source-shebangs 'patch-tests - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) - (substitute* (find-files "test" ".*") - (("/bin/sh") - (string-append bash "/bin/sh")) - (("/bin/rm") - "rm")) - #t))) - (add-before 'configure 'patch-Makefile.org - (lambda* (#:key outputs #:allow-other-keys) - ;; The default MANDIR is some unusual place. Fix that. - (let ((out (assoc-ref outputs "out"))) - (patch-makefile-SHELL "Makefile.org") - (substitute* "Makefile.org" - (("^MANDIR[[:blank:]]*=.*$") - (string-append "MANDIR = " out "/share/man\n"))) - #t))) - (replace 'configure - ;; Override this phase because OpenSSL 1.0 does not understand -rpath. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke ,@(if (%current-target-system) - '("./Configure") - '("./config")) - "shared" ;build shared libraries - "--libdir=lib" + (hidden-package + (package + (inherit openssl) + (name "openssl") + (version "1.0.2u") + (source (origin + (method url-fetch) + (uri (list (string-append "https://www.openssl.org/source/openssl-" + version ".tar.gz") + (string-append "ftp://ftp.openssl.org/source/" + "openssl-" version ".tar.gz") + (string-append "ftp://ftp.openssl.org/source/old/" + (string-trim-right version char-set:letter) + "/openssl-" version ".tar.gz"))) + (sha256 + (base32 + "05lxcs4hzyfqd5jn0d9p0fvqna62v2s4pc9qgmq0dpcknkzwdl7c")) + (patches (search-patches "openssl-runpath.patch" + "openssl-c-rehash-in.patch")))) + (outputs '("out" + "doc" ;1.5MiB of man3 pages + "static")) ;6MiB of .a files + (arguments + (substitute-keyword-arguments (package-arguments openssl) + ;; Parallel build is not supported in 1.0.x. + ((#:parallel-build? _ #f) #f) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'patch-source-shebangs 'patch-tests + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) + (substitute* (find-files "test" ".*") + (("/bin/sh") + (string-append bash "/bin/sh")) + (("/bin/rm") + "rm")) + #t))) + (add-before 'configure 'patch-Makefile.org + (lambda* (#:key outputs #:allow-other-keys) + ;; The default MANDIR is some unusual place. Fix that. + (let ((out (assoc-ref outputs "out"))) + (patch-makefile-SHELL "Makefile.org") + (substitute* "Makefile.org" + (("^MANDIR[[:blank:]]*=.*$") + (string-append "MANDIR = " out "/share/man\n"))) + #t))) + (replace 'configure + ;; Override this phase because OpenSSL 1.0 does not understand -rpath. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke ,@(if (%current-target-system) + '("./Configure") + '("./config")) + "shared" ;build shared libraries + "--libdir=lib" - ;; The default for this catch-all directory is - ;; PREFIX/ssl. Change that to something more - ;; conventional. - (string-append "--openssldir=" out - "/share/openssl-" ,version) + ;; The default for this catch-all directory is + ;; PREFIX/ssl. Change that to something more + ;; conventional. + (string-append "--openssldir=" out + "/share/openssl-" ,version) - (string-append "--prefix=" out) - ,@(if (%current-target-system) - '((getenv "CONFIGURE_TARGET_ARCH")) - '()))))) - (delete 'move-extra-documentation) - (add-after 'install 'move-man3-pages - (lambda* (#:key outputs #:allow-other-keys) - ;; Move section 3 man pages to "doc". - (let* ((out (assoc-ref outputs "out")) - (man3 (string-append out "/share/man/man3")) - (doc (assoc-ref outputs "doc")) - (target (string-append doc "/share/man/man3"))) - (mkdir-p target) - (for-each (lambda (file) - (rename-file file - (string-append target "/" - (basename file)))) - (find-files man3)) - (delete-file-recursively man3) - #t))) - ;; XXX: Duplicate this phase to make sure 'version' evaluates - ;; in the current scope and not the inherited one. - (replace 'remove-miscellany - (lambda* (#:key outputs #:allow-other-keys) - ;; The 'misc' directory contains random undocumented shell and Perl - ;; scripts. Remove them to avoid retaining a reference on Perl. - (let ((out (assoc-ref outputs "out"))) - (delete-file-recursively (string-append out "/share/openssl-" - ,version "/misc")) - #t))))))))) + (string-append "--prefix=" out) + ,@(if (%current-target-system) + '((getenv "CONFIGURE_TARGET_ARCH")) + '()))))) + (delete 'move-extra-documentation) + (add-after 'install 'move-man3-pages + (lambda* (#:key outputs #:allow-other-keys) + ;; Move section 3 man pages to "doc". + (let* ((out (assoc-ref outputs "out")) + (man3 (string-append out "/share/man/man3")) + (doc (assoc-ref outputs "doc")) + (target (string-append doc "/share/man/man3"))) + (mkdir-p target) + (for-each (lambda (file) + (rename-file file + (string-append target "/" + (basename file)))) + (find-files man3)) + (delete-file-recursively man3) + #t))) + ;; XXX: Duplicate this phase to make sure 'version' evaluates + ;; in the current scope and not the inherited one. + (replace 'remove-miscellany + (lambda* (#:key outputs #:allow-other-keys) + ;; The 'misc' directory contains random undocumented shell and Perl + ;; scripts. Remove them to avoid retaining a reference on Perl. + (let ((out (assoc-ref outputs "out"))) + (delete-file-recursively (string-append out "/share/openssl-" + ,version "/misc")) + #t)))))))))) (define-public libressl (package -- cgit v1.2.3 From b57f4667116a7236bfba88ae6f276009318af37d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 Aug 2021 11:49:02 -0400 Subject: gnu: linux-libre: Update to 5.13.11. * gnu/packages/linux.scm (linux-libre-5.13-version): Update to 5.13.11. (linux-libre-5.13-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b1f7ab3cb7..d586501dca 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -356,7 +356,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.13-version "5.13.10") +(define-public linux-libre-5.13-version "5.13.11") (define deblob-scripts-5.13 (linux-libre-deblob-scripts linux-libre-5.13-version @@ -364,7 +364,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "153jf5l5x4438zgxwggaky2ahjlfl48j438vhpzks6h77lzc51a5"))) (define-public linux-libre-5.13-pristine-source (let ((version linux-libre-5.13-version) - (hash (base32 "01fpj02q4vdn7i6f6710lly0w33cd5gfvn6avgrjglcbiwdzbjih"))) + (hash (base32 "0za59652wrh4mlhd9w3dx4y1nnk8nrj9hb56pssgdckdvp7rp4l0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.13))) -- cgit v1.2.3 From b6ff990f3d8b48037d310e529c8df8d6efa7b33b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 Aug 2021 11:49:22 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.59. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.59. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d586501dca..4dbf48448d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -372,7 +372,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.58") +(define-public linux-libre-5.10-version "5.10.59") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -380,7 +380,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0c9x07gplzajm0h5if3fpw2rvfb7psw3yp7i2n6ws7ggq1dvmki2"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "047j51w4yyvfva19nc8pvbsqqzar80k6nfqwcaa5irirwmmwab3k"))) + (hash (base32 "107anv16khx055rpkvfd532rdcfg4ffbs7bhp45hdqi3bz0ssg1k"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From 66680c59d93cd9494fd3868203e28d393c798c96 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 Aug 2021 11:49:39 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.141. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.141. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4dbf48448d..8594e6ec28 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -385,7 +385,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.140") +(define-public linux-libre-5.4-version "5.4.141") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -393,7 +393,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0hvygxc6nj0lzpm1bkvz3r8b2k0ybp7rxcxfa2n0bs7jyhnplr9c"))) + (hash (base32 "0a4c2fbv0j1p8fliz62ycw319nzw9q5gn7g9z1bkifn51hv6sqqh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 1332f8e9ab2486d27bc8ae281ad3d2b73bfc9224 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 Aug 2021 11:50:20 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.204. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.204. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8594e6ec28..e78c7d48ca 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -398,7 +398,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.203") +(define-public linux-libre-4.19-version "4.19.204") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -406,7 +406,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1ykahjymz12ayx7qgmrpndsdf61pb8gxfl2nadqrv02imr845c7z"))) + (hash (base32 "1rcx99sz4fgr2d138i92dw2vfplnqgys58hxywgmjb56c83l3qy4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 91dc085cbe34b690dfbb50797a135eee872160ad Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 Aug 2021 11:50:36 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.244. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.244. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e78c7d48ca..d15a589730 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -411,7 +411,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.243") +(define-public linux-libre-4.14-version "4.14.244") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -419,7 +419,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0wdk93qv91pa6bd3ff1gv7manhkzh190c5blcpl14cbh9m2ms8vz"))) + (hash (base32 "0x554dck5f78ljknwahjvf49952s1w0zja3yh4vfz6lmf6hvzq5n"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 89f36c411927c5d46099572b8de38b84961bc9a2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 Aug 2021 11:51:07 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.280. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.280. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d15a589730..7da95aee75 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -424,7 +424,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.279") +(define-public linux-libre-4.9-version "4.9.280") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -432,7 +432,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "01rf3xh2jcz6l2h79g0m02i8f9q51j64wvgvzi8lmq0gx9yvbv91"))) + (hash (base32 "0am9qg9j18j4fc5zi6bk1g0mi8dp31pl62wlihxhhkc5yspzrna3"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From f80b377e10e9510a818b0b0f276dca299b4f1d6f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 Aug 2021 11:51:25 -0400 Subject: gnu: linux-libre 4.4: Update to 4.4.281. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.281. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7da95aee75..6f0bd5e285 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -437,7 +437,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.280") +(define-public linux-libre-4.4-version "4.4.281") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -445,7 +445,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1b9jx9zkycj0xjmy35890q5phiznayaz730dmsv3mdjg4qgfn18y"))) + (hash (base32 "12grr2vc2mcvy7k8w1apqs9mhfg0lvz6mrpksym234m4n5yy48ng"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 6fcaf8533792a64bc00292326f960561de591200 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 16 Aug 2021 09:32:47 +0200 Subject: gnu: Add cl-yxorp. * gnu/packages/lisp-xyz.scm (cl-yxorp, ecl-yxorp, sbcl-yxorp): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 38cc7d6695..e1d034a19c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18243,6 +18243,49 @@ functions allow Lisp programs to explore the web.") (define-public cl-aserve (sbcl-package->cl-source-package sbcl-aserve)) +(define-public sbcl-yxorp + (let ((commit "d2e8f9304549e47ae5c7fa35a6b114804603eac9") + (revision "1")) + (package + (name "sbcl-yxorp") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/charJe/cl-yxorp") + (commit commit))) + (file-name (git-file-name "cl-yxorp" version)) + (sha256 + (base32 "1zz1j678vzwkf817h2z0pf0fcyf4mldv4hiv1wyam58hd4bcrjsw")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl+ssl" ,sbcl-cl+ssl) + ("cl-binding-arrows" ,sbcl-binding-arrows) + ("cl-str" ,sbcl-cl-str) + ("cl-usocket" ,sbcl-usocket) + ("flexi-streams" ,sbcl-flexi-streams) + ("trivial-garbage" ,sbcl-trivial-garbage))) + (home-page "https://github.com/charje/cl-yxorp") + (synopsis + "Reverse proxy server written in and configurable in Common Lisp") + (description + "This is a reverse proxy server written in and configurable in +Common Lisp. It supports WebSocket, HTTP, HTTPS, HTTP to HTTPS +redirecting, port and host forwarding configuration using a real programming +language, HTTP header and body manipulation (also using a real programming +language).") + (license license:agpl3)))) + +(define-public ecl-yxorp + ;; Note that due to a bug in ECL this package does not build. + ;; The bug has already been fixed on the development branch, + ;; so this package will work work in the version after 21.2.1. + (sbcl-package->ecl-package sbcl-yxorp)) + +(define-public cl-yxorp + (sbcl-package->cl-source-package sbcl-yxorp)) + (define-public sbcl-rss ;; No release. (let ((commit "51d0145e91b86327ae5c36364f9c3048052e7a58")) -- cgit v1.2.3 From 5d2853f4b2eddcce879ed285c96fa6e533148225 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 16 Aug 2021 09:45:34 +0200 Subject: gnu: Add cl-yxorp-cli. * gnu/packages/lisp-xyz.scm (cl-yxorp-cli): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e1d034a19c..06ce3c699e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -57,6 +57,7 @@ #:use-module (guix hg-download) #:use-module (guix utils) #:use-module (guix build-system asdf) + #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages base) #:use-module (gnu packages c) @@ -18286,6 +18287,36 @@ language).") (define-public cl-yxorp (sbcl-package->cl-source-package sbcl-yxorp)) +(define-public cl-yxorp-cli + (package + (inherit sbcl-yxorp) + (name "cl-yxorp-cli") + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:strip-binaries? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'set-home + (lambda _ + (setenv "HOME" "/tmp"))) + (replace 'build + (lambda _ + (invoke + "sbcl" "--noinform" + "--non-interactive" + "--no-userinit" + "--eval" "(require :asdf)" + "--eval" "(pushnew (uiop:getcwd) asdf:*central-registry*)" + "--load" "build.lisp"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (mkdir-p bin) + (install-file "cl-yxorp" bin))))))) + (inputs (cons (list "sbcl" sbcl) (package-inputs sbcl-yxorp))))) + (define-public sbcl-rss ;; No release. (let ((commit "51d0145e91b86327ae5c36364f9c3048052e7a58")) -- cgit v1.2.3 From acc41180ef5809a058955facadfc9f1e0c3e429d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 16 Aug 2021 10:25:02 +0200 Subject: gnu: emacs-org-fragtog: Update to 0.4.0. * gnu/packages/emacs-xyz.scm (emacs-org-fragtog): Update to 0.4.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0b76b4e64e..fb840a1a02 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5069,7 +5069,7 @@ displays the priority part of a heading as your preferred string value.") (define-public emacs-org-fragtog (package (name "emacs-org-fragtog") - (version "0.3.3") + (version "0.4.0") (source (origin (method git-fetch) @@ -5078,7 +5078,7 @@ displays the priority part of a heading as your preferred string value.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "02g4a5lsmalc5mcybimx7ils43w3ac6269n9kzcnw59bj0i5kkcj")))) + (base32 "0ra4sfy48p8pm1c7h8wlmbl68r4s0f4qc49xapvs550pm4mf3hiq")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-org" ,emacs-org))) -- cgit v1.2.3 From d2c1bf6b9a45bd2d2ea80f1c67f47e0f3e9ed92b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 16 Aug 2021 10:30:23 +0200 Subject: gnu: emacs-olivetti: Update to 2.0.1. * gnu/packages/emacs-xyz.scm (emacs-olivetti): Update to 2.0.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fb840a1a02..421ea03673 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3774,7 +3774,7 @@ a command.") (define-public emacs-olivetti (package (name "emacs-olivetti") - (version "2.0.0") + (version "2.0.1") (source (origin (method git-fetch) @@ -3783,7 +3783,7 @@ a command.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0c0nkxik74p6s1pbf1l8pix5yy4xgnakqkwrrmf2ic1x1m4xv3hj")))) + (base32 "0njkzd8x3wryyzd3czzk6f5w9jr7jly5l03ar706h77kpakd8z2y")))) (build-system emacs-build-system) (home-page "https://github.com/rnkn/olivetti") (synopsis "Emacs minor mode for a nice writing environment") -- cgit v1.2.3 From 020a67489c89c27e3bb8b346ecec6f4b58cafc19 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 16 Aug 2021 10:34:37 +0200 Subject: gnu: emacs-consult-notmuch: Update to 0.4. * gnu/packages/emacs-xyz.scm (emacs-consult-notmuch): Update to 0.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 421ea03673..4a0ab76fe6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8289,7 +8289,7 @@ list of candidates.") (define-public emacs-consult-notmuch (package (name "emacs-consult-notmuch") - (version "0.3") + (version "0.4") (source (origin (method git-fetch) @@ -8298,7 +8298,7 @@ list of candidates.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "19flyh3v1xm2zswzjkvjbijvpbq5r8isafza4fd0yicvqbjyklhx")))) + (base32 "0x2lz2df1rjq3vdxvqqnxqxh257hq5iyx1w3yc85w7lmnb59gbvy")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-consult" ,emacs-consult) -- cgit v1.2.3 From 0fa49fd2a8f0d1d2c37ea276cc44d0d5adcea701 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 16 Aug 2021 11:03:21 +0200 Subject: gnu: cataclysm-dda: Update to 0.F-1. * gnu/packages/games.scm (cataclysm-dda): Update to 0.F-1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b3a6d7bb4d..28cd0cdc71 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -879,7 +879,7 @@ high a score as possible.") (define-public cataclysm-dda (package (name "cataclysm-dda") - (version "0.F") + (version "0.F-1") (source (origin (method git-fetch) @@ -887,7 +887,7 @@ high a score as possible.") (url "https://github.com/CleverRaven/Cataclysm-DDA") (commit version))) (sha256 - (base32 "1jid8lcl04y768b3psj1ifhx96lmd6fn1j2wzxhl4ic7ra66p2z3")) + (base32 "03a4q0y6vci278yb6b6d0qwk9abn1qgqifcmbrm5wrqbqygjalkd")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From a9eb969bb63fc421e5cb2a699ef1f1e7c5cbd1b4 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 16 Aug 2021 19:28:09 +0200 Subject: gnu: network-manager-applet: Update to 1.22.0. * gnu/packages/gnome.scm (network-manager-applet): Update to 1.22.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5cf3bf36d1..98c121ac22 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7983,7 +7983,7 @@ Cisco's AnyConnect SSL VPN.") (define-public network-manager-applet (package (name "network-manager-applet") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/network-manager-applet/" @@ -7991,7 +7991,7 @@ Cisco's AnyConnect SSL VPN.") "network-manager-applet-" version ".tar.xz")) (sha256 (base32 - "0lsjkbv66hn7acl2pg9h6hz4b700zzv4cjwrwjvy7043blw0bcla")))) + "1gj6lqqi613j2m49v9i82lqg1rv7kwwc8z4nxjcwpaa0ins803f7")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 43b7da5cb9a9d80d668a20ae1c44db87fb049a13 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Aug 2021 23:18:12 +0200 Subject: gnu: tor: Update to 0.4.6.7 [fixes CVE-2021-38385]. * gnu/packages/tor.scm (tor): Update to 0.4.6.7. --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 5ad15d085d..8bcc404184 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -57,14 +57,14 @@ (define-public tor (package (name "tor") - (version "0.4.6.6") + (version "0.4.6.7") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "04ifi18cj4cw5lhfzgfrrc42j7qqdmbvxq24xlhj0dsmljdih8rl")))) + "16hga7195va8v0x062dc05nbz4sm3dscifcqpl8235dj47hmqrpz")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From ef4a931532fb8eac68ccff4f84d25005237e9a2f Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 21 Mar 2021 18:01:20 +0300 Subject: gnu: Add pam-gnupg. * gnu/packages/linux.scm (pam-gnupg): New variable. --- gnu/packages/linux.scm | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6f0bd5e285..803ef0d9bd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -38,7 +38,7 @@ ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019, 2020, 2021 Brice Waegeneire ;;; Copyright © 2019 Kei Kebreau -;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020, 2021 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 Chris Marusich ;;; Copyright © 2020 Vincent Legoll @@ -99,6 +99,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) + #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages gperf) #:use-module (gnu packages gstreamer) @@ -1616,6 +1617,40 @@ at login. Local and dynamic reconfiguration are its key features.") (description "This package provides a PAM interface using @code{ctypes}.") (license license:expat))) +(define-public pam-gnupg + (package + (name "pam-gnupg") + (version "0.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cruegge/pam-gnupg") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bf91gi6zmfzzmczxm7pajxdlgnikasvg5xsd3j0a368rcr7lf9l")))) + (build-system gnu-build-system) + (inputs + `(("gnupg" ,gnupg) + ("linux-pam" ,linux-pam))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (arguments + `(#:tests? #f ;no tests suite + #:configure-flags + (list (string-append "--with-moduledir=" + (assoc-ref %outputs "out") "/lib/security")))) + + (home-page "https://github.com/cruegge/pam-gnupg") + (synopsis "Unlock GnuPG keys on login") + (description "This package provides a PAM module that hands over your +login password to @code{gpg-agent}. This can be useful if you are using a +GnuPG-based password manager like @code{pass}.") + (license license:gpl3+))) + ;;; ;;; Miscellaneous. -- cgit v1.2.3 From f7094f5a4207a706c9ed9024d71a442f14d0a7fd Mon Sep 17 00:00:00 2001 From: Danial Behzadi Date: Tue, 17 Aug 2021 11:55:47 +0430 Subject: gnu: tractor: Update to 3.12. * gnu/packages/tor.scm (tractor): Update to 3.12. Signed-off-by: Efraim Flashner --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 8bcc404184..972160fb8e 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -435,14 +435,14 @@ Potential client and exit connections are scrubbed of sensitive information.") (define-public tractor (package (name "tractor") - (version "3.10") + (version "3.12") (source (origin (method url-fetch) (uri (pypi-uri "traxtor" version)) (sha256 (base32 - "0cysxfynsnf5p61m7n6kb58bn1cf81n68clxh5irp44kjshi0q6l")))) + "0bwj4l6szvx7hpjr8va3hlv0g79sxz02hsb60l61hb314c6d4r3q")))) (build-system python-build-system) (native-inputs `(("glib:bin" ,glib "bin"))) ; for glib-compile-schemas. -- cgit v1.2.3 From 66cb568e311c88891de9c27bcb0f3eb658af6ae3 Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Tue, 17 Aug 2021 08:50:41 +0300 Subject: gnu: Add go-github-com-oneofone-xxhash. * gnu/packages/golang.scm (go-github-com-oneofone-xxhash): New variable. Signed-off-by: Arun Isaac --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f4cd30c662..490872e886 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 jgart +;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; ;;; This file is part of GNU Guix. ;;; @@ -8396,3 +8397,27 @@ zero round-trip encryption, and other advanced features.") (synopsis "Go compression library") (description "@code{compress} provides various compression algorithms.") (license license:bsd-3))) + +(define-public go-github-com-oneofone-xxhash + (package + (name "go-github-com-oneofone-xxhash") + (version "1.2.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OneOfOne/xxhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f98qk83l2fhpclvrgyxsa9b8m4pipf11fah85bnjl01wy4lvybw")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/OneOfOne/xxhash")) + (home-page "https://github.com/OneOfOne/xxhash") + (synopsis "Go implementation of xxHash") + (description "This is a native Go implementation of the +@url{https://github.com/Cyan4973/xxHash, xxHash} algorithm, an extremely fast +non-cryptographic hash algorithm, working at speeds close to RAM limits.") + (license license:asl2.0))) -- cgit v1.2.3 From 5fbeb09f911fb04dbce43282e27fce9d04d6b9b9 Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Tue, 17 Aug 2021 08:50:42 +0300 Subject: gnu: Add go-github-com-aswinkarthik-csvdiff. * gnu/packages/golang.scm (go-github-com-aswinkarthik-csvdiff): New variable. Signed-off-by: Arun Isaac --- gnu/packages/golang.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 490872e886..72579d6bd2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8421,3 +8421,47 @@ zero round-trip encryption, and other advanced features.") @url{https://github.com/Cyan4973/xxHash, xxHash} algorithm, an extremely fast non-cryptographic hash algorithm, working at speeds close to RAM limits.") (license license:asl2.0))) + +(define-public go-github-com-aswinkarthik-csvdiff + (package + (name "go-github-com-aswinkarthik-csvdiff") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aswinkarthik/csvdiff") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cd1ikxsypjqisfnmr7zix3g7x8p892w77086465chyd39gpk97b")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/aswinkarthik/csvdiff")) + (propagated-inputs + `(("go-golang-org-x-sys" ,go-golang-org-x-sys) + ("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify) + ("go-github-com-spf13-cobra" ,go-github-com-spf13-cobra) + ("go-github-com-spf13-afero" ,go-github-com-spf13-afero) + ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) + ("go-github-com-mattn-go-colorable" ,go-github-com-mattn-go-colorable) + ("go-github-com-fatih-color" ,go-github-com-fatih-color) + ("go-github-com-cespare-xxhash" ,go-github-com-cespare-xxhash) + ("go-github-com-oneofone-xxhash" ,go-github-com-oneofone-xxhash))) + (home-page "https://github.com/aswinkarthik/csvdiff") + (synopsis "Fast diff tool for comparing CSV files") + (description "@code{csvdiff} is a diff tool to compute changes between two +CSV files. It can compare CSV files with a million records in under 2 +seconds. It is specifically suited for comparing CSV files dumped from +database tables. GNU Diff is orders of magnitude faster for comparing line by +line. @code{csvdiff} supports + +@itemize +@item Selective comparison of fields in a row +@item Specifying group of columns as primary-key to uniquely identify a row +@item Ignoring columns +@item Several output formats including colored git style output or +JSON for post-processing +@end itemize") + (license license:expat))) -- cgit v1.2.3 From a45d5a9478187d63c8ac314ce8ce96b2cfc5ee09 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Tue, 17 Aug 2021 07:34:03 +0200 Subject: gnu: git: Update to 2.33.0. * gnu/packages/version-control.scm (git): Update to 2.33.0. --- gnu/packages/version-control.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 95175251ad..15f68ecf3a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2020 Roel Janssen -;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 John D. Boy ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020, 2021 Vinicius Monego @@ -175,14 +175,14 @@ as well as the classic centralized workflow.") (define-public git (package (name "git") - (version "2.32.0") + (version "2.33.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "08rnm3ipjqdd2n31dw7mxl3iv9g4nxgc409krmz892a37kd43a38")))) + "0kqcs8nj5h7rh3q86pw5777awq7gn77lgxk88ynjl1rfz2snlg5z")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -202,7 +202,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "1hba3wh1fmhrwzw93a0m7q4kb3kwwwi1bx4457c4lkf94l2cpqqr")))) + "0cdwqhj6yx3rlzvvfh0jamzjva9svd8kxmb5kqsp8nz47yz8mlyn")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) -- cgit v1.2.3 From ea04295256329511b3201feaefb17900b05053b0 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Tue, 17 Aug 2021 20:25:52 +0200 Subject: gnu: git: Hide CVEs from the linter. * gnu/packages/version-control.scm (git)[properties]: Set 'properties' field. --- gnu/packages/version-control.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 15f68ecf3a..22bf9b408f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -538,6 +538,13 @@ as well as the classic centralized workflow.") (description "Git is a free distributed version control system designed to handle everything from small to very large projects with speed and efficiency.") + ;; XXX: Ignore this CVE to work around a name clash with the unrelated + ;; "cpe:2.3:a:jenkins:git" package. The proper fix is for (guix cve) to + ;; account for "vendor names". + (properties '((lint-hidden-cve . ("CVE-2018-1000182" + "CVE-2018-1000110" + "CVE-2019-1003010" + "CVE-2020-2136")))) (license license:gpl2) (home-page "https://git-scm.com/"))) -- cgit v1.2.3 From d31301dfe08076e5d229175b2cd093c6fe60a6d5 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 2 Aug 2021 14:15:39 +0530 Subject: gnu: Add python-pyan3. * gnu/packages/python-xyz.scm (python-pyan3): New variable. * gnu/packages/patches/python-pyan3-fix-absolute-path-bug.patch, gnu/packages/patches/python-pyan3-fix-positional-arguments.patch: New files. * gnu/local.mk: Register them. --- .../python-pyan3-fix-absolute-path-bug.patch | 160 +++++++++++++++++++++ .../python-pyan3-fix-positional-arguments.patch | 22 +++ gnu/packages/python-xyz.scm | 42 ++++++ 3 files changed, 224 insertions(+) create mode 100644 gnu/packages/patches/python-pyan3-fix-absolute-path-bug.patch create mode 100644 gnu/packages/patches/python-pyan3-fix-positional-arguments.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/python-pyan3-fix-absolute-path-bug.patch b/gnu/packages/patches/python-pyan3-fix-absolute-path-bug.patch new file mode 100644 index 0000000000..0b6a083fa3 --- /dev/null +++ b/gnu/packages/patches/python-pyan3-fix-absolute-path-bug.patch @@ -0,0 +1,160 @@ +From ac1bd55d07fd1bad2f4a92dc0809607c407d9140 Mon Sep 17 00:00:00 2001 +From: "Maciej A. Czyzewski" +Date: Wed, 9 Jun 2021 15:29:18 +0200 +Subject: [PATCH] feature: new params for graphviz + solves #70 + +- solve abs path bug #70 +- new params for graphviz (ranksep; layout) +- tested layout `dot`; `fdp` (square graph) +- updated `.gitignore` (files gen. after `visualize_pyan_architecture.sh`) +--- + .gitignore | 5 ++++ + README.md | 6 ++-- + pyan/main.py | 55 +++++++++++++++++++++++++++++++--- + visualize_pyan_architecture.sh | 5 ++++ + 4 files changed, 64 insertions(+), 7 deletions(-) + +diff --git a/.gitignore b/.gitignore +index 990fdc0c..93313aaf 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -162,3 +162,8 @@ htmlcov + .idea/ + .history/ + .vscode/ ++ ++# our vis. of architecture ++architecture.dot ++architecture.html ++architecture.svg +diff --git a/README.md b/README.md +index d1f19dcf..9e6919a3 100644 +--- a/README.md ++++ b/README.md +@@ -48,7 +48,7 @@ See `pyan3 --help`. + + Example: + +-`pyan *.py --uses --no-defines --colored --grouped --annotated --dot >myuses.dot` ++`pyan3 *.py --uses --no-defines --colored --grouped --annotated --dot >myuses.dot` + + Then render using your favorite GraphViz filter, mainly `dot` or `fdp`: + +@@ -56,11 +56,11 @@ Then render using your favorite GraphViz filter, mainly `dot` or `fdp`: + + Or use directly + +-`pyan *.py --uses --no-defines --colored --grouped --annotated --svg >myuses.svg` ++`pyan3 *.py --uses --no-defines --colored --grouped --annotated --svg >myuses.svg` + + You can also export as an interactive HTML + +-`pyan *.py --uses --no-defines --colored --grouped --annotated --html > myuses.html` ++`pyan3 *.py --uses --no-defines --colored --grouped --annotated --html > myuses.html` + + Alternatively, you can call `pyan` from a script + +diff --git a/pyan/main.py b/pyan/main.py +index 5d079714..b1a16f63 100644 +--- a/pyan/main.py ++++ b/pyan/main.py +@@ -141,6 +141,31 @@ def main(cli_args=None): + ), + ) + ++ parser.add_argument( ++ "--dot-ranksep", ++ default="0.5", ++ dest="ranksep", ++ help=( ++ "specifies the dot graph 'ranksep' property for " ++ "controlling desired rank separation, in inches. " ++ "Allowed values: [0.02 .. 1000.0]. " ++ "[dot only]" ++ ), ++ ) ++ ++ parser.add_argument( ++ "--graphviz-layout", ++ default="dot", ++ dest="layout", ++ help=( ++ "specifies the graphviz 'layout' property for " ++ "the name of the layout algorithm to use. " ++ "Allowed values: ['dot', 'neato', 'fdp', 'sfdp', 'twopi', 'circo']. " ++ "Recommended values: ['dot', 'fdp']. " ++ "[graphviz only]" ++ ), ++ ) ++ + parser.add_argument( + "-a", + "--annotated", +@@ -159,7 +184,12 @@ def main(cli_args=None): + + known_args, unknown_args = parser.parse_known_args(cli_args) + +- filenames = [fn2 for fn in unknown_args for fn2 in glob(fn, recursive=True)] ++ ++ filenames = [] ++ for fn in unknown_args: ++ for fn2 in glob(fn, recursive=True): ++ abs_fn2 = os.path.abspath(fn2) ++ filenames.append(abs_fn2) + + # determine root + if known_args.root is not None: +@@ -203,6 +233,11 @@ def main(cli_args=None): + handler = logging.FileHandler(known_args.logname) + logger.addHandler(handler) + ++ logger.debug(f"[files] {unknown_args}") ++ ++ if root: ++ root = os.path.abspath(root) ++ + v = CallGraphVisitor(filenames, logger=logger, root=root) + + if known_args.function or known_args.namespace: +@@ -222,13 +257,25 @@ def main(cli_args=None): + writer = None + + if known_args.dot: +- writer = DotWriter(graph, options=["rankdir=" + known_args.rankdir], output=known_args.filename, logger=logger) ++ writer = DotWriter(graph, options=[ ++ "rankdir=" + known_args.rankdir, ++ "ranksep=" + known_args.ranksep, ++ "layout=" + known_args.layout, ++ ], output=known_args.filename, logger=logger) + + if known_args.html: +- writer = HTMLWriter(graph, options=["rankdir=" + known_args.rankdir], output=known_args.filename, logger=logger) ++ writer = HTMLWriter(graph, options=[ ++ "rankdir=" + known_args.rankdir, ++ "ranksep=" + known_args.ranksep, ++ "layout=" + known_args.layout, ++ ], output=known_args.filename, logger=logger) + + if known_args.svg: +- writer = SVGWriter(graph, options=["rankdir=" + known_args.rankdir], output=known_args.filename, logger=logger) ++ writer = SVGWriter(graph, options=[ ++ "rankdir=" + known_args.rankdir, ++ "ranksep=" + known_args.ranksep, ++ "layout=" + known_args.layout, ++ ], output=known_args.filename, logger=logger) + + if known_args.tgf: + writer = TgfWriter(graph, output=known_args.filename, logger=logger) +diff --git a/visualize_pyan_architecture.sh b/visualize_pyan_architecture.sh +index 22c63342..81b6ca24 100755 +--- a/visualize_pyan_architecture.sh ++++ b/visualize_pyan_architecture.sh +@@ -2,3 +2,8 @@ + echo -ne "Pyan architecture: generating architecture.{dot,svg}\n" + python3 -m pyan pyan/*.py --no-defines --uses --colored --annotate --dot -V >architecture.dot 2>architecture.log + dot -Tsvg architecture.dot >architecture.svg ++echo -ne "Pyan architecture: generating architecture.{html,graphviz=fdp}\n" ++python3 -m pyan pyan/*.py --no-defines --uses \ ++ --grouped --nested-groups \ ++ --graphviz-layout fdp \ ++ --colored --html > architecture.html diff --git a/gnu/packages/patches/python-pyan3-fix-positional-arguments.patch b/gnu/packages/patches/python-pyan3-fix-positional-arguments.patch new file mode 100644 index 0000000000..81923d7a41 --- /dev/null +++ b/gnu/packages/patches/python-pyan3-fix-positional-arguments.patch @@ -0,0 +1,22 @@ +From 37404bb039bd9c5509b4aec8f61e360dfba50715 Mon Sep 17 00:00:00 2001 +From: Wenxin Ling +Date: Mon, 1 Mar 2021 15:21:16 +0100 +Subject: [PATCH] Fix positional arguments issue for CallGraphVisitor + +--- + pyan/main.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyan/main.py b/pyan/main.py +index 18821a14..5d079714 100644 +--- a/pyan/main.py ++++ b/pyan/main.py +@@ -203,7 +203,7 @@ def main(cli_args=None): + handler = logging.FileHandler(known_args.logname) + logger.addHandler(handler) + +- v = CallGraphVisitor(filenames, logger, root=root) ++ v = CallGraphVisitor(filenames, logger=logger, root=root) + + if known_args.function or known_args.namespace: + diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 56920f68c3..87a90ab680 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26232,3 +26232,45 @@ for the Go language tool chain; it adapts to different calling conventions and application binary interfaces (ABIs); it takes care of register allocation; it supports x86_64 instructions up to AVX-512 and SHA.") (license license:bsd-2)))) + +(define-public python-pyan3 + (package + (name "python-pyan3") + (version "1.2.0") + (source + (origin + ;; Source tarball on PyPI lacks tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/Technologicat/pyan") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1367x25rcy2y8f0x9c2dbxl2qgdln3arr7ddyzybz2c28g6jrv5z")) + (patches (search-patches "python-pyan3-fix-positional-arguments.patch" + "python-pyan3-fix-absolute-path-bug.patch")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Extend PYTHONPATH so the built package will be found. + (setenv "PYTHONPATH" + (string-append (getcwd) ":" (getenv "PYTHONPATH"))) + (invoke "pytest"))))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-wheel" ,python-wheel))) + (propagated-inputs + `(("python-jinja2" ,python-jinja2))) + (home-page "https://github.com/Technologicat/pyan") + (synopsis "Offline call graph generator for Python 3") + (description "Pyan takes one or more Python source files, performs +a (rather superficial) static analysis, and constructs a directed graph of the +objects in the combined source, and how they define or use each other. The +graph can be output for rendering by GraphViz or yEd.") + (license license:gpl2))) -- cgit v1.2.3 From 75e7e4e71cfe7a89d78c953bf85dbbce41869f52 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 12 Aug 2021 22:59:17 +0000 Subject: gnu: Add gcolor3. * gnu/packages/gnome.scm (gcolor3): New variable. Signed-off-by: Arun Isaac --- gnu/packages/gnome.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 98c121ac22..37e39137e1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9978,6 +9978,38 @@ detailed properties. It is an easy way to find the character you might only know by its Unicode name or code point.") (license license:gpl3+)))) +(define-public gcolor3 + (package + (name "gcolor3") + (version "2.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/World/gcolor3") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1igqmach1vhcrvbpw346pmkbb5kabbb806ssswrvkp569n700wmc")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) + (native-inputs + `(("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gtk+:bin" ,gtk+ "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk+" ,gtk+) + ("libportal" ,libportal))) + (home-page "https://www.hjdskes.nl/projects/gcolor3/") + (synopsis "Simple color chooser written in GTK3") + (description "Color Picker is a simple color chooser written in GTK3. It +supports both X and Wayland display servers.") + (license license:gpl2+))) + (define-public bluefish (package (name "bluefish") -- cgit v1.2.3 From 672739cc9d2f3450b500b9318c71c47864b240c9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 18 Aug 2021 17:29:41 +0200 Subject: gnu: emacs-org-re-reveal: Update to 3.10.0. * gnu/packages/emacs-xyz.scm (emacs-org-re-reveal): Update to 3.10.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4a0ab76fe6..ea832db6fe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18764,7 +18764,7 @@ powerful Org contents.") (define-public emacs-org-re-reveal (package (name "emacs-org-re-reveal") - (version "3.9.0") + (version "3.10.0") (source (origin (method git-fetch) (uri (git-reference @@ -18773,7 +18773,7 @@ powerful Org contents.") (file-name (git-file-name name version)) (sha256 (base32 - "1w6zvgfcyjqlxy4s13h7w66vv0fcid57s6vigzgnzi666w86fdyh")))) + "1bc01ybs498x0b6l136czp2y6js8ngwc9jkrmahnqdkkvm65il5y")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-htmlize" ,emacs-htmlize) -- cgit v1.2.3 From fe98d354126c26140c8df2cbcd268b0ba772148b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 18 Aug 2021 17:33:14 +0200 Subject: gnu: emacs-magit-gerrit: Update to 0.4. * gnu/packages/emacs-xyz.scm (emacs-magit-gerrit): Update to 0.4. --- gnu/packages/emacs-xyz.scm | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ea832db6fe..3ca851cb78 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19062,30 +19062,27 @@ time is being spent during Emacs startup in order to optimize startup time.") (license license:gpl3+))) (define-public emacs-magit-gerrit - (let ((version "0.3") - (revision "1") - (commit "ece6f369694aca17f3ac166ed2801b432acfe20d")) - (package - (name "emacs-magit-gerrit") - (version (git-version version revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terranpro/magit-gerrit") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0mms0gxv9a3ns8lk5k2wjibm3088y1cmpr3axjdh6ppv7r5wdvii")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-magit" ,emacs-magit))) - (home-page "https://github.com/terranpro/magit-gerrit") - (synopsis "Magit extension for Gerrit") - (description "This Magit extension provides integration with Gerrit, + (package + (name "emacs-magit-gerrit") + (version "0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/terranpro/magit-gerrit") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1q4kcr2ha2kir7pj0cshmgllgq51543syxkkk5jk3ksfiaba4crj")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-magit" ,emacs-magit))) + (home-page "https://github.com/terranpro/magit-gerrit") + (synopsis "Magit extension for Gerrit") + (description "This Magit extension provides integration with Gerrit, which makes it possible to conduct Gerrit code reviews directly from within Emacs.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-magit-org-todos-el (package -- cgit v1.2.3 From 503272077e320b2cc3080873c76c6bcb87d4a9b0 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Wed, 18 Aug 2021 18:26:39 +0200 Subject: gnu: emacs-consult: Update to 0.11. * gnu/packages/emacs-xyz.scm (emacs-consult): Update to 0.11. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3ca851cb78..0430a5b38d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8265,7 +8265,7 @@ style, or as multiple word prefixes.") (define-public emacs-consult (package (name "emacs-consult") - (version "0.10") + (version "0.11") (source (origin (method git-fetch) @@ -8273,7 +8273,7 @@ style, or as multiple word prefixes.") (url "https://github.com/minad/consult") (commit version))) (sha256 - (base32 "131342149xvmrcr3iwmx05id7358158i6m9an8izdpggsnwhs3i4")) + (base32 "01kx3zg858bqyajglamxn319qabycnabzj73kl4x7sd55p2yi179")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs -- cgit v1.2.3 From 9b2d2c622363bb93e91b38ad66642f0df3a67b4f Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Fri, 13 Aug 2021 10:46:25 +0200 Subject: gnu: Add emacs-srfi. * gnu/packages/emacs-xyz.scm (emacs-srfi): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0430a5b38d..24fcfda835 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21076,6 +21076,31 @@ viewing files with long lines. It is included as standard with Emacs 27 or later.") (license license:gpl3+))) +(define-public emacs-srfi + ;; SRFI data gets updated quite frequently; lastest tag is from + ;; 2020; commit from 2021-08-12. + (let ((commit "e31bf04a3be3aad1286b7fe919c2e4810aae751e") + (revision "0")) + (package + (name "emacs-srfi") + (version (git-version "0.3" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/srfi-explorations/emacs-srfi") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01n3yrjrdl2gdhvgd56lpjqg9d82mmrnb0h6hxdx4h5hy8sbk2p4")))) + (build-system emacs-build-system) + (home-page "https://github.com/srfi-explorations/emacs-srfi") + (synopsis "Scheme Requests for Implementation browser in Emacs") + (description + "This package shows a list of all SRFIs and provides commands to visit +them in your web browser.") + (license license:expat)))) + (define-public emacs-github-review (let ((commit "a13a3b4f1b6114a32af843971a145ab880f51232") (revision "2")) -- cgit v1.2.3 From 62eb249f8ae5423ac7dc1bd56b529bfee1ffa3f0 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Wed, 18 Aug 2021 19:07:50 +0200 Subject: gnu: Add emacs-pcmpl-args. * gnu/packages/emacs-xyz.scm (emacs-pcmpl-args): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 24fcfda835..bea6288976 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28411,6 +28411,28 @@ Features: @end itemize\n") (license license:gpl3+))) +(define-public emacs-pcmpl-args + (package + (name "emacs-pcmpl-args") + (version "0.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JonWaltman/pcmpl-args.el") + (commit version))) + (sha256 + (base32 "19xwwpfcf0l9jh7xixyjd5adivj27jw00zvxb7n1240k5p332pzi")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (home-page "https://github.com/JonWaltman/pcmpl-args.el") + (synopsis "Enhanced shell command completion") + (description + "pcmpl-args extends option and argument completion of shell commands read +by Emacs. It is intended to make shell completion in Emacs comparable to the +rather excellent completion provided by both Bash and Zsh.") + (license license:gpl3+))) + (define-public emacs-shell-command+ (package (name "emacs-shell-command+") -- cgit v1.2.3 From 0a32302df33a539b0805ad3574654a9de123547b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 Aug 2021 16:32:48 -0400 Subject: gnu: linux-libre: Update to 5.13.12. * gnu/packages/linux.scm (linux-libre-5.13-version): Update to 5.13.12. (linux-libre-5.13-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 803ef0d9bd..5677580164 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -357,7 +357,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.13-version "5.13.11") +(define-public linux-libre-5.13-version "5.13.12") (define deblob-scripts-5.13 (linux-libre-deblob-scripts linux-libre-5.13-version @@ -365,7 +365,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "153jf5l5x4438zgxwggaky2ahjlfl48j438vhpzks6h77lzc51a5"))) (define-public linux-libre-5.13-pristine-source (let ((version linux-libre-5.13-version) - (hash (base32 "0za59652wrh4mlhd9w3dx4y1nnk8nrj9hb56pssgdckdvp7rp4l0"))) + (hash (base32 "0948w1zc2gqnl8x60chjqngfzdi0kcxm12i1nx3nx4ksiwj5vc98"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.13))) -- cgit v1.2.3 From 1bcd652cb955545f8b785b68cd289d9a2afc6f80 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 Aug 2021 16:33:08 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.60. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.60. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5677580164..1f2a7fb703 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -373,7 +373,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.59") +(define-public linux-libre-5.10-version "5.10.60") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -381,7 +381,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0c9x07gplzajm0h5if3fpw2rvfb7psw3yp7i2n6ws7ggq1dvmki2"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "107anv16khx055rpkvfd532rdcfg4ffbs7bhp45hdqi3bz0ssg1k"))) + (hash (base32 "13gpamqj0shvad4nd9v11iv8qdfbjgb242nbvcim2z3c7xszfvv9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From bf8ee37e73933682293c6fc8738d753feff88a38 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 Aug 2021 16:33:22 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.142. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.142. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1f2a7fb703..7b92be4b9c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -386,7 +386,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.141") +(define-public linux-libre-5.4-version "5.4.142") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -394,7 +394,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0a4c2fbv0j1p8fliz62ycw319nzw9q5gn7g9z1bkifn51hv6sqqh"))) + (hash (base32 "0l8l4cg04p5vx890jm45r35js1v0nljd0lp5qwkvlr45jql5fy4r"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 343a0bb1578d772de7abcdd7045f2c54be3dbc4b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 19 Aug 2021 22:13:05 -0400 Subject: gnu: duperemove: Update to 0.11.3. * gnu/packages/disk.scm (duperemove): Update to 0.11.3. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 0495be3a36..95f712966b 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -688,7 +688,7 @@ a card with a smaller capacity than stated.") (define-public duperemove (package (name "duperemove") - (version "0.11.2") + (version "0.11.3") (source (origin (method git-fetch) @@ -696,7 +696,7 @@ a card with a smaller capacity than stated.") (url "https://github.com/markfasheh/duperemove") (commit (string-append "v" version)))) (sha256 - (base32 "1a87mka2sfzhbch2jip6wlvvs0glxq9lqwmyrp359d1rmwwmqiw9")) + (base32 "0jwxmhadv2f1mx7gan4gk0xwrjr5g2xa71z1rp0knc1acbkhqdas")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From 27952318a58fe264080c351615cc73d40ed458c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 20 Aug 2021 10:42:11 +0200 Subject: gnu: fastp: Update to 0.20.1. * gnu/packages/bioinformatics.scm (fastp): Update to 0.20.1. [arguments]: Set PREFIX instead of BINDIR. --- gnu/packages/bioinformatics.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5785e27a85..426926a37c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4583,7 +4583,7 @@ The main functions of FastQC are: (define-public fastp (package (name "fastp") - (version "0.14.1") + (version "0.20.1") (source (origin (method git-fetch) @@ -4593,19 +4593,18 @@ The main functions of FastQC are: (file-name (git-file-name name version)) (sha256 (base32 - "1r6ms5zbf5rps4rgp4z73nczadl00b5rqylw8f684isfz27dp0xh")))) + "0ly8mxdvrcy23jwxyppysx3dhb1lwsqhfbgpyvargxhfk6k700x4")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are none #:make-flags - (list (string-append "BINDIR=" (assoc-ref %outputs "out") "/bin")) + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (delete 'configure) (add-before 'install 'create-target-dir (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "out") "/bin")) - #t))))) + (mkdir-p (string-append (assoc-ref outputs "out") "/bin"))))))) (inputs `(("zlib" ,zlib))) (home-page "https://github.com/OpenGene/fastp/") -- cgit v1.2.3 From bfadab9177866f0d638449451e1dbde2b36c3d51 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:15 +0200 Subject: gnu: minetest: Respect --without-tests. * gnu/packages/games.scm (minetest)[arguments]<#:phases>{check}: Use 'tests?' instead of ',(%current-target-system)'. Remove trailing #t. Signed-off-by: Leo Prikler --- gnu/packages/games.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 28cd0cdc71..37d658ee13 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3633,13 +3633,12 @@ match, cannon keep, and grave-itation pit.") (string-append (getcwd) "/games")) ; for check #t)) (replace 'check - (lambda _ + (lambda* (#:key tests? #:allow-other-keys) ;; Thanks to our substitutions, the tests should also run ;; when invoked on the target outside of `guix build'. - (unless ,(%current-target-system) + (when tests? (setenv "HOME" "/tmp") - (invoke "src/minetest" "--run-unittests")) - #t))))) + (invoke "src/minetest" "--run-unittests"))))))) (native-search-paths (list (search-path-specification (variable "MINETEST_SUBGAME_PATH") -- cgit v1.2.3 From bb61100ee320b749f644f6847dba5bcb92d3c5aa Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:16 +0200 Subject: gnu: minetest: Search for mods in MINETEST_MOD_PATH. * gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch: New file. * gnu/packages/games.scm (minetest)[source]{patches}: Add it. (minetest)[native-search-paths]: Add "MINETEST_MOD_PATH". * gnu/local.mk (dist_patch_DATA): Add the patch. Signed-off-by: Leo Prikler --- gnu/packages/games.scm | 8 +- .../patches/minetest-add-MINETEST_MOD_PATH.patch | 156 +++++++++++++++++++++ 2 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 37d658ee13..291733234e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3596,6 +3596,9 @@ match, cannon keep, and grave-itation pit.") (base32 "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8")) (modules '((guix build utils))) + (patches + (search-patches + "minetest-add-MINETEST_MOD_PATH.patch")) (snippet '(begin ;; Delete bundled libraries. @@ -3642,7 +3645,10 @@ match, cannon keep, and grave-itation pit.") (native-search-paths (list (search-path-specification (variable "MINETEST_SUBGAME_PATH") - (files '("share/minetest/games"))))) + (files '("share/minetest/games"))) + (search-path-specification + (variable "MINETEST_MOD_PATH") + (files '("share/minetest/mods"))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs diff --git a/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch b/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch new file mode 100644 index 0000000000..a74034a2c5 --- /dev/null +++ b/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch @@ -0,0 +1,156 @@ +From d10ea2ad7efc2364a8a2007b4c6d3e85511e2f84 Mon Sep 17 00:00:00 2001 +From: Maxime Devos +Date: Tue, 3 Aug 2021 01:00:23 +0200 +Subject: [PATCH] Add environment variable MINETEST_MOD_PATH + +This adds an environment variable MINETEST_MOD_PATH. +When it exists, Minetest will look there for mods +in addition to ~/.minetest/mods/. Mods can still be +installed to ~/.minetest/mods/ with the built-in installer. + +With thanks to Leo Prikler. +--- + builtin/mainmenu/pkgmgr.lua | 7 +++---- + doc/menu_lua_api.txt | 8 +++++++- + src/content/subgames.cpp | 11 +++++++++++ + src/script/lua_api/l_mainmenu.cpp | 23 +++++++++++++++++++++++ + src/script/lua_api/l_mainmenu.h | 2 ++ + 5 files changed, 46 insertions(+), 5 deletions(-) + +diff --git a/builtin/mainmenu/pkgmgr.lua b/builtin/mainmenu/pkgmgr.lua +index 787936e31..d8fba0ebe 100644 +--- a/builtin/mainmenu/pkgmgr.lua ++++ b/builtin/mainmenu/pkgmgr.lua +@@ -682,10 +682,9 @@ function pkgmgr.preparemodlist(data) + local game_mods = {} + + --read global mods +- local modpath = core.get_modpath() +- +- if modpath ~= nil and +- modpath ~= "" then ++ local modpaths = core.get_modpaths() ++ --XXX what was ‘modpath ~= ""’ and ‘modpath ~= nil’ for? ++ for _,modpath in ipairs(modpaths) do + get_mods(modpath,global_mods) + end + +diff --git a/doc/menu_lua_api.txt b/doc/menu_lua_api.txt +index b3975bc1d..132444b14 100644 +--- a/doc/menu_lua_api.txt ++++ b/doc/menu_lua_api.txt +@@ -218,7 +218,13 @@ Package - content which is downloadable from the content db, may or may not be i + * returns path to global user data, + the directory that contains user-provided mods, worlds, games, and texture packs. + * core.get_modpath() (possible in async calls) +- * returns path to global modpath ++ * returns path to global modpath, where mods can be installed ++* core.get_modpaths() (possible in async calls) ++ * returns list of paths to global modpaths, where mods have been installed ++ ++ The difference with "core.get_modpath" is that no mods should be installed in these ++ directories by Minetest -- they might be read-only. ++ + * core.get_clientmodpath() (possible in async calls) + * returns path to global client-side modpath + * core.get_gamepath() (possible in async calls) +diff --git a/src/content/subgames.cpp b/src/content/subgames.cpp +index e9dc609b0..d73f95a1f 100644 +--- a/src/content/subgames.cpp ++++ b/src/content/subgames.cpp +@@ -61,6 +61,12 @@ std::string getSubgamePathEnv() + return subgame_path ? std::string(subgame_path) : ""; + } + ++std::string getModPathEnv() ++{ ++ char *mod_path = getenv("MINETEST_MOD_PATH"); ++ return mod_path ? std::string(mod_path) : ""; ++} ++ + SubgameSpec findSubgame(const std::string &id) + { + if (id.empty()) +@@ -110,6 +116,11 @@ SubgameSpec findSubgame(const std::string &id) + std::set mods_paths; + if (!user_game) + mods_paths.insert(share + DIR_DELIM + "mods"); ++ ++ Strfnd mod_search_paths(getModPathEnv()); ++ while (!mod_search_paths.at_end()) ++ mods_paths.insert(mod_search_paths.next(PATH_DELIM)); ++ + if (user != share || user_game) + mods_paths.insert(user + DIR_DELIM + "mods"); + +diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp +index 3e9709bde..903ac3a22 100644 +--- a/src/script/lua_api/l_mainmenu.cpp ++++ b/src/script/lua_api/l_mainmenu.cpp +@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., + #include "lua_api/l_internal.h" + #include "common/c_content.h" + #include "cpp_api/s_async.h" ++#include "util/strfnd.h" + #include "gui/guiEngine.h" + #include "gui/guiMainMenu.h" + #include "gui/guiKeyChangeMenu.h" +@@ -502,6 +503,26 @@ int ModApiMainMenu::l_get_modpath(lua_State *L) + return 1; + } + ++/******************************************************************************/ ++int ModApiMainMenu::l_get_modpaths(lua_State *L) ++{ ++ const char *c_modpath = getenv("MINETEST_MOD_PATH"); ++ if (c_modpath == NULL) ++ c_modpath = ""; ++ int index = 1; ++ lua_newtable(L); ++ Strfnd mod_search_paths{std::string(c_modpath)}; ++ while (!mod_search_paths.at_end()) { ++ std::string component = mod_search_paths.next(PATH_DELIM); ++ lua_pushstring(L, component.c_str()); ++ lua_rawseti(L, -2, index); ++ index++; ++ } ++ ModApiMainMenu::l_get_modpath(L); ++ lua_rawseti(L, -2, index); ++ return 1; ++} ++ + /******************************************************************************/ + int ModApiMainMenu::l_get_clientmodpath(lua_State *L) + { +@@ -949,6 +970,7 @@ void ModApiMainMenu::Initialize(lua_State *L, int top) + API_FCT(get_mapgen_names); + API_FCT(get_user_path); + API_FCT(get_modpath); ++ API_FCT(get_modpaths); + API_FCT(get_clientmodpath); + API_FCT(get_gamepath); + API_FCT(get_texturepath); +@@ -983,6 +1005,7 @@ void ModApiMainMenu::InitializeAsync(lua_State *L, int top) + API_FCT(get_mapgen_names); + API_FCT(get_user_path); + API_FCT(get_modpath); ++ API_FCT(get_modpaths); + API_FCT(get_clientmodpath); + API_FCT(get_gamepath); + API_FCT(get_texturepath); +diff --git a/src/script/lua_api/l_mainmenu.h b/src/script/lua_api/l_mainmenu.h +index 33ac9e721..a6a54a2cb 100644 +--- a/src/script/lua_api/l_mainmenu.h ++++ b/src/script/lua_api/l_mainmenu.h +@@ -112,6 +112,8 @@ class ModApiMainMenu: public ModApiBase + + static int l_get_modpath(lua_State *L); + ++ static int l_get_modpaths(lua_State *L); ++ + static int l_get_clientmodpath(lua_State *L); + + static int l_get_gamepath(lua_State *L); +-- +2.32.0 + -- cgit v1.2.3 From 7b9d5b6ca023647158bdc0be18ff0f6412097c41 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:17 +0200 Subject: gnu: minetest: New package module. Aside from the 'minetest-topic' procedure which will be used for the 'home-page' field of some packages, this module is currently empty. The 'contentdb' importer defined in the following patches will be used to populate this module. * gnu/packages/minetest.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 gnu/packages/minetest.scm (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm new file mode 100644 index 0000000000..f8aca3005c --- /dev/null +++ b/gnu/packages/minetest.scm @@ -0,0 +1,26 @@ +;;; Copyright © 2021 Maxime Devos +;;; 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 minetest) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system minetest) + #:use-module ((guix licenses) #:prefix license:)) + +(define-public (minetest-topic topic-id) + "Return an URL (as a string) pointing to the forum topic with +numeric identifier TOPIC-ID on the official Minetest forums." + (string-append "https://forum.minetest.net/viewtopic.php?t=" + (number->string topic-id))) -- cgit v1.2.3 From 60a30d33f65ebc44633c4075972f5b0176327af5 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:21 +0200 Subject: gnu: Add minetest-mesecons. * gnu/packages/minetest.scm (minetest-mesecons): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index f8aca3005c..d99efa4625 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -24,3 +24,39 @@ numeric identifier TOPIC-ID on the official Minetest forums." (string-append "https://forum.minetest.net/viewtopic.php?t=" (number->string topic-id))) + +(define-public minetest-mesecons + ;; The release on ContentDB does not have its own version number. + (let ((commit "db5879706d04d3480bc4863ce0c03fa73e5f10c7") + (revision "0")) + (package + (name "minetest-mesecons") + (version (git-version "1.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest-mods/mesecons") + (commit commit))) + (sha256 + (base32 "04m9s9l3frw1lgki41hgvjsw2zkrvfv0sy750b6j12arzb3lv645")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (home-page "https://mesecons.net") + (synopsis + "Digital circuitry for Minetest, including wires, buttons and lights") + (description + "Mesecons is a mod for Minetest implementing various items related +to digital circuitry, such as wires, buttons, lights and programmable +controllers. Among other things, there are also pistons, solar panels, +pressure plates and note blocks. + +Mesecons has a similar goal to Redstone in Minecraft, but works in its own way, +with different rules and mechanics.") + ;; LGPL for code, CC-BY-SA for textures. + ;; The README.md and COPYING.txt disagree about the "+" in license:lgpl3+. + ;; For now, assume README.md is correct. Upstream has been asked to + ;; correct the inconsistency: + ;; . + (license (list license:lgpl3+ license:cc-by-sa3.0)) + (properties `((upstream-name . "Jeija/mesecons")))))) -- cgit v1.2.3 From a471acd9d3b7ab9dc5c2cd4fb8aceb1077d6c0b2 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:22 +0200 Subject: gnu: Add minetest-basic-materials. * gnu/packages/minetest.scm (minetest-basic-materials): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index d99efa4625..97d4d3c9ac 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -25,6 +25,31 @@ numeric identifier TOPIC-ID on the official Minetest forums." (string-append "https://forum.minetest.net/viewtopic.php?t=" (number->string topic-id))) +(define-public minetest-basic-materials + (package + (name "minetest-basic-materials") + ;; Upstream uses dates as version numbers. + (version "2021-01-30") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/VanessaE/basic_materials.git") + (commit "e72665b2ed98d7be115779a32d35e6d9ffa231bd"))) + (sha256 + (base32 "0v6l3lrjgshy4sccjhfhmfxc3gk0cdy73qb02i9wd2vw506v5asx")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (home-page (minetest-topic 21000)) + (synopsis "Some \"basic\" materials and items for other Minetest mods to use") + (description + "The Minetest mod \"basic_materials\" provides a small selection of +\"basic\" materials and items that other mods should use when possible -- things +like steel bars and chains, wire, plastic strips and sheets, and more.") + (license + (list license:cc-by-sa4.0 license:lgpl3)) + (properties `((upstream-name . "VanessaE/basic_materials"))))) + (define-public minetest-mesecons ;; The release on ContentDB does not have its own version number. (let ((commit "db5879706d04d3480bc4863ce0c03fa73e5f10c7") -- cgit v1.2.3 From 46a28e01b4bb47feab064d9ed327a99313e1d17e Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:23 +0200 Subject: gnu: Add minetest-unifieddyes. * gnu/packages/minetest.scm (minetest-unifieddyes): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 97d4d3c9ac..8b9eb30a6a 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -85,3 +85,32 @@ with different rules and mechanics.") ;; . (license (list license:lgpl3+ license:cc-by-sa3.0)) (properties `((upstream-name . "Jeija/mesecons")))))) + +(define-public minetest-unifieddyes + (package + (name "minetest-unifieddyes") + ;; Upstream uses dates as version numbers. + (version "2021-04-20-1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/VanessaE/unifieddyes") + (commit "ff3b2d30fa0df5c7181fdd401b989de6271c3bb3"))) + (sha256 + (base32 + "0rba9n192xcpmxwnq7ixb6mn32gkpic247j3w4mwinrqcyscacsv")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (propagated-inputs + `(("minetest-basic-materials" ,minetest-basic-materials))) + (home-page (minetest-topic 2178)) + (synopsis + "Unified Dyes expands the standard dye set of Minetest to up to 256 colours") + (description "The purpose of this mod originally was to supply a complete +set of colours for Minetest mod authors to use for colourised nodes or +reference in recipes. Since the advent of the default dyes mod in the standard +Minetest game, this mod has become an extension of the default mod an a library +for general colour handling.") + (license license:gpl2+) + (properties `((upstream-name . "VanessaE/unifieddyes"))))) -- cgit v1.2.3 From 4535a187ccb32aa8a906394977c251e3aa95b4b2 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:24 +0200 Subject: gnu: Add minetest-pipeworks. * gnu/packages/minetest.scm (minetest-pipeworks): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 8b9eb30a6a..782166daef 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -86,6 +86,37 @@ with different rules and mechanics.") (license (list license:lgpl3+ license:cc-by-sa3.0)) (properties `((upstream-name . "Jeija/mesecons")))))) +(define-public minetest-pipeworks + (package + (name "minetest-pipeworks") + ;; Upstream uses dates as version numbers. + (version "2021-04-14-1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/VanessaE/pipeworks") + (commit "db6d1bd9c109e1e543b97cc3fa8a11400da23bcd"))) + (sha256 + (base32 "1flhcnf17dn1v86kcg47a1n4cb0lybd11ncxrkxn3wmf10ibsrm0")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (propagated-inputs + `(("minetest-basic-materials" ,minetest-basic-materials))) + (home-page (minetest-topic 2155)) + (synopsis "Pipes, item-transport tubes and related devices for Minetest") + (description + "Pipeworks is a mod for Minetest implementing 3D pipes and tubes for +transporting liquids and items and some related devices. Pipes and tubes can +go horizontally or vertically. Item tubes can also be used for sorting items +and extracting items from chests or putting items in chests. Autocrafters can +automatically follow craft recipes to make new items and can be fed by item +tubes. Deployers can place items in the world as a player would. Node +breakers simulate a player punching a node.") + ;; CC-BY-SA for textures, LGPL for code + (license (list license:cc-by-sa4.0 license:lgpl3)) + (properties `((upstream-name . "VanessaE/pipeworks"))))) + (define-public minetest-unifieddyes (package (name "minetest-unifieddyes") -- cgit v1.2.3 From 680131246fe261329ac6af01663eae245ea7ef09 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:25 +0200 Subject: gnu: Add minetest-coloredwood. * gnu/packages/minetest.scm (minetest-coloredwood): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 782166daef..4c542c6061 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -50,6 +50,34 @@ like steel bars and chains, wire, plastic strips and sheets, and more.") (list license:cc-by-sa4.0 license:lgpl3)) (properties `((upstream-name . "VanessaE/basic_materials"))))) +(define-public minetest-coloredwood + (package + (name "minetest-coloredwood") + ;; Upstream uses dates as version numbers. + (version "2021-04-14-1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/VanessaE/coloredwood") + (commit "be4df6fc889419155bed8638bbb752493e78cbd5"))) + (sha256 + (base32 "1swirfk6b4xfbiwv8adyw5yl2lyfpp8ymfipzq9ivyvmif8nl3ki")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (propagated-inputs + `(("minetest-unifieddyes" ,minetest-unifieddyes))) + (home-page (minetest-topic 2411)) + (synopsis "Painted wood in Minetest") + (description + "This Minetest mod provides hundreds of colours of wood and fences to +Minetest, using Unified Dyes. If the \"moreblocks\" mod is active, +coloured and cut wood shapes are provided as well.") + (license + ;; LGPL for code, CC-BY-SA for textures + (list license:cc-by-sa4.0 license:lgpl3)) + (properties `((upstream-name . "VanessaE/coloredwood"))))) + (define-public minetest-mesecons ;; The release on ContentDB does not have its own version number. (let ((commit "db5879706d04d3480bc4863ce0c03fa73e5f10c7") -- cgit v1.2.3 From facd787c2c0cd2b6a489f19b6351ab2c6936b392 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:26 +0200 Subject: gnu: Add minetest-ethereal. * gnu/packages/minetest.scm (minetest-ethereal): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 4c542c6061..a1aa90276d 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -78,6 +78,35 @@ coloured and cut wood shapes are provided as well.") (list license:cc-by-sa4.0 license:lgpl3)) (properties `((upstream-name . "VanessaE/coloredwood"))))) +(define-public minetest-ethereal + ;; ContentDB release 2021-07-28 is slightly ahead of the + ;; initial version 1.29 -- i.e., some released changes have been + ;; made to version 1.29 without a corresponding version bump. + (let ((commit "7670c1da9274901f57f6682384af2b3bae005a86") + (revision "0")) + (package + (name "minetest-ethereal") + (version (git-version "1.29" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/TenPlus1/ethereal") + (commit commit))) + (sha256 + (base32 "1hal8bq4fydsip7s8rqz4vlaaqy9rhzxmryd0j2qnqm9286yjgkk")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (home-page (minetest-topic 14638)) + (synopsis "The Ethereal mod adds many new biomes to Minetest") + (description + "The Ethereal Minetest mod uses the v7 map generator to add many new +biomes to the world. It adds new trees, plants, food items, tweaks and some +special items, intending to make an interesting adventure.") + ;; CC0: some textures + (license (list license:cc0 license:expat)) + (properties `((upstream-name . "TenPlus1/ethereal")))))) + (define-public minetest-mesecons ;; The release on ContentDB does not have its own version number. (let ((commit "db5879706d04d3480bc4863ce0c03fa73e5f10c7") @@ -157,8 +186,7 @@ breakers simulate a player punching a node.") (url "https://gitlab.com/VanessaE/unifieddyes") (commit "ff3b2d30fa0df5c7181fdd401b989de6271c3bb3"))) (sha256 - (base32 - "0rba9n192xcpmxwnq7ixb6mn32gkpic247j3w4mwinrqcyscacsv")) + (base32 "0rba9n192xcpmxwnq7ixb6mn32gkpic247j3w4mwinrqcyscacsv")) (file-name (git-file-name name version)))) (build-system minetest-mod-build-system) (propagated-inputs -- cgit v1.2.3 From 7479d8425cd356bfc763dff763d85361f83b1e19 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:27 +0200 Subject: gnu: Add minetest-technic. * gnu/packages/minetest.scm (minetest-technic): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index a1aa90276d..bb914f32b4 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -174,6 +174,41 @@ breakers simulate a player punching a node.") (license (list license:cc-by-sa4.0 license:lgpl3)) (properties `((upstream-name . "VanessaE/pipeworks"))))) +(define-public minetest-technic + (package + (name "minetest-technic") + ;; Upstream doesn't keep version numbers, so use the release + ;; date on ContentDB instead. + (version "2021-04-15") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest-mods/technic") + (commit "1c219487d3f4dd03c01ff9aa1f298c7c18c7e189"))) + (sha256 + (base32 "1k9hdgzp7jnhsk6rgrlrv1lr5xrmh8ln4wv6r25v6f0fwbyj57sf")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (propagated-inputs + `(("minetest-pipeworks" ,minetest-pipeworks) + ("minetest-basic-materials" ,minetest-basic-materials))) + (home-page (minetest-topic 2538)) + (synopsis "Machinery and automation for Minetest") + (description + "This Minetest mod adds machinery and automation to Minetest. +It adds various ores that can be processed for constructing various +machinery, such as power generators, force field emitters, quarries +and a workshop for repairing tools. Most machines are electrically +powered.") + ;; CC BY-SA 3.0: some texture + ;; WTFPL: some textures + ;; CC BY-SA3.0: some textures + ;; CC BY-SA4.0: some sounds + (license (list license:lgpl2.1+ license:cc-by-sa3.0 license:cc-by-sa4.0 + license:wtfpl2)) + (properties `((upstream-name . "RealBadAngel/technic"))))) + (define-public minetest-unifieddyes (package (name "minetest-unifieddyes") -- cgit v1.2.3 From 01c697329660ffce118724cfc44c02fa0177b7d3 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:28 +0200 Subject: gnu: Add minetest-throwing. * gnu/packages/minetest.scm (minetest-throwing): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index bb914f32b4..4566d94489 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -209,6 +209,33 @@ powered.") license:wtfpl2)) (properties `((upstream-name . "RealBadAngel/technic"))))) +(define-public minetest-throwing + ;; The latest release on ContentDB is ahead of the latet + ;; tagged commit. + (let ((commit "31f0cf5f868673dc82f24ddc432b45c9cd282d27") + (revision "0")) + (package + (name "minetest-throwing") + (version (git-version "1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest-mods/throwing") + (commit commit))) + (sha256 + (base32 "1s5kkr6rxxv2dhbbjzv62gw1s617hnpjavw1v9fv11v3mgigdfjb")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (home-page (minetest-topic 16365)) + (synopsis "API for throwing things in Minetest") + (description + "This Minetest mod provides an API for registering throwable things and +throwing things like arrows. However, this mod does not provide an actual +arrow and bow, but @code{minetest-throwing-arrows} does.") + (license license:mpl2.0) + (properties `((upstream-name . "Palige/throwing")))))) + (define-public minetest-unifieddyes (package (name "minetest-unifieddyes") -- cgit v1.2.3 From 41f5f99b12179a0823f21b4394df2a183c5ca441 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:29 +0200 Subject: gnu: Add minetest-throwing-arrows. * gnu/packages/minetest.scm (minetest-throwing-arrows): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 4566d94489..1f785098f9 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -236,6 +236,36 @@ arrow and bow, but @code{minetest-throwing-arrows} does.") (license license:mpl2.0) (properties `((upstream-name . "Palige/throwing")))))) +(define-public minetest-throwing-arrows + ;; There is only one tagged commit (version 1.1), + ;; there are no releases on ContentDB and the latest + ;; commit has a compatibility fix for Minetest 5.4.0-dev. + (let ((commit "059cc897af0aebfbd2c54ac5588f2b842f44f159") + (revision "0")) + (package + (name "minetest-throwing-arrows") + (version (git-version "1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest-mods/throwing_arrows") + (commit commit))) + (sha256 + (base32 "0m2pmccpfxn878zd00pmrpga2h6gknz4f3qprck0fq94mksmwqs3")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (propagated-inputs + `(("minetest-throwing" ,minetest-throwing))) + (home-page (minetest-topic 16365)) + (synopsis "Arrows and bows for Minetest") + (description + ;; TRANSLATORS: "throwing" is the name of a Minetest mod and should + ;; not be translated. + "This mod adds arrows and bows to Minetest. It is a compatible +replacement for the throwing mod by PilzAdam that uses the throwing API.") + (license license:mpl2.0)))) + (define-public minetest-unifieddyes (package (name "minetest-unifieddyes") -- cgit v1.2.3 From 5e9aeab2f8d9b2e2ca1fee97769d090b4a4f748d Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:30 +0200 Subject: gnu: Add minetest-unified-inventory. * gnu/packages/minetest.scm (minetest-unified-inventory): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 1f785098f9..d6ff6c9e47 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -293,3 +293,38 @@ Minetest game, this mod has become an extension of the default mod an a library for general colour handling.") (license license:gpl2+) (properties `((upstream-name . "VanessaE/unifieddyes"))))) + +(define-public minetest-unified-inventory + (package + (name "minetest-unified-inventory") + ;; Upstream doesn't keep version numbers, so use the release title + ;; on ContentDB instead. + (version "2021-03-25-1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest-mods/unified_inventory") + (commit "c044f5e3b08f0c68ab028d757b2fa63d9a1b0370"))) + (sha256 + (base32 "198g945gzbfl0kps46gwjw0c601l3b3wvn4c7dw8manskri1jr4g")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (home-page (minetest-topic 12767)) + (synopsis "Replace the default inventory in Minetest and add a crafting guide") + (description + "The Unified Inventory Minetest mod relaces the default survival an +creative inventory. It includes a node, item and tool browser, a crafting +guide, a trash and refill slot for creative mode, bags and waypoints for keeping +track of important locations.") + ;; CC-BY: some textures and icons + ;; CC-BY-SA: some textures and icons + ;; LGLPL2.1+: code and some textures + ;; GPL2+: some textures + ;; GPL3: bags.lua + ;; GFDL: some icons + ;; public domain, CC0: some icons + (license (list license:gpl3 license:gpl2+ license:lgpl2.1+ license:cc-by3.0 + license:cc-by4.0 license:cc-by-sa3.0 license:public-domain + license:cc0 license:fdl1.2+)) + (properties `((upstream-name . "RealBadAngel/unified_inventory"))))) -- cgit v1.2.3 From 958e7c851afedc31954cd2f704f2d314ff265e2e Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:31 +0200 Subject: gnu: Add minetest-worldedit. * gnu/packages/minetest.scm (minetest-worldedit): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index d6ff6c9e47..700a9b2872 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -266,6 +266,29 @@ arrow and bow, but @code{minetest-throwing-arrows} does.") replacement for the throwing mod by PilzAdam that uses the throwing API.") (license license:mpl2.0)))) +(define-public minetest-worldedit + (package + (name "minetest-worldedit") + (version "1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Uberi/Minetest-WorldEdit") + (commit "2f26fb76459c587868199160b9d7b5d6d7852e50"))) + (sha256 + (base32 "0lsvihkixi2na1b0vmml9vwgs0g24hqqshl73ffhkzh6jsq4cagq")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (home-page (minetest-topic 572)) + (synopsis "In-game world editor for Minetest") + (description + "WorldEdit is a mod for Minetest. It allows for creating various +geometric shapes and copying regions. It can also export and import regions +to and from the file system.") + (license license:agpl3) + (properties `((upstream-name . "sfan5/worldedit"))))) + (define-public minetest-unifieddyes (package (name "minetest-unifieddyes") -- cgit v1.2.3 From 03685ea2c2c7d0dcb5b1c7245d68b4f016124fd2 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:32 +0200 Subject: gnu: Add minetest-mobs. * gnu/packages/minetest.scm (minetest-mobs): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 700a9b2872..d36ca06ef5 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -143,6 +143,35 @@ with different rules and mechanics.") (license (list license:lgpl3+ license:cc-by-sa3.0)) (properties `((upstream-name . "Jeija/mesecons")))))) +(define-public minetest-mobs + (package + (name "minetest-mobs") + ;; Upstream does not tag release, so use the ContentDB release + ;; title instead. + (version "2021-07-22") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/TenPlus1/mobs_redo") + (commit "9f46182bb4b1a390f9a140bc2b443f3cda702332"))) + (sha256 + (base32 "026kqjis4lipgskjivb3jh9ris3iz80vy2q1jvgxhxmfghjjzp4j")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (home-page (minetest-topic 9917)) + (synopsis "Mob library for Minetest mods, for animals, monsters etc.") + (description + "This Minetest mod provides an API for adding mods (moving entities +like animals and monsters), but does not include any mobs itself. To actually +add some mobs, a mod like e.g. @code{mobs_animal} provided by the +@code{minetest-mobs-animal} package needs to be enabled.") + ;; CC0: mob_swing.ogg + ;; CC-BY 3.0: mob_spell.ogg + ;; Expat: everything else + (license (list license:expat license:cc0 license:cc-by3.0)) + (properties `((upstream-name . "TenPlus1/mobs"))))) + (define-public minetest-pipeworks (package (name "minetest-pipeworks") -- cgit v1.2.3 From 948677b67ea46500cb49e388668a80d74304417e Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:33 +0200 Subject: gnu: Add minetest-mobs-animal. * gnu/packages/minetest.scm (minetest-mobs-animal): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index d36ca06ef5..3cd14a6df8 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -172,6 +172,33 @@ add some mobs, a mod like e.g. @code{mobs_animal} provided by the (license (list license:expat license:cc0 license:cc-by3.0)) (properties `((upstream-name . "TenPlus1/mobs"))))) +(define-public minetest-mobs-animal + (package + (name "minetest-mobs-animal") + ;; Upstream does not use version numbers, so use the release title + ;; from ContentDB instead; + (version "2021-07-24") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/TenPlus1/mobs_animal") + (commit "c2fa3e300c79c7dd80b6fe91a8b5082bb6b3d934"))) + (sha256 + (base32 "1j719f079ia9vjxrmjrcj8s6jvaz5kgs1r4dh66z8ql6s70kx7vh")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (propagated-inputs + `(("minetest-mobs" ,minetest-mobs))) + (home-page "https://notabug.org/TenPlus1/mobs_animal") + (synopsis "Add animals to Minetest") + (description + "This Minetest mod adds various animals to Minetest, such as bees, +bunnies, chickens, cows, kittens, rats, sheep, warthogs, penguins and pandas.") + ;; CC0: some textures and sounds + (license (list license:cc0 license:expat)) + (properties `((upstream-name . "TenPlus1/mobs_animal"))))) + (define-public minetest-pipeworks (package (name "minetest-pipeworks") -- cgit v1.2.3 From 10fc3e37c6f0e6cd4d6a5a71da81e444f12c6b79 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 10 Aug 2021 17:07:34 +0200 Subject: gnu: Add minetest-homedecor-modpack. * gnu/packages/minetest.scm (minetest-homedecor-modpack): New variable. Signed-off-by: Leo Prikler --- gnu/packages/minetest.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 3cd14a6df8..3bd640da45 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -107,6 +107,37 @@ special items, intending to make an interesting adventure.") (license (list license:cc0 license:expat)) (properties `((upstream-name . "TenPlus1/ethereal")))))) +(define-public minetest-homedecor-modpack + (package + (name "minetest-homedecor-modpack") + ;; Upstream doesn't tag releases, so use the release title from + ;; ContentDB as version. + (version "2021-03-27-1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/VanessaE/homedecor_modpack") + (commit "9ffe2b7d691133e1a067546574fbe7364fd02f32"))) + (sha256 + (base32 "1lfajqvc2adf9hqskghky4arccqzpjw4i9a01hv4qcckvivm04ag")) + (file-name (git-file-name name version)))) + (build-system minetest-mod-build-system) + (propagated-inputs + `(("minetest-basic-materials" ,minetest-basic-materials) + ("minetest-unifieddyes" ,minetest-unifieddyes))) + (home-page (minetest-topic 2041)) + (synopsis "Home decor mod for Minetest") + (description + ;; TRANSLATORS: ‘homedecor’ is the name is the name of a Minetest mod + ;; and should not be translated. + "The homedecor Minetest mod provides a large seleection of items that +might be found inside and around homes, such as sofas, chairs, tables, fences +and a variety of other stuff.") + (license + (list license:cc-by-sa4.0 license:lgpl3)) + (properties `((upstream-name . "VanessaE/homedecor_modpack"))))) + (define-public minetest-mesecons ;; The release on ContentDB does not have its own version number. (let ((commit "db5879706d04d3480bc4863ce0c03fa73e5f10c7") -- cgit v1.2.3 From cd8df9aab276a852629816ee5d497230f9c3558d Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 20 Aug 2021 12:45:56 +0200 Subject: gnu: minetest-mineclone: move to minetest.scm. * gnu/packages/games.scm (minetest-mineclone): Move from here... * gnu/packages/minetest.scm (minetest-mineclone): ... to here. --- gnu/packages/games.scm | 24 ------------------------ gnu/packages/minetest.scm | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 291733234e..fbf43b9b10 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3715,30 +3715,6 @@ in different ways.") (home-page "https://www.minetest.net/") (license license:lgpl2.1+))) -(define-public minetest-mineclone - (package - (name "minetest-mineclone") - (version "0.71.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.minetest.land/Wuzzy/MineClone2") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0qm809dqvxc7pa1cr9skmglq9vrbq5hhm4c4m5yi46ldh1v96dgf")))) - (build-system copy-build-system) - (arguments - `(#:install-plan - '(("." "share/minetest/games/mineclone")))) - (synopsis "Minecraft clone based on Minetest engine") - (description - "MineClone is a Minetest subgame, that aims to recreate Minecraft as -closely as the engine allows.") - (home-page "https://content.minetest.net/packages/Wuzzy/mineclone2/") - (license license:gpl3+))) - (define glkterm (package (name "glkterm") diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 3bd640da45..0cb31808c9 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -16,6 +16,7 @@ (define-module (gnu packages minetest) #:use-module (guix packages) #:use-module (guix git-download) + #:use-module (guix build-system copy) #:use-module (guix build-system minetest) #:use-module ((guix licenses) #:prefix license:)) @@ -174,6 +175,30 @@ with different rules and mechanics.") (license (list license:lgpl3+ license:cc-by-sa3.0)) (properties `((upstream-name . "Jeija/mesecons")))))) +(define-public minetest-mineclone + (package + (name "minetest-mineclone") + (version "0.71.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.minetest.land/Wuzzy/MineClone2") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qm809dqvxc7pa1cr9skmglq9vrbq5hhm4c4m5yi46ldh1v96dgf")))) + (build-system copy-build-system) + (arguments + `(#:install-plan + '(("." "share/minetest/games/mineclone")))) + (synopsis "Minecraft clone based on Minetest engine") + (description + "MineClone is a Minetest subgame, that aims to recreate Minecraft as +closely as the engine allows.") + (home-page "https://content.minetest.net/packages/Wuzzy/mineclone2/") + (license license:gpl3+))) + (define-public minetest-mobs (package (name "minetest-mobs") -- cgit v1.2.3 From b7d1698f7fb1f4119d29951d0059b26770e2a853 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 20 Aug 2021 13:34:59 +0200 Subject: gnu: minetest: move to minetest.scm. * gnu/packages/games.scm (minetest, minetest-data): Move from here... * gnu/packages/minetest.scm (minetest, minetest-data): ... to here. * guix/build-system/minetest.scm (default-minetest): Adjust accordingly. --- gnu/packages/games.scm | 137 +-------------------------------------- gnu/packages/minetest.scm | 161 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 135 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index fbf43b9b10..0249662d23 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 John Darrington ;;; Copyright © 2013 Nikita Karetnikov -;;; Copyright © 2014, 2016 David Thompson +;;; Copyright © 2014, 2015 David Thompson ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Eric Bavier ;;; Copyright © 2014 Cyrill Schenkel ;;; Copyright © 2014 Sylvain Beucler @@ -52,7 +52,7 @@ ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020, 2021 Michael Rohleder -;;; Copyright © 2020, 2021 Trevor Hass +;;; Copyright © 2020 Trevor Hass ;;; Copyright © 2020, 2021 Leo Prikler ;;; Copyright © 2020 Lu hux ;;; Copyright © 2020 Tomás Ortín Fernández @@ -3582,139 +3582,6 @@ enemies in different game modes such as space ball, death match, team death match, cannon keep, and grave-itation pit.") (license license:gpl3+)))) -(define-public minetest - (package - (name "minetest") - (version "5.4.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest/minetest") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8")) - (modules '((guix build utils))) - (patches - (search-patches - "minetest-add-MINETEST_MOD_PATH.patch")) - (snippet - '(begin - ;; Delete bundled libraries. - (delete-file-recursively "lib") - #t)))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags - (list "-DRUN_IN_PLACE=0" - "-DENABLE_FREETYPE=1" - "-DENABLE_GETTEXT=1" - "-DENABLE_SYSTEM_JSONCPP=TRUE" - (string-append "-DIRRLICHT_INCLUDE_DIR=" - (assoc-ref %build-inputs "irrlicht") - "/include/irrlicht") - (string-append "-DCURL_INCLUDE_DIR=" - (assoc-ref %build-inputs "curl") - "/include/curl")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-sources - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/filesys.cpp" - ;; Use store-path for "rm" instead of non-existing FHS path. - (("\"/bin/rm\"") - (string-append "\"" (assoc-ref inputs "coreutils") "/bin/rm\""))) - (substitute* "src/CMakeLists.txt" - ;; Let minetest binary remain in build directory. - (("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") "")) - (substitute* "src/unittest/test_servermodmanager.cpp" - ;; do no override MINETEST_SUBGAME_PATH - (("(un)?setenv\\(\"MINETEST_SUBGAME_PATH\".*\\);") - "(void)0;")) - (setenv "MINETEST_SUBGAME_PATH" - (string-append (getcwd) "/games")) ; for check - #t)) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - ;; Thanks to our substitutions, the tests should also run - ;; when invoked on the target outside of `guix build'. - (when tests? - (setenv "HOME" "/tmp") - (invoke "src/minetest" "--run-unittests"))))))) - (native-search-paths - (list (search-path-specification - (variable "MINETEST_SUBGAME_PATH") - (files '("share/minetest/games"))) - (search-path-specification - (variable "MINETEST_MOD_PATH") - (files '("share/minetest/mods"))))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("coreutils" ,coreutils) - ("curl" ,curl) - ("freetype" ,freetype) - ("gettext" ,gettext-minimal) - ("gmp" ,gmp) - ("irrlicht" ,irrlicht) - ("jsoncpp" ,jsoncpp) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libogg" ,libogg) - ("libvorbis" ,libvorbis) - ("libxxf86vm" ,libxxf86vm) - ("luajit" ,luajit) - ("mesa" ,mesa) - ("ncurses" ,ncurses) - ("openal" ,openal) - ("sqlite" ,sqlite))) - (propagated-inputs - `(("minetest-data" ,minetest-data))) - (synopsis "Infinite-world block sandbox game") - (description - "Minetest is a sandbox construction game. Players can create and destroy -various types of blocks in a three-dimensional open world. This allows -forming structures in every possible creation, on multiplayer servers or as a -single player. Mods and texture packs allow players to personalize the game -in different ways.") - (home-page "https://www.minetest.net/") - (license license:lgpl2.1+))) - -(define minetest-data - (package - (name "minetest-data") - (version (package-version minetest)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minetest/minetest_game") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4")))) - (build-system trivial-build-system) - (native-inputs - `(("source" ,source))) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (let ((install-dir (string-append - %output - "/share/minetest/games/minetest_game"))) - (mkdir-p install-dir) - (copy-recursively - (assoc-ref %build-inputs "source") - install-dir) - #t)))) - (synopsis "Main game data for the Minetest game engine") - (description - "Game data for the Minetest infinite-world block sandbox game.") - (home-page "https://www.minetest.net/") - (license license:lgpl2.1+))) - (define glkterm (package (name "glkterm") diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 0cb31808c9..5453f4d16a 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -1,3 +1,12 @@ +;;; Copyright © 2014, 2015, 2016 David Thompson +;;; Copyright © 2015 Andreas Enge +;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2015, 2019 Mark H Weaver +;;; Copyright © 2016, 2017, 2018, 2019 Kei Kebreau +;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019–2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 Trevor Hass +;;; Copyright © 2020, 2021 Leo Prikler ;;; Copyright © 2021 Maxime Devos ;;; This file is part of GNU Guix. ;;; @@ -14,12 +23,164 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . (define-module (gnu packages minetest) + #:use-module (gnu packages) + #:use-module (gnu packages audio) + #:use-module (gnu packages base) + #:use-module (gnu packages curl) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages games) + #:use-module (gnu packages gettext) + #:use-module (gnu packages gl) + #:use-module (gnu packages image) + #:use-module (gnu packages lua) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages xiph) + #:use-module (gnu packages xorg) #:use-module (guix packages) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system copy) + #:use-module (guix build-system trivial) #:use-module (guix build-system minetest) #:use-module ((guix licenses) #:prefix license:)) +(define-public minetest + (package + (name "minetest") + (version "5.4.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest/minetest") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8")) + (modules '((guix build utils))) + (patches + (search-patches + "minetest-add-MINETEST_MOD_PATH.patch")) + (snippet + '(begin + ;; Delete bundled libraries. + (delete-file-recursively "lib") + #t)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list "-DRUN_IN_PLACE=0" + "-DENABLE_FREETYPE=1" + "-DENABLE_GETTEXT=1" + "-DENABLE_SYSTEM_JSONCPP=TRUE" + (string-append "-DIRRLICHT_INCLUDE_DIR=" + (assoc-ref %build-inputs "irrlicht") + "/include/irrlicht") + (string-append "-DCURL_INCLUDE_DIR=" + (assoc-ref %build-inputs "curl") + "/include/curl")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/filesys.cpp" + ;; Use store-path for "rm" instead of non-existing FHS path. + (("\"/bin/rm\"") + (string-append "\"" (assoc-ref inputs "coreutils") "/bin/rm\""))) + (substitute* "src/CMakeLists.txt" + ;; Let minetest binary remain in build directory. + (("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") "")) + (substitute* "src/unittest/test_servermodmanager.cpp" + ;; do no override MINETEST_SUBGAME_PATH + (("(un)?setenv\\(\"MINETEST_SUBGAME_PATH\".*\\);") + "(void)0;")) + (setenv "MINETEST_SUBGAME_PATH" + (string-append (getcwd) "/games")) ; for check + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + ;; Thanks to our substitutions, the tests should also run + ;; when invoked on the target outside of `guix build'. + (when tests? + (setenv "HOME" "/tmp") + (invoke "src/minetest" "--run-unittests"))))))) + (native-search-paths + (list (search-path-specification + (variable "MINETEST_SUBGAME_PATH") + (files '("share/minetest/games"))) + (search-path-specification + (variable "MINETEST_MOD_PATH") + (files '("share/minetest/mods"))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("coreutils" ,coreutils) + ("curl" ,curl) + ("freetype" ,freetype) + ("gettext" ,gettext-minimal) + ("gmp" ,gmp) + ("irrlicht" ,irrlicht) + ("jsoncpp" ,jsoncpp) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libogg" ,libogg) + ("libvorbis" ,libvorbis) + ("libxxf86vm" ,libxxf86vm) + ("luajit" ,luajit) + ("mesa" ,mesa) + ("ncurses" ,ncurses) + ("openal" ,openal) + ("sqlite" ,sqlite))) + (propagated-inputs + `(("minetest-data" ,minetest-data))) + (synopsis "Infinite-world block sandbox game") + (description + "Minetest is a sandbox construction game. Players can create and destroy +various types of blocks in a three-dimensional open world. This allows +forming structures in every possible creation, on multiplayer servers or as a +single player. Mods and texture packs allow players to personalize the game +in different ways.") + (home-page "https://www.minetest.net/") + (license license:lgpl2.1+))) + +(define minetest-data + (package + (name "minetest-data") + (version (package-version minetest)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minetest/minetest_game") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4")))) + (build-system trivial-build-system) + (native-inputs + `(("source" ,source))) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils)) + (let ((install-dir (string-append + %output + "/share/minetest/games/minetest_game"))) + (mkdir-p install-dir) + (copy-recursively + (assoc-ref %build-inputs "source") + install-dir) + #t)))) + (synopsis "Main game data for the Minetest game engine") + (description + "Game data for the Minetest infinite-world block sandbox game.") + (home-page "https://www.minetest.net/") + (license license:lgpl2.1+))) + (define-public (minetest-topic topic-id) "Return an URL (as a string) pointing to the forum topic with numeric identifier TOPIC-ID on the official Minetest forums." -- cgit v1.2.3 From 903b68cac5812b0f007f372d236f3e82ac66995b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 20 Aug 2021 14:41:40 -0400 Subject: gnu: GnuPG: Update to 2.2.29. * gnu/packages/gnupg.scm (gnupg): Update to 2.22.9. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index f0e87a36bb..ebd89a2009 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -262,7 +262,7 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.2.27") + (version "2.2.29") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version @@ -270,7 +270,7 @@ compatible to GNU Pth.") (patches (search-patches "gnupg-default-pinentry.patch")) (sha256 (base32 - "1693s2rp9sjwvdslj94n03wnb6rxysjy0dli0q1698af044h1ril")))) + "1j8cpp08zlz9a9n4g9z6352m1bvl369r94p4pjg8z0948pdprl1r")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From f916c827092aca86bd2581299f0335bcbae64f35 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 9 Aug 2021 03:57:38 +0200 Subject: gnu: ocaml-markup: Update to 1.0.2. * gnu/packages/ocaml.scm (ocaml-markup): Update to 1.0.2. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 112751ddec..923d7b1704 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6432,7 +6432,7 @@ the full Core is not available, such as in Javascript.") (define-public ocaml-markup (package (name "ocaml-markup") - (version "1.0.0") + (version "1.0.2") (home-page "https://github.com/aantron/markup.ml") (source (origin @@ -6443,7 +6443,7 @@ the full Core is not available, such as in Javascript.") (file-name (git-file-name name version)) (sha256 (base32 - "09hkrf9pw6hpb9j06p5bddklpnjwdjpqza3bx2179l970yl67an9")))) + "1kvqwrrcrys5d0kzdwxcj66jpi6sdhfas4pcg02pixx92q87vhqm")))) (build-system dune-build-system) (arguments `(#:package "markup")) -- cgit v1.2.3 From 43c0be8c6a4ba0f2d4f25bae0313a3fa69dc66cb Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 9 Aug 2021 03:24:08 +0200 Subject: gnu: ocaml-opam-file-format: Update to 2.1.3. * gnu/packages/ocaml.scm (ocaml-opam-file-format): Update to 2.1.3. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 923d7b1704..11f7eff267 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -747,7 +747,7 @@ let () = String.split_on_char ':' (Sys.getenv \"OCAMLPATH\") (define-public ocaml-opam-file-format (package (name "ocaml-opam-file-format") - (version "2.0.0") + (version "2.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -756,7 +756,7 @@ let () = String.split_on_char ':' (Sys.getenv \"OCAMLPATH\") (file-name (git-file-name name version)) (sha256 (base32 - "0fqb99asnair0043hhc8r158d6krv5nzvymd0xwycr5y72yrp0hv")))) + "1fxhppdmrysr2nb5z3c448h17np48f3ga9jih33acj78r4rdblcs")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; No tests -- cgit v1.2.3 From 3d3807a02215425d31782ac5c961c2aa50c7ca22 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 9 Aug 2021 03:20:06 +0200 Subject: gnu: opam: Update to 2.1.0. * gnu/packages/ocaml.scm (opam): Update to 2.1.0. --- gnu/packages/ocaml.scm | 164 ++++++++++++++++++++++++++++--------------------- 1 file changed, 93 insertions(+), 71 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 11f7eff267..bee0a06e24 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -77,6 +77,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization) #:use-module (gnu packages web) #:use-module (gnu packages web-browsers) @@ -775,7 +776,7 @@ the opam file format.") (define-public opam (package (name "opam") - (version "2.0.8") + (version "2.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -784,78 +785,99 @@ the opam file format.") (file-name (git-file-name name version)) (sha256 (base32 - "1z0ls6xxa4ws5xw0am5gxmh5apnmyhgkcphrncp53w34j8sfydsj")))) - (build-system ocaml-build-system) + "12l7l4pbzy71k1yc7ym5aczajszvc9bqkdnfg8xhqc8ch8j1h1lj")))) + (build-system dune-build-system) (arguments - `(#:configure-flags - (list (string-append "SHELL=" - (assoc-ref %build-inputs "bash") - "/bin/sh")) - - ;; For some reason, 'ocp-build' needs $TERM to be set. - #:make-flags - (list "TERM=screen" - (string-append "SHELL=" - (assoc-ref %build-inputs "bash") - "/bin/sh")) - - #:test-target "tests" - - #:phases (modify-phases %standard-phases - (add-before 'build 'pre-build - (lambda* (#:key inputs make-flags #:allow-other-keys) - (let ((bash (assoc-ref inputs "bash")) - (bwrap (string-append (assoc-ref inputs "bubblewrap") - "/bin/bwrap"))) - (substitute* "src/core/opamSystem.ml" - (("\"/bin/sh\"") - (string-append "\"" bash "/bin/sh\"")) - (("getconf") - (which "getconf"))) - ;; Use bwrap from the store directly. - (substitute* "src/state/shellscripts/bwrap.sh" - (("-v bwrap") (string-append "-v " bwrap)) - (("exec bwrap") (string-append "exec " bwrap)) - ;; Mount /gnu and /run/current-system in the - ;; isolated environment when building with opam. - ;; This is necessary for packages to find external - ;; dependencies, such as a C compiler, make, etc... - (("^add_sys_mounts /usr") - "add_sys_mounts /gnu /run/current-system /usr")) - (substitute* "src/client/opamInitDefaults.ml" - (("\"bwrap\"") (string-append "\"" bwrap "\""))) - ;; Generating the documentation needs write access - (for-each - (lambda (f) (chmod f #o644)) - (find-files "doc" ".")) - #t))) - (add-before 'check 'pre-check - (lambda _ - ;; The "repo" test attempts to open some of these files O_WRONLY - ;; and fails with a bogus "OpamSystem.File_not_found" otherwise. - (for-each - (lambda (f) (chmod f #o644)) - (find-files "tests/packages" "\\.opam$")) - - (substitute* "tests/Makefile" - (("/usr/bin/printf") - (which "printf")) - ;; By default tests run twice: once with a "local" repository - ;; and once with a git repository: disable the git tests to - ;; avoid the dependency. - (("all: local git") - "all: local")) - #t))))) + `(#:test-target "." + #:phases + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda* (#:key inputs make-flags #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash")) + (bwrap (string-append (assoc-ref inputs "bubblewrap") + "/bin/bwrap"))) + (substitute* "src/core/opamSystem.ml" + (("\"/bin/sh\"") + (string-append "\"" bash "/bin/sh\"")) + (("getconf") + (which "getconf"))) + ;; Use bwrap from the store directly. + (substitute* "src/state/shellscripts/bwrap.sh" + (("-v bwrap") (string-append "-v " bwrap)) + (("exec bwrap") (string-append "exec " bwrap)) + ;; Mount /gnu and /run/current-system in the + ;; isolated environment when building with opam. + ;; This is necessary for packages to find external + ;; dependencies, such as a C compiler, make, etc... + (("^add_sys_mounts /usr") + (string-append "add_sys_mounts " + (%store-directory) + " /run/current-system /usr"))) + (substitute* "src/client/opamInitDefaults.ml" + (("\"bwrap\"") (string-append "\"" bwrap "\"")))))) + (add-before 'check 'prepare-checks + (lambda* (#:key inputs #:allow-other-keys) + ;; Opam tests need to run an isolated environment from a writable + ;; home directory. + (mkdir-p "test-home") + (setenv "HOME" (string-append (getcwd) "/test-home")) + + ;; Opam tests require data from opam-repository. Instead of + ;; downloading them with wget from the guix environment, copy the + ;; content to the expected directory. + (substitute* "tests/reftests/dune.inc" + (("tar -C.*opam-archive-([0-9a-f]*)[^)]*" _ commit) + (string-append "rmdir %{targets}) (run cp -r " + (assoc-ref inputs (string-append "opam-repo-" commit)) + "/ %{targets}) (run chmod +w -R %{targets}")) + (("wget[^)]*") "touch %{targets}") + ;; Disable a failing test because of different line wrapping + (("diff cli-versioning.test cli-versioning.out") "run true") + ;; Disable a failing test because it tries to clone a git + ;; repository from inside bwrap + (("diff upgrade-format.test upgrade-format.out") "run true")) + (substitute* "tests/reftests/dune" + ;; Because of our changes to the previous file, we cannot check + ;; it can be regenerated + (("diff dune.inc dune.inc.gen") "run true")) + ;; Ensure we can run the generated build.sh (no /bin/sh) + (substitute* '("tests/reftests/legacy-local.test" + "tests/reftests/legacy-git.test") + (("#! ?/bin/sh") (string-append "#!" (assoc-ref inputs "bash") + "/bin/sh"))) + (substitute* "tests/reftests/testing-env" + (("OPAMSTRICT=1") + (string-append "OPAMSTRICT=1\nLIBRARY_PATH=" + (assoc-ref inputs "libc") "/lib")))))))) (native-inputs - `(("dune" ,dune) - ("ocaml-cppo" ,ocaml-cppo) - - ;; For tests. - ("openssl" ,openssl) - ("python" ,python-wrapper) - ("rsync" ,rsync) - ("unzip" ,unzip) - ("which" ,which))) + (let ((opam-repo (lambda (commit hash) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/opam-repository") + (commit commit))) + (file-name (git-file-name "opam-repo" commit)) + (sha256 (base32 hash)))))) + `(("dune" ,dune) + ("ocaml-cppo" ,ocaml-cppo) + + ;; For tests. + ("git" ,git-minimal) + ("openssl" ,openssl) + ("python" ,python-wrapper) + ("rsync" ,rsync) + ("unzip" ,unzip) + ("which" ,which) + + ;; Data for tests + ("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2" + "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w")) + ("opam-repo-ad4dd344" ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4" + "1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518baw8")) + ("opam-repo-c1d23f0e" ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0" + "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii")) + ("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701" + "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))))) (inputs `(("ocaml" ,ocaml) ("ncurses" ,ncurses) -- cgit v1.2.3 From 777ce1485749cc3dbe178fcc1e0654a7e74900c5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 8 Aug 2021 22:53:27 +0200 Subject: gnu: ocaml-dune: Update to 2.9.0. * gnu/packages/ocaml.scm (dune): Update to 2.9.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bee0a06e24..bdd52d2940 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1627,7 +1627,7 @@ full_split, cut, rcut, etc..") (define dune-bootstrap (package (name "dune") - (version "2.8.5") + (version "2.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -1636,7 +1636,7 @@ full_split, cut, rcut, etc..") (file-name (git-file-name name version)) (sha256 (base32 - "0a1jj6njzsfjgklsirs6a79079wg4jhy6n888vg3dgp44awwq5jn")))) + "01np4jy0f3czkpzkl38k9b4lsh41qk52ldaqxl98mgigyzhx4w0b")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc -- cgit v1.2.3 From 33a1ec29fa0ad72c61cef13c8af08c847eb399c1 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Mon, 9 Aug 2021 07:19:03 +0000 Subject: guix: dune-build-system: Add a profile parameter. * guix/build-system/dune.scm: Add a profile parameter. * guix/build/dune-build-system.scm (build): Use it. * doc/guix.texi: Document it. * gnu/packages/ocaml.scm: Remove profile being set from build flags. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bdd52d2940..fee9e5e0ee 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2876,8 +2876,7 @@ without a complete in-memory representation of the data.") "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3")))) (build-system dune-build-system) (arguments - `(#:test-target "tests" - #:build-flags (list "--profile=release"))) + `(#:test-target "tests")) (propagated-inputs `(("ocaml-cmdliner" ,ocaml-cmdliner))) (home-page "https://www.typerex.org/ocp-indent.html") @@ -3295,8 +3294,7 @@ build system and allows external tools to analyse your project easily.") "1smcc0l6fh2n0y6bp96c69j5nw755jja99w0b206wx3yb2m4w2hs")))) (build-system dune-build-system) (arguments - `(#:tests? #f - #:build-flags (list "--profile" "release"))) + `(#:tests? #f)) (native-inputs `(("ocamlbuild" ,ocamlbuild))) (home-page "https://github.com/mjambon/cppo") @@ -3364,8 +3362,7 @@ standard iterator type starting from 4.07.") (base32 "07ycb103mr4mrkxfd63cwlsn023xvcjp0ra0k7n2gwrg0mwxmfss")))) (build-system dune-build-system) (arguments - `(#:tests? #f - #:build-flags (list "--profile" "release"))) + `(#:tests? #f)) (propagated-inputs `(("ocaml-seq" ,ocaml-seq))) (native-inputs @@ -3842,9 +3839,8 @@ the plugins facilitate extensibility, and the frontends serve as entry points.") "0chn7ldqb3wyf95yhmsxxq65cif56smgz1mhhc7m0dpwmyq1k97h")))) (build-system dune-build-system) (arguments - `(#:build-flags (list "--profile" "release") - #:test-target "camomile-test" - #:tests? #f; Tests fail, see https://github.com/yoriyuki/Camomile/issues/82 + `(#:test-target "camomile-test" + #:tests? #f ; Tests fail, see https://github.com/yoriyuki/Camomile/issues/82 #:phases (modify-phases %standard-phases (add-before 'build 'fix-usr-share @@ -3935,8 +3931,7 @@ connect an engine to your inputs and rendering functions to get an editor.") (base32 "0zcjy6fvf0d3i2ssz96asl889n3r6bplyzk7xvb2s3dkxbgcisyy")))) (build-system dune-build-system) (arguments - `(#:build-flags (list "--profile" "release") - #:tests? #f + `(#:tests? #f #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) -- cgit v1.2.3 From 6d9d10ae3fae465625bcac52a968fd9828164b5c Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Mon, 9 Aug 2021 07:19:04 +0000 Subject: gnu: ocaml4.07-base: Remove unnecessary arguments. * gnu/packages/ocaml.scm (ocaml4.07-base): Remove unnecessary arguments. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fee9e5e0ee..c1cdc8f3f3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4942,16 +4942,6 @@ provided by companion libraries such as (sha256 (base32 "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'build - ;; make warnings non fatal (jbuilder behaviour) - (lambda _ - (invoke "dune" "build" "@install" "--profile=release")))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (properties '())))) (define-public ocaml-compiler-libs -- cgit v1.2.3 From d548fa91446d4738adb1a5289746bf9363fff398 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Fri, 20 Aug 2021 15:55:26 +0200 Subject: gnu: appstream-glib: Fix failing tests. * gnu/packages/glib.scm (appstream-glib)[arguments]<#:phases>{set-home}: Add a new phase 'set-home' for tests that want to write to $HOME. Signed-off-by: Leo Famulari --- gnu/packages/glib.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 91ef45099c..8ed1e3a944 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1107,7 +1107,11 @@ Some codes examples can be find at: (lambda _ (substitute* "libappstream-glib/as-self-test.c" (("g_test_add_func.*as_test_store_local_appdata_func);") "")) - #t))))) + #t)) + (add-before 'check 'set-home + (lambda _ + ;; Some tests want write access there. + (setenv "HOME" "/tmp")))))) (home-page "https://github.com/hughsie/appstream-glib") (synopsis "Library for reading and writing AppStream metadata") (description "This library provides objects and helper methods to help -- cgit v1.2.3 From 15ba093ce36ebe792d09555c8734d73d1db9a704 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 21 Aug 2021 09:20:35 +0200 Subject: gnu: emacs-ebdb: Update to 0.8.1. * gnu/packages/emacs-xyz.scm (emacs-ebdb): Update to 0.8.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bea6288976..afe6ded66f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25863,14 +25863,14 @@ federated microblogging social network.") (define-public emacs-ebdb (package (name "emacs-ebdb") - (version "0.7.1") + (version "0.8.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "ebdb-" version ".tar")) (sha256 - (base32 "1z5lh1mib60mvs5kbdsrw2h4whz4n5ad4qkpphs2xjvaz92jgq6s")))) + (base32 "1wdv1jkcawbxa8nnd0856ix1qp0chkc9yasvm7dmn7gj1y92nss1")))) (build-system emacs-build-system) (home-page "https://github.com/girzel/ebdb") (synopsis "EIEIO port of BBDB, Emacs's contact-management package") -- cgit v1.2.3 From de3cc38adfbe7ebbbbd89ff9c40fea03087479bc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 21 Aug 2021 09:23:08 +0200 Subject: gnu: emacs-elfeed-score: Update to 0.8.3. * gnu/packages/emacs-xyz.scm (emacs-elfeed-score): Update to 0.8.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index afe6ded66f..5d4ff74be9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10211,7 +10211,7 @@ with Elfeed.") (define-public emacs-elfeed-score (package (name "emacs-elfeed-score") - (version "0.7.10") + (version "0.8.3") (source (origin (method git-fetch) @@ -10220,7 +10220,7 @@ with Elfeed.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "15gjsp4whrdw9yx3mw1517wfynv9yya5yhalqqdb738q5c32p9lm")))) + (base32 "0nwzw2574pik3jk6x35lghxy4h79jnfdl3hakg3aw0fr8sh8ypbx")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-elfeed" ,emacs-elfeed))) -- cgit v1.2.3 From ce2fd09ea6f35f09db2ad4b30373f0381a9a6b5d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 21 Aug 2021 09:25:15 +0200 Subject: gnu: emacs-org-mime: Update to 0.2.2. * gnu/packages/emacs-xyz.scm (emacs-org-mime): Update to 0.2.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5d4ff74be9..1809616a21 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7496,7 +7496,7 @@ cards created in Org mode.") (define-public emacs-org-mime (package (name "emacs-org-mime") - (version "0.2.1") + (version "0.2.2") (source (origin (method git-fetch) @@ -7505,7 +7505,7 @@ cards created in Org mode.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0vchyd80ybvr6317dwm50nxcgxfrpc0bz6259vnrh24p5sb8shbj")))) + (base32 "0gvir8c8b2m5z784ml5h957f7mxgp3vn7v91p6igaq5bjf5xcfpp")))) (build-system emacs-build-system) (home-page "https://github.com/org-mime/org-mime") (synopsis "Send HTML email using Org mode HTML export") -- cgit v1.2.3 From a328c4a6a9f0292682dc282f1659f7ab3690bcec Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 21 Aug 2021 09:27:11 +0200 Subject: gnu: emacs-org-roam: Update to 2.1.0. * gnu/packages/emacs-xyz.scm (emacs-org-roam): Update to 2.1.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1809616a21..ef53ab03cd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28145,7 +28145,7 @@ snippets for Emacs.") (define-public emacs-org-roam (package (name "emacs-org-roam") - (version "2.0.0") + (version "2.1.0") (source (origin (method git-fetch) @@ -28154,7 +28154,7 @@ snippets for Emacs.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0mslrdgd41czay3w7znz4qsv1h0p3zqfsq6bkyxmxfyd2w5z82zf")))) + (base32 "092xn0sqc7b7f6pdf7m6c3giqqbh6fq02mfz8qrg0wmx4ds1isqp")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From ac9fd0629b37ab54ed5da0180d3bcae0977d9e88 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 21 Aug 2021 09:33:14 +0200 Subject: gnu: emacs-undo-tree: Update to 0.8.1. * gnu/packages/emacs-xyz.scm (emacs-undo-tree): Update to 0.8.1. [source]: Switch from GNU ELPA to Gitlab repository. [propagated-inputs]: Add emacs-queue. --- gnu/packages/emacs-xyz.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ef53ab03cd..e9a5e31496 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3794,15 +3794,19 @@ in the center.") (define-public emacs-undo-tree (package (name "emacs-undo-tree") - (version "0.7.5") + (version "0.8.1") (source (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/" - "undo-tree-" version ".el")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/tsc25/undo-tree") + (commit (string-append "release/" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "00admi87gqm0akhfqm4dcp9fw8ihpygy030955jswkha4zs7lw2p")))) + (base32 "1khkwrrbwaimspc013n4k9mpv8g302r0zkrsqnza2x1d3qznn08y")))) (build-system emacs-build-system) + (propagated-inputs + `(("emacs-queue" ,emacs-queue))) (home-page "https://www.dr-qubit.org/undo-tree.html") (synopsis "Treat undo history as a tree") (description -- cgit v1.2.3 From 847dfcdc29be8eb5fa77334f8b3d5f866b368221 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 20 Aug 2021 21:11:13 +0100 Subject: gnu: mu: Update to 1.6.3. * gnu/packages/mail.scm (mu): Update to 1.6.3. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ccf44b7cf3..c3bf8b3be7 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1146,7 +1146,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.6.2") + (version "1.6.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" @@ -1154,7 +1154,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") "mu-" version ".tar.xz")) (sha256 (base32 - "0jlpkx1486ac8649jc2kxjklzsfaxj9qf2kji4kszy4axd0iwi1p")))) + "1djl0wh3g1vdjwvdm2ag23zf2vbsvpbswrf3cw50d8nrqbmnwa7y")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 9e3b68203cba2b1bd96e524d3ae9dfc3336a72f7 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 22 Aug 2021 09:24:33 +0200 Subject: gnu: openssh: Update to 8.7p1. * gnu/packages/ssh.scm (openssh): Update to 8.7p1. --- gnu/packages/ssh.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 4ceb437b26..854dd19067 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -186,7 +187,7 @@ a server that supports the SSH-2 protocol.") (define-public openssh (package (name "openssh") - (version "8.6p1") + (version "8.7p1") (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" @@ -194,7 +195,7 @@ a server that supports the SSH-2 protocol.") (patches (search-patches "openssh-hurd.patch")) (sha256 (base32 - "1bnpivgk98h2f9afpp88jv6g9ps83vnpxd031n2jqxi12vdf9rn3")))) + "090yxpi03pxxzb4ppx8g8hdpw7c4nf8p0avr6c7ybsaana5lp8vw")))) (build-system gnu-build-system) (native-inputs `(("groff" ,groff) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 9adb69b089cc22fc054219bb83187331769d1284 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 22 Aug 2021 21:06:39 +0200 Subject: gnu: python-duniterpy: Update to 1.0.0. * gnu/packages/finance.scm (python-duniterpy): Update to 1.0.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 0d398a5367..53f022db12 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1149,13 +1149,13 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") (define-public python-duniterpy (package (name "python-duniterpy") - (version "0.62.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "duniterpy" version)) (sha256 - (base32 "1ldiw5j2g92cib9v06kgv4z8dw2zi0x1dmpisf8w78h4kg6712w1")))) + (base32 "13kp2ph7fb1cdkx1y6j2h8q33fj2akc104l77ng52cy4v8jic9nz")))) (build-system python-build-system) (arguments ;; FIXME: Tests fail with: "TypeError: block_uid() missing 1 required -- cgit v1.2.3 From 0d3cf065ec872200b3536964c82246d453c7bf3f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 23 Aug 2021 08:54:37 +0200 Subject: gnu: emacs-org-appear: Update to 0.2.4. * gnu/packages/emacs-xyz.scm (emacs-org-appear): Update to 0.2.4. --- gnu/packages/emacs-xyz.scm | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e9a5e31496..ea33728c79 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7422,27 +7422,25 @@ Cucumber tool) user stories. Also known by the name @code{cucumber.el}.") (license license:gpl3+))) (define-public emacs-org-appear - (let ((commit "19ea96e6e2ce01b8583b25a6e5579f1be207a119") - (revision "1")) - (package - (name "emacs-org-appear") - (version (git-version "0.0.1" revision commit)) ;no upstream release - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/awth13/org-appear") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "064kdb3z4zr9sa7qi5921cqh8vj226ifl8x1bkc59qd9a1p34ghd")))) - (build-system emacs-build-system) - (home-page "https://github.com/awth13/org-appear") - (synopsis "Make invisible parts of Org fragments appear visible") - (description "This package enables automatic visibility toggling of + (package + (name "emacs-org-appear") + (version "0.2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/awth13/org-appear") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sfz8rpvc9hidjj81wlc48vi7ii90mssgvfnp2z215phv67npbzp")))) + (build-system emacs-build-system) + (home-page "https://github.com/awth13/org-appear") + (synopsis "Make invisible parts of Org fragments appear visible") + (description "This package enables automatic visibility toggling of org-mode elements depending on cursor position. Hidden fragment parts appear when the cursor enters a fragment and disappear when it leaves.") - (license license:expat)))) + (license license:expat))) (define-public emacs-org-drill (package -- cgit v1.2.3 From efde98a4438c2dd733bdb64fd6be9d1d5ac3b897 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 23 Aug 2021 08:55:58 +0200 Subject: gnu: emacs-elfeed-score: Update to 0.8.4. * gnu/packages/emacs-xyz.scm (emacs-elfeed-score): Update to 0.8.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ea33728c79..ebb60b0c8a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10213,7 +10213,7 @@ with Elfeed.") (define-public emacs-elfeed-score (package (name "emacs-elfeed-score") - (version "0.8.3") + (version "0.8.4") (source (origin (method git-fetch) @@ -10222,7 +10222,7 @@ with Elfeed.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0nwzw2574pik3jk6x35lghxy4h79jnfdl3hakg3aw0fr8sh8ypbx")))) + (base32 "1whf7nxfpb003wk9v15ib4xy1a7dfygdkg7jf3ly5z5l81607ap8")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-elfeed" ,emacs-elfeed))) -- cgit v1.2.3 From d6c2fc37292f5bd75a7fd26ae4bccf649175c00e Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 23 Aug 2021 12:33:20 +0100 Subject: gnu: python-pygmsh: Update to 7.1.11. *gnu/packages/simulation.scm (python-pygmsh): Update to 7.1.11. [source](snippet): Re-phrase comment. --- gnu/packages/simulation.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index a2c65b73c8..23580322bb 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -843,27 +843,27 @@ tools and a collection of Python modules for programmatic use.") (define-public python-pygmsh (package (name "python-pygmsh") - (version "7.1.10") + (version "7.1.11") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/nschloe/pygmsh") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "03a949nl99ny9h0ni8lqgaljgkgicd305ls6zy1vkwgfa4mzsgqh")) + "0g4yllmxks7yb50vild5xi1cma0yl16vsq6rfvdwmqaj4hwxcabk")) (modules '((guix build utils))) (snippet '(begin (let ((file (open-file "setup.py" "a"))) (display "from setuptools import setup\nsetup()" file) (close-port file)) - ;; setuptools is supplied by the build system. An extra - ;; reference in the original configuration file triggers - ;; an attempt to download the package again. This fails. - ;; The extra reference is unnecessary and is removed. + ;; A reference to setuptools in the configuration file + ;; triggers an attempt to download the package from pypi. + ;; The reference is not needed since the package is + ;; provided by the build system. (substitute* "setup.cfg" (("^[[:blank:]]+setuptools>=42\n") "")) #t)))) -- cgit v1.2.3 From f04883d0ba8ddd3977b18ccfc281a5de64bd2e1e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 23 Aug 2021 15:13:52 +0200 Subject: gnu: bat: Update to 0.18.3. * gnu/packages/rust-apps.scm (bat): Update to 0.18.3. --- gnu/packages/rust-apps.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 72148947e5..24e002493a 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -88,14 +88,14 @@ low-end hardware and serving many concurrent requests.") (define-public bat (package (name "bat") - (version "0.18.2") + (version "0.18.3") (source (origin (method url-fetch) (uri (crate-uri "bat" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "01zdamn1rd6d4xwwba1a8nfh06nmg7a0lakzgq8yfj5hsdgj9rdm")))) + (base32 "0qlk032dd6zxda1v7clah33nafxygaw3x7f73ajwlvk956nrn1js")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -104,7 +104,6 @@ low-end hardware and serving many concurrent requests.") ("rust-atty" ,rust-atty-0.2) ("rust-bugreport" ,rust-bugreport-0.4) ("rust-clap" ,rust-clap-2) - ("rust-clap" ,rust-clap-2) ("rust-clircle" ,rust-clircle-0.3) ("rust-console" ,rust-console-0.14) ("rust-content-inspector" ,rust-content-inspector-0.2) -- cgit v1.2.3 From 1a5c3f1af3cb679002bda7534f85a0f8aab10c59 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 24 Aug 2021 11:10:47 +0200 Subject: gnu: emacs-org-ref: Update to 2.0.0. * gnu/packages/emacs-xyz.scm (emacs-org-ref): Update to 2.0.0. --- gnu/packages/emacs-xyz.scm | 61 ++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 32 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ebb60b0c8a..85fce1ab92 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18691,37 +18691,34 @@ their meaning for the current Emacs major-mode.") (license license:gpl3+))) (define-public emacs-org-ref - ;; No release since June 2017. - (let ((commit "5bb9be2232db72b04754d7e4c02a3976ad422f6f") - (revision "2")) - (package - (name "emacs-org-ref") - (version (git-version "1.1.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jkitchin/org-ref") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "15gcvbfj19kyv4nxa632b261dwhb26m99plq230qhv9ssfwfgxbx")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-f" ,emacs-f) - ("emacs-helm" ,emacs-helm) - ("emacs-helm-bibtex" ,emacs-helm-bibtex) - ("emacs-htmlize" ,emacs-htmlize) - ("emacs-hydra" ,emacs-hydra) - ("emacs-ivy" ,emacs-ivy) - ("emacs-key-chord" ,emacs-key-chord) - ("emacs-pdf-tools" ,emacs-pdf-tools) - ("emacs-s" ,emacs-s))) - (home-page "https://github.com/jkitchin/org-ref") - (synopsis "Citations, cross-references and bibliographies in Org mode") - (description - "Org Ref is an Emacs library that provides rich support for citations, + (package + (name "emacs-org-ref") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jkitchin/org-ref") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xd1qp8dfy8n8b2n3rsdzm8vrfl7dii142kw330s8jp3pavww1f6")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-helm" ,emacs-helm) + ("emacs-helm-bibtex" ,emacs-helm-bibtex) + ("emacs-htmlize" ,emacs-htmlize) + ("emacs-hydra" ,emacs-hydra) + ("emacs-ivy" ,emacs-ivy) + ("emacs-key-chord" ,emacs-key-chord) + ("emacs-pdf-tools" ,emacs-pdf-tools) + ("emacs-s" ,emacs-s))) + (home-page "https://github.com/jkitchin/org-ref") + (synopsis "Citations, cross-references and bibliographies in Org mode") + (description + "Org Ref is an Emacs library that provides rich support for citations, labels and cross-references in Org mode. The basic idea of Org Ref is that it defines a convenient interface to insert @@ -18739,7 +18736,7 @@ a DOI. Org Ref is especially suitable for Org documents destined for LaTeX export and scientific publication. Org Ref is also useful for research documents and notes.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-org-reveal (let ((commit "84039bb499290926511b04749882ecb5eda45a0c")) -- cgit v1.2.3 From 5552104cd2d24da7e415e63c54be4f2046fc8c32 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 24 Aug 2021 11:14:27 +0200 Subject: gnu: emacs-olivetti: Update to 2.0.2. * gnu/packages/emacs-xyz.scm (emacs-olivetti): Update to 2.0.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 85fce1ab92..4794fbaf91 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3774,7 +3774,7 @@ a command.") (define-public emacs-olivetti (package (name "emacs-olivetti") - (version "2.0.1") + (version "2.0.2") (source (origin (method git-fetch) @@ -3783,7 +3783,7 @@ a command.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0njkzd8x3wryyzd3czzk6f5w9jr7jly5l03ar706h77kpakd8z2y")))) + (base32 "0nx16w2d1wrqa5cgpbwqfy2al49b9nx2pr9zygiz5qa8jdlzw86l")))) (build-system emacs-build-system) (home-page "https://github.com/rnkn/olivetti") (synopsis "Emacs minor mode for a nice writing environment") -- cgit v1.2.3 From 14c38717201e7dc5abe9ff9cfc131fa3da343680 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Aug 2021 23:56:38 +0200 Subject: gnu: r-with-tests: Update to 4.1.1. * gnu/packages/statistics.scm (r-with-tests): Update to 4.1.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 5c744f664a..78ac49b3e7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -187,7 +187,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") (define r-with-tests (package (name "r-with-tests") - (version "4.1.0") + (version "4.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" @@ -195,7 +195,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") version ".tar.gz")) (sha256 (base32 - "109732arm6dq6d6v3fl1nyx63lcvv9569j8g6r3s2b18sxcqkrp8")))) + "0r6kpnxjbvb7gdfg4m1z8zc6xd225vw81wrnf05ps9ajawk06pji")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,tzdata-for-tests) -- cgit v1.2.3 From cabaa73f70a29f297deb9ff8b049021f509ccf33 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:49:51 +0200 Subject: gnu: Add r-yulab-utils. * gnu/packages/cran.scm (r-yulab-utils): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fab433b2f7..236ed54fca 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16979,6 +16979,26 @@ improvements over the @code{convertColor} function in the @code{grDevices} package.") (license license:expat))) +(define-public r-yulab-utils + (package + (name "r-yulab-utils") + (version "0.0.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "yulab.utils" version)) + (sha256 + (base32 + "1haq6k0r64gs76p2vvrm42m64r8s32kzyz573pw9789y32zn0s5q")))) + (properties `((upstream-name . "yulab.utils"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/package=yulab.utils") + (synopsis "Supporting functions for packages maintained by YuLab-SMU") + (description + "Miscellaneous functions commonly used by YuLab-SMU, such as +@code{install_zip_gh} to install R packages from Github ZIP files.") + (license license:artistic2.0))) + (define-public r-ggplotify (package (name "r-ggplotify") -- cgit v1.2.3 From ffe8484d9dd1b3d177d7dc9192b3ca1afb56b52d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:50:06 +0200 Subject: gnu: Add r-ggfun. * gnu/packages/cran.scm (r-ggfun): New variable. --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 236ed54fca..72f7e65dd1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17552,6 +17552,31 @@ matrix and displays the significance level on the plot. It also includes a function for computing a matrix of correlation p-values.") (license license:gpl2))) +(define-public r-ggfun + (package + (name "r-ggfun") + (version "0.0.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "ggfun" version)) + (sha256 + (base32 + "0bf8pl3scy5fx15h1fx0799cb9sg9spjapqif9gcz27pmmgdc0n9")))) + (properties `((upstream-name . "ggfun"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-rlang" ,r-rlang))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://cran.r-project.org/package=ggfun") + (synopsis "Miscellaneous functions for ggplot2") + (description + "This package provides useful functions to edit ggplot object (e.g., +setting fonts for theme and layers, adding rounded rectangle as background for +each of the legends).") + (license license:artistic2.0))) + (define-public r-gridtext (package (name "r-gridtext") -- cgit v1.2.3 From 6ff48c64f1e2a8badcb74475847c8b73a6d09815 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:50:37 +0200 Subject: gnu: Add r-distributional. * gnu/packages/cran.scm (r-distributional): New variable. --- gnu/packages/cran.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 72f7e65dd1..271bb99891 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25236,6 +25236,43 @@ packages, but other reference models can also be used. See the package vignette for more information and examples.") (license license:gpl3))) +(define-public r-distributional + (package + (name "r-distributional") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "distributional" version)) + (sha256 + (base32 + "0ps30ijlf0xwranxkq1z29d76d3zgy8drwxpnxp6ffmyma8mm3h2")))) + (properties + `((upstream-name . "distributional"))) + (build-system r-build-system) + (propagated-inputs + `(("r-digest" ,r-digest) + ("r-ellipsis" ,r-ellipsis) + ("r-farver" ,r-farver) + ("r-generics" ,r-generics) + ("r-ggplot2" ,r-ggplot2) + ("r-lifecycle" ,r-lifecycle) + ("r-numderiv" ,r-numderiv) + ("r-rlang" ,r-rlang) + ("r-scales" ,r-scales) + ("r-vctrs" ,r-vctrs))) + (home-page "https://pkg.mitchelloharawild.com/distributional/") + (synopsis "Vectorized probability distributions") + (description + "This package provides vectorized distribution objects with tools for +manipulating, visualizing, and using probability distributions. It was +designed to allow model prediction outputs to return distributions rather than +their parameters, allowing users to directly interact with predictive +distributions in a data-oriented workflow. In addition to providing generic +replacements for p/d/q/r functions, other useful statistics can be computed +including means, variances, intervals, and highest density regions.") + (license license:gpl3))) + (define-public r-brms (package (name "r-brms") -- cgit v1.2.3 From 8239f1f8cf95b73a38aae08cc5f8db093280259b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:51:02 +0200 Subject: gnu: Add r-posterior. * gnu/packages/cran.scm (r-posterior): New variable. --- gnu/packages/cran.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 271bb99891..8c19d3db1d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25273,6 +25273,52 @@ replacements for p/d/q/r functions, other useful statistics can be computed including means, variances, intervals, and highest density regions.") (license license:gpl3))) +(define-public r-posterior + (package + (name "r-posterior") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "posterior" version)) + (sha256 + (base32 + "000k2sih7r89nmw3nwndx5jljcvkyr61b96mdkqrw83rs74lnh6f")))) + (properties `((upstream-name . "posterior"))) + (build-system r-build-system) + (propagated-inputs + `(("r-abind" ,r-abind) + ("r-checkmate" ,r-checkmate) + ("r-distributional" ,r-distributional) + ("r-pillar" ,r-pillar) + ("r-rlang" ,r-rlang) + ("r-tensora" ,r-tensora) + ("r-tibble" ,r-tibble) + ("r-vctrs" ,r-vctrs))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://mc-stan.org/posterior/") + (synopsis "Tools for working with posterior distributions") + (description + "This package provides useful tools for both users and developers of +packages for fitting Bayesian models or working with output from Bayesian +models. The primary goals of the package are to: + +@enumerate +@item Efficiently convert between many different useful formats of +draws (samples) from posterior or prior distributions. + +@item Provide consistent methods for operations commonly performed on draws, +for example, subsetting, binding, or mutating draws. + +@item Provide various summaries of draws in convenient formats. + +@item Provide lightweight implementations of state of the art posterior +inference diagnostics. +@end enumerate +") + (license license:bsd-3))) + (define-public r-brms (package (name "r-brms") -- cgit v1.2.3 From dc18d10cbc5dbf0982c67023072e29d98149b9ab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:51:27 +0200 Subject: gnu: Add r-tfautograph. * gnu/packages/cran.scm (r-tfautograph): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8c19d3db1d..c8abaa10d4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30245,6 +30245,29 @@ functions to retrieve the directory of the latest run or latest several runs.") (license license:asl2.0))) +(define-public r-tfautograph + (package + (name "r-tfautograph") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "tfautograph" version)) + (sha256 + (base32 + "1fgpvv330g61ghzhkwnzx04gd9l3d6x1vxd1xqslb05h5acagwqn")))) + (properties `((upstream-name . "tfautograph"))) + (build-system r-build-system) + (inputs `(("tensorflow" ,tensorflow))) + (propagated-inputs + `(("r-reticulate" ,r-reticulate))) + (home-page "https://t-kalinowski.github.io/tfautograph/") + (synopsis "Autograph R for Tensorflow") + (description + "This package lets you translate R control flow expressions into +Tensorflow graphs.") + (license license:gpl3))) + (define-public r-tensorflow (package (name "r-tensorflow") -- cgit v1.2.3 From 10b152ae15e1fa5b140a9bffcb7114a2da7ac1ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:23 +0200 Subject: gnu: r-cachem: Update to 1.0.6. * gnu/packages/cran.scm (r-cachem): Update to 1.0.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c8abaa10d4..f7a3c86f49 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -134,14 +134,14 @@ files and provide more explicit control over line endings.") (define-public r-cachem (package (name "r-cachem") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (cran-uri "cachem" version)) (sha256 (base32 - "1xigqfhkl4n768bjgn2bqvb9k70h1ibj4lv5vvpwsh1p6vw4mkw2")))) + "0r0q5w8lsxak46crnkbi739qzys90hlw7cqqqhv99xzkpkvm554s")))) (properties `((upstream-name . "cachem"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 1a54a0b975eee4aae7fc2bb45741341634ab8d4d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:23 +0200 Subject: gnu: r-datawizard: Update to 0.2.0. * gnu/packages/cran.scm (r-datawizard): Update to 0.2.0. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f7a3c86f49..413a0bd78d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -187,18 +187,20 @@ etc.") (define-public r-datawizard (package (name "r-datawizard") - (version "0.1.0") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "datawizard" version)) (sha256 (base32 - "1fc27arvm6ks65kl9nrl2vnprpz7j8d0r2yassgxnnvr3p3ba043")))) + "1brbkjl0ds3gd0x6jl6vggzl1nfrn76z63vhj2gbl9l168iss5z3")))) (properties `((upstream-name . "datawizard"))) (build-system r-build-system) (propagated-inputs `(("r-insight" ,r-insight))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://easystats.github.io/datawizard/") (synopsis "Easy data wrangling") (description -- cgit v1.2.3 From 1eee39454ba7c67c7a118d6f8e93e34ffd92da94 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:23 +0200 Subject: gnu: r-ggpmisc: Update to 0.4.2-1. * gnu/packages/cran.scm (r-ggpmisc): Update to 0.4.2-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 413a0bd78d..cc122f856c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -640,13 +640,13 @@ variables.") (define-public r-ggpmisc (package (name "r-ggpmisc") - (version "0.4.2") + (version "0.4.2-1") (source (origin (method url-fetch) (uri (cran-uri "ggpmisc" version)) (sha256 (base32 - "0ma0xcwjgj0sp9483s2y62ylv992dqjxqfgb3zl8f1pksypqdbac")))) + "1jkxcmpxq3b5ng276adph25s5w9imjxr1lqasqw50d2kcdhq58cy")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) -- cgit v1.2.3 From 7285c1db5333d1ac8ecc4786b6b36f497c9dcb0e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:24 +0200 Subject: gnu: r-reprex: Update to 2.0.1. * gnu/packages/cran.scm (r-reprex): Update to 2.0.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cc122f856c..5d95152aec 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1197,14 +1197,14 @@ package is a port of the Python package @code{cssselect}.") (define-public r-reprex (package (name "r-reprex") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "reprex" version)) (sha256 (base32 - "1lcnxczy28n4g3rvph09va7svcznfyqa7zdggklqb924qvy7flwh")))) + "09k4rasp7mz6n796dsklcbc5l7prljiznrm7fra16qybr9kqcv8f")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) -- cgit v1.2.3 From ee5fc0a2412e02d8ff051ceceff38ce7030a283c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:24 +0200 Subject: gnu: r-httpuv: Update to 1.6.2. * gnu/packages/cran.scm (r-httpuv): Update to 1.6.2. [inputs]: Add zlib. --- gnu/packages/cran.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5d95152aec..01260e4bcc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1426,23 +1426,21 @@ Zucchini.") (define-public r-httpuv (package (name "r-httpuv") - (version "1.6.1") + (version "1.6.2") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "0rxy57zl8yb5amsn3pvikha04k2vk0py4gys09lc7wr3agamswva")) + "1p5savhrcqlagnnh8ccnhpypbif9jhp97nq4rnhldn98gmb4a7sn")) ;; Unvendor bundled libraries. As of 1.5.4 the vendored libuv ;; only contains fixes for building on Solaris. (patches (search-patches "r-httpuv-1.5.5-unvendor-libuv.patch")) (modules '((guix build utils))) + ;; Cannot unbundle http-parser, because it contains local + ;; modifications. (snippet - `(begin - (delete-file-recursively "src/libuv") - ;; Cannot unbundle http-parser, because it contains local - ;; modifications. - #t)))) + '(delete-file-recursively "src/libuv")))) (build-system r-build-system) (arguments `(#:phases @@ -1455,10 +1453,10 @@ Zucchini.") ;; Fix https://github.com/rstudio/httpuv/issues/282 (substitute* "src/http.cpp" (("uv_pipe_init\\(pLoop, &pSocket->handle\\.pipe, true\\);") - "uv_pipe_init(pLoop, &pSocket->handle.pipe, 0);")) - #t))))) + "uv_pipe_init(pLoop, &pSocket->handle.pipe, 0);"))))))) (inputs - `(("libuv" ,libuv))) + `(("libuv" ,libuv) + ("zlib" ,zlib))) (propagated-inputs `(("r-later" ,r-later) ("r-promises" ,r-promises) -- cgit v1.2.3 From d390bf650bb52b9854458e4db91d9fbe2f5bfd23 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:24 +0200 Subject: gnu: r-servr: Update to 0.23. * gnu/packages/cran.scm (r-servr): Update to 0.23. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 01260e4bcc..d9a4971d90 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1503,13 +1503,13 @@ in systems and applications.") (define-public r-servr (package (name "r-servr") - (version "0.22") + (version "0.23") (source (origin (method url-fetch) (uri (cran-uri "servr" version)) (sha256 (base32 - "1vnlkbf8s55rfgz7qp2dd84pf9zw94qmdx25rl6i7jybhsxmb71h")))) + "1f1fgfgjgjsbn2krkbyw2qwkm0k4lq9p9jakg9zwyqlgpkdd34j4")))) (build-system r-build-system) (propagated-inputs `(("r-httpuv" ,r-httpuv) -- cgit v1.2.3 From 630491f535d5aedbab845606fae415d5c15448a3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:25 +0200 Subject: gnu: r-d3r: Update to 1.0.0. * gnu/packages/cran.scm (r-d3r): Update to 1.0.0. [arguments]: Also replace d3.v7.js. [native-inputs]: Add d3.v7.js. --- gnu/packages/cran.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d9a4971d90..8c186aaac6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2261,14 +2261,14 @@ Bootstrap themes, which are packaged for use with Shiny applications.") (define-public r-d3r (package (name "r-d3r") - (version "0.9.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "d3r" version)) (sha256 (base32 - "0kc82vvyfxhxvqfalngn36prn3sxdiinsx04rn99ha6zdc27zp5k")))) + "1qijkllfaaw0lb29j8mappm8jz9kg8gkihxq5wqhb4gabsazdwva")))) (build-system r-build-system) (arguments `(#:modules ((guix build utils) @@ -2289,7 +2289,9 @@ Bootstrap themes, which are packaged for use with Shiny applications.") (,(assoc-ref inputs "d3.v5.js") "v5/dist/d3.min.js") (,(assoc-ref inputs "d3.v6.js") - "v6/dist/d3.min.js")))) + "v6/dist/d3.min.js") + (,(assoc-ref inputs "d3.v7.js") + "v7/dist/d3.min.js")))) (lambda (sources targets) (for-each (lambda (source target) (format #t "Processing ~a --> ~a~%" @@ -2297,8 +2299,7 @@ Bootstrap themes, which are packaged for use with Shiny applications.") (delete-file target) (invoke "esbuild" source "--minify" (string-append "--outfile=" target))) - sources targets)))) - #t))))) + sources targets))))))))) (propagated-inputs `(("r-dplyr" ,r-dplyr) ("r-htmltools" ,r-htmltools) @@ -2333,7 +2334,14 @@ Bootstrap themes, which are packaged for use with Shiny applications.") (uri "https://d3js.org/d3.v6.js") (sha256 (base32 - "1x6432ca7p1pfxhz3airzw943fincn9izzxkclc1wmphcvv2n2p9")))))) + "1x6432ca7p1pfxhz3airzw943fincn9izzxkclc1wmphcvv2n2p9")))) + ("d3.v7.js" + ,(origin + (method url-fetch) + (uri "https://d3js.org/d3.v7.js") + (sha256 + (base32 + "0sd6vavxs8mx5xyb8xahlqghdiczqd284a7d5wravhqnrj0bw097")))))) (home-page "https://github.com/timelyportfolio/d3r") (synopsis "d3.js utilities for R") (description -- cgit v1.2.3 From 442a26491b6dcac417f0229bacb98402908573eb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:25 +0200 Subject: gnu: r-bbmle: Update to 1.0.24. * gnu/packages/cran.scm (r-bbmle): Update to 1.0.24. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8c186aaac6..c0373613a2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4037,14 +4037,14 @@ matrices, a special case of sparse matrices.") (define-public r-bbmle (package (name "r-bbmle") - (version "1.0.23.1") + (version "1.0.24") (source (origin (method url-fetch) (uri (cran-uri "bbmle" version)) (sha256 (base32 - "0p3l9shbr2846qmw8n0fyzf4j7gmi08aypl82jml3dwh26q1whk0")))) + "1bck8rmink4wsk8pcbnj4d60svxymp29pxbzwj8p9gzsg42c1v81")))) (build-system r-build-system) (propagated-inputs `(("r-bdsmatrix" ,r-bdsmatrix) @@ -4053,6 +4053,8 @@ matrices, a special case of sparse matrices.") ("r-matrix" ,r-matrix) ("r-mvtnorm" ,r-mvtnorm) ("r-numderiv" ,r-numderiv))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/bbmle") (synopsis "Tools for General Maximum Likelihood Estimation") (description -- cgit v1.2.3 From b7d47d7715569d46c9561e9209a5eb35db3575e4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:25 +0200 Subject: gnu: r-xfun: Update to 0.25. * gnu/packages/cran.scm (r-xfun): Update to 0.25. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c0373613a2..f88584902b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5747,13 +5747,13 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.24") + (version "0.25") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "10xmw82wk40kjx22slla7959993l80s9m2rsvvvb8v9g42armqz3")))) + (base32 "15xy6hpz35j3mn4gvllj5m6krh5d86l4rnlxazsqjlckr237qgg6")))) (build-system r-build-system) ;; knitr itself depends on xfun #; -- cgit v1.2.3 From 1b85d116501e0f3a1c031c90f1d95168c3bd1066 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:25 +0200 Subject: gnu: r-tinytex: Update to 0.33. * gnu/packages/cran.scm (r-tinytex): Update to 0.33. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f88584902b..5ee89f797f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5920,14 +5920,14 @@ packages that work with genomic data.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.32") + (version "0.33") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "17y20kb5xgmz77n4rrkqmcm0cnjwfi4mn84h6zabij76b8cjiykh")))) + "10lqn704dqv5k5v6y964l8c77rwy4ilrc1hcb99j4vxpx3p4nd43")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) -- cgit v1.2.3 From 5c35a92d4be117790998a577766e3c8210232252 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:26 +0200 Subject: gnu: r-later: Update to 1.3.0. * gnu/packages/cran.scm (r-later): Update to 1.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5ee89f797f..a54437285b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7447,14 +7447,14 @@ exchanging spatial objects with other R packages.") (define-public r-later (package (name "r-later") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "later" version)) (sha256 (base32 - "00f4n1b2ykrs2cd61pypa4d00ydx9hqq2c1a1p8psa2yym6979bm")))) + "0acqg29hcm2iq1418b54np7zb5pnr3xzrwc3ijv2pz9wra10ix88")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) -- cgit v1.2.3 From c34dd257ee12606e9a7e38514451f142c2913914 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:26 +0200 Subject: gnu: r-rgexf: Update to 0.16.2. * gnu/packages/cran.scm (r-rgexf): Update to 0.16.2. [source]: Simplify snippet. [arguments]: Remove trailing #t. --- gnu/packages/cran.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a54437285b..cfc4ecbb20 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7572,22 +7572,20 @@ it.") (define-public r-rgexf (package (name "r-rgexf") - (version "0.16.0") + (version "0.16.2") (source (origin (method url-fetch) (uri (cran-uri "rgexf" version)) (sha256 (base32 - "1vj5ha1qx0xzflchxf25ycys6clfn9y32m1717afzkvhmkwisrra")) + "00c2zka1n3k7p1l0mlchr063s6x58p9r3fb64d4wgl4rvsq55q3f")) + ;; Delete minified JavaScript files (snippet - '(begin - ;; Delete minified JavaScript files - (for-each delete-file - '("inst/gexf-js/js/jquery-2.0.2.min.js" - "inst/gexf-js/js/jquery-ui-1.10.3.custom.min.js" - "inst/gexf-js/js/jquery.mousewheel.min.js")) - #true)))) + '(for-each delete-file + '("inst/gexf-js/js/jquery-2.0.2.min.js" + "inst/gexf-js/js/jquery-ui-1.10.3.custom.min.js" + "inst/gexf-js/js/jquery.mousewheel.min.js"))))) (properties `((upstream-name . "rgexf"))) (build-system r-build-system) (arguments @@ -7616,8 +7614,7 @@ it.") source target) (invoke "esbuild" source "--minify" (string-append "--outfile=" target))) - sources targets)))) - #t))))) + sources targets))))))))) (propagated-inputs `(("r-igraph" ,r-igraph) ("r-servr" ,r-servr) -- cgit v1.2.3 From 741f61998210e7a83cbbae3b84426706f450adbc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:26 +0200 Subject: gnu: r-rbibutils: Update to 2.2.3. * gnu/packages/cran.scm (r-rbibutils): Update to 2.2.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cfc4ecbb20..9be65abf84 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8426,14 +8426,14 @@ hierarchical models using Markov Chain Monte Carlo (MCMC) simulation.") (define-public r-rbibutils (package (name "r-rbibutils") - (version "2.2.2") + (version "2.2.3") (source (origin (method url-fetch) (uri (cran-uri "rbibutils" version)) (sha256 (base32 - "0ks43z6vvdz0d0jv5d2qrm12yb4cwvi7p3kjk6byi4farhh368di")))) + "1rzc2icik26qlnrbq58c24lc9m0grl83p0hyr70whallqfipa174")))) (properties `((upstream-name . "rbibutils"))) (build-system r-build-system) (home-page "https://geobosh.github.io/rbibutils/") -- cgit v1.2.3 From 46439f6d655b59e0bd097b137f0c3fdce55f4ece Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:26 +0200 Subject: gnu: r-insight: Update to 0.14.3. * gnu/packages/cran.scm (r-insight): Update to 0.14.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9be65abf84..253c08b13f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8700,14 +8700,14 @@ other add-on packages.") (define-public r-insight (package (name "r-insight") - (version "0.14.2") + (version "0.14.3") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "0dy7m6fb9ciyskxjirk6k4blfj9k3n4zfyx677xm3cmscp61g8gp")))) + "1fynidv11wmh51ybwzqj3c206slfwdz8a53qr57lcxwrg7zjn94q")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From 16bb0355f25718feaec7ba36a87007a5a8afcac8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:27 +0200 Subject: gnu: r-argparse: Update to 2.0.4. * gnu/packages/cran.scm (r-argparse): Update to 2.0.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 253c08b13f..974eeeede6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8988,14 +8988,14 @@ matches version and feature constraints.") (define-public r-argparse (package (name "r-argparse") - (version "2.0.3") + (version "2.0.4") (source (origin (method url-fetch) (uri (cran-uri "argparse" version)) (sha256 (base32 - "1c2r417m1dxk1jhcggv3g4zax5a59k9rqs9jcs6xy2pa2333jqfj")))) + "1sgrr6acvfjbhksj45v6d5m5n5pp12kypcxisgbshlr9jdkmasd7")))) (build-system r-build-system) (inputs `(("python" ,python))) (propagated-inputs -- cgit v1.2.3 From bd7a0667bfb91815aa83bfc37bb3aec90e8ad88e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:27 +0200 Subject: gnu: r-magick: Update to 2.7.3. * gnu/packages/cran.scm (r-magick): Update to 2.7.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 974eeeede6..c1a291a80c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10206,14 +10206,14 @@ samples is large and the number of mixture components is not too large.") (define-public r-magick (package (name "r-magick") - (version "2.7.2") + (version "2.7.3") (source (origin (method url-fetch) (uri (cran-uri "magick" version)) (sha256 (base32 - "1ckp85wk9lj6jjm92ww4mg1r4h4zm2cm68y6fyb1hz4mr3nihmji")))) + "0h942bn7wfnzbbgq9hrs75c7igmg5r1c5sad2v0znhza4cp7p1w3")))) (build-system r-build-system) (inputs `(("imagemagick" ,imagemagick) -- cgit v1.2.3 From bc81012532a73046f524f2b34b692e46e6923d75 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:27 +0200 Subject: gnu: r-emmeans: Update to 1.6.3. * gnu/packages/cran.scm (r-emmeans): Update to 1.6.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c1a291a80c..70494b361c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10648,14 +10648,14 @@ Hothorn, Westfall, 2010, CRC Press).") (define-public r-emmeans (package (name "r-emmeans") - (version "1.6.2-1") + (version "1.6.3") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "04971fi02x4ajkx1mijdv283wb5acic0s1s8g68vv7vk2bk09rj4")))) + "1mwcq3hvpx04qnn5k0bv1mikjgm9mk6m83i8hj350s1c1a0mi40n")))) (build-system r-build-system) (propagated-inputs `(("r-estimability" ,r-estimability) -- cgit v1.2.3 From a618f77c95c71b05f97dc677400aa6ba120cbb30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:27 +0200 Subject: gnu: r-gert: Update to 1.3.2. * gnu/packages/cran.scm (r-gert): Update to 1.3.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 70494b361c..72f7a90346 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11200,14 +11200,14 @@ user credentials.") (define-public r-gert (package (name "r-gert") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "gert" version)) (sha256 (base32 - "0ydakqhwi406pn255zgrzw31x01djrrjdaknh0d2ibw136lmw5hj")))) + "0pqrv58hqbf6cifwi9zxgnkql6a2j9i8wknnd5ng8z3d94zs12bz")))) (properties `((upstream-name . "gert"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 22f83fb615046e91d61c41ceb7a3067393d3455d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:28 +0200 Subject: gnu: r-rgl: Update to 0.107.14. * gnu/packages/cran.scm (r-rgl): Update to 0.107.14. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 72f7a90346..0fa62b5568 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11840,14 +11840,14 @@ Bioconductor packages.") (define-public r-rgl (package (name "r-rgl") - (version "0.107.10") + (version "0.107.14") (source (origin (method url-fetch) (uri (cran-uri "rgl" version)) (sha256 (base32 - "0ikqk30bpaak26f230rxi3l6fq5ym1558ngni86zs3nd42gqm3mi")))) + "1z5h4wbjj18prcykc96rqcn699pnqw6vybwj2mpbbbdw2lr3q8b7")))) (build-system r-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 4a7b76a62bec6b4ee698e939f3cde7878b786ce8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:28 +0200 Subject: gnu: r-bigrquery: Update to 1.4.0. * gnu/packages/cran.scm (r-bigrquery): Update to 1.4.0. [propagated-inputs]: Add r-lifecycle. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0fa62b5568..9d562e3e1e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13277,14 +13277,14 @@ preparing, executing, and processing HTTP requests.") (define-public r-bigrquery (package (name "r-bigrquery") - (version "1.3.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "bigrquery" version)) (sha256 (base32 - "16whccv7f94vf57dvbbrhdskz3nnbmpa11a14kp7aynckldlfy0v")))) + "02msq61l7vamzpvbhvalh3qil1aa7pr68pwpsivbb6pvz6p4zyns")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) @@ -13295,6 +13295,7 @@ preparing, executing, and processing HTTP requests.") ("r-glue" ,r-glue) ("r-httr" ,r-httr) ("r-jsonlite" ,r-jsonlite) + ("r-lifecycle" ,r-lifecycle) ("r-prettyunits" ,r-prettyunits) ("r-progress" ,r-progress) ("r-rapidjsonr" ,r-rapidjsonr) -- cgit v1.2.3 From 58a8e675ee0268708766532c1f77d386fc7f844a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:28 +0200 Subject: gnu: r-future-apply: Update to 1.8.1. * gnu/packages/cran.scm (r-future-apply): Update to 1.8.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9d562e3e1e..c66dd41ec8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14402,14 +14402,14 @@ the local machine to, say, distributed processing on a remote compute cluster.") (define-public r-future-apply (package (name "r-future-apply") - (version "1.7.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (cran-uri "future.apply" version)) (sha256 (base32 - "1ns5cf80vyabvyz9qp6kpvkg4jycinn7x6v7x6692fgjapdnmyig")))) + "1ix61bfbk43pwnjb0wk8lkfgdsy5zi8svk74gar5nrl90b5w6nqd")))) (properties `((upstream-name . "future.apply"))) (build-system r-build-system) (arguments -- cgit v1.2.3 From 586c5df06265e56fc0f06c0a6ec6ef93fe8e8af0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:28 +0200 Subject: gnu: r-bookdown: Update to 0.23. * gnu/packages/cran.scm (r-bookdown): Update to 0.23. [propagated-inputs]: Add r-jquerylib. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c66dd41ec8..af8da8ac0b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16511,16 +16511,17 @@ SELECT or UPDATE queries to an end-point.") (define-public r-bookdown (package (name "r-bookdown") - (version "0.22") + (version "0.23") (source (origin (method url-fetch) (uri (cran-uri "bookdown" version)) (sha256 (base32 - "0j80wm36mw3f14ncfwm6xx09wff1kswfiv8b309x9y0f9r46dr0z")))) + "1q0n3pjhgpsin4z7bdf0hixkfxvbbn1wc23040yl11wzc5x2f1ap")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) + ("r-jquerylib" ,r-jquerylib) ("r-knitr" ,r-knitr) ("r-rmarkdown" ,r-rmarkdown) ("r-tinytex" ,r-tinytex) -- cgit v1.2.3 From ae71a35b9b0e43e702ac16ce3b5211f4a315a1c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:29 +0200 Subject: gnu: r-ggplotify: Update to 0.0.9. * gnu/packages/cran.scm (r-ggplotify): Update to 0.0.9. [propagated-inputs]: Remove r-rvcheck; add r-yulab-utils. --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index af8da8ac0b..7d6331d3a2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17011,19 +17011,19 @@ package.") (define-public r-ggplotify (package (name "r-ggplotify") - (version "0.0.8") + (version "0.0.9") (source (origin (method url-fetch) (uri (cran-uri "ggplotify" version)) (sha256 (base32 - "08c9vxm8pg6l5g3r7wsfgzsq00xdrc6v4xnn7pd3qcyw7cc8s969")))) + "1irm8pmf20bfl2djr591jfs7g8l7vw2673ri76pimz3285l74bp0")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) ("r-gridgraphics" ,r-gridgraphics) - ("r-rvcheck" ,r-rvcheck))) + ("r-yulab-utils" ,r-yulab-utils))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://github.com/GuangchuangYu/ggplotify") -- cgit v1.2.3 From de3e5506daebe9f0177cd1a1284b50b692c7f819 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:29 +0200 Subject: gnu: r-dae: Update to 3.2-10. * gnu/packages/cran.scm (r-dae): Update to 3.2-10. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7d6331d3a2..dc6c8021fd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18544,14 +18544,14 @@ classification and regression models.") (define-public r-dae (package (name "r-dae") - (version "3.1-37") + (version "3.2-10") (source (origin (method url-fetch) (uri (cran-uri "dae" version)) (sha256 (base32 - "102fgbdpn7yvm1zj180cv4sr1096sz35d4gndsv7w9kriqyi1c1l")))) + "1z5vxxzzpqfl78c2c60109jdr003j48qjisj3mrhsxa89wdv9hs9")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From 6b4e6deea60eca661cd242c697efca03618f75fe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:29 +0200 Subject: gnu: r-terra: Update to 1.3-22. * gnu/packages/cran.scm (r-terra): Update to 1.3-22. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dc6c8021fd..cfa66802c2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19240,14 +19240,14 @@ emphasize hidden group structures in networks or focus on specific nodes.") (define-public r-terra (package (name "r-terra") - (version "1.3-4") + (version "1.3-22") (source (origin (method url-fetch) (uri (cran-uri "terra" version)) (sha256 (base32 - "04fcraicr79vrvzqfxqsgzqp6awf2g5qrvpi76dcm3c04i5z3rlc")))) + "1z5zql68q4n81ccpl02hndhbavhhqs65bli1hjxlqdwdq192whkh")))) (properties `((upstream-name . "terra"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From a6ffecaf7b3bdc5a140656c8750772ff34c2fd66 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:29 +0200 Subject: gnu: r-sysfonts: Update to 0.8.5. * gnu/packages/cran.scm (r-sysfonts): Update to 0.8.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cfa66802c2..d792e94aa9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20006,14 +20006,14 @@ server-side.") (define-public r-sysfonts (package (name "r-sysfonts") - (version "0.8.4") + (version "0.8.5") (source (origin (method url-fetch) (uri (cran-uri "sysfonts" version)) (sha256 (base32 - "0bq48hf2h4dkxymc36ypqvbwx5lbyj2m6fsikmgqiy4ixjpbvz8h")))) + "1fhf0x5sqx3mv72j9d0clkq1qzqiqxbxn1h808f7ccf0mb04v43y")))) (properties `((upstream-name . "sysfonts"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 0ed48e1314855c5853dd50aa97737e0ea09cfe62 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:30 +0200 Subject: gnu: r-showtext: Update to 0.9-4. * gnu/packages/cran.scm (r-showtext): Update to 0.9-4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d792e94aa9..023ad8619d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20054,14 +20054,14 @@ package.") (define-public r-showtext (package (name "r-showtext") - (version "0.9-3") + (version "0.9-4") (source (origin (method url-fetch) (uri (cran-uri "showtext" version)) (sha256 (base32 - "0ghxd5la8is2mz5w7lk507zgcpr5lz30miqyhyn9cqazlsfwp4wa")))) + "1gvj32wrs5q31bmg5dy6n85d0igm3jhkldhdv8kscw0pfrk89y36")))) (properties `((upstream-name . "showtext"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From b4b3ffb09e6a91f03242f101b35db4269cc5b3ac Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:30 +0200 Subject: gnu: r-tree: Update to 1.0-41. * gnu/packages/cran.scm (r-tree): Update to 1.0-41. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 023ad8619d..c79eaba191 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21269,13 +21269,13 @@ management} (aCRM).") (define-public r-tree (package (name "r-tree") - (version "1.0-40") + (version "1.0-41") (source (origin (method url-fetch) (uri (cran-uri "tree" version)) (sha256 (base32 - "1rr6ws62j9h36f3nl713f8h3ndkh95mv46l055jvgmby5lw1dazz")))) + "13jwdxx3na16mly176n01zdkaqn4a8x9fc43rq5xx5vx31drkkr1")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/tree/") (synopsis "Classification and regression trees") -- cgit v1.2.3 From 33df0e388e9763073f7e02d86d34f5504c86e540 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:30 +0200 Subject: gnu: r-quanteda: Update to 3.1.0. * gnu/packages/cran.scm (r-quanteda): Update to 3.1.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c79eaba191..5811ec296b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23201,14 +23201,14 @@ Norwegian, Portuguese, Romanian, Russian, Spanish, Swedish and Turkish.") (define-public r-quanteda (package (name "r-quanteda") - (version "3.0.0") + (version "3.1.0") (source (origin (method url-fetch) (uri (cran-uri "quanteda" version)) (sha256 (base32 - "0b1jfkdhpsg5jhjz4p0nf4cmi9p8w40wv3i2f17jf2x1n1y2hjj8")))) + "0gafbb73gcxx2gq9q7bg88alyhymkr471lp394m5ydij6mdm4hb9")))) (properties `((upstream-name . "quanteda"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8804fe4f650416d9b306bca30124452c81ad986a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:30 +0200 Subject: gnu: r-rpf: Update to 1.0.8. * gnu/packages/cran.scm (r-rpf): Update to 1.0.8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5811ec296b..99e822d87a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23549,14 +23549,14 @@ and analyze Stan models.") (define-public r-rpf (package (name "r-rpf") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) (uri (cran-uri "rpf" version)) (sha256 (base32 - "04n605h091d6nijbbhar79zj7gfkymb6pp7v1496avzajy483klw")))) + "039r6yz2ax7i9sv8vi98yg7llwb966ay6mrifpmp6q3xh1f634kl")))) (properties `((upstream-name . "rpf"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 50e345f1b199577d6d1f11f047a82951cf3bbf49 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:30 +0200 Subject: gnu: r-packrat: Update to 0.7.0. * gnu/packages/cran.scm (r-packrat): Update to 0.7.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 99e822d87a..7f941d9372 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23988,14 +23988,14 @@ interesting features. iheatmapr uses the plotly library for interactivity.") (define-public r-packrat (package (name "r-packrat") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (cran-uri "packrat" version)) (sha256 (base32 - "01cn2vf95nc8bh0hh8imkn030yra3hx64q1fb8jwsr52p9s397fr")))) + "1hnwhdgqljqs3m7c4rjlyndyc0k85jpa4rbfymxkm3zjg3yy3g78")))) (properties `((upstream-name . "packrat"))) (build-system r-build-system) (home-page "https://github.com/rstudio/packrat/") -- cgit v1.2.3 From 01bcea4dcbb491d495f335ba3600bc9d2d3ac6e5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:31 +0200 Subject: gnu: r-rsconnect: Update to 0.8.24. * gnu/packages/cran.scm (r-rsconnect): Update to 0.8.24. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7f941d9372..8c0c12b8c1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24009,14 +24009,14 @@ and reproducible way.") (define-public r-rsconnect (package (name "r-rsconnect") - (version "0.8.18") + (version "0.8.24") (source (origin (method url-fetch) (uri (cran-uri "rsconnect" version)) (sha256 (base32 - "01bj16iggj5fggfa7n312458p8xg30zx2vzfkd8jqcchnbrphfvl")))) + "19p4w9dmhsl1vdvwv3hfmd5qzf4296g0x878idfajvrx0wgfysyg")))) (properties `((upstream-name . "rsconnect"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 9480d44b4052e846ef8623e221f82a659e812208 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:31 +0200 Subject: gnu: r-rlinsolve: Update to 0.3.2. * gnu/packages/cran.scm (r-rlinsolve): Update to 0.3.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8c0c12b8c1..4ccf637856 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24402,14 +24402,14 @@ climate data.") (define-public r-rlinsolve (package (name "r-rlinsolve") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (cran-uri "Rlinsolve" version)) (sha256 (base32 - "1x02xxbkchcwwfa2123n9yqfzinfi0zba8zxhp977czzwysy75cc")))) + "1xv500n1480qyakw0isanw1s5ywykhc207hqja4804s5s2m8zfjw")))) (properties `((upstream-name . "Rlinsolve"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8a2f102fb4eaf581529cf0d6c573d049e7728bac Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:31 +0200 Subject: gnu: r-rxnat: Update to 1.0.15. * gnu/packages/cran.scm (r-rxnat): Update to 1.0.15. [propagated-inputs]: Remove r-dplyr. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4ccf637856..e3181050dd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25079,20 +25079,19 @@ infinite-precision rational arithmetic.") (define-public r-rxnat (package (name "r-rxnat") - (version "1.0.14") + (version "1.0.15") (source (origin (method url-fetch) (uri (cran-uri "Rxnat" version)) (sha256 (base32 - "00fl68pa0c2vy4xlny67pn41lzgm7b97wgg3dwm6z35izca62l11")))) + "0siylypjd8cgcmr2c443w8krg8sgr5gz4zapbinanp8vsfzivdv2")))) (properties `((upstream-name . "Rxnat"))) (build-system r-build-system) (propagated-inputs - `(("r-dplyr" ,r-dplyr) - ("r-httr" ,r-httr) + `(("r-httr" ,r-httr) ("r-rcurl" ,r-rcurl) ("r-tibble" ,r-tibble))) (native-inputs -- cgit v1.2.3 From d8cd4468e4d35ded8b6254da5fa036beaba4badc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:31 +0200 Subject: gnu: r-brms: Update to 2.16.0. * gnu/packages/cran.scm (r-brms): Update to 2.16.0. [propagated-inputs]: Add r-posterior. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e3181050dd..5a969f15e2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25330,14 +25330,14 @@ inference diagnostics. (define-public r-brms (package (name "r-brms") - (version "2.15.0") + (version "2.16.0") (source (origin (method url-fetch) (uri (cran-uri "brms" version)) (sha256 (base32 - "0byc3fyvf9qbvvgwf55ih5d4br1nnxlbaidq9fvr11bmv38h25y1")))) + "14ykj7h0pzyzsyd1c46ybapsz3aqnffjih5hm7khfa5jk05wbs7a")))) (properties `((upstream-name . "brms"))) (build-system r-build-system) (propagated-inputs @@ -25355,6 +25355,7 @@ inference diagnostics. ("r-mgcv" ,r-mgcv) ("r-nleqslv" ,r-nleqslv) ("r-nlme" ,r-nlme) + ("r-posterior" ,r-posterior) ("r-projpred" ,r-projpred) ("r-rcpp" ,r-rcpp) ("r-rstan" ,r-rstan) -- cgit v1.2.3 From 59bc5db72e3641c0644fb90befdb722663793308 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:32 +0200 Subject: gnu: r-scatterpie: Update to 0.1.7. * gnu/packages/cran.scm (r-scatterpie): Update to 0.1.7. [propagated-inputs]: Remove r-rvcheck; add r-ggfun. --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5a969f15e2..38705d8c3d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25417,21 +25417,21 @@ multi-state models.") (define-public r-scatterpie (package (name "r-scatterpie") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) (uri (cran-uri "scatterpie" version)) (sha256 (base32 - "1lilzybbxqhrjpwwf9050wf5f896pn5d93llp5da7ssrcn5bm9i8")))) + "1pmspv8a7k20zyd5xvmav2k9mnjrkfhdij3rr9k504zyki8hfy1z")))) (properties `((upstream-name . "scatterpie"))) (build-system r-build-system) (propagated-inputs `(("r-ggforce" ,r-ggforce) + ("r-ggfun" ,r-ggfun) ("r-ggplot2" ,r-ggplot2) ("r-rlang" ,r-rlang) - ("r-rvcheck" ,r-rvcheck) ("r-tidyr" ,r-tidyr))) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From 0887bff472895ecf5b2df0488d7886d6e959ce45 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:32 +0200 Subject: gnu: r-infer: Update to 1.0.0. * gnu/packages/cran.scm (r-infer): Update to 1.0.0. [propagated-inputs]: Add r-broom, r-generics, r-patchwork, and r-tidyr. --- gnu/packages/cran.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 38705d8c3d..4dcb446b61 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27499,24 +27499,28 @@ functions or computational engines (e.g. R, Spark, Stan, etc).") (define-public r-infer (package (name "r-infer") - (version "0.5.4") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "infer" version)) (sha256 (base32 - "0wvvgqjhyv7ql98cjzqad61wbmk7xrqd1ybk894jr5cmza13c8w2")))) + "1qbpcn7jqbvgwnpiyylj021j8m33p58a204yd1pfkpzd3x2lbsm6")))) (properties `((upstream-name . "infer"))) (build-system r-build-system) (propagated-inputs - `(("r-dplyr" ,r-dplyr) + `(("r-broom" ,r-broom) + ("r-dplyr" ,r-dplyr) + ("r-generics" ,r-generics) ("r-ggplot2" ,r-ggplot2) ("r-glue" ,r-glue) ("r-magrittr" ,r-magrittr) + ("r-patchwork" ,r-patchwork) ("r-purrr" ,r-purrr) ("r-rlang" ,r-rlang) - ("r-tibble" ,r-tibble))) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://github.com/tidymodels/infer") -- cgit v1.2.3 From 7dae9355fda99e3c164dcf937111fe71ab158831 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:32 +0200 Subject: gnu: r-seurat: Update to 4.0.4. * gnu/packages/cran.scm (r-seurat): Update to 4.0.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4dcb446b61..09f1aefe7b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27929,13 +27929,13 @@ other R users.") (define-public r-seurat (package (name "r-seurat") - (version "4.0.3") + (version "4.0.4") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "1jfzkqnk4r82ssyz6h51n2jybkdcjkpjdb2la6n2xqnfs2b8dnbm")))) + "1pa2v29mx39swblzwzqc7rpql2rizhi2nj426r1i63wyla6lcxc0")))) (properties `((upstream-name . "Seurat"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From f6e76ab26287241561eb63fb788bd7461110fd05 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:32 +0200 Subject: gnu: r-mlr3: Update to 0.12.0. * gnu/packages/cran.scm (r-mlr3): Update to 0.12.0. [propagated-inputs]: Remove r-digest; add r-future. --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 09f1aefe7b..63f1bc379f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28325,20 +28325,20 @@ implemented as @code{R6} classes.") (define-public r-mlr3 (package (name "r-mlr3") - (version "0.11.0") + (version "0.12.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3" version)) (sha256 (base32 - "0qh9vdac1als2123wf51bwa7spdqk33iydlawi5n5dpci892iahl")))) + "0nimwczsgrj29r9qrlz32qc3fkj02369zql7jhkrn3lk3mfy5zmz")))) (build-system r-build-system) (propagated-inputs `(("r-r6" ,r-r6) ("r-backports" ,r-backports) ("r-checkmate" ,r-checkmate) ("r-data-table" ,r-data-table) - ("r-digest" ,r-digest) + ("r-future" ,r-future) ("r-future-apply" ,r-future-apply) ("r-lgr" ,r-lgr) ("r-mlbench" ,r-mlbench) -- cgit v1.2.3 From 1df8915a0346e5ea683176908f90f04d05a6e047 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:33 +0200 Subject: gnu: r-mlr3learners: Update to 0.5.0. * gnu/packages/cran.scm (r-mlr3learners): Update to 0.5.0. [propagated-inputs]: Add r-checkmate. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 63f1bc379f..e97d80199d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28361,16 +28361,17 @@ computational operations, add-on packages provide additional functionality.") (define-public r-mlr3learners (package (name "r-mlr3learners") - (version "0.4.5") + (version "0.5.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3learners" version)) (sha256 (base32 - "02v4y32yn1m0akkqzhfg65ib21rgy9iz8db4kdcrvi949clkxnfk")))) + "1gkbbn5ah2iv4pv5q2jf4lrqkga744d4y9jlyhyjqf0x75y9wkg2")))) (build-system r-build-system) (propagated-inputs - `(("r-data-table" ,r-data-table) + `(("r-checkmate" ,r-checkmate) + ("r-data-table" ,r-data-table) ("r-mlr3" ,r-mlr3) ("r-mlr3misc" ,r-mlr3misc) ("r-paradox" ,r-paradox) -- cgit v1.2.3 From 5f95575b84f8528d28a98e0e28d1457fc2873e48 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:33 +0200 Subject: gnu: r-english: Update to 1.2-6. * gnu/packages/cran.scm (r-english): Update to 1.2-6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e97d80199d..e6febbb6ea 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29024,14 +29024,14 @@ and word lists.") (define-public r-english (package (name "r-english") - (version "1.2-5") + (version "1.2-6") (source (origin (method url-fetch) (uri (cran-uri "english" version)) (sha256 (base32 - "0d6rin40wy2y6k75x8d5qvf03rfy139f309wrl8xwbdb1h8fjkd1")))) + "1g3nmy5p8wj3ix1vp1qmkmy3dyqisrw0md8cjrx4klqkp0wqlms9")))) (properties `((upstream-name . "english"))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From 36a506586be2609e2c6f1b652966701aa4bd7be8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:33 +0200 Subject: gnu: r-rjsonio: Update to 1.3-1.5. * gnu/packages/cran.scm (r-rjsonio): Update to 1.3-1.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e6febbb6ea..c780da78b5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29641,14 +29641,14 @@ variability than the Poisson, but less than the negative binomial.") (define-public r-rjsonio (package (name "r-rjsonio") - (version "1.3-1.4") + (version "1.3-1.5") (source (origin (method url-fetch) (uri (cran-uri "RJSONIO" version)) (sha256 (base32 - "141ijm9570mg1180isvi0jb9vd3b08s5gb9dl1wa5v0m3s9jq52l")))) + "1dp9kdf0ca27br1wsq9pj7d55n601achpbzdzxhykzz531xhmjrl")))) (properties `((upstream-name . "RJSONIO"))) (build-system r-build-system) (home-page "https://cran.r-project.org/package=RJSONIO") -- cgit v1.2.3 From 18a887b767c3958e358bc3e78373f64840eb12ad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:33 +0200 Subject: gnu: r-textplot: Update to 0.2.0. * gnu/packages/cran.scm (r-textplot): Update to 0.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c780da78b5..6a8e3f06db 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29715,14 +29715,14 @@ quantitative real-time polymerase chain reaction (qPCR).") (define-public r-textplot (package (name "r-textplot") - (version "0.1.4") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "textplot" version)) (sha256 (base32 - "1sgkndy2cxk8c76h8hwajn6f78w5jj2n8vsmaxh9kj931crzn8cy")))) + "1fhnwbcgkliq71lry21762djhlbap1qg4mgil0np46aa6619l21m")))) (properties `((upstream-name . "textplot"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 224cb006f6a4ab4f27e273ad7daae998cf51cea1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:34 +0200 Subject: gnu: r-vroom: Update to 1.5.4. * gnu/packages/cran.scm (r-vroom): Update to 1.5.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6a8e3f06db..b6b3f80a27 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29937,14 +29937,14 @@ time zone manipulations.") (define-public r-vroom (package (name "r-vroom") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) (uri (cran-uri "vroom" version)) (sha256 (base32 - "0hjb9qxv1ma7c38pihqhypc9l55ad1i1dfzxsz56jn3jsiw29ya4")))) + "15gbr35pmbnxjy0la2h20c0vf64q69gk7k996gn8b5wn3klxvg7n")))) (properties `((upstream-name . "vroom"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ed7d8e74e433e138f2cff9498a46cf571d9693b9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:34 +0200 Subject: gnu: r-opencpu: Update to 2.2.5. * gnu/packages/cran.scm (r-opencpu): Update to 2.2.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b6b3f80a27..c5569db030 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30055,13 +30055,13 @@ reading and writing arbitrary protocol-buffer data in R.") (define-public r-opencpu (package (name "r-opencpu") - (version "2.2.4") + (version "2.2.5") (source (origin (method url-fetch) (uri (cran-uri "opencpu" version)) (sha256 - (base32 "0f0lrqfzzrbaimd39v1gzdirf0zpkc5n58z8jj5nl6jb6mppf4qk")))) + (base32 "1qlwx8iq30qfy2sh0v31pxg955bj4zs0r7v8yklbdwb3qw7kv30g")))) (properties `((upstream-name . "opencpu"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 33317ba7223725961eab2cddf691fdf2cad15fab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:34 +0200 Subject: gnu: r-tensorflow: Update to 2.6.0. * gnu/packages/cran.scm (r-tensorflow): Update to 2.6.0. [propagated-inputs]: Remove r-jsonlite; add r-tfautograph. --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c5569db030..a609186589 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30285,23 +30285,23 @@ Tensorflow graphs.") (define-public r-tensorflow (package (name "r-tensorflow") - (version "2.5.0") + (version "2.6.0") (source (origin (method url-fetch) (uri (cran-uri "tensorflow" version)) (sha256 (base32 - "00g9w4xmdyjl4578kmhng58k7afjkj2vwgcq2ik8rqwljkcz5pph")))) + "1lkzxc3b5gkcg4hwqr57cysplcba6ff44qz8lbvk19kxnrhjaf9g")))) (properties `((upstream-name . "tensorflow"))) (build-system r-build-system) (inputs `(("tensorflow" ,tensorflow))) (propagated-inputs `(("r-config" ,r-config) - ("r-jsonlite" ,r-jsonlite) ("r-processx" ,r-processx) ("r-reticulate" ,r-reticulate) ("r-rstudioapi" ,r-rstudioapi) + ("r-tfautograph" ,r-tfautograph) ("r-tfruns" ,r-tfruns) ("r-yaml" ,r-yaml))) (home-page "https://github.com/rstudio/tensorflow") -- cgit v1.2.3 From 4f5328854f250b09e5170da6b00bcb31e53cab23 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:34 +0200 Subject: gnu: r-keras: Update to 2.6.0. * gnu/packages/cran.scm (r-keras): Update to 2.6.0. [propagated-inputs]: Add r-ellipsis and r-glue. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a609186589..337ad2816d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30316,18 +30316,20 @@ between them.") (define-public r-keras (package (name "r-keras") - (version "2.4.0") + (version "2.6.0") (source (origin (method url-fetch) (uri (cran-uri "keras" version)) (sha256 (base32 - "00bw5f5d81md8db1k6bf2a91by4k25xvlwxiwv188y4vw3bfc7md")))) + "1pgdcypp9x9dw7aa5ka7qqgd24jdcp3ja94jpm7j6l6j4930k5vd")))) (properties `((upstream-name . "keras"))) (build-system r-build-system) (propagated-inputs - `(("r-generics" ,r-generics) + `(("r-ellipsis" ,r-ellipsis) + ("r-generics" ,r-generics) + ("r-glue" ,r-glue) ("r-magrittr" ,r-magrittr) ("r-r6" ,r-r6) ("r-reticulate" ,r-reticulate) -- cgit v1.2.3 From 54b95b640dc8928baa27a72215e1a74320fd9fc1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:34 +0200 Subject: gnu: r-survival: Update to 3.2-12. * gnu/packages/statistics.scm (r-survival): Update to 3.2-12. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 78ac49b3e7..90fc7d1206 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -716,14 +716,14 @@ analysis.") (define-public r-survival (package (name "r-survival") - (version "3.2-11") + (version "3.2-12") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "0w0gkni1w8rbmfw7yl08bl1s9lij1yhbkj4dvmxcarkkw26sjjzs")))) + "1152zpd961bzwnabkhf6q9jgb72bj68023dsn2dcdmxqdi72mps5")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit v1.2.3 From ccdcb673532927435c89ee1f88a6d62b6f46fba5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:35 +0200 Subject: gnu: r-r6: Update to 2.5.1. * gnu/packages/statistics.scm (r-r6): Update to 2.5.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 90fc7d1206..a0e7129605 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1640,13 +1640,13 @@ flexible and easy to set up.") (define-public r-r6 (package (name "r-r6") - (version "2.5.0") + (version "2.5.1") (source (origin (method url-fetch) (uri (cran-uri "R6" version)) (sha256 (base32 - "00ifi2kwa7kn67xf0z1w6jfdicjczygbyi5mhfw2qlzc4sbazhdf")))) + "0j5z0b0myzjyyykk310xsa9n2mcm9bz8yqbq4xgz2yzdq8lvv4ld")))) (build-system r-build-system) (home-page "https://github.com/wch/R6/") (synopsis "Classes with reference semantics in R") -- cgit v1.2.3 From 5b7813fd0903482746146fb4bd61c3d0a852143b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:35 +0200 Subject: gnu: r-readr: Update to 2.0.1. * gnu/packages/statistics.scm (r-readr): Update to 2.0.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a0e7129605..7fdd8bdba9 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2555,13 +2555,13 @@ time-of-day values, based on the @code{difftime} class.") (define-public r-readr (package (name "r-readr") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "readr" version)) (sha256 (base32 - "1738nccg0msrhmzsasp19i0dpqi3m1nqbbg3nf1iiyp0mqc1dl8r")))) + "0cj5k3ykkhixgdsqm1gnmpc0d8z04l3fhvm2dr5xp7cpmhgsrpfr")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) -- cgit v1.2.3 From e626540d415caa6cfd80a51888257df8414f74d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:35 +0200 Subject: gnu: r-rmarkdown: Update to 2.10. * gnu/packages/statistics.scm (r-rmarkdown): Update to 2.10. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 7fdd8bdba9..3e60214217 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2740,13 +2740,13 @@ certain criterion, e.g., it contains a certain regular file.") (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "2.9") + (version "2.10") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 - (base32 "0s46x819zhf45k8qzpiwz79i5pn4gv99jfadywcjca3wka5szrbc")))) + (base32 "1p2cc9ysj906gkl4c6ac7s8njh32p2kcx1ib4gjj3jmfz915k9jk")))) (properties `((upstream-name . "rmarkdown"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 871c81d0e60a6d7c9081287dd5d0af79f5ebe485 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:35 +0200 Subject: gnu: r-rsqlite: Update to 2.2.8. * gnu/packages/statistics.scm (r-rsqlite): Update to 2.2.8. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 3e60214217..5fb09d744c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2855,13 +2855,13 @@ a column in data frame.") (define-public r-rsqlite (package (name "r-rsqlite") - (version "2.2.7") + (version "2.2.8") (source (origin (method url-fetch) (uri (cran-uri "RSQLite" version)) (sha256 (base32 - "1j89n4ydv42y5hqqv8nz72sa5wncws074kg527s902k1a67s69ii")))) + "1hscgi11px9hq0sx78c2lkfzq121rlvmhxmqf305xg6lgqdxr2hv")))) (properties `((upstream-name . "RSQLite"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2a775745d7b09f5f42a53aaf38a23f5ad8f3341d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 22 Aug 2021 17:53:35 +0200 Subject: gnu: r-xml: Update to 3.99-0.7. * gnu/packages/statistics.scm (r-xml): Update to 3.99-0.7. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 5fb09d744c..f711a963a3 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2928,13 +2928,13 @@ ldap, and also supports cookies, redirects, authentication, etc.") (define-public r-xml (package (name "r-xml") - (version "3.99-0.6") + (version "3.99-0.7") (source (origin (method url-fetch) (uri (cran-uri "XML" version)) (sha256 (base32 - "0qibvacbfm7gl41ylway3vdyi1qbpa211d48rg3k5i30d48rbf58")))) + "024038g1mrzkv7b7fyrzpzpxlch3sifsnaa584g98y3c3g6jbrz0")))) (properties `((upstream-name . "XML"))) (build-system r-build-system) -- cgit v1.2.3 From 227579e84a6846a26b2eaa8b9cc5f7d45b09697c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:12 +0200 Subject: gnu: r-biomart: Update to 2.48.3. * gnu/packages/bioconductor.scm (r-biomart): Update to 2.48.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a85cf904f7..7af777fe86 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2154,13 +2154,13 @@ on Bioconductor or which replace R functions.") (define-public r-biomart (package (name "r-biomart") - (version "2.48.2") + (version "2.48.3") (source (origin (method url-fetch) (uri (bioconductor-uri "biomaRt" version)) (sha256 (base32 - "1na271z9gc3b7xfcghbljj9lqq6v9b2kb71xahsq544yv4z9w8xj")))) + "096s243yzbhhz3wsm7azml5sznqczmcpi5g0gnb02mah1przczfx")))) (properties `((upstream-name . "biomaRt"))) (build-system r-build-system) -- cgit v1.2.3 From e46cf457bb3957e8789dd045c5985712ca86f132 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:17 +0200 Subject: gnu: r-biostrings: Update to 2.60.2. * gnu/packages/bioconductor.scm (r-biostrings): Update to 2.60.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7af777fe86..bb7735b86f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2247,13 +2247,13 @@ objects.") (define-public r-biostrings (package (name "r-biostrings") - (version "2.60.1") + (version "2.60.2") (source (origin (method url-fetch) (uri (bioconductor-uri "Biostrings" version)) (sha256 (base32 - "1a2vq4rram7chnccx0piccgi0mlblmjh26y51bch86lxr7qwlr22")))) + "0ai0fg0w4l0a7avbafdbqjgjpg91myxalwrg2i3ixm1l2lyyfyah")))) (properties `((upstream-name . "Biostrings"))) (build-system r-build-system) -- cgit v1.2.3 From 8df84bedf7ef592e91c2ce93307b5eea24760c50 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:18 +0200 Subject: gnu: r-ensembldb: Update to 2.16.4. * gnu/packages/bioconductor.scm (r-ensembldb): Update to 2.16.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bb7735b86f..9af3f85336 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2743,14 +2743,14 @@ CAGE.") (define-public r-ensembldb (package (name "r-ensembldb") - (version "2.16.3") + (version "2.16.4") (source (origin (method url-fetch) (uri (bioconductor-uri "ensembldb" version)) (sha256 (base32 - "1y3d6mx59531ixr8nzq57sa5nwimq3qyy1xabk52vvdbkl2aa52x")))) + "15yllkxr6sj5pfvkvv285nk3q5374nzq1iz8ywmnrq910k3xagd8")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From 3277c4e7490c03a1d6d9ed7ff06afdbd8339c6ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:18 +0200 Subject: gnu: r-genomicfeatures: Update to 1.44.1. * gnu/packages/bioconductor.scm (r-genomicfeatures): Update to 1.44.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9af3f85336..cccc57a61c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3007,13 +3007,13 @@ alignments.") (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.44.0") + (version "1.44.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "0y7lnvfcfrs72xbkn67xcqyz9csl5696mr2zl425fkhmnmimm4fg")))) + "0byizkq18kkyq3n604f38z4mikhi3szsrfrlz22wdq2ldq3nzkis")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) -- cgit v1.2.3 From 495c50c68d83324dced7140e5776cec257296c9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:18 +0200 Subject: gnu: r-limma: Update to 3.48.3. * gnu/packages/bioconductor.scm (r-limma): Update to 3.48.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cccc57a61c..12292a2306 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3300,13 +3300,13 @@ Shiny-based display methods for Bioconductor objects.") (define-public r-limma (package (name "r-limma") - (version "3.48.1") + (version "3.48.3") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "1wscxvhrz16sfa0qwk9anxqjy1vgvqmq6ia9gx6pwpga8qzwn5bi")))) + "0385ac0hvvml99krcgcpp6q7layjhzgp9xcxkcjrpfg5mjg1z4sx")))) (build-system r-build-system) (home-page "http://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") -- cgit v1.2.3 From 1920e567a75081c4efb7b1b65e64d94f78b79a62 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:18 +0200 Subject: gnu: r-rtracklayer: Update to 1.52.1. * gnu/packages/bioconductor.scm (r-rtracklayer): Update to 1.52.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 12292a2306..c8e33cc313 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3987,13 +3987,13 @@ tab-delimited (tabix) files.") (define-public r-rtracklayer (package (name "r-rtracklayer") - (version "1.52.0") + (version "1.52.1") (source (origin (method url-fetch) (uri (bioconductor-uri "rtracklayer" version)) (sha256 (base32 - "0iic0g0clsjd9ypdmfs6k52hrnmfszhxzg0xx89nszpasf69wghv")))) + "11w6dx09pb49lin1gr9q88xn7ixh9jd5z6m9z27djchm0nw10lx9")))) (build-system r-build-system) (arguments `(#:phases -- cgit v1.2.3 From 514454cc8f54cb9f129f72de0db4e9bbb799ad67 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:18 +0200 Subject: gnu: r-structuralvariantannotation: Update to 1.8.2. * gnu/packages/bioconductor.scm (r-structuralvariantannotation): Update to 1.8.2. [propagated-inputs]: Add r-genomeinfodb, r-iranges, r-s4vectors, and r-summarizedexperiment. --- gnu/packages/bioconductor.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c8e33cc313..0d9df496d3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4221,24 +4221,28 @@ graph construction.") (define-public r-structuralvariantannotation (package (name "r-structuralvariantannotation") - (version "1.8.1") + (version "1.8.2") (source (origin (method url-fetch) (uri (bioconductor-uri "StructuralVariantAnnotation" version)) (sha256 - (base32 "13q6zbdkpx1iw6n75pggg50f9q3zb7k3dxjdra8mhi6zin7018j8")))) + (base32 "04ac4mjh3pgdlws0aiacqg0vd7bhg890w44r7b90p947c3rk1mfw")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) ("r-biocgenerics" ,r-biocgenerics) ("r-biostrings" ,r-biostrings) ("r-dplyr" ,r-dplyr) + ("r-genomeinfodb" ,r-genomeinfodb) ("r-genomicfeatures" ,r-genomicfeatures) ("r-genomicranges" ,r-genomicranges) + ("r-iranges" ,r-iranges) ("r-rlang" ,r-rlang) ("r-rtracklayer" ,r-rtracklayer) + ("r-s4vectors" ,r-s4vectors) ("r-stringr" ,r-stringr) + ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-variantannotation" ,r-variantannotation))) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From 33fedd371a32254992068aa8e56b5a56841ef414 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:18 +0200 Subject: gnu: r-diffbind: Update to 3.2.5. * gnu/packages/bioconductor.scm (r-diffbind): Update to 3.2.5. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0d9df496d3..5d6d4debc2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4771,14 +4771,14 @@ signal in the input, that lead to spurious peaks during peak calling.") (define-public r-diffbind (package (name "r-diffbind") - (version "3.2.4") + (version "3.2.5") (source (origin (method url-fetch) (uri (bioconductor-uri "DiffBind" version)) (sha256 (base32 - "024ff12v42yvcma29cis4f777jrdgmgfr06lxn6l3nh30ghxawci")))) + "1rp4sgx58g1lq5brpx07wffllhvsqq1097vrjiaksbih08338nih")))) (properties `((upstream-name . "DiffBind"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 3ef4c12a4918bcd406276f396ec1b78d1979f411 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:18 +0200 Subject: gnu: r-chippeakanno: Update to 3.26.3. * gnu/packages/bioconductor.scm (r-chippeakanno): Update to 3.26.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5d6d4debc2..88f8099cdd 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5017,14 +5017,14 @@ determining dependencies between variables, code improvement suggestions.") (define-public r-chippeakanno (package (name "r-chippeakanno") - (version "3.26.2") + (version "3.26.3") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPpeakAnno" version)) (sha256 (base32 - "003550ygh0haxyyypsss7s03jlsx7cqkhly4fcz10maczi6j4l30")))) + "07dvg3r4kghkqhh1a8rw149hgfswmzdh9cvnam8c82006cpmi74s")))) (properties `((upstream-name . "ChIPpeakAnno"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 917f0def66422f6378c23e87db6ae810faf3dc1a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:18 +0200 Subject: gnu: r-matrixgenerics: Update to 1.4.2. * gnu/packages/bioconductor.scm (r-matrixgenerics): Update to 1.4.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 88f8099cdd..10b9298225 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5071,13 +5071,13 @@ enrichedGO (addGeneIDs).") (define-public r-matrixgenerics (package (name "r-matrixgenerics") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "MatrixGenerics" version)) (sha256 (base32 - "1xq3a9ls125wfnhn13rdbsxzq3f6klsspx7h0znd6l67f5j5k25s")))) + "0kjsc5ghcplay4a74ffpwsf3kbp51x6rl5265gvlfchdwrawkzd2")))) (properties `((upstream-name . "MatrixGenerics"))) (build-system r-build-system) -- cgit v1.2.3 From e4ad91eb3e5cc2d73a3eb1ba0e793c6af4cbe0b3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:19 +0200 Subject: gnu: r-treeio: Update to 1.16.2. * gnu/packages/bioconductor.scm (r-treeio): Update to 1.16.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 10b9298225..11db94c540 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5689,14 +5689,14 @@ multiplication.") (define-public r-treeio (package (name "r-treeio") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (bioconductor-uri "treeio" version)) (sha256 (base32 - "0ypl4h80m08sf7r4zfvqgvpsz46x15wvcl1idq5pd813bp1w2sws")))) + "1y60yvg1rl21cab9xrkns0209pg44mwr90qj099dvk97wsjkx67g")))) (properties `((upstream-name . "treeio"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 82d677475772d8351960151cb113d411c9a7bf54 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:19 +0200 Subject: gnu: r-ggtree: Update to 3.0.3. * gnu/packages/bioconductor.scm (r-ggtree): Update to 3.0.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 11db94c540..5c4eaf6e20 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5721,14 +5721,14 @@ platform for merging tree with associated data and converting file formats.") (define-public r-ggtree (package (name "r-ggtree") - (version "3.0.2") + (version "3.0.3") (source (origin (method url-fetch) (uri (bioconductor-uri "ggtree" version)) (sha256 (base32 - "0i665b5jxgsv3ncxmczy7n0h911br44dw9f7m4jwv3pjmr5mm6vk")))) + "02ydi5iyxwrvwfjmv8pbanmzpi1r99mc4gxl17fpq2jf1d1mk6g0")))) (properties `((upstream-name . "ggtree"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 1c23b99a3c231ca67cc77efc9d68f7976bcf57c3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:19 +0200 Subject: gnu: r-batchelor: Update to 1.8.1. * gnu/packages/bioconductor.scm (r-batchelor): Update to 1.8.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5c4eaf6e20..6bd9cce958 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6245,14 +6245,14 @@ multiplication and calculation of row/column sums or means.") (define-public r-batchelor (package (name "r-batchelor") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "batchelor" version)) (sha256 (base32 - "1xm204wp3m3mmlc1s59lscbbjvwm5nj32vvf16njcg7pb32lsiqa")))) + "1bkk69b5llkmvmpsnhymwjm2szmzypgszfsw8mak1b5ms5zf8lr0")))) (properties `((upstream-name . "batchelor"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 5543456ae9a430137b97210037760bc58c30466b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:19 +0200 Subject: gnu: r-dose: Update to 3.18.2. * gnu/packages/bioconductor.scm (r-dose): Update to 3.18.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6bd9cce958..81b920efcc 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7246,14 +7246,14 @@ to multiple hypothesis correction.") (define-public r-dose (package (name "r-dose") - (version "3.18.1") + (version "3.18.2") (source (origin (method url-fetch) (uri (bioconductor-uri "DOSE" version)) (sha256 (base32 - "1g3llrb51m8lj3prcr6ryxj0lf4qqzg9mzi36y71pp9qzfvf3c0k")))) + "0kp6j42mpxrpd02cjrzqmrx3rvvpi90xiy4gc5km6ny3vxbhlaqw")))) (properties `((upstream-name . "DOSE"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 0022f404626336b97ee916930eef17b4fb324ae8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:19 +0200 Subject: gnu: r-clusterprofiler: Update to 4.0.4. * gnu/packages/bioconductor.scm (r-clusterprofiler): Update to 4.0.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 81b920efcc..e32a5147a8 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7318,14 +7318,14 @@ All the visualization methods are developed based on ggplot2 graphics.") (define-public r-clusterprofiler (package (name "r-clusterprofiler") - (version "4.0.2") + (version "4.0.4") (source (origin (method url-fetch) (uri (bioconductor-uri "clusterProfiler" version)) (sha256 (base32 - "11pjzh7inh1x0gry42nlq4har65s8pc0w3bkccm6kmxycvaxb9rh")))) + "161w9mn2plmymvzf1hkk9fwi3d9c26kbcpndyyrfcl6bg2nxr1s8")))) (properties `((upstream-name . "clusterProfiler"))) (build-system r-build-system) -- cgit v1.2.3 From 9ff9a4756d1b8fd100476454155ccc95491d05c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:19 +0200 Subject: gnu: r-universalmotif: Update to 1.10.2. * gnu/packages/bioconductor.scm (r-universalmotif): Update to 1.10.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e32a5147a8..0cb77c5b20 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -10881,14 +10881,14 @@ data.") (define-public r-universalmotif (package (name "r-universalmotif") - (version "1.10.1") + (version "1.10.2") (source (origin (method url-fetch) (uri (bioconductor-uri "universalmotif" version)) (sha256 (base32 - "1hwp7802r4pr7yafzir9afqaim9l0vznglm35b0gxaca8k7a3jvy")))) + "0hv2v2zgif5ihr5hxmdz32rln43jc1j0rslp44kd3rijjl45zysn")))) (properties `((upstream-name . "universalmotif"))) (build-system r-build-system) -- cgit v1.2.3 From da7e7c9de8543a3755c34756d6b9351049ef13c3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:19 +0200 Subject: gnu: r-biocset: Update to 1.6.1. * gnu/packages/bioconductor.scm (r-biocset): Update to 1.6.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0cb77c5b20..433d2c4b90 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -11847,14 +11847,14 @@ analytics on packages.") (define-public r-biocset (package (name "r-biocset") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocSet" version)) (sha256 (base32 - "18zr0r4b4rblfmsiilipqdfxn9fgymx75hlxzx1wk3bm71ryk078")))) + "0nmrg9cgq8l9w467y364jghnvym05abpj8pyj90grmrib2xc5sj2")))) (properties `((upstream-name . "BiocSet"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2897ad3178f388614aa8f892691b4dba9b901831 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:20 +0200 Subject: gnu: r-beachmat: Update to 2.8.1. * gnu/packages/bioconductor.scm (r-beachmat): Update to 2.8.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 433d2c4b90..7191d0e833 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -12473,14 +12473,14 @@ packages.") (define-public r-beachmat (package (name "r-beachmat") - (version "2.8.0") + (version "2.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "beachmat" version)) (sha256 (base32 - "16p6shab4y8sy1adn4qr05ysvwmvs9idliccixafvx9icv5sla86")))) + "06bpfpddsl49csxrs8hlx5pv0absc2wdcparchf8qqaqydazwci2")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) -- cgit v1.2.3 From b2316605e295b5a375e7b3f55033567b860bad59 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:20 +0200 Subject: gnu: r-scuttle: Update to 1.2.1. * gnu/packages/bioconductor.scm (r-scuttle): Update to 1.2.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7191d0e833..ee32017386 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -12708,14 +12708,14 @@ libraries.") (define-public r-scuttle (package (name "r-scuttle") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (bioconductor-uri "scuttle" version)) (sha256 (base32 - "1vxmgm52n5z2m1a7d4c5ajp5d35rdq7j3hln9qn7188zk9ijjsz5")))) + "015k879gg2r39lp6mz26jwmysa56k0ial6v74zzmbi8hnz9zic3i")))) (properties `((upstream-name . "scuttle"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 26d6db11f063b19c9b6c36b7a9e1e8c4ba83484c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:20 +0200 Subject: gnu: r-sparsematrixstats: Update to 1.4.2. * gnu/packages/bioconductor.scm (r-sparsematrixstats): Update to 1.4.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ee32017386..d8f6a1aa50 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -12826,14 +12826,14 @@ variable and significantly correlated genes.") (define-public r-sparsematrixstats (package (name "r-sparsematrixstats") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "sparseMatrixStats" version)) (sha256 (base32 - "0ilspddfkqpnf2lng9jjs2ahv6vlc6sap69fzkcw314rha59kncr")))) + "0b22kzg751zlkcbs8pi0bcqrsj3imsg35qfvxfrqb7gav7qznc8v")))) (properties `((upstream-name . "sparseMatrixStats"))) (build-system r-build-system) -- cgit v1.2.3 From 68b22a85419a52dcdb47422c10f9575b5d332790 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Aug 2021 00:33:20 +0200 Subject: gnu: r-delayedmatrixstats: Update to 1.14.2. * gnu/packages/bioconductor.scm (r-delayedmatrixstats): Update to 1.14.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d8f6a1aa50..e0644aeab5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -12854,14 +12854,14 @@ data in the column sparse format.") (define-public r-delayedmatrixstats (package (name "r-delayedmatrixstats") - (version "1.14.0") + (version "1.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedMatrixStats" version)) (sha256 (base32 - "02r68rzmc54m353fpw5ampyv26i5622bc7iihfqlpy6p3033lpqk")))) + "1avzd3fj4am9klmlx03nwq2pvgx7646yjwha1gqf0cbx5hibxy02")))) (properties `((upstream-name . "DelayedMatrixStats"))) (build-system r-build-system) -- cgit v1.2.3 From 5422920b9eaaa0c6bf779588748595c66ca86ba3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Aug 2021 22:32:58 +0300 Subject: gnu: openssl: Update replacement to 1.1.1l [security fixes]. * gnu/packages/tls.scm (openssl)[replacement]: Replace with 1.1.1l. (openssl-1.1.1k): Remove variable. (openssl-1.1.1l): Add variable. --- gnu/packages/tls.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index fb7d364c94..d52a88fc86 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -356,7 +356,7 @@ required structures.") (package (name "openssl") (version "1.1.1j") - (replacement openssl-1.1.1k) + (replacement openssl-1.1.1l) (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -490,11 +490,11 @@ required structures.") (license license:openssl) (home-page "https://www.openssl.org/"))) -;; Replacement package to fix CVE-2021-3449 and CVE-2021-3450. -(define openssl-1.1.1k +;; Replacement package to fix multiple CVEs. +(define openssl-1.1.1l (package (inherit openssl) - (version "1.1.1k") + (version "1.1.1l") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -507,7 +507,7 @@ required structures.") (patches (search-patches "openssl-1.1-c-rehash-in.patch")) (sha256 (base32 - "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9")))))) + "1lbblxps2fhmz7bqh058iywh5wxfignbfx1s1kz2fj63b5g3wyhb")))))) ;; We will not add any new uses of this package. If you add new code that uses ;; this package, your change will be reverted! -- cgit v1.2.3 From ae3e6ba506f57a4353f491242a3f5e4d419f9aa9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 24 Aug 2021 16:46:55 -0400 Subject: gnu: atop: Update to 2.6.0. * gnu/packages/admin.scm (atop): Update to 2.6.0. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 007f15f9f5..1d5fe5990f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4413,14 +4413,14 @@ Netgear devices.") (define-public atop (package (name "atop") - (version "2.5.0") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append "https://www.atoptool.nl/download/atop-" version ".tar.gz")) (sha256 (base32 - "0crzz4i2nabyh7d6xg7fvl65qls87nbca5ihidp3nijhrrbi14ab")))) + "0wlg0n0h9vwpjp2dcb623jvvqck422jrjpq9mbpzg4hnawxcmhly")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit v1.2.3 From f66759e0b2410aaa2ad8e74ef5c0aaf728abb6ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 25 Aug 2021 11:21:42 +0200 Subject: gnu: Add ivar. * gnu/packages/bioinformatics.scm (ivar): New variable. --- gnu/packages/bioinformatics.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 426926a37c..e663ff2591 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14272,6 +14272,32 @@ sequencing (e.g. mapping or base/indel alignment uncertainty), which are usually ignored by other methods or only used for filtering.") (license license:expat))) +(define-public ivar + (package + (name "ivar") + (version "1.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/andersen-lab/ivar") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "044xa0hm3b8fga64csrdx05ih8w7kwmvcdrdrhkg8j11ml4bi4xv")))) + (build-system gnu-build-system) + (inputs + `(("htslib" ,htslib) + ("zlib" ,zlib))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (home-page "https://andersen-lab.github.io/ivar/html/") + (synopsis "Tools for amplicon-based sequencing") + (description "iVar is a computational package that contains functions +broadly useful for viral amplicon-based sequencing. ") + (license license:gpl3+))) + (define-public python-pyliftover (package (name "python-pyliftover") -- cgit v1.2.3 From 2f16659b404eac09f5174fe5e16cc97f21643bd7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 25 Aug 2021 12:30:33 +0200 Subject: gnu: Add r-ballgown. * gnu/packages/bioconductor.scm (r-ballgown): New variable. --- gnu/packages/bioconductor.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e0644aeab5..36ab137519 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -13666,6 +13666,40 @@ starting site, start codon, stop codon and transcription ending site.") visualizations for publication-quality multi-panel figures.") (license license:gpl2+))) +(define-public r-ballgown + (package + (name "r-ballgown") + (version "2.24.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "ballgown" version)) + (sha256 + (base32 + "0ff8z4pfgzai2q4aafclg36bhsi9jwl9xhh1p9fqhmikisscq7i1")))) + (properties `((upstream-name . "ballgown"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicranges" ,r-genomicranges) + ("r-iranges" ,r-iranges) + ("r-limma" ,r-limma) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rtracklayer" ,r-rtracklayer) + ("r-s4vectors" ,r-s4vectors) + ("r-sva" ,r-sva))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/ballgown") + (synopsis "Flexible, isoform-level differential expression analysis") + (description + "This package provides tools for statistical analysis of assembled +transcriptomes, including flexible differential expression analysis, +visualization of transcript structures, and matching of assembled transcripts +to annotation.") + (license license:artistic2.0))) + (define-public r-tximeta (package (name "r-tximeta") -- cgit v1.2.3 From 08660f7c8880e30aecc05cd6302d2ccd715913e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Aug 2021 14:28:31 +0200 Subject: gnu: ungoogled-chromium: Update to 92.0.4515.159-0.8164c91. * gnu/packages/chromium.scm (%chromium-version): Set to 92.0.4515.159. (%ungoogled-revision): Set to 92.0.4515.159-1-8-g8164c91. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 390ca166b5..26ae1e2550 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -324,11 +324,11 @@ (string-append "ungoogled-chromium-" category "-" name)))) (sha256 (base32 hash)))) -(define %chromium-version "92.0.4515.131") +(define %chromium-version "92.0.4515.159") (define %debian-revision "debian/90.0.4430.85-1") ;; Note: use 'git describe --long' even for exact tags to placate the ;; custom version format for ungoogled-chromium. -(define %ungoogled-revision "92.0.4515.131-1-0-g4a9534c") +(define %ungoogled-revision "92.0.4515.159-1-8-g8164c91") (define %debian-patches (list (debian-patch "fixes/nomerge.patch" @@ -348,7 +348,7 @@ (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "1nbgknj5ba116y47sxbp7pbma1bp0lmkyi3vk915x837ysaf6mrd")))) + "0wbcbjzh5ak4nciahqw4yvxc4x8ik4x0iz9h4kfy0m011sxzy174")))) (define %guix-patches (list (local-file @@ -484,7 +484,7 @@ %chromium-version ".tar.xz")) (sha256 (base32 - "0fnfyh61w6dmavvfbf2x1zzrby0xpx4jd4ifjsgyc39rsl789b5n")) + "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From 49339d2e68587d9346c0ea56b15d89b6ad95244d Mon Sep 17 00:00:00 2001 From: Simon South Date: Wed, 25 Aug 2021 08:47:48 -0400 Subject: gnu: knot-resolver: Update to 5.4.1. * gnu/packages/dns.scm (knot-resolver): Update to 5.4.1. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 69218c08af..c5e305f1d7 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -947,14 +947,14 @@ synthesis, and on-the-fly re-configuration.") (define-public knot-resolver (package (name "knot-resolver") - (version "5.4.0") + (version "5.4.1") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-resolver/" "knot-resolver-" version ".tar.xz")) (sha256 (base32 - "0pl1l167fqb1lgmrmkx8i140l41wgnfwr6h3awxv4cw4p5qzcjjk")))) + "0rixiqfj53rfabrz8qpnq4whx8y29d2m5w64a4jlwx7gv4nrd2zv")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 26878cb3d81e75293c9f062bebde29a2afb7a2e2 Mon Sep 17 00:00:00 2001 From: Andrew Whatson Date: Fri, 20 Aug 2021 22:16:59 +1000 Subject: gnu: osinfo-db: Update to 20210809. Fixes failures when attempting to download some images in gnome-boxes. * gnu/packages/virtualization.scm (osinfo-db): Update to 20210809. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 1bbcb46b99..e952c009b5 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -2073,14 +2073,14 @@ administrators and developers in managing the database.") (define-public osinfo-db (package (name "osinfo-db") - (version "20201218") + (version "20210809") (source (origin (method url-fetch) (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-" version ".tar.xz")) (sha256 (base32 - "0ydbindwgw7kg861rqii5036gq0dbbbmv35dzrmmv937ddfsxwh0")))) + "16gas6ahxwim1vdjlc4p1gm6q5gfy25h82ngykcm94x69sl6qsan")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 20ca345899ee046426201c07e9e2eb9d2737645a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:13:45 +0200 Subject: gnu: emacs-ebdb: Update to 0.8.2. * gnu/packages/emacs-xyz.scm (emacs-ebdb): Update to 0.8.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4794fbaf91..5d3bc944fa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25862,14 +25862,14 @@ federated microblogging social network.") (define-public emacs-ebdb (package (name "emacs-ebdb") - (version "0.8.1") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "ebdb-" version ".tar")) (sha256 - (base32 "1wdv1jkcawbxa8nnd0856ix1qp0chkc9yasvm7dmn7gj1y92nss1")))) + (base32 "1idwih5v287q9vdhsnr1bsibdv4h61vmy3b82svf2x9aik1a7vir")))) (build-system emacs-build-system) (home-page "https://github.com/girzel/ebdb") (synopsis "EIEIO port of BBDB, Emacs's contact-management package") -- cgit v1.2.3 From 29b3c0898f17f7df7cb5c7bd9b0adaf1c38231be Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:25:15 +0200 Subject: gnu: Add emacs-inheritenv. * gnu/packages/emacs-xyz.scm (emacs-inheritenv): New variable. --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5d3bc944fa..8dad498e03 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15082,6 +15082,27 @@ query them from the comfort of your editor.") (home-page "https://github.com/hrs/engine-mode") (license license:gpl3+))) +(define-public emacs-inheritenv + (package + (name "emacs-inheritenv") + (version "0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/purcell/inheritenv") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ygzf70vfb7qwpsllcq5i3brprsnx3sxy2zng02mzwrr5jkx4ypc")))) + (build-system emacs-build-system) + (home-page "https://github.com/purcell/inheritenv/releases") + (synopsis "Emacs temp buffers inherit buffer-local environment variables") + (description + "Inheritenv provides tools to execute processes inheriting the calling +buffer's environment.") + (license license:gpl3+))) + (define-public emacs-envrc (package (name "emacs-envrc") -- cgit v1.2.3 From e645194d80a000a3f114a88f4c0866886e4d324d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:25:28 +0200 Subject: gnu: emacs-envrc: Update to 0.4. * gnu/packages/emacs-xyz.scm (emacs-envrc): Update to 0.4. [propagated-inputs]: Add emacs-inheritenv. --- gnu/packages/emacs-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8dad498e03..553cc80531 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15106,7 +15106,7 @@ buffer's environment.") (define-public emacs-envrc (package (name "emacs-envrc") - (version "0.2") + (version "0.4") (source (origin (method git-fetch) @@ -15116,8 +15116,10 @@ buffer's environment.") (file-name (git-file-name name version)) (sha256 (base32 - "0ssf9i6iym2rb530k2w5aj392qa73i6p5y0vwrs5qhkv9lagqq7p")))) + "0nqqx4qlw75lmbn0v927sg3xyjkk86ihw1q3rdbbn59va41grds4")))) (build-system emacs-build-system) + (propagated-inputs + `(("emacs-inheritenv" ,emacs-inheritenv))) (home-page "https://github.com/purcell/envrc") (synopsis "Support for Direnv which operates buffer-locally") (description -- cgit v1.2.3 From f0b0d6734118b82d78f900be248199a05726366d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:26:42 +0200 Subject: gnu: emacs-htmlize: Update to 1.56. * gnu/packages/emacs-xyz.scm (emacs-htmlize): Update to 1.56. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 553cc80531..eaf7dacdbd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13509,7 +13509,7 @@ to the home page or read the comments in the source file, (define-public emacs-htmlize (package (name "emacs-htmlize") - (version "1.55") + (version "1.56") (source (origin (method git-fetch) @@ -13518,7 +13518,7 @@ to the home page or read the comments in the source file, (commit (string-append "release/" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0gi3xshscpa53qrj8yplfsqahcilc2ybcc2p7gnh5nbnf2n1n97x")))) + (base32 "14m8si49br62lgx7asdyp9jysq0v6midrfk32sxy521ydqmqr3c1")))) (build-system emacs-build-system) (home-page "https://github.com/hniksic/emacs-htmlize") (synopsis "Convert buffer text and decorations to HTML") -- cgit v1.2.3 From 71521c341f1ab34967a7c0ecc7ec5980e71ebbec Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:27:50 +0200 Subject: gnu: emacs-keycast: Update to 1.1.1. * gnu/packages/emacs-xyz.scm (emacs-keycast): Update to 1.1.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eaf7dacdbd..893285345f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3733,7 +3733,7 @@ kmonad's configuration files (@file{.kbd}).") (define-public emacs-keycast (package (name "emacs-keycast") - (version "1.1.0") + (version "1.1.1") (source (origin (method git-fetch) @@ -3742,7 +3742,7 @@ kmonad's configuration files (@file{.kbd}).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0093v1c5nl2bh1lvccqq6fzpgjald3yypp87dsim982aywl2vlv1")))) + (base32 "09xr0h2ag3pzlz455gv5h915vn1dz56gqx61jx3n7fc4a794pqxw")))) (build-system emacs-build-system) (home-page "https://github.com/tarsius/keycast") (synopsis "Show current command and its key in the mode line") -- cgit v1.2.3 From 7ef00db9334edf8c8ea376f66ce001680a74ba26 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:28:55 +0200 Subject: gnu: emacs-moody: Update to 0.6.0. * gnu/packages/emacs-xyz.scm (emacs-moody): Update to 0.6.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 893285345f..e1647c5303 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -976,7 +976,7 @@ Alternatively the menu can be bound globally, for example: (define-public emacs-moody (package (name "emacs-moody") - (version "0.5.5") + (version "0.6.0") (source (origin (method git-fetch) @@ -985,7 +985,7 @@ Alternatively the menu can be bound globally, for example: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0b4kg4dxy4ywwin96vz6x3rpvgr718y5rgrdarmwym9wv1qz0a0c")))) + (base32 "14x3hd0z0nh0dyfi434vqywi7aawfxhlqj6sp7m17np56zq32yhi")))) (build-system emacs-build-system) (home-page "https://github.com/tarsius/moody") (synopsis "Tabs and ribbons for Emacs mode-line") -- cgit v1.2.3 From 9483d10494e69a441aea6d4923f939bac142bc57 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:30:09 +0200 Subject: gnu: emacs-orgit: Update to 1.7.1. * gnu/packages/emacs-xyz.scm (emacs-orgit): Update to 1.7.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e1647c5303..0e284a6a9c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23345,7 +23345,7 @@ recursively. The results are cached for speed.") (define-public emacs-orgit (package (name "emacs-orgit") - (version "1.7.0") + (version "1.7.1") (home-page "https://github.com/magit/orgit") (source (origin (method git-fetch) @@ -23355,7 +23355,7 @@ recursively. The results are cached for speed.") (file-name (git-file-name name version)) (sha256 (base32 - "1xd58yqqsb79lgxkhxs4s50jq8f3639k6fhlza9hsy53apfczkal")))) + "0mbcr98xq3zim01dk1fbyc1vajnjwx90k62mygv343rhrd05v44m")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From c410001d2132ac32740585660d4cda174b7369db Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:36:02 +0200 Subject: gnu: wireshark: Update to 3.4.8. * gnu/packages/networking.scm (wireshark): Update to 3.4.8. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ec5e383b0e..c941fbd2f9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1445,14 +1445,14 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "3.4.7") + (version "3.4.8") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "17d00kl0s010wg2dfhy7sdbr2qm54lsi317fmbcvjz4rxx8ywk3c")))) + (base32 "09fpvfj4m7glisj6p4zb8wylkrjkqqw69xnwnz4ah410zs6zm9sq")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From e5f360aa97a39d1f3068f6aeef369b2e67c879fd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 10:54:00 +0200 Subject: gnu: Add r-zzlite. * gnu/packages/cran.scm (r-zzlite): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 337ad2816d..5a9889f11e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30347,3 +30347,30 @@ experimentation, supports both convolution based networks and recurrent networks (as well as combinations of the two), and runs seamlessly on both CPU and GPU devices.") (license license:expat))) + +(define-public r-zzlite + (package + (name "r-zzlite") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "zzlite" version)) + (sha256 + (base32 + "0vi1slx2s4r5zf82lazqv0c3m12xq73wlgsbz6af4y00h0bkr3ps")))) + (properties `((upstream-name . "zzlite"))) + (build-system r-build-system) + (propagated-inputs + `(("r-httr" ,r-httr) + ("r-jsonlite" ,r-jsonlite))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://cran.r-project.org/package=zzlite") + (synopsis "Wrapper for the Zamzar file conversion API") + (description + "This package provides a minor collection of HTTP wrappers for the Zamzar +file conversion API. The wrappers makes it easy to utilize the API and thus +convert between more than 100 different file formats (ranging from audio +files, images, movie formats, etc., etc.) through an R session.") + (license license:gpl3))) -- cgit v1.2.3 From f4cb9563a3ff0fb3341f3c4fa424c46ef464c3d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 10:54:10 +0200 Subject: gnu: Add r-ztree. * gnu/packages/cran.scm (r-ztree): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5a9889f11e..a3b98ea8cc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30374,3 +30374,26 @@ file conversion API. The wrappers makes it easy to utilize the API and thus convert between more than 100 different file formats (ranging from audio files, images, movie formats, etc., etc.) through an R session.") (license license:gpl3))) + +(define-public r-ztree + (package + (name "r-ztree") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (cran-uri "zTree" version)) + (sha256 + (base32 + "1mywxrx6bw7dzhrdwyxbjzc8ikgvw423zycyji0jjr69cfhpmywv")))) + (properties `((upstream-name . "zTree"))) + (build-system r-build-system) + (propagated-inputs + `(("r-plyr" ,r-plyr))) + (home-page "https://cran.r-project.org/package=zTree") + (synopsis "Functions to import data from z-Tree into R") + (description + "This package provides tools for reading @code{.xls} and @code{.sbj} +files which are written by the proprietary program z-Tree for developing and +carrying out economic experiments.") + (license license:gpl3))) -- cgit v1.2.3 From ed531c6cd9a24fd09769c5c081acb76e8191daa9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 10:55:11 +0200 Subject: gnu: Add r-distributionutils. * gnu/packages/cran.scm (r-distributionutils): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a3b98ea8cc..5593b1a8f7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30397,3 +30397,30 @@ files, images, movie formats, etc., etc.) through an R session.") files which are written by the proprietary program z-Tree for developing and carrying out economic experiments.") (license license:gpl3))) + +(define-public r-distributionutils + (package + (name "r-distributionutils") + (version "0.6-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "DistributionUtils" version)) + (sha256 + (base32 + "08vq54pyqxlqsj6q6gsg5ikqa0z3x842j52ld5dxaq272p6xchvl")))) + (properties + `((upstream-name . "DistributionUtils"))) + (build-system r-build-system) + (native-inputs + `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/package=DistributionUtils") + (synopsis "Distribution utilities") + (description + "This package provides utilities for dealing with distributions. +Functionality includes sample skewness and kurtosis, log-histogram, tail +plots, moments by integration, changing the point about which a moment is +calculated, functions for testing distributions using inversion tests and the +Massart inequality. Also included is an implementation of the incomplete +Bessel K function.") + (license license:gpl2+))) -- cgit v1.2.3 From 9f120e9150ae51cf6274479e9b6441f09b6a93dc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 10:55:20 +0200 Subject: gnu: Add r-ztpln. * gnu/packages/cran.scm (r-ztpln): New variable. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5593b1a8f7..8499b2a44f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30424,3 +30424,32 @@ calculated, functions for testing distributions using inversion tests and the Massart inequality. Also included is an implementation of the incomplete Bessel K function.") (license license:gpl2+))) + +(define-public r-ztpln + (package + (name "r-ztpln") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "ztpln" version)) + (sha256 + (base32 + "18rbfdp22jaxg4nkqzj2393nhjdl1gzv4xhmr6aci76ymdixsfnl")))) + (properties `((upstream-name . "ztpln"))) + (build-system r-build-system) + (propagated-inputs + `(("r-distributionutils" ,r-distributionutils) + ("r-mixtools" ,r-mixtools) + ("r-rcpp" ,r-rcpp) + ("r-rcppeigen" ,r-rcppeigen) + ("r-rcppnumerical" ,r-rcppnumerical))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/mattocci27/ztpln") + (synopsis "Zero-truncated Poisson lognormal distribution") + (description + "This package provides functions for obtaining the density, random +variates and maximum likelihood estimates of the Zero-truncated Poisson +lognormal distribution and their mixture distribution.") + (license license:expat))) -- cgit v1.2.3 From fac893fa7fbbe854aa3fa53ca399c52c9a59e11e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 10:55:27 +0200 Subject: gnu: Add r-zscorer. * gnu/packages/cran.scm (r-zscorer): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8499b2a44f..0dabbda66e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30453,3 +30453,30 @@ Bessel K function.") variates and maximum likelihood estimates of the Zero-truncated Poisson lognormal distribution and their mixture distribution.") (license license:expat))) + +(define-public r-zscorer + (package + (name "r-zscorer") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "zscorer" version)) + (sha256 + (base32 + "0aijhs0fyird5gq68x4dxchb02mxa7ijk10k9zjhngghxbjj7iqn")))) + (properties `((upstream-name . "zscorer"))) + (build-system r-build-system) + (propagated-inputs + `(("r-shiny" ,r-shiny))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/nutriverse/zscorer") + (synopsis "Child Anthropometry z-Score Calculator") + (description + "This package provides a tool for calculating z-scores and centiles for +weight-for-age, length/height-for-age, weight-for-length/height, BMI-for-age, +head circumference-for-age, age circumference-for-age, subscapular +skinfold-for-age, triceps skinfold-for-age based on the WHO Child Growth +Standards.") + (license license:agpl3+))) -- cgit v1.2.3 From 2f00425b4e07a0492b70cec0911a8644fe6f9489 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 10:55:31 +0200 Subject: gnu: Add r-zra. * gnu/packages/cran.scm (r-zra): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0dabbda66e..23076e77cb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30480,3 +30480,26 @@ head circumference-for-age, age circumference-for-age, subscapular skinfold-for-age, triceps skinfold-for-age based on the WHO Child Growth Standards.") (license license:agpl3+))) + +(define-public r-zra + (package + (name "r-zra") + (version "0.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "ZRA" version)) + (sha256 + (base32 + "1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi")))) + (properties `((upstream-name . "ZRA"))) + (build-system r-build-system) + (propagated-inputs + `(("r-dygraphs" ,r-dygraphs) + ("r-forecast" ,r-forecast))) + (home-page "https://cran.r-project.org/package=ZRA") + (synopsis "Dynamic plots for time series forecasting") + (description + "This package combines a forecast of a time series, using the function @code{forecast}, +with the dynamic plots from @code{dygraphs}.") + (license license:gpl2+))) -- cgit v1.2.3 From f8c88560db1d3436f9a27d1720d6af8b6333fdaf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:22:20 +0200 Subject: gnu: Add r-rfigshare. * gnu/packages/cran.scm (r-rfigshare): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 23076e77cb..e99c959639 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30503,3 +30503,31 @@ Standards.") "This package combines a forecast of a time series, using the function @code{forecast}, with the dynamic plots from @code{dygraphs}.") (license license:gpl2+))) + +(define-public r-rfigshare + (package + (name "r-rfigshare") + (version "0.3.7") + (source + (origin + (method url-fetch) + (uri (cran-uri "rfigshare" version)) + (sha256 + (base32 + "1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq")))) + (properties `((upstream-name . "rfigshare"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-httpuv" ,r-httpuv) + ("r-httr" ,r-httr) + ("r-plyr" ,r-plyr) + ("r-rjsonio" ,r-rjsonio) + ("r-xml" ,r-xml) + ("r-yaml" ,r-yaml))) + (home-page "https://github.com/ropensci/rfigshare") + (synopsis "R Interface to figshare") + (description + "This package provides an interface to figshare, a scientific repository +to archive and assign DOIs to data, software, figures, and more.") + (license license:cc0))) -- cgit v1.2.3 From 8b00e7055825b8c4902d7b839a94cea680722c6c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:22:31 +0200 Subject: gnu: Add r-dismo. * gnu/packages/cran.scm (r-dismo): New variable. --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e99c959639..4a54183af4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30531,3 +30531,29 @@ with the dynamic plots from @code{dygraphs}.") "This package provides an interface to figshare, a scientific repository to archive and assign DOIs to data, software, figures, and more.") (license license:cc0))) + +(define-public r-dismo + (package + (name "r-dismo") + (version "1.3-3") + (source + (origin + (method url-fetch) + (uri (cran-uri "dismo" version)) + (sha256 + (base32 + "1jj9d78f251bxgrwbv1ycn677qnhvl40bfan12x8fhlaq4d36rgx")))) + (properties `((upstream-name . "dismo"))) + (build-system r-build-system) +; (inputs `(("java" ,java))) + (propagated-inputs + `(("r-raster" ,r-raster) + ("r-rcpp" ,r-rcpp) + ("r-sp" ,r-sp))) + (home-page "https://rspatial.org/raster/sdm/") + (synopsis "Species distribution modeling") + (description + "This package provides methods for species distribution modeling, i.e., +predicting the environmental similarity of any site to that of the locations +of known occurrences of a species.") + (license license:gpl3+))) -- cgit v1.2.3 From 26cc1eafe77d4f033a498705ffdaf3aea3f6fc10 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:22:42 +0200 Subject: gnu: Add r-zoon. * gnu/packages/cran.scm (r-zoon): New variable. --- gnu/packages/cran.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4a54183af4..eb00a6f3fb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30557,3 +30557,38 @@ to archive and assign DOIs to data, software, figures, and more.") predicting the environmental similarity of any site to that of the locations of known occurrences of a species.") (license license:gpl3+))) + +(define-public r-zoon + (package + (name "r-zoon") + (version "0.6.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "zoon" version)) + (sha256 + (base32 + "02y29vr2yn8al69km8faiqrwjrc1r3hsvw3dg8lwjr65cxw1krip")))) + (properties `((upstream-name . "zoon"))) + (build-system r-build-system) + (propagated-inputs + `(("r-dismo" ,r-dismo) + ("r-plyr" ,r-plyr) + ("r-randomforest" ,r-randomforest) + ("r-raster" ,r-raster) + ("r-rcurl" ,r-rcurl) + ("r-rfigshare" ,r-rfigshare) + ("r-rgdal" ,r-rgdal) + ("r-roxygen2" ,r-roxygen2) + ("r-rworldmap" ,r-rworldmap) + ("r-sp" ,r-sp) + ("r-testthat" ,r-testthat))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/zoonproject/zoon") + (synopsis "Reproducible, accessible and shareable species distribution modelling") + (description + "This package reads user submitted modules from an online repository, +runs full species distribution modelling workflows and returns output that is +fully reproducible.") + (license license:bsd-3))) -- cgit v1.2.3 From add144a0c4b3636c643829f11baf953352b04b3f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:22:50 +0200 Subject: gnu: Add r-paws-common. * gnu/packages/cran.scm (r-paws-common): New variable. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index eb00a6f3fb..68861bf571 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30592,3 +30592,32 @@ of known occurrences of a species.") runs full species distribution modelling workflows and returns output that is fully reproducible.") (license license:bsd-3))) + +(define-public r-paws-common + (package + (name "r-paws-common") + (version "0.3.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "paws.common" version)) + (sha256 + (base32 + "1khq1rv0yij4l0vi2x6hslnzpsd6m5n6nipfac7g3na9ah93h8i9")))) + (properties `((upstream-name . "paws.common"))) + (build-system r-build-system) + (propagated-inputs + `(("r-base64enc" ,r-base64enc) + ("r-digest" ,r-digest) + ("r-httr" ,r-httr) + ("r-jsonlite" ,r-jsonlite) + ("r-xml2" ,r-xml2))) + (home-page "https://cran.r-project.org/package=paws.common") + (synopsis "Paws low-level Amazon Web Services API") + (description + "This package provides functions for making low-level API requests to +Amazon Web Services. The functions handle building, signing, and sending +requests, and receiving responses. They are designed to help build +higher-level interfaces to individual services, such as Simple Storage +Service (S3).") + (license license:asl2.0))) -- cgit v1.2.3 From e1f7b3e8f9023e6e9e6e9534d28e3d8db018834b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:22:55 +0200 Subject: gnu: Add r-paws-customer-engagement. * gnu/packages/cran.scm (r-paws-customer-engagement): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 68861bf571..67c36c9e93 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30621,3 +30621,27 @@ requests, and receiving responses. They are designed to help build higher-level interfaces to individual services, such as Simple Storage Service (S3).") (license license:asl2.0))) + +(define-public r-paws-customer-engagement + (package + (name "r-paws-customer-engagement") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "paws.customer.engagement" version)) + (sha256 + (base32 + "0ac6hzn4ilfjhzdmc9x80999fl18cz16mky31qd3y09m93w2xkdj")))) + (properties + `((upstream-name . "paws.customer.engagement"))) + (build-system r-build-system) + (propagated-inputs + `(("r-paws-common" ,r-paws-common))) + (home-page "https://github.com/paws-r/paws") + (synopsis "Amazon Web Services customer engagement services") + (description + "This package provides an interface to Amazon Web Services customer +engagement services, including Simple Email Service, Connect contact center +service, and more.") + (license license:asl2.0))) -- cgit v1.2.3 From a30b1ff44478b11785afb146e12b9f8aaca48f43 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:23:01 +0200 Subject: gnu: Add r-paws-cost-management. * gnu/packages/cran.scm (r-paws-cost-management): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 67c36c9e93..b1a0547241 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30645,3 +30645,27 @@ Service (S3).") engagement services, including Simple Email Service, Connect contact center service, and more.") (license license:asl2.0))) + +(define-public r-paws-cost-management + (package + (name "r-paws-cost-management") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "paws.cost.management" version)) + (sha256 + (base32 + "0in4f8ygw5g2v6vl3lz2y0v51llglh8b1ymbd04d54xxlgn83knh")))) + (properties + `((upstream-name . "paws.cost.management"))) + (build-system r-build-system) + (propagated-inputs + `(("r-paws-common" ,r-paws-common))) + (home-page "https://github.com/paws-r/paws") + (synopsis "Amazon Web Services cost management services") + (description + "This package provides an interface to Amazon Web Services cost +management services, including cost and usage reports, budgets, pricing, and +more.") + (license license:asl2.0))) -- cgit v1.2.3 From 6850d222e60bcfea80b50a455ab979be8f013b97 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:23:08 +0200 Subject: gnu: Add r-paws-application-integration. * gnu/packages/cran.scm (r-paws-application-integration): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b1a0547241..0c43b4dfcc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30669,3 +30669,27 @@ service, and more.") management services, including cost and usage reports, budgets, pricing, and more.") (license license:asl2.0))) + +(define-public r-paws-application-integration + (package + (name "r-paws-application-integration") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "paws.application.integration" version)) + (sha256 + (base32 + "0llyd9hc679pad1ih0rcc38q5xxpzinhwrl8cvrkgsjgbc3agq42")))) + (properties + `((upstream-name . "paws.application.integration"))) + (build-system r-build-system) + (propagated-inputs + `(("r-paws-common" ,r-paws-common))) + (home-page "https://github.com/paws-r/paws") + (synopsis "Amazon Web Services application integration services") + (description + "This package provides an interface to Amazon Web Services application +integration services, including Simple Queue Service (SQS) message queue, +Simple Notification Service (SNS) publish/subscribe messaging, and more.") + (license license:asl2.0))) -- cgit v1.2.3 From 10139557f01ccdc475ebfdb5f22b4aed0b96ac60 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:23:13 +0200 Subject: gnu: Add r-paws-security-identity. * gnu/packages/cran.scm (r-paws-security-identity): New variable. --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0c43b4dfcc..ca9bf58c6c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30693,3 +30693,28 @@ more.") integration services, including Simple Queue Service (SQS) message queue, Simple Notification Service (SNS) publish/subscribe messaging, and more.") (license license:asl2.0))) + +(define-public r-paws-security-identity + (package + (name "r-paws-security-identity") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "paws.security.identity" version)) + (sha256 + (base32 + "092lz2ipn5iqr593x7ra8c0bj64yf6315mdc3llgwrjyb4vfxif9")))) + (properties + `((upstream-name . "paws.security.identity"))) + (build-system r-build-system) + (propagated-inputs + `(("r-paws-common" ,r-paws-common))) + (home-page "https://github.com/paws-r/paws") + (synopsis "Amazon Web Services security, identity, and compliance services") + (description + "This package provides an interface to Amazon Web Services security, +identity, and compliance services, including the Identity and Access +Management (IAM) service for managing access to services and resources, and +more.") + (license license:asl2.0))) -- cgit v1.2.3 From c7b913a535e8ec9b2834312d6acc1a1bfa799028 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:23:18 +0200 Subject: gnu: Add r-paws-analytics. * gnu/packages/cran.scm (r-paws-analytics): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ca9bf58c6c..f892921698 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30718,3 +30718,27 @@ identity, and compliance services, including the Identity and Access Management (IAM) service for managing access to services and resources, and more.") (license license:asl2.0))) + +(define-public r-paws-analytics + (package + (name "r-paws-analytics") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "paws.analytics" version)) + (sha256 + (base32 + "04gnaxmj21l312xkrsd9bisi0bz9h6h5fyhwlqylcxi077z1yb2g")))) + (properties + `((upstream-name . "paws.analytics"))) + (build-system r-build-system) + (propagated-inputs + `(("r-paws-common" ,r-paws-common))) + (home-page "https://github.com/paws-r/paws") + (synopsis "Amazon Web Services analytics services") + (description + "This package provides an interface to Amazon Web Services analytics +services, including Elastic MapReduce Hadoop and Spark big data service, +Elasticsearch search engine, and more.") + (license license:asl2.0))) -- cgit v1.2.3 From 322290ba138710802ee286e2a91f5340dcaf01a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:23:24 +0200 Subject: gnu: Add r-paws-machine-learning. * gnu/packages/cran.scm (r-paws-machine-learning): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f892921698..e8ee20397d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30742,3 +30742,27 @@ more.") services, including Elastic MapReduce Hadoop and Spark big data service, Elasticsearch search engine, and more.") (license license:asl2.0))) + +(define-public r-paws-machine-learning + (package + (name "r-paws-machine-learning") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "paws.machine.learning" version)) + (sha256 + (base32 + "01w2y5952pk50xjbzby2pc51xrkrzjpfxbmii1b10cl2xgzfkxsa")))) + (properties + `((upstream-name . "paws.machine.learning"))) + (build-system r-build-system) + (propagated-inputs + `(("r-paws-common" ,r-paws-common))) + (home-page "https://github.com/paws-r/paws") + (synopsis "Amazon Web Services machine learning services") + (description + "This package provides an interface to Amazon Web Services machine +learning services, including SageMaker managed machine learning service, +natural language processing, speech recognition, translation, and more.") + (license license:asl2.0))) -- cgit v1.2.3 From 16cc95c4e9369dc95b2b05a9441402dc12b98e9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:23:29 +0200 Subject: gnu: Add r-paws-management. * gnu/packages/cran.scm (r-paws-management): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e8ee20397d..56e20a0c9c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30766,3 +30766,27 @@ Elasticsearch search engine, and more.") learning services, including SageMaker managed machine learning service, natural language processing, speech recognition, translation, and more.") (license license:asl2.0))) + +(define-public r-paws-management + (package + (name "r-paws-management") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "paws.management" version)) + (sha256 + (base32 + "09k7wg0jlj40zs2yb3vldffpkdcjg7ap98n7c5lxr5plpca08swg")))) + (properties + `((upstream-name . "paws.management"))) + (build-system r-build-system) + (propagated-inputs + `(("r-paws-common" ,r-paws-common))) + (home-page "https://github.com/paws-r/paws") + (synopsis "Amazon Web Services management and governance services") + (description + "This package provides an interface to Amazon Web Services management and +governance services, including CloudWatch application and infrastructure +monitoring, Auto Scaling for automatically scaling resources, and more.") + (license license:asl2.0))) -- cgit v1.2.3 From 478a889925a488ea2785c4146b0da8c63d79209b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:23:35 +0200 Subject: gnu: Add r-paws-networking. * gnu/packages/cran.scm (r-paws-networking): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 56e20a0c9c..fb93f1585e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30790,3 +30790,27 @@ natural language processing, speech recognition, translation, and more.") governance services, including CloudWatch application and infrastructure monitoring, Auto Scaling for automatically scaling resources, and more.") (license license:asl2.0))) + +(define-public r-paws-networking + (package + (name "r-paws-networking") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "paws.networking" version)) + (sha256 + (base32 + "02hxaa5nlj70mdggh379ij3fn09xm8h5ldzsyf45c342prpl6zwj")))) + (properties + `((upstream-name . "paws.networking"))) + (build-system r-build-system) + (propagated-inputs + `(("r-paws-common" ,r-paws-common))) + (home-page "https://github.com/paws-r/paws") + (synopsis "Amazon Web Services networking and content delivery services") + (description + "This package provides an interface to Amazon Web Services networking and +content delivery services, including Route 53 Domain Name System service, +CloudFront content delivery, load balancing, and more.") + (license license:asl2.0))) -- cgit v1.2.3 From b28cfb83e4d9c314969b5f6772041b8e8a3c2e64 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:23:40 +0200 Subject: gnu: Add r-paws-database. * gnu/packages/cran.scm (r-paws-database): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fb93f1585e..9946d779b6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30814,3 +30814,27 @@ monitoring, Auto Scaling for automatically scaling resources, and more.") content delivery services, including Route 53 Domain Name System service, CloudFront content delivery, load balancing, and more.") (license license:asl2.0))) + +(define-public r-paws-database + (package + (name "r-paws-database") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "paws.database" version)) + (sha256 + (base32 + "08jpwz95fw3f68j0wxh2lg57nn60khflldab0ryhkkbcw1iy0qyz")))) + (properties `((upstream-name . "paws.database"))) + (build-system r-build-system) + (propagated-inputs + `(("r-paws-common" ,r-paws-common))) + (home-page "https://github.com/paws-r/paws") + (synopsis + "Amazon Web Services Database Services") + (description + "This package provides an interface to Amazon Web Services database +services, including Relational Database Service (RDS), DynamoDB NoSQL +database, and more.") + (license license:asl2.0))) -- cgit v1.2.3 From c6849d2ca25ccb610115bad2e02181b3d7c433c7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:23:46 +0200 Subject: gnu: Add r-paws-storage. * gnu/packages/cran.scm (r-paws-storage): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9946d779b6..d4e0da0e91 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30838,3 +30838,25 @@ CloudFront content delivery, load balancing, and more.") services, including Relational Database Service (RDS), DynamoDB NoSQL database, and more.") (license license:asl2.0))) + +(define-public r-paws-storage + (package + (name "r-paws-storage") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "paws.storage" version)) + (sha256 + (base32 + "06m887vpqp5d6k3zxdlga599dsv8v3rladk7xqaxqnld1f17am04")))) + (properties `((upstream-name . "paws.storage"))) + (build-system r-build-system) + (propagated-inputs + `(("r-paws-common" ,r-paws-common))) + (home-page "https://github.com/paws-r/paws") + (synopsis "Amazon Web Services storage services") + (description + "This package provides an interface to Amazon Web Services storage +services, including Simple Storage Service (S3).") + (license license:asl2.0))) -- cgit v1.2.3 From 499ffd579e46ad4d42c7a1971741a862775647bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:23:52 +0200 Subject: gnu: Add r-paws-compute. * gnu/packages/cran.scm (r-paws-compute): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d4e0da0e91..b7d7b9af93 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30860,3 +30860,26 @@ database, and more.") "This package provides an interface to Amazon Web Services storage services, including Simple Storage Service (S3).") (license license:asl2.0))) + +(define-public r-paws-compute + (package + (name "r-paws-compute") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "paws.compute" version)) + (sha256 + (base32 + "1km6fng6il5fcjlrbbndahsw2dr2ql83hwac9wlpd67zm3wy9lky")))) + (properties `((upstream-name . "paws.compute"))) + (build-system r-build-system) + (propagated-inputs + `(("r-paws-common" ,r-paws-common))) + (home-page "https://github.com/paws-r/paws") + (synopsis "Amazon Web Services compute services") + (description + "This package provides an interface to Amazon Web Services compute +services, including Elastic Compute Cloud (EC2), Lambda +functions-as-a-service, containers, batch processing, and more.") + (license license:asl2.0))) -- cgit v1.2.3 From 870fb5dc2218331dce044c5553c3159f300afd3e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:23:58 +0200 Subject: gnu: Add r-paws. * gnu/packages/cran.scm (r-paws): New variable. --- gnu/packages/cran.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b7d7b9af93..b5e1e58e4e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30883,3 +30883,36 @@ services, including Simple Storage Service (S3).") services, including Elastic Compute Cloud (EC2), Lambda functions-as-a-service, containers, batch processing, and more.") (license license:asl2.0))) + +(define-public r-paws + (package + (name "r-paws") + (version "0.1.11") + (source + (origin + (method url-fetch) + (uri (cran-uri "paws" version)) + (sha256 + (base32 + "1pkwjdrziyh6bhpilx29zsv2nmv60z6fqxgx2kvjqvl8z36yqfhw")))) + (properties `((upstream-name . "paws"))) + (build-system r-build-system) + (propagated-inputs + `(("r-paws-analytics" ,r-paws-analytics) + ("r-paws-application-integration" ,r-paws-application-integration) + ("r-paws-compute" ,r-paws-compute) + ("r-paws-cost-management" ,r-paws-cost-management) + ("r-paws-customer-engagement" ,r-paws-customer-engagement) + ("r-paws-database" ,r-paws-database) + ("r-paws-machine-learning" ,r-paws-machine-learning) + ("r-paws-management" ,r-paws-management) + ("r-paws-networking" ,r-paws-networking) + ("r-paws-security-identity" ,r-paws-security-identity) + ("r-paws-storage" ,r-paws-storage))) + (home-page "https://github.com/paws-r/paws") + (synopsis "Amazon Web Services software development kit") + (description + "This package provides an interface to Amazon Web Services, including +storage, database, and compute services, such as Simple Storage Service (S3), +DynamoDB NoSQL database, and Lambda functions-as-a-service.") + (license license:asl2.0))) -- cgit v1.2.3 From 7bc1b5a23df2bf44898e4d1dd3a42be007ff88ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:24:04 +0200 Subject: gnu: Add r-zoomgroupstats. * gnu/packages/cran.scm (r-zoomgroupstats): New variable. --- gnu/packages/cran.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b5e1e58e4e..ffac9ba3f8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30916,3 +30916,38 @@ functions-as-a-service, containers, batch processing, and more.") storage, database, and compute services, such as Simple Storage Service (S3), DynamoDB NoSQL database, and Lambda functions-as-a-service.") (license license:asl2.0))) + +(define-public r-zoomgroupstats + (package + (name "r-zoomgroupstats") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "zoomGroupStats" version)) + (sha256 + (base32 + "0gndiq92cy6gi7f833hdjvqii3cn83wz5rjvygcvjl3dw4pwv966")))) + (properties + `((upstream-name . "zoomGroupStats"))) + (build-system r-build-system) + (propagated-inputs + `(("r-data-table" ,r-data-table) + ("r-dplyr" ,r-dplyr) + ("r-lubridate" ,r-lubridate) + ("r-magick" ,r-magick) + ("r-openxlsx" ,r-openxlsx) + ("r-paws" ,r-paws) + ("r-pbapply" ,r-pbapply) + ("r-stringr" ,r-stringr) + ("r-syuzhet" ,r-syuzhet))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "http://zoomgroupstats.org") + (synopsis "Analyze text, audio, and video from Zoom meetings") + (description + "This package provides utilities for processing and analyzing the files +that are exported from a recorded Zoom meeting. This includes analyzing data +captured through video cameras and microphones, the text-based chat, and +meta-data. You can analyze aspects of the conversation among meeting +participants and their emotional expressions throughout the meeting.") + (license license:expat))) -- cgit v1.2.3 From 7986f5cb3d36302ec203ab0eeb83921c940c9f3c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:24:09 +0200 Subject: gnu: Add r-zoom. * gnu/packages/cran.scm (r-zoom): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ffac9ba3f8..b8f8937976 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30951,3 +30951,23 @@ captured through video cameras and microphones, the text-based chat, and meta-data. You can analyze aspects of the conversation among meeting participants and their emotional expressions throughout the meeting.") (license license:expat))) + +(define-public r-zoom + (package + (name "r-zoom") + (version "2.0.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "zoom" version)) + (sha256 + (base32 + "03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5")))) + (properties `((upstream-name . "zoom"))) + (build-system r-build-system) + (home-page "https://github.com/cbarbu/R-package-zoom") + (synopsis "Spatial data visualization tool") + (description + "This package provides @code{zm}, a utility that allows you to +zoom/navigate any plot when called with any active plot.") + (license license:gpl3+))) -- cgit v1.2.3 From 738a48adb1c5c7e69e37105713fdd28706bafd73 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:24:15 +0200 Subject: gnu: Add r-zoolog. * gnu/packages/cran.scm (r-zoolog): New variable. --- gnu/packages/cran.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b8f8937976..32f3774da6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30971,3 +30971,33 @@ participants and their emotional expressions throughout the meeting.") "This package provides @code{zm}, a utility that allows you to zoom/navigate any plot when called with any active plot.") (license license:gpl3+))) + +(define-public r-zoolog + (package + (name "r-zoolog") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "zoolog" version)) + (sha256 + (base32 + "1lgdr4hbpdh1b468i3l9msbj8wcd20m323lv5an9y6dnfb9pm986")))) + (properties `((upstream-name . "zoolog"))) + (build-system r-build-system) + (propagated-inputs + `(("r-rdpack" ,r-rdpack) + ("r-stringi" ,r-stringi))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://josempozo.github.io/zoolog/") + (synopsis "Zooarchaeological analysis with log-ratios") + (description + "This package includes functions and reference data to generate and +manipulate log-ratios (also known as @dfn{log size index} (LSI) values) from +measurements obtained on zooarchaeological material. Log ratios are used to +compare the relative (rather than the absolute) dimensions of animals from +archaeological contexts. The zoolog package is also able to seamlessly +integrate data and references with heterogeneous nomenclature, which is +internally managed by a zoolog thesaurus.") + (license license:gpl3))) -- cgit v1.2.3 From b28a60c02c26e815e3e648d62df23db1773cbba6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:24:20 +0200 Subject: gnu: Add r-filehash. * gnu/packages/cran.scm (r-filehash): New variable. --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 32f3774da6..890bf645b6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31001,3 +31001,28 @@ archaeological contexts. The zoolog package is also able to seamlessly integrate data and references with heterogeneous nomenclature, which is internally managed by a zoolog thesaurus.") (license license:gpl3))) + +(define-public r-filehash + (package + (name "r-filehash") + (version "2.4-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "filehash" version)) + (sha256 + (base32 + "14zv7h5195dmfksgk8qvjgc2qq8253vga6267aa1bqs5bpvmdl5n")))) + (properties `((upstream-name . "filehash"))) + (build-system r-build-system) + (home-page "http://github.com/rdpeng/filehash") + (synopsis "Simple key-value database") + (description + "This package implements a simple key-value style database where +character string keys are associated with data values that are stored on the +disk. A simple interface is provided for inserting, retrieving, and deleting +data from the database. Utilities are provided that allow filehash databases +to be treated much like environments and lists are already used in R. These +utilities are provided to encourage interactive and exploratory analysis on +large datasets.") + (license license:gpl2+))) -- cgit v1.2.3 From 9d56788e1c43266f2f35ce6703d684d464e1582d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:24:25 +0200 Subject: gnu: Add r-mlearning. * gnu/packages/cran.scm (r-mlearning): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 890bf645b6..8b0feff6e8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31026,3 +31026,30 @@ to be treated much like environments and lists are already used in R. These utilities are provided to encourage interactive and exploratory analysis on large datasets.") (license license:gpl2+))) + +(define-public r-mlearning + (package + (name "r-mlearning") + (version "1.0-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "mlearning" version)) + (sha256 + (base32 + "0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r")))) + (properties `((upstream-name . "mlearning"))) + (build-system r-build-system) + (propagated-inputs + `(("r-class" ,r-class) + ("r-e1071" ,r-e1071) + ("r-ipred" ,r-ipred) + ("r-mass" ,r-mass) + ("r-nnet" ,r-nnet) + ("r-randomforest" ,r-randomforest))) + (home-page "http://www.sciviews.org/zooimage") + (synopsis "Machine learning algorithms with unified interface") + (description + "This package provides a unified interface to various machine learning +algorithms. Confusion matrices are provided too.") + (license license:gpl2+))) -- cgit v1.2.3 From 1c4b1a1f490f450ed73878ade3dda07608befdce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:24:32 +0200 Subject: gnu: Add r-zooimage. * gnu/packages/cran.scm (r-zooimage): New variable. --- gnu/packages/cran.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8b0feff6e8..bda361e951 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31053,3 +31053,39 @@ large datasets.") "This package provides a unified interface to various machine learning algorithms. Confusion matrices are provided too.") (license license:gpl2+))) + +(define-public r-zooimage + (package + (name "r-zooimage") + (version "5.5.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "zooimage" version)) + (sha256 + (base32 + "0ck8w0zb9l1n9xvjwqshq9q9l8pigy3yslq2hnfbgcwk17kk9mp8")))) + (properties `((upstream-name . "zooimage"))) + (build-system r-build-system) + (propagated-inputs + `(("r-digest" ,r-digest) + ("r-dt" ,r-dt) + ("r-filehash" ,r-filehash) + ("r-jpeg" ,r-jpeg) + ("r-mass" ,r-mass) + ("r-mda" ,r-mda) + ("r-mlearning" ,r-mlearning) + ("r-png" ,r-png) + ("r-shiny" ,r-shiny) + ("r-svdialogs" ,r-svdialogs) + ("r-svmisc" ,r-svmisc) + ("r-tiff" ,r-tiff))) + (home-page "http://www.sciviews.org/zooimage") + (synopsis "Analysis of numerical plankton images") + (description + "This package provides a solution for analyzing digital images of +plankton. In combination with ImageJ, an image analysis system, it processes +digital images, measures individuals, trains for automatic classification of +taxa, and finally, measures plankton samples (abundances, total and partial +size spectra or biomasses, etc.).") + (license license:gpl2+))) -- cgit v1.2.3 From 1c8a0dbcaf700b94fc9c3ec7ba9fc5db333c9265 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:34:26 +0200 Subject: gnu: r-dismo: Remove commented input. * gnu/packages/cran.scm (r-dismo)[inputs]: Remove commented "java" input. --- gnu/packages/cran.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bda361e951..cf8c601bbf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30545,7 +30545,6 @@ to archive and assign DOIs to data, software, figures, and more.") "1jj9d78f251bxgrwbv1ycn677qnhvl40bfan12x8fhlaq4d36rgx")))) (properties `((upstream-name . "dismo"))) (build-system r-build-system) -; (inputs `(("java" ,java))) (propagated-inputs `(("r-raster" ,r-raster) ("r-rcpp" ,r-rcpp) -- cgit v1.2.3 From 5e3199e37b6fc9494d91d68de4eb90e6d48916de Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:45:15 +0200 Subject: gnu: Add r-zooarch. * gnu/packages/cran.scm (r-zooarch): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cf8c601bbf..7fc9f180d8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31088,3 +31088,30 @@ digital images, measures individuals, trains for automatic classification of taxa, and finally, measures plankton samples (abundances, total and partial size spectra or biomasses, etc.).") (license license:gpl2+))) + +(define-public r-zooarch + (package + (name "r-zooarch") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "zooaRch" version)) + (sha256 + (base32 + "0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc")))) + (properties `((upstream-name . "zooaRch"))) + (build-system r-build-system) + (propagated-inputs `(("r-ggplot2" ,r-ggplot2))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page + "https://cran.r-project.org/package=zooaRch") + (synopsis + "Analytical Tools for Zooarchaeological Data") + (description + "The analysis and inference of faunal remains recovered from +archaeological sites concerns the field of zooarchaeology. The zooaRch +package provides analytical tools to make inferences on zooarchaeological +data. Functions in this package allow users to read, manipulate, visualize, +and analyze zooarchaeological data.") + (license license:gpl2+))) -- cgit v1.2.3 From 3d111f14302e99dd4bcd1d8d60fdde312cd027c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:45:24 +0200 Subject: gnu: Add r-zonebuilder. * gnu/packages/cran.scm (r-zonebuilder): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7fc9f180d8..98ed932014 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31115,3 +31115,31 @@ package provides analytical tools to make inferences on zooarchaeological data. Functions in this package allow users to read, manipulate, visualize, and analyze zooarchaeological data.") (license license:gpl2+))) + +(define-public r-zonebuilder + (package + (name "r-zonebuilder") + (version "0.0.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "zonebuilder" version)) + (sha256 + (base32 + "0mxf3dz0d6bi5wwjilqivdxhy5ypnq5svky8zygha0clv45l4dmn")))) + (properties `((upstream-name . "zonebuilder"))) + (build-system r-build-system) + (propagated-inputs + `(("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-sf" ,r-sf))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/zonebuilders/zonebuilder") + (synopsis "Create and explore geographic zoning systems") + (description + "This package provides functions, documentation and example data to help +divide geographic space into discrete polygons (zones). The functions are +motivated by research into the merits of different zoning systems. A flexible +@code{ClockBoard} zoning system is provided, which breaks-up space by +concentric rings and radial lines emanating from a central point.") + (license license:gpl3))) -- cgit v1.2.3 From 4638c52e32f15610a65c3dfc5e6833be088646b9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:45:29 +0200 Subject: gnu: Add r-zonator. * gnu/packages/cran.scm (r-zonator): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 98ed932014..a8164c8a98 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31143,3 +31143,30 @@ motivated by research into the merits of different zoning systems. A flexible @code{ClockBoard} zoning system is provided, which breaks-up space by concentric rings and radial lines emanating from a central point.") (license license:gpl3))) + +(define-public r-zonator + (package + (name "r-zonator") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "zonator" version)) + (sha256 + (base32 + "1plxchpd4ypp36phl13pi9yvlrqi3lk83lv5rldrhdqynhcgfw2k")))) + (properties `((upstream-name . "zonator"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-raster" ,r-raster) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-reshape2" ,r-reshape2) + ("r-rgdal" ,r-rgdal))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://cbig.github.io/zonator/") + (synopsis "Utilities for Zonation spatial conservation prioritization") + (description + "Create new analysis setups and deal with results of Zonation +conservation prioritization software.") + (license license:bsd-2))) -- cgit v1.2.3 From 87682c88c858a2b545b347ad951524f14bd98633 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:45:37 +0200 Subject: gnu: Add r-mmwrweek. * gnu/packages/cran.scm (r-mmwrweek): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a8164c8a98..a66ec87adc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31170,3 +31170,26 @@ concentric rings and radial lines emanating from a central point.") "Create new analysis setups and deal with results of Zonation conservation prioritization software.") (license license:bsd-2))) + +(define-public r-mmwrweek + (package + (name "r-mmwrweek") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "MMWRweek" version)) + (sha256 + (base32 + "1l1ks44v52iggw9nhs56lfj6804yab5b17k8fzrc6h1kvj3vda0s")))) + (properties `((upstream-name . "MMWRweek"))) + (build-system r-build-system) + (home-page "http://wwwn.cdc.gov/nndss/document/MMWR_Week_overview.pdf") + (synopsis "Convert dates to MMWR day, week, and year") + (description + "The first day of any MMWR week is Sunday. MMWR week numbering is +sequential beginning with 1 and incrementing with each week to a maximum of 52 +or 53. MMWR week #1 of an MMWR year is the first week of the year that has at +least four days in the calendar year. This package provides functionality to +convert dates to MMWR day, week, and year and the reverse.") + (license license:gpl2+))) -- cgit v1.2.3 From e13de8715ffe98b707d4702ddd67d300017f5aa3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:45:42 +0200 Subject: gnu: Add r-crul. * gnu/packages/cran.scm (r-crul): New variable. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a66ec87adc..64008c97e0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31193,3 +31193,32 @@ or 53. MMWR week #1 of an MMWR year is the first week of the year that has at least four days in the calendar year. This package provides functionality to convert dates to MMWR day, week, and year and the reverse.") (license license:gpl2+))) + +(define-public r-crul + (package + (name "r-crul") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "crul" version)) + (sha256 + (base32 + "1kjsc5gkx5k5cfwlfjp2cjm9cdzq2l1m68bnrjmahw3lkz8wzdph")))) + (properties `((upstream-name . "crul"))) + (build-system r-build-system) + (propagated-inputs + `(("r-curl" ,r-curl) + ("r-httpcode" ,r-httpcode) + ("r-jsonlite" ,r-jsonlite) + ("r-mime" ,r-mime) + ("r-r6" ,r-r6) + ("r-urltools" ,r-urltools))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/ropensci/crul") + (synopsis "HTTP client") + (description + "This package provides a simple HTTP client, with tools for making HTTP +requests, and mocking HTTP requests. The package is built on R6, and takes +inspiration from Ruby's @code{faraday} gem.") + (license license:expat))) -- cgit v1.2.3 From 9c4e106383c49f1cc70ce37fe6a7182b1daff741 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:45:47 +0200 Subject: gnu: Add r-fauxpas. * gnu/packages/cran.scm (r-fauxpas): New variable. --- gnu/packages/cran.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 64008c97e0..c1ddcb7897 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31222,3 +31222,33 @@ convert dates to MMWR day, week, and year and the reverse.") requests, and mocking HTTP requests. The package is built on R6, and takes inspiration from Ruby's @code{faraday} gem.") (license license:expat))) + +(define-public r-fauxpas + (package + (name "r-fauxpas") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "fauxpas" version)) + (sha256 + (base32 + "129fzqb7wsskbn50s8x0marr4wm8jrns6hiycqcsk166k3dnyyy8")))) + (properties `((upstream-name . "fauxpas"))) + (build-system r-build-system) + (propagated-inputs + `(("r-httpcode" ,r-httpcode) + ("r-r6" ,r-r6) + ("r-whisker" ,r-whisker))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://docs.ropensci.org/fauxpas") + (synopsis "HTTP error helpers") + (description + "This package provides HTTP error helpers. Methods are included for +general purpose HTTP error handling, as well as individual methods for every +HTTP status code, both via status code numbers as well as their descriptive +names. It supports the ability to adjust behavior to stop, message or +warning. It includes the ability to use a custom whisker template to have any +configuration of status code, short description, and verbose message.") + (license license:expat))) -- cgit v1.2.3 From bb2eef3bf1245b2b09c96fb96ace87a76e71dab9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:45:52 +0200 Subject: gnu: Add r-webmockr. * gnu/packages/cran.scm (r-webmockr): New variable. --- gnu/packages/cran.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c1ddcb7897..b80f3b7750 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31252,3 +31252,35 @@ names. It supports the ability to adjust behavior to stop, message or warning. It includes the ability to use a custom whisker template to have any configuration of status code, short description, and verbose message.") (license license:expat))) + +(define-public r-webmockr + (package + (name "r-webmockr") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "webmockr" version)) + (sha256 + (base32 + "0j40srwi0yasmllb9wsww4m6zkiyzqd549cis4dxd7c7p24hak8j")))) + (properties `((upstream-name . "webmockr"))) + (build-system r-build-system) + (propagated-inputs + `(("r-base64enc" ,r-base64enc) + ("r-crul" ,r-crul) + ("r-curl" ,r-curl) + ("r-fauxpas" ,r-fauxpas) + ("r-jsonlite" ,r-jsonlite) + ("r-magrittr" ,r-magrittr) + ("r-r6" ,r-r6) + ("r-urltools" ,r-urltools))) + (home-page "https://github.com/ropensci/webmockr") + (synopsis "Stubbing and setting expectations on HTTP Requests") + (description + "This is a package for stubbing and setting expectations on HTTP +requests. It includes tools for stubbing HTTP requests, including expected +request conditions and response conditions. You can match on HTTP method, +query parameters, request body, headers and more. It can be used for unit +tests or outside of a testing context.") + (license license:expat))) -- cgit v1.2.3 From db438e2dff2861ecbdaf89f6bcdcefab22278c7f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:45:57 +0200 Subject: gnu: Add r-mockery. * gnu/packages/cran.scm (r-mockery): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b80f3b7750..8a07540fc6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31284,3 +31284,31 @@ request conditions and response conditions. You can match on HTTP method, query parameters, request body, headers and more. It can be used for unit tests or outside of a testing context.") (license license:expat))) + +(define-public r-mockery + (package + (name "r-mockery") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "mockery" version)) + (sha256 + (base32 + "16zayzi2qdmiy513hvlci9f4p8jwry24006yfzrgmrvf6sf293lq")))) + (properties `((upstream-name . "mockery"))) + (build-system r-build-system) + (propagated-inputs + `(("r-testthat" ,r-testthat))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/jfiksel/mockery") + (synopsis "Mocking library for R") + (description + "The two main functionalities of this package are creating mock +objects (functions) and selectively intercepting calls to a given function +that originate in some other function. It can be used with any testing +framework available for R. Mock objects can be injected with either this +package's own @code{stub} function or a similar @code{with_mock} facility +present in the @code{testthat} package.") + (license license:expat))) -- cgit v1.2.3 From 71f3255faa24fe34adf4355b56143469bbfcaa92 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:46:03 +0200 Subject: gnu: Add r-zoltr. * gnu/packages/cran.scm (r-zoltr): New variable. --- gnu/packages/cran.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8a07540fc6..d47c4f198a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31312,3 +31312,40 @@ framework available for R. Mock objects can be injected with either this package's own @code{stub} function or a similar @code{with_mock} facility present in the @code{testthat} package.") (license license:expat))) + +(define-public r-zoltr + (package + (name "r-zoltr") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "zoltr" version)) + (sha256 + (base32 + "12zh7y3pwidclscgvd0b0iaqq9j5y8mc8xd6pz4vs0jy5qs3ahar")))) + (properties `((upstream-name . "zoltr"))) + (build-system r-build-system) + (propagated-inputs + `(("r-base64url" ,r-base64url) + ("r-dplyr" ,r-dplyr) + ("r-httr" ,r-httr) + ("r-jsonlite" ,r-jsonlite) + ("r-magrittr" ,r-magrittr) + ("r-mmwrweek" ,r-mmwrweek) + ("r-mockery" ,r-mockery) + ("r-readr" ,r-readr) + ("r-rlang" ,r-rlang) + ("r-webmockr" ,r-webmockr))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/reichlab/zoltr") + (synopsis "Interface to the Zoltar forecast repository API") + (description + "Zoltar is a website that provides a repository of model forecast results +in a standardized format and a central location. It supports storing, +retrieving, comparing, and analyzing time series forecasts for prediction +challenges of interest to the modeling community. This package provides +functions for working with the Zoltar API, including connecting and +authenticating, getting information about projects, models, and forecasts, +deleting and uploading forecast data, and downloading scores.") + (license license:gpl3))) -- cgit v1.2.3 From 03ed20e87b9460ad08522fd9d77af3293f03a7a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Aug 2021 11:46:07 +0200 Subject: gnu: Add r-zoib. * gnu/packages/cran.scm (r-zoib): New variable. --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d47c4f198a..8dd37434f2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31349,3 +31349,29 @@ functions for working with the Zoltar API, including connecting and authenticating, getting information about projects, models, and forecasts, deleting and uploading forecast data, and downloading scores.") (license license:gpl3))) + +(define-public r-zoib + (package + (name "r-zoib") + (version "1.5.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "zoib" version)) + (sha256 + (base32 + "0inm7f2pc68ksqxvq12xp9jc99vj7ydylvs24ip12nksbj5k1n8f")))) + (properties `((upstream-name . "zoib"))) + (build-system r-build-system) + (propagated-inputs + `(("r-abind" ,r-abind) + ("r-coda" ,r-coda) + ("r-formula" ,r-formula) + ("r-rjags" ,r-rjags))) + (home-page "https://www.r-project.org") + (synopsis "Bayesian inference for beta regression") + (description + "This package lets you fit beta regression and zero-or-one inflated beta +regression and obtain Bayesian inference of the model via the Markov Chain +Monte Carlo approach implemented in JAGS.") + (license license:gpl3+))) -- cgit v1.2.3 From 89dab587d6798db8bb1620b015bedfd33eeab194 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:43:45 +0200 Subject: gnu: rust-thiserror-impl-1: Update to 1.0.26. * gnu/packages/crates-io.scm (rust-thiserror-impl-1): Update to 1.0.26. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 24cc772ba7..00ef6938ee 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48204,7 +48204,7 @@ handle Unicode characters correctly.") (define-public rust-thiserror-impl-1 (package (name "rust-thiserror-impl") - (version "1.0.25") + (version "1.0.26") (source (origin (method url-fetch) @@ -48213,7 +48213,7 @@ handle Unicode characters correctly.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "139i3bxidyncjd1sphkn4c577nkba8lzmphhr9gb26xz1y67cdla")))) + "0ia72qiynlws5avb8f1xqlazp4g6bqgzjbwy5vs6nyg7myh6j386")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 513f5e5179a4de8d6b224bbdfd65e1aff6c96b28 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:44:21 +0200 Subject: gnu: rust-thiserror-1: Update to 1.0.26. * gnu/packages/crates-io.scm (rust-thiserror-1): Update to 1.0.26. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 00ef6938ee..cf9237905e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48176,7 +48176,7 @@ handle Unicode characters correctly.") (define-public rust-thiserror-1 (package (name "rust-thiserror") - (version "1.0.25") + (version "1.0.26") (source (origin (method url-fetch) @@ -48185,7 +48185,7 @@ handle Unicode characters correctly.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ip9j8riar3xffp261yls4phpasz768xhnafxdz4qlargx2pcvzs")))) + "1qmz542pq4wmz3p0s4kavsqv09h0x99klkf3k33ydjy1x97rw4ck")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 45ad28409006cc09af79cae041355e2f84c9cd6e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:44:48 +0200 Subject: gnu: rust-libc-0.2: Update to 0.2.101. * gnu/packages/crates-io.scm (rust-libc-0.2): Update to 0.2.101. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cf9237905e..d15a6e810f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23867,7 +23867,7 @@ strings.") (define-public rust-libc-0.2 (package (name "rust-libc") - (version "0.2.96") + (version "0.2.101") (source (origin (method url-fetch) @@ -23875,7 +23875,7 @@ strings.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1z5l4rdk44sx1vaq69x1mbwi5zh75q46p2hkl90ihhn5xzkb802n")))) + "08dsmvn397ph8gnj552k12gmpp2rk6p60jyliqnfvr8vhwv07c1w")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 60f6e97dd9c56aad357a4441b200ce6a9d41b451 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:45:43 +0200 Subject: gnu: Add rust-nix-0.22. * gnu/packages/crates-io.scm (rust-nix-0.22): New variable. (rust-nix-0.21): Inherit from above. --- gnu/packages/crates-io.scm | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d15a6e810f..e4cd61587e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28386,17 +28386,17 @@ nitrokey crate and others using it.") nitrokey-test crate.") (license license:gpl3+))) -(define-public rust-nix-0.21 +(define-public rust-nix-0.22 (package (name "rust-nix") - (version "0.21.0") + (version "0.22.1") (source (origin (method url-fetch) (uri (crate-uri "nix" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1isfgr239sxvkcjhcp08rz2nqi4s6w5ik2l2m183ldlxqkz2hdsw")))) + (base32 "0cahgzxhdwsaa8491n6cn8gadgfsxk5razyfw4xr3k34f5n5smg7")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -28414,6 +28414,27 @@ The goal is to not provide a 100% unified interface, but to unify what can be while still providing platform specific APIs.") (license license:expat))) +(define-public rust-nix-0.21 + (package + (inherit rust-nix-0.22) + (name "rust-nix") + (version "0.21.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "nix" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1isfgr239sxvkcjhcp08rz2nqi4s6w5ik2l2m183ldlxqkz2hdsw")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cc" ,rust-cc-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-memoffset" ,rust-memoffset-0.6)))))) + (define-public rust-nix-0.20 (package (inherit rust-nix-0.21) -- cgit v1.2.3 From ec51a9845deb9707a6404c91facb3da215e8a4ec Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:46:48 +0200 Subject: gnu: Add rust-fd-lock-3. * gnu/packages/crates-io.scm (rust-fd-lock-3): New variable. (rust-fd-lock-2): Inherit from above. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e4cd61587e..5b8d163bef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15890,22 +15890,23 @@ floats.") "This package provides a simple and fast random number generator.") (license (list license:asl2.0 license:expat)))) -(define-public rust-fd-lock-2 +(define-public rust-fd-lock-3 (package (name "rust-fd-lock") - (version "2.0.0") + (version "3.0.0") (source (origin (method url-fetch) (uri (crate-uri "fd-lock" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "01kzrikg3a60lxmr0k8bbm4nggh6693f1pf530ip136qzwpg0400")))) + (base32 "0dif8wk9xrqkjyfgqqy3zfg4ckmkpyzzk5p5m01s99q63bcnv05q")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-libc" ,rust-libc-0.2) + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-libc" ,rust-libc-0.2) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/yoshuawuyts/fd-lock") (synopsis "Advisory lock on a file") @@ -15914,6 +15915,24 @@ floats.") it.") (license (list license:expat license:asl2.0)))) +(define-public rust-fd-lock-2 + (package + (inherit rust-fd-lock-3) + (name "rust-fd-lock") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fd-lock" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01kzrikg3a60lxmr0k8bbm4nggh6693f1pf530ip136qzwpg0400")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-femme-2 (package (name "rust-femme") -- cgit v1.2.3 From 671aae1178c7ef3cb67e3583d27ab676b7f5a3a6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:47:48 +0200 Subject: gnu: Add rust-rustyline-9. * gnu/packages/crates-io.scm (rust-rustyline-9): New variable. (rust-rustyline-8): Inherit from above. --- gnu/packages/crates-io.scm | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5b8d163bef..ea362c3182 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39959,17 +39959,17 @@ sub-processes using a fork-like interface.") ("rust-tempfile" ,rust-tempfile-3) ("rust-wait-timeout" ,rust-wait-timeout-0.2)))))) -(define-public rust-rustyline-8 +(define-public rust-rustyline-9 (package (name "rust-rustyline") - (version "8.2.0") + (version "9.0.0") (source (origin (method url-fetch) (uri (crate-uri "rustyline" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0x0qwcbnq6zyayxv1xqqn0zbwlz878jra0sgiv4pd3vklzvymm7v")))) + (base32 "1mj0cgdyw6gaadsg7yxsnb9n4bdl91qga9kiwyd4hqqsi31qf13r")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -39978,12 +39978,13 @@ sub-processes using a fork-like interface.") ("rust-cfg-if" ,rust-cfg-if-1) ("rust-clipboard-win" ,rust-clipboard-win-4) ("rust-dirs-next" ,rust-dirs-next-2) - ("rust-fd-lock" ,rust-fd-lock-2) + ("rust-fd-lock" ,rust-fd-lock-3) ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-memchr" ,rust-memchr-2) - ("rust-nix" ,rust-nix-0.20) + ("rust-nix" ,rust-nix-0.22) ("rust-radix-trie" ,rust-radix-trie-0.2) + ("rust-regex" ,rust-regex-1) ("rust-scopeguard" ,rust-scopeguard-1) ("rust-smallvec" ,rust-smallvec-1) ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) @@ -39997,6 +39998,39 @@ sub-processes using a fork-like interface.") "Rustyline is a readline implementation based on the linenoise package.") (license license:expat))) +(define-public rust-rustyline-8 + (package + (inherit rust-rustyline-9) + (name "rust-rustyline") + (version "8.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustyline" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0x0qwcbnq6zyayxv1xqqn0zbwlz878jra0sgiv4pd3vklzvymm7v")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-clipboard-win" ,rust-clipboard-win-4) + ("rust-dirs-next" ,rust-dirs-next-2) + ("rust-fd-lock" ,rust-fd-lock-2) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-nix" ,rust-nix-0.20) + ("rust-radix-trie" ,rust-radix-trie-0.2) + ("rust-scopeguard" ,rust-scopeguard-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-utf8parse" ,rust-utf8parse-0.2) + ("rust-winapi" ,rust-winapi-0.3) + ("skim" ,skim)))))) + (define-public rust-rustyline-7 (package (inherit rust-rustyline-8) -- cgit v1.2.3 From 721a18bc785258110ec7dff602463bba022be67b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:49:50 +0200 Subject: gnu: Add rust-arrow-5. * gnu/packages/crates-io.scm (rust-arrow-5): New variable. (rust-arrow-4): Inherit from above. --- gnu/packages/crates-io.scm | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ea362c3182..0726f2cb6f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2356,25 +2356,26 @@ ArrayVec and ArrayString.") ("rust-matches" ,rust-matches-0.1) ("rust-serde-test" ,rust-serde-test-1)))))) -(define-public rust-arrow-4 +(define-public rust-arrow-5 (package (name "rust-arrow") - (version "4.4.0") + (version "5.2.0") (source (origin (method url-fetch) (uri (crate-uri "arrow" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "141qb0yqk179n324qrhbv14ysz13mcfsw00d6m09882gx9637wzn")))) + (base32 "1zj2sjlnkwz2sdfc83zcz75vg1d3900h8ix15nkjsbz5hd1pzvri")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-cfg-aliases" ,rust-cfg-aliases-0.1) + (("rust-bitflags" ,rust-bitflags-1) ("rust-chrono" ,rust-chrono-0.4) ("rust-csv" ,rust-csv-1) - ("rust-flatbuffers" ,rust-flatbuffers-0.8) + ("rust-flatbuffers" ,rust-flatbuffers-2) + ("rust-getrandom" ,rust-getrandom-0.2) ("rust-hex" ,rust-hex-0.4) ("rust-indexmap" ,rust-indexmap-1) ("rust-lazy-static" ,rust-lazy-static-1) @@ -2383,7 +2384,7 @@ ArrayVec and ArrayString.") ("rust-num" ,rust-num-0.4) ("rust-packed-simd-2" ,rust-packed-simd-2-0.3) ("rust-prettytable-rs" ,rust-prettytable-rs-0.8) - ("rust-rand" ,rust-rand-0.7) + ("rust-rand" ,rust-rand-0.8) ("rust-regex" ,rust-regex-1) ("rust-serde" ,rust-serde-1) ("rust-serde-derive" ,rust-serde-derive-1) @@ -2395,6 +2396,39 @@ ArrayVec and ArrayString.") format.") (license license:asl2.0))) +(define-public rust-arrow-4 + (package + (inherit rust-arrow-5) + (name "rust-arrow") + (version "4.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "arrow" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "141qb0yqk179n324qrhbv14ysz13mcfsw00d6m09882gx9637wzn")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-aliases" ,rust-cfg-aliases-0.1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-csv" ,rust-csv-1) + ("rust-flatbuffers" ,rust-flatbuffers-0.8) + ("rust-hex" ,rust-hex-0.4) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-lexical-core" ,rust-lexical-core-0.7) + ("rust-multiversion" ,rust-multiversion-0.6) + ("rust-num" ,rust-num-0.4) + ("rust-packed-simd-2" ,rust-packed-simd-2-0.3) + ("rust-prettytable-rs" ,rust-prettytable-rs-0.8) + ("rust-rand" ,rust-rand-0.7) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1)))))) + (define-public rust-askama-escape-0.10 (package (name "rust-askama-escape") -- cgit v1.2.3 From 4da42edec54c928cc74a14cf13e935b3fd691110 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:56:15 +0200 Subject: gnu: Add rust-parquet-5. * gnu/packages/crates-io.scm (rust-parquet-5): New variable. (rust-parquet-4): Inherit from above. --- gnu/packages/crates-io.scm | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0726f2cb6f..fc7491cf9e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31434,22 +31434,22 @@ synchronization primitives.") ("rust-winapi" ,rust-winapi-0.3) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) -(define-public rust-parquet-4 +(define-public rust-parquet-5 (package (name "rust-parquet") - (version "4.4.0") + (version "5.2.0") (source (origin (method url-fetch) (uri (crate-uri "parquet" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0m3aqmaa79wka7adijl3zqkfjf1iwm2y58v0g16askv73pj48l16")))) + (base32 "0k2pzbqy6qb3rhxfsbx6gnmqyz4c9rprn6p76ws5f7cbgjwv97p2")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-arrow" ,rust-arrow-4) + (("rust-arrow" ,rust-arrow-5) ("rust-base64" ,rust-base64-0.13) ("rust-brotli" ,rust-brotli-3) ("rust-byteorder" ,rust-byteorder-1) @@ -31459,16 +31459,47 @@ synchronization primitives.") ("rust-lz4" ,rust-lz4-1) ("rust-num-bigint" ,rust-num-bigint-0.4) ("rust-parquet-format" ,rust-parquet-format-2) + ("rust-rand" ,rust-rand-0.8) ("rust-serde-json" ,rust-serde-json-1) ("rust-snap" ,rust-snap-1) ("rust-thrift" ,rust-thrift-0.13) - ("rust-zstd" ,rust-zstd-0.8)))) + ("rust-zstd" ,rust-zstd-0.9)))) (home-page "https://github.com/apache/arrow-rs") (synopsis "Apache Parquet implementation in Rust") (description "This crate provides an Apache Parquet implementation in Rust.") (license license:asl2.0))) +(define-public rust-parquet-4 + (package + (inherit rust-parquet-5) + (name "rust-parquet") + (version "4.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "parquet" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0m3aqmaa79wka7adijl3zqkfjf1iwm2y58v0g16askv73pj48l16")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-arrow" ,rust-arrow-4) + ("rust-base64" ,rust-base64-0.13) + ("rust-brotli" ,rust-brotli-3) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-clap" ,rust-clap-2) + ("rust-flate2" ,rust-flate2-1) + ("rust-lz4" ,rust-lz4-1) + ("rust-num-bigint" ,rust-num-bigint-0.4) + ("rust-parquet-format" ,rust-parquet-format-2) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-snap" ,rust-snap-1) + ("rust-thrift" ,rust-thrift-0.13) + ("rust-zstd" ,rust-zstd-0.8)))))) + (define-public rust-parquet-format-2 (package (name "rust-parquet-format") -- cgit v1.2.3 From 4bfd6d9b49743726e980126320c40a327218bf5c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:50:56 +0200 Subject: gnu: Add rust-polars-core-0.15. * gnu/packages/crates-io.scm (rust-polars-core-0.15): New variable. (rust-polars-core-0.14): Inherit from above. --- gnu/packages/crates-io.scm | 51 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fc7491cf9e..5191f9054c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33148,34 +33148,35 @@ applications.") ("rust-num" ,rust-num-0.4) ("rust-thiserror" ,rust-thiserror-1)))))) -(define-public rust-polars-core-0.14 +(define-public rust-polars-core-0.15 (package (name "rust-polars-core") - (version "0.14.8") + (version "0.15.1") (source (origin (method url-fetch) (uri (crate-uri "polars-core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1vlzqsp0hrdixv4gyprlkmyhh7s3m2lnq9nizpm3sqhlccfdahyz")))) + (base32 "0vzyyqg0s6h3k77z7nkmqrrgnp7nbi7sh5nmlw1ggrlml9ps0aa9")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-ahash" ,rust-ahash-0.7) ("rust-anyhow" ,rust-anyhow-1) - ("rust-arrow" ,rust-arrow-4) + ("rust-arrow" ,rust-arrow-5) ("rust-chrono" ,rust-chrono-0.4) ("rust-comfy-table" ,rust-comfy-table-1) ("rust-hashbrown" ,rust-hashbrown-0.11) ("rust-itertools" ,rust-itertools-0.10) + ("rust-jsonpath-lib" ,rust-jsonpath-lib-0.3) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-ndarray" ,rust-ndarray-0.15) ("rust-num" ,rust-num-0.4) ("rust-num-cpus" ,rust-num-cpus-1) - ("rust-parquet" ,rust-parquet-4) - ("rust-polars-arrow" ,rust-polars-arrow-0.14) + ("rust-parquet" ,rust-parquet-5) + ("rust-polars-arrow" ,rust-polars-arrow-0.15) ("rust-prettytable-rs" ,rust-prettytable-rs-0.8) ("rust-rand" ,rust-rand-0.7) ("rust-rand-distr" ,rust-rand-distr-0.3) @@ -33191,6 +33192,44 @@ applications.") "This crate provides the core of the Polars DataFrame library.") (license license:expat))) +(define-public rust-polars-core-0.14 + (package + (inherit rust-polars-core-0.15) + (name "rust-polars-core") + (version "0.14.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1vlzqsp0hrdixv4gyprlkmyhh7s3m2lnq9nizpm3sqhlccfdahyz")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ahash" ,rust-ahash-0.7) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-arrow" ,rust-arrow-4) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-comfy-table" ,rust-comfy-table-1) + ("rust-hashbrown" ,rust-hashbrown-0.11) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-ndarray" ,rust-ndarray-0.15) + ("rust-num" ,rust-num-0.4) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-parquet" ,rust-parquet-4) + ("rust-polars-arrow" ,rust-polars-arrow-0.14) + ("rust-prettytable-rs" ,rust-prettytable-rs-0.8) + ("rust-rand" ,rust-rand-0.7) + ("rust-rand-distr" ,rust-rand-distr-0.3) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-unsafe-unwrap" ,rust-unsafe-unwrap-0.1)))))) + (define-public rust-polars-core-0.13 (package (inherit rust-polars-core-0.14) -- cgit v1.2.3 From 84479475f6a642b587fa57edf23f7bdd417aa2b0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:51:58 +0200 Subject: gnu: Add rust-polars-arrow-0.15. * gnu/packages/crates-io.scm (rust-polars-arrow-0.15): New variable. (rust-polars-arrow-0.14): Inherit from above. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5191f9054c..7dee185625 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33104,22 +33104,22 @@ applications.") ("rust-polars-io" ,rust-polars-io-0.13) ("rust-polars-lazy" ,rust-polars-lazy-0.13)))))) -(define-public rust-polars-arrow-0.14 +(define-public rust-polars-arrow-0.15 (package (name "rust-polars-arrow") - (version "0.14.8") + (version "0.15.1") (source (origin (method url-fetch) (uri (crate-uri "polars-arrow" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1wk6qfj821w6qqs35n9f0zhp9n7mffxzah12nqk1xlpv2ci2ahsr")))) + (base32 "0d8ir9dajywfqg6ck557vbvzsdmndc1ipn9mgrqi15yini1qmw2z")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-arrow" ,rust-arrow-4) + (("rust-arrow" ,rust-arrow-5) ("rust-num" ,rust-num-0.4) ("rust-thiserror" ,rust-thiserror-1)))) (home-page "https://github.com/ritchie46/polars") @@ -33128,6 +33128,25 @@ applications.") "This crate provides Arrow interfaces for Polars DataFrame library.") (license license:expat))) +(define-public rust-polars-arrow-0.14 + (package + (inherit rust-polars-arrow-0.15) + (name "rust-polars-arrow") + (version "0.14.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-arrow" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1wk6qfj821w6qqs35n9f0zhp9n7mffxzah12nqk1xlpv2ci2ahsr")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-arrow" ,rust-arrow-4) + ("rust-num" ,rust-num-0.4) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-polars-arrow-0.13 (package (inherit rust-polars-arrow-0.14) -- cgit v1.2.3 From 734aa60424870408efe6f6d325c8791c0c38216f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:52:57 +0200 Subject: gnu: Add rust-polars-io-0.15. * gnu/packages/crates-io.scm (rust-polars-io-0.15): New variable. (rust-polars-io-0.14): Inherit from above. --- gnu/packages/crates-io.scm | 48 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7dee185625..552cacab08 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33286,8 +33286,48 @@ applications.") ("rust-thiserror" ,rust-thiserror-1) ("rust-unsafe-unwrap" ,rust-unsafe-unwrap-0.1)))))) +(define-public rust-polars-io-0.15 + (package + (name "rust-polars-io") + (version "0.15.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-io" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19r2l3rxjdk25ir93l85ap4q0w5p7apjw3g57pszxph9nh2j8ba2")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ahash" ,rust-ahash-0.7) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-arrow" ,rust-arrow-5) + ("rust-csv-core" ,rust-csv-core-0.1) + ("rust-dirs" ,rust-dirs-3) + ("rust-fast-float" ,rust-fast-float-0.2) + ("rust-flate2" ,rust-flate2-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-lexical" ,rust-lexical-5) + ("rust-memmap2" ,rust-memmap2-0.2) + ("rust-num" ,rust-num-0.4) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-parquet" ,rust-parquet-5) + ("rust-polars-arrow" ,rust-polars-arrow-0.15) + ("rust-polars-core" ,rust-polars-core-0.15) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-simdutf8" ,rust-simdutf8-0.1)))) + (home-page "https://github.com/ritchie46/polars") + (synopsis "IO related logic for the Polars DataFrame library") + (description + "This crate provides IO related logic for the Polars DataFrame library.") + (license license:expat))) + (define-public rust-polars-io-0.14 (package + (inherit rust-polars-io-0.15) (name "rust-polars-io") (version "0.14.8") (source @@ -33297,7 +33337,6 @@ applications.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0fha62dln5xv2sa38jrfmd7amj9557y66dy8v44gn9j896mqm6fd")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -33319,12 +33358,7 @@ applications.") ("rust-polars-core" ,rust-polars-core-0.14) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) - ("rust-simdutf8" ,rust-simdutf8-0.1)))) - (home-page "https://github.com/ritchie46/polars") - (synopsis "IO related logic for the Polars DataFrame library") - (description - "This crate provides IO related logic for the Polars DataFrame library.") - (license license:expat))) + ("rust-simdutf8" ,rust-simdutf8-0.1)))))) (define-public rust-polars-io-0.13 (package -- cgit v1.2.3 From 4a8e07e326c9d371dc101d3f5de5320796dcbdd5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:53:57 +0200 Subject: gnu: Add rust-polars-lazy-0.15. * gnu/packages/crates-io.scm (rust-polars-lazy-0.15): New variable. (rust-polars-lazy-0.14): Inherit from above. --- gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 552cacab08..d06ab6e5de 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33392,27 +33392,28 @@ applications.") ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1)))))) -(define-public rust-polars-lazy-0.14 +(define-public rust-polars-lazy-0.15 (package (name "rust-polars-lazy") - (version "0.14.8") + (version "0.15.1") (source (origin (method url-fetch) (uri (crate-uri "polars-lazy" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "07gir4r7ifc9przvd8acd09g225si2z2lpczmmv8jdqyrz8vd5k5")))) + (base32 "0xh3a0gjsisx62zwjmawxg9giin7bwmh7z7y4cc2d3ygy8nk19jh")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-ahash" ,rust-ahash-0.7) ("rust-itertools" ,rust-itertools-0.10) - ("rust-polars-arrow" ,rust-polars-arrow-0.14) - ("rust-polars-core" ,rust-polars-core-0.14) - ("rust-polars-io" ,rust-polars-io-0.14) - ("rust-rayon" ,rust-rayon-1)))) + ("rust-polars-arrow" ,rust-polars-arrow-0.15) + ("rust-polars-core" ,rust-polars-core-0.15) + ("rust-polars-io" ,rust-polars-io-0.15) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1)))) (home-page "https://github.com/ritchie46/polars") (synopsis "Lazy query engine for the Polars DataFrame library") (description @@ -33420,6 +33421,28 @@ applications.") library.") (license license:expat))) +(define-public rust-polars-lazy-0.14 + (package + (inherit rust-polars-lazy-0.15) + (name "rust-polars-lazy") + (version "0.14.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-lazy" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07gir4r7ifc9przvd8acd09g225si2z2lpczmmv8jdqyrz8vd5k5")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ahash" ,rust-ahash-0.7) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-polars-arrow" ,rust-polars-arrow-0.14) + ("rust-polars-core" ,rust-polars-core-0.14) + ("rust-polars-io" ,rust-polars-io-0.14) + ("rust-rayon" ,rust-rayon-1)))))) + (define-public rust-polars-lazy-0.13 (package (inherit rust-polars-lazy-0.14) -- cgit v1.2.3 From 82637c1aeffcc8286eff5e825aeb1ff56826a6be Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:54:49 +0200 Subject: gnu: Add rust-polars-0.15. * gnu/packages/crates-io.scm (rust-polars-0.15): New variable. (rust-polars-0.14): Inherit from above. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d06ab6e5de..734899b62a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33059,30 +33059,49 @@ applications.") "Additional trait for Read and Write to read and write Plain Old Data.") (license (list license:expat license:asl2.0)))) -(define-public rust-polars-0.14 +(define-public rust-polars-0.15 (package (name "rust-polars") - (version "0.14.8") + (version "0.15.1") (source (origin (method url-fetch) (uri (crate-uri "polars" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0mjp68cjya17gfvc0kqy7wkcggrnjn1pd2pgxpn8ba5b7mgn9lcy")))) + (base32 "1sl7vs6ck05f8w8jp7v75431b4v5j2rvvvw53jqgxc5226i7a2h8")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-polars-core" ,rust-polars-core-0.14) - ("rust-polars-io" ,rust-polars-io-0.14) - ("rust-polars-lazy" ,rust-polars-lazy-0.14)))) + (("rust-polars-core" ,rust-polars-core-0.15) + ("rust-polars-io" ,rust-polars-io-0.15) + ("rust-polars-lazy" ,rust-polars-lazy-0.15)))) (home-page "https://github.com/ritchie46/polars") (synopsis "DataFrame Library based on Apache Arrow") (description "Polars is a dataframe Library based on Apache Arrow.") (license license:expat))) +(define-public rust-polars-0.14 + (package + (inherit rust-polars-0.15) + (name "rust-polars") + (version "0.14.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0mjp68cjya17gfvc0kqy7wkcggrnjn1pd2pgxpn8ba5b7mgn9lcy")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-polars-core" ,rust-polars-core-0.14) + ("rust-polars-io" ,rust-polars-io-0.14) + ("rust-polars-lazy" ,rust-polars-lazy-0.14)))))) + (define-public rust-polars-0.13 (package (inherit rust-polars-0.14) -- cgit v1.2.3 From eb9ae642d4315d756955e2b9301e6edddfac121b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 10:59:35 +0200 Subject: gnu: Add rust-jsonpath-lib-0.3. * gnu/packages/crates-io.scm (rust-jsonpath-lib-0.3): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 734899b62a..32b897f779 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23254,6 +23254,31 @@ the jni-bindgen code generator for binding to JVM APIs from Rust.") @code{std::thread}, which makes sure that by default all threads are joined.") (license (list license:expat license:asl2.0)))) +(define-public rust-jsonpath-lib-0.3 + (package + (name "rust-jsonpath-lib") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "jsonpath_lib" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0kvp4fargixqlwjvpb3w6f1lvmiysnmj7an5h75wqc42ss8k39pa")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/freestrings/jsonpath") + (synopsis "JsonPath engine written in Rust") + (description + "It is JsonPath engine written in Rust. It provides a similar API +interface in Webassembly and Javascript too.") + (license license:expat))) + (define-public rust-jsonrpc-core-14 (package (name "rust-jsonrpc-core") -- cgit v1.2.3 From e832c3325f8f08adb1188fc3e532312a1e51d8d4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 11:00:49 +0200 Subject: gnu: Add rust-flatbuffers-2. * gnu/packages/crates-io.scm (rust-flatbuffers-2): New variable. (rust-flatbuffers-0.8): Inherit from above. --- gnu/packages/crates-io.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 32b897f779..2b4fc19b27 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16284,17 +16284,17 @@ cross platform API.") "A procedural macro to insert @code{flame::start_guard(_)} calls.") (license license:asl2.0))) -(define-public rust-flatbuffers-0.8 +(define-public rust-flatbuffers-2 (package (name "rust-flatbuffers") - (version "0.8.4") + (version "2.0.0") (source (origin (method url-fetch) (uri (crate-uri "flatbuffers" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0sc0ngk9xim7xgqydx36xz4a1sqxq2fv7fmqn6z76vbx5cs05if3")))) + (base32 "1xp5ppif0hvgh9kfvy1199gdmjc3dw1517022l1x3ynpphw5fk7g")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -16308,6 +16308,25 @@ cross platform API.") "This crates provides FlatBuffers runtime serialization library.") (license license:asl2.0))) +(define-public rust-flatbuffers-0.8 + (package + (inherit rust-flatbuffers-2) + (name "rust-flatbuffers") + (version "0.8.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "flatbuffers" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0sc0ngk9xim7xgqydx36xz4a1sqxq2fv7fmqn6z76vbx5cs05if3")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-flate2-1 (package (name "rust-flate2") -- cgit v1.2.3 From 299c5d212e98ab0a647ed1ed7a8a28302b40c978 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 11:15:41 +0200 Subject: gnu: Add rust-bigdecimal-rs-0.2. * gnu/packages/crates-io.scm (rust-bigdecimal-rs-0.2): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2b4fc19b27..fe168ca7d7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4396,6 +4396,31 @@ tracebacks.") #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1)))))) +(define-public rust-bigdecimal-rs-0.2 + (package + (name "rust-bigdecimal-rs") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "bigdecimal-rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "035i2r07zrv9r71z11ipn2lw9rdns39ig8mqnl5afgv3in85ldw5")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-num-bigint" ,rust-num-bigint-0.3) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/akubera/bigdecimal-rs") + (synopsis "Arbitrary precision decimal numbers") + (description "This package provides arbitrary precision decimal numbers.") + (license (list license:expat license:asl2.0)))) + (define-public rust-bincode-1 (package (name "rust-bincode") -- cgit v1.2.3 From 5c5176a1e88aa98fbb8d952a5f0ade7e6f7d1be5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 11:16:29 +0200 Subject: gnu: rust-zstd-sys-1: Update to 1.6.1+zstd.1.5.0. * gnu/packages/crates-io.scm (rust-zstd-sys-1): Update to 1.6.1+zstd.1.5.0. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fe168ca7d7..57bc9d2491 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56821,7 +56821,7 @@ library.") (define-public rust-zstd-sys-1 (package (name "rust-zstd-sys") - (version "1.6.0+zstd.1.5.0") + (version "1.6.1+zstd.1.5.0") (source (origin (method url-fetch) @@ -56829,8 +56829,7 @@ library.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "19rs3vvwlzr9v6qfmfxh43x99njmybpvysqf8xhpfhibjbcbwh91")))) + (base32 "0cra76lginz5k659rch7axg5nyms67yffygr3k7ic7a3lb3j0lb1")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 37c0f201c27ec9310d857ceb600b36004a6a8079 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 11:17:12 +0200 Subject: gnu: rust-zstd-safe-4: Update to 4.1.1+zstd.1.5.0. * gnu/packages/crates-io.scm (rust-zstd-safe-4): Update to 4.1.1+zstd.1.5.0. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 57bc9d2491..2e1cddec3b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56759,7 +56759,7 @@ implementation that works everywhere, even WASM!") (define-public rust-zstd-safe-4 (package (name "rust-zstd-safe") - (version "4.1.0+zstd.1.5.0") + (version "4.1.1+zstd.1.5.0") (source (origin (method url-fetch) @@ -56767,7 +56767,7 @@ implementation that works everywhere, even WASM!") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1rssk1njcy9vz40ja0rpjyi9lbqnq2i2xx1h374s8p0qivvpa0yk")))) + (base32 "0yghr94blhnfigzsynm2km3g93886z49612y7rh07c4kqpr90769")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 99edce2091b31899f84828670533dae283efb879 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 11:17:58 +0200 Subject: gnu: Add rust-zstd-0.9. * gnu/packages/crates-io.scm (rust-zstd-0.9): New variable. (rust-zstd-0.8): Inherit from above. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2e1cddec3b..087ffa1d27 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56688,8 +56688,33 @@ implementation that works everywhere, even WASM!") "This package provides a library for parsing compiled zoneinfo files.") (license license:expat))) +(define-public rust-zstd-0.9 + (package + (name "rust-zstd") + (version "0.9.0+zstd.1.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "zstd" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1k9caa048d8x9asksjaf62xkpv0m1wsmw94h29k3csybq9frlx07")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-zstd-safe" ,rust-zstd-safe-4)))) + (home-page "https://github.com/gyscos/zstd-rs") + (synopsis "Binding to the zstd compression library") + (description + "This package provides a binding to the Zstd compression library.") + (license license:expat))) + (define-public rust-zstd-0.8 (package + (inherit rust-zstd-0.9) (name "rust-zstd") (version "0.8.3+zstd.1.5.0") (source @@ -56699,18 +56724,12 @@ implementation that works everywhere, even WASM!") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1gy2rc3hmqpzfkh9f5d395lhwjk8qwpll3gb73bznn2agd60k9sy")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.1) ("rust-tokio-io" ,rust-tokio-io-0.1) - ("rust-zstd-safe" ,rust-zstd-safe-4)))) - (home-page "https://github.com/gyscos/zstd-rs") - (synopsis "Binding to the zstd compression library") - (description - "This package provides a binding to the zstd compression library.") - (license license:expat))) + ("rust-zstd-safe" ,rust-zstd-safe-4)))))) (define-public rust-zstd-0.6 (package -- cgit v1.2.3 From 6becdbdc9bd9af4b979200b2c136366b954ebb39 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 14:22:42 +0200 Subject: gnu: nushell: Update to 0.36.0. * gnu/packages/shells.scm (nushell): Update to 0.36.0. (rust-nu-ansi-term-0.36): (rust-nu-cli-0.36): (rust-nu-command-0.36): (rust-nu-completion-0.36): (rust-nu-data-0.36): (rust-nu-engine-0.36): (rust-nu-errors-0.36): (rust-nu-json-0.36): (rust-nu-parser-0.36): (rust-nu-path-0.36): (rust-nu-plugin-0.36): (rust-nu-plugin-binaryview-0.36): (rust-nu-plugin-chart-0.36): (rust-nu-plugin-fetch-0.36): (rust-nu-plugin-from-bson-0.36): (rust-nu-plugin-from-sqlite-0.36): (rust-nu-plugin-inc-0.36): (rust-nu-plugin-match-0.36): (rust-nu-plugin-post-0.36): (rust-nu-plugin-ps-0.36): (rust-nu-plugin-query-json-0.36): (rust-nu-plugin-s3-0.36): (rust-nu-plugin-selector-0.36): (rust-nu-plugin-start-0.36): (rust-nu-plugin-sys-0.36): (rust-nu-plugin-textview-0.36): (rust-nu-plugin-to-bson-0.36): (rust-nu-plugin-to-sqlite-0.36): (rust-nu-plugin-tree-0.36): (rust-nu-plugin-xpath-0.36): (rust-nu-pretty-hex-0.36): (rust-nu-protocol-0.36): (rust-nu-source-0.36): (rust-nu-stream-0.36): (rust-nu-table-0.36): (rust-nu-test-support-0.36): (rust-nu-value-ext-0.36): Update to 0.36.0. (rust-nu-serde-0.36): New variable. --- gnu/packages/shells.scm | 703 +++++++++++++++++++++++++----------------------- 1 file changed, 373 insertions(+), 330 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 21754f8edc..ec3723031f 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -946,7 +946,7 @@ files and text.") (define-public nushell (package (name "nushell") - (version "0.35.0") + (version "0.36.0") (source (origin (method git-fetch) @@ -955,7 +955,7 @@ files and text.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0p5whwx6wk9k7mrxhr7azrppbj9mv53hd4bl1cgygxz231aq8337")))) + (base32 "1db521jrs0yxwmvkkl8wssa8qyi0m62n69l7xxl2gpyz1v8nvw76")))) (build-system cargo-build-system) (arguments `(#:rust ,rust-1.52 @@ -964,44 +964,57 @@ files and text.") #:cargo-inputs (("rust-ctrlc" ,rust-ctrlc-3) ("rust-futures" ,rust-futures-0.3) - ("rust-insta" ,rust-insta-1) ("rust-itertools" ,rust-itertools-0.10) ("rust-mp4" ,rust-mp4-0.8) - ("rust-nu-cli" ,rust-nu-cli-0.35) - ("rust-nu-command" ,rust-nu-command-0.35) - ("rust-nu-completion" ,rust-nu-completion-0.35) - ("rust-nu-data" ,rust-nu-data-0.35) - ("rust-nu-engine" ,rust-nu-engine-0.35) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-parser" ,rust-nu-parser-0.35) - ("rust-nu-path" ,rust-nu-path-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.35) - ("rust-nu-plugin-binaryview" ,rust-nu-plugin-binaryview-0.35) - ("rust-nu-plugin-chart" ,rust-nu-plugin-chart-0.35) - ("rust-nu-plugin-fetch" ,rust-nu-plugin-fetch-0.35) - ("rust-nu-plugin-from-bson" ,rust-nu-plugin-from-bson-0.35) - ("rust-nu-plugin-from-sqlite" ,rust-nu-plugin-from-sqlite-0.35) - ("rust-nu-plugin-inc" ,rust-nu-plugin-inc-0.35) - ("rust-nu-plugin-match" ,rust-nu-plugin-match-0.35) - ("rust-nu-plugin-post" ,rust-nu-plugin-post-0.35) - ("rust-nu-plugin-ps" ,rust-nu-plugin-ps-0.35) - ("rust-nu-plugin-query-json" ,rust-nu-plugin-query-json-0.35) - ("rust-nu-plugin-s3" ,rust-nu-plugin-s3-0.35) - ("rust-nu-plugin-selector" ,rust-nu-plugin-selector-0.35) - ("rust-nu-plugin-start" ,rust-nu-plugin-start-0.35) - ("rust-nu-plugin-sys" ,rust-nu-plugin-sys-0.35) - ("rust-nu-plugin-textview" ,rust-nu-plugin-textview-0.35) - ("rust-nu-plugin-to-bson" ,rust-nu-plugin-to-bson-0.35) - ("rust-nu-plugin-to-sqlite" ,rust-nu-plugin-to-sqlite-0.35) - ("rust-nu-plugin-tree" ,rust-nu-plugin-tree-0.35) - ("rust-nu-plugin-xpath" ,rust-nu-plugin-xpath-0.35)) + ("rust-nu-cli" ,rust-nu-cli-0.36) + ("rust-nu-command" ,rust-nu-command-0.36) + ("rust-nu-completion" ,rust-nu-completion-0.36) + ("rust-nu-data" ,rust-nu-data-0.36) + ("rust-nu-engine" ,rust-nu-engine-0.36) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-parser" ,rust-nu-parser-0.36) + ("rust-nu-path" ,rust-nu-path-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.36) + ("rust-nu-plugin-binaryview" + ,rust-nu-plugin-binaryview-0.36) + ("rust-nu-plugin-chart" + ,rust-nu-plugin-chart-0.36) + ("rust-nu-plugin-fetch" + ,rust-nu-plugin-fetch-0.36) + ("rust-nu-plugin-from-bson" + ,rust-nu-plugin-from-bson-0.36) + ("rust-nu-plugin-from-sqlite" + ,rust-nu-plugin-from-sqlite-0.36) + ("rust-nu-plugin-inc" ,rust-nu-plugin-inc-0.36) + ("rust-nu-plugin-match" + ,rust-nu-plugin-match-0.36) + ("rust-nu-plugin-post" ,rust-nu-plugin-post-0.36) + ("rust-nu-plugin-ps" ,rust-nu-plugin-ps-0.36) + ("rust-nu-plugin-query-json" + ,rust-nu-plugin-query-json-0.36) + ("rust-nu-plugin-s3" ,rust-nu-plugin-s3-0.36) + ("rust-nu-plugin-selector" + ,rust-nu-plugin-selector-0.36) + ("rust-nu-plugin-start" + ,rust-nu-plugin-start-0.36) + ("rust-nu-plugin-sys" ,rust-nu-plugin-sys-0.36) + ("rust-nu-plugin-textview" + ,rust-nu-plugin-textview-0.36) + ("rust-nu-plugin-to-bson" + ,rust-nu-plugin-to-bson-0.36) + ("rust-nu-plugin-to-sqlite" + ,rust-nu-plugin-to-sqlite-0.36) + ("rust-nu-plugin-tree" ,rust-nu-plugin-tree-0.36) + ("rust-nu-plugin-xpath" + ,rust-nu-plugin-xpath-0.36)) #:cargo-development-inputs (("rust-dunce" ,rust-dunce-1) ("rust-hamcrest2" ,rust-hamcrest2-0.3) - ("rust-nu-test-support" ,rust-nu-test-support-0.35) + ("rust-nu-test-support" + ,rust-nu-test-support-0.36) ("rust-rstest" ,rust-rstest-0.10) ("rust-serial-test" ,rust-serial-test-0.5)))) (native-inputs @@ -1026,17 +1039,17 @@ directory. These values can be piped through a series of steps, in a series of commands called a ``pipeline''.") (license license:expat))) -(define-public rust-nu-ansi-term-0.35 +(define-public rust-nu-ansi-term-0.36 (package (name "rust-nu-ansi-term") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-ansi-term" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0lmax555a3k5dsxmks3s4al0qsn70i8g9w28xx5ymrxjdv1x577x")))) + (base32 "0p68s0djx4xr93vn7lh8774srazjw4dxsi3px8c8mbv0a4ixg5wr")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1052,17 +1065,17 @@ of commands called a ``pipeline''.") underline).") (license license:expat))) -(define-public rust-nu-cli-0.35 +(define-public rust-nu-cli-0.36 (package (name "rust-nu-cli") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-cli" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "04d2xdjzhbj055vjr9d0v2fkjb7xnqpj6340b8xb65vcnwmhwc0c")))) + (base32 "1zb6x6knn1hrpkyryniq73vkrgg9arqnxy50klm8963dnq49082v")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1071,19 +1084,19 @@ underline).") ("rust-indexmap" ,rust-indexmap-1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.35) - ("rust-nu-command" ,rust-nu-command-0.35) - ("rust-nu-completion" ,rust-nu-completion-0.35) - ("rust-nu-data" ,rust-nu-data-0.35) - ("rust-nu-engine" ,rust-nu-engine-0.35) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-parser" ,rust-nu-parser-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) - ("rust-nu-stream" ,rust-nu-stream-0.35) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.36) + ("rust-nu-command" ,rust-nu-command-0.36) + ("rust-nu-completion" ,rust-nu-completion-0.36) + ("rust-nu-data" ,rust-nu-data-0.36) + ("rust-nu-engine" ,rust-nu-engine-0.36) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-parser" ,rust-nu-parser-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) + ("rust-nu-stream" ,rust-nu-stream-0.36) ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4) - ("rust-rustyline" ,rust-rustyline-8) + ("rust-rustyline" ,rust-rustyline-9) ("rust-serde" ,rust-serde-1) ("rust-serde-yaml" ,rust-serde-yaml-0.8) ("rust-shadow-rs" ,rust-shadow-rs-0.6) @@ -1095,24 +1108,24 @@ underline).") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-command-0.35 +(define-public rust-nu-command-0.36 (package (name "rust-nu-command") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-command" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1m85ar9sn4hfjikb1c5pl54bj6la4w6miwvwhjh0qd5vs843qpqk")))) + (base32 "0690iw3wn0jas04471dyvsqswbwxpab2qp2r3r5ma0za98s4p3ry")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-arboard" ,rust-arboard-1) ("rust-base64" ,rust-base64-0.13) - ("rust-bigdecimal" ,rust-bigdecimal-0.2) + ("rust-bigdecimal-rs" ,rust-bigdecimal-rs-0.2) ("rust-byte-unit" ,rust-byte-unit-4) ("rust-bytes" ,rust-bytes-1) ("rust-calamine" ,rust-calamine-0.18) @@ -1147,40 +1160,41 @@ underline).") ("rust-md-5" ,rust-md-5-0.9) ("rust-meval" ,rust-meval-0.2) ("rust-minus" ,rust-minus-3) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.35) - ("rust-nu-data" ,rust-nu-data-0.35) - ("rust-nu-engine" ,rust-nu-engine-0.35) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-json" ,rust-nu-json-0.35) - ("rust-nu-parser" ,rust-nu-parser-0.35) - ("rust-nu-path" ,rust-nu-path-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-pretty-hex" ,rust-nu-pretty-hex-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-quickcheck-macros" - ,rust-quickcheck-macros-1) - ("rust-nu-source" ,rust-nu-source-0.35) - ("rust-nu-stream" ,rust-nu-stream-0.35) - ("rust-nu-table" ,rust-nu-table-0.35) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.36) + ("rust-nu-data" ,rust-nu-data-0.36) + ("rust-nu-engine" ,rust-nu-engine-0.36) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-json" ,rust-nu-json-0.36) + ("rust-nu-parser" ,rust-nu-parser-0.36) + ("rust-nu-path" ,rust-nu-path-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-pretty-hex" ,rust-nu-pretty-hex-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-serde" ,rust-nu-serde-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) + ("rust-nu-stream" ,rust-nu-stream-0.36) + ("rust-nu-table" ,rust-nu-table-0.36) ("rust-nu-test-support" - ,rust-nu-test-support-0.35) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.35) + ,rust-nu-test-support-0.36) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.36) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-pin-utils" ,rust-pin-utils-0.1) - ("rust-polars" ,rust-polars-0.14) + ("rust-polars" ,rust-polars-0.15) ("rust-query-interface" ,rust-query-interface-0.3) ("rust-quick-xml" ,rust-quick-xml-0.22) + ("rust-quickcheck-macros" + ,rust-quickcheck-macros-1) ("rust-rand" ,rust-rand-0.8) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) ("rust-roxmltree" ,rust-roxmltree-0.14) ("rust-rusqlite" ,rust-rusqlite-0.25) ("rust-rust-embed" ,rust-rust-embed-5) - ("rust-rustyline" ,rust-rustyline-8) + ("rust-rustyline" ,rust-rustyline-9) ("rust-serde" ,rust-serde-1) ("rust-serde-bytes" ,rust-serde-bytes-0.11) ("rust-serde-ini" ,rust-serde-ini-0.2) @@ -1198,6 +1212,7 @@ underline).") ("rust-term" ,rust-term-0.7) ("rust-term-size" ,rust-term-size-0.3) ("rust-termcolor" ,rust-termcolor-1) + ("rust-thiserror" ,rust-thiserror-1) ("rust-titlecase" ,rust-titlecase-1) ("rust-toml" ,rust-toml-0.5) ("rust-trash" ,rust-trash-1) @@ -1214,10 +1229,10 @@ underline).") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-completion-0.35 +(define-public rust-nu-completion-0.36 (package (name "rust-nu-completion") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) @@ -1226,7 +1241,7 @@ underline).") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0x264c7rsmsrm39fhka11cdp04iiclmjsycjq2nn80v9wkdmpmkm")))) + "1kmn80cwpi8dd25vxm4r7ap35igfy4mqax20z31c51qwj2a8r6cx")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1234,36 +1249,36 @@ underline).") (("rust-dirs-next" ,rust-dirs-next-2) ("rust-indexmap" ,rust-indexmap-1) ("rust-is-executable" ,rust-is-executable-1) - ("rust-nu-data" ,rust-nu-data-0.35) - ("rust-nu-engine" ,rust-nu-engine-0.35) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-parser" ,rust-nu-parser-0.35) - ("rust-nu-path" ,rust-nu-path-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-data" ,rust-nu-data-0.36) + ("rust-nu-engine" ,rust-nu-engine-0.36) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-parser" ,rust-nu-parser-0.36) + ("rust-nu-path" ,rust-nu-path-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-nu-test-support" - ,rust-nu-test-support-0.35)))) + ,rust-nu-test-support-0.36)))) (home-page "https://www.nushell.sh") (synopsis "Completions for nushell") (description "Completions for nushell") (license license:expat))) -(define-public rust-nu-data-0.35 +(define-public rust-nu-data-0.36 (package (name "rust-nu-data") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-data" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0p0hblkrkfrrg9gg2d36lqy3b2mkwj132s7y6z4i09vgyvqns307")))) + (base32 "02m4zyrgaxkpvvbknqang9cqbzqmbp8bvmvisxp5yijwadzjr66y")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.2) + (("rust-bigdecimal-rs" ,rust-bigdecimal-rs-0.2) ("rust-byte-unit" ,rust-byte-unit-4) ("rust-chrono" ,rust-chrono-0.4) ("rust-common-path" ,rust-common-path-1) @@ -1274,14 +1289,14 @@ underline).") ("rust-getset" ,rust-getset-0.1) ("rust-indexmap" ,rust-indexmap-1) ("rust-log" ,rust-log-0.4) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.35) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) - ("rust-nu-table" ,rust-nu-table-0.35) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.36) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) + ("rust-nu-table" ,rust-nu-table-0.36) ("rust-nu-test-support" - ,rust-nu-test-support-0.35) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.35) + ,rust-nu-test-support-0.36) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.36) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) @@ -1297,17 +1312,17 @@ underline).") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-engine-0.35 +(define-public rust-nu-engine-0.36 (package (name "rust-nu-engine") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-engine" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gmkpr7qq76r0cas31w5x2hhlwfgssvjr16m926q7capqfb47pdn")))) + (base32 "03nngv2pcn10ydc1wq3chvd31rzgh4j7jrvkgmgps4ml1avn6yfr")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1316,7 +1331,7 @@ underline).") ("rust-async-recursion" ,rust-async-recursion-0.3) ("rust-async-trait" ,rust-async-trait-0.1) - ("rust-bigdecimal" ,rust-bigdecimal-0.2) + ("rust-bigdecimal-rs" ,rust-bigdecimal-rs-0.2) ("rust-bytes" ,rust-bytes-0.5) ("rust-chrono" ,rust-chrono-0.4) ("rust-codespan-reporting" @@ -1337,18 +1352,18 @@ underline).") ("rust-itertools" ,rust-itertools-0.10) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.35) - ("rust-nu-data" ,rust-nu-data-0.35) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-parser" ,rust-nu-parser-0.35) - ("rust-nu-path" ,rust-nu-path-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) - ("rust-nu-stream" ,rust-nu-stream-0.35) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.36) + ("rust-nu-data" ,rust-nu-data-0.36) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-parser" ,rust-nu-parser-0.36) + ("rust-nu-path" ,rust-nu-path-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) + ("rust-nu-stream" ,rust-nu-stream-0.36) ("rust-nu-test-support" - ,rust-nu-test-support-0.35) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.35) + ,rust-nu-test-support-0.36) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.36) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) @@ -1368,29 +1383,29 @@ underline).") (description "Core commands for nushell") (license license:expat))) -(define-public rust-nu-errors-0.35 +(define-public rust-nu-errors-0.36 (package (name "rust-nu-errors") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-errors" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1078ijc2r77s211bm7izg39k5g21dq72b5jdmnp7pwq6k880xyxl")))) + (base32 "0k5xpfl9igz99sf4czhc9zrgkzfza915a9isvkm0kda2zyy1fnwf")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.2) + (("rust-bigdecimal-rs" ,rust-bigdecimal-rs-0.2) ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) ("rust-derive-new" ,rust-derive-new-0.5) ("rust-getset" ,rust-getset-0.1) ("rust-glob" ,rust-glob-0.3) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde" ,rust-serde-1) @@ -1402,17 +1417,17 @@ underline).") (description "Core error subsystem for Nushell") (license license:expat))) -(define-public rust-nu-json-0.35 +(define-public rust-nu-json-0.36 (package (name "rust-nu-json") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-json" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "10vzq390xlrjwj02khqv5h186829d6armb9fymyqgrwy6hyik7wy")))) + (base32 "145h7npb8j24x7a8mggqbvafssc0qmfh53azvp88a3svv4n5q16x")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1428,22 +1443,22 @@ underline).") (description "This package is a fork of @code{serde-hjson}.") (license license:expat))) -(define-public rust-nu-parser-0.35 +(define-public rust-nu-parser-0.36 (package (name "rust-nu-parser") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-parser" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1w06kf54jhl3c1xvvvr8g48f4zh48a6gm3b8sbxv5ac0armb58q2")))) + (base32 "1i3wyvpvv7xsdjlvl7c6hpic4dcsqbvvfppdb8z298wkk8v65hd4")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.2) + (("rust-bigdecimal-rs" ,rust-bigdecimal-rs-0.2) ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) ("rust-derive-new" ,rust-derive-new-0.5) @@ -1453,12 +1468,12 @@ underline).") ("rust-indexmap" ,rust-indexmap-1) ("rust-itertools" ,rust-itertools-0.10) ("rust-log" ,rust-log-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-path" ,rust-nu-path-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-path" ,rust-nu-path-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-nu-test-support" - ,rust-nu-test-support-0.35) + ,rust-nu-test-support-0.36) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde" ,rust-serde-1) @@ -1468,17 +1483,17 @@ underline).") (description "Nushell parser") (license license:expat))) -(define-public rust-nu-path-0.35 +(define-public rust-nu-path-0.36 (package (name "rust-nu-path") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-path" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0dckmj1agrlpxbwkdqdn1msslm4xdsyd8b5ypfz4mxzmhwwxcfnh")))) + (base32 "1pjx76zblqmpllkv3p6hrf5my85xf9jwds0v067a9d3nfpm2c46g")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1490,10 +1505,10 @@ underline).") (description "Nushell parser") (license license:expat))) -(define-public rust-nu-plugin-0.35 +(define-public rust-nu-plugin-0.36 (package (name "rust-nu-plugin") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) @@ -1501,19 +1516,19 @@ underline).") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "10pygksxzzl8b6szanb4wgkf39hj0r54kf3r2rl1qk1lfg4vakjs")))) + (base32 "08qll1q26igfjkp6xc2gd6rkpw379x828wan4xsh1dmaspikvqh9")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.2) + (("rust-bigdecimal-rs" ,rust-bigdecimal-rs-0.2) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-nu-test-support" - ,rust-nu-test-support-0.35) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.35) + ,rust-nu-test-support-0.36) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.36) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1)))) @@ -1522,17 +1537,17 @@ underline).") (description "Nushell Plugin") (license license:expat))) -(define-public rust-nu-plugin-binaryview-0.35 +(define-public rust-nu-plugin-binaryview-0.36 (package (name "rust-nu-plugin-binaryview") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_binaryview" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "01c2rqf4ncmrjkazh8jp5qc3xrq6qhhxwhdqjflmily89ch08cbz")))) + (base32 "1ma52kw575bq5552x6pz5dzfwj1n33c1z27p9md0iw1zl1zc79zm")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1540,12 +1555,12 @@ underline).") (("rust-crossterm" ,rust-crossterm-0.19) ("rust-image" ,rust-image-0.22) ("rust-neso" ,rust-neso-0.5) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.35) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-pretty-hex" ,rust-nu-pretty-hex-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.36) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-pretty-hex" ,rust-nu-pretty-hex-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-rawkey" ,rust-rawkey-0.1)))) (home-page "https://www.nushell.sh") (synopsis "Binary viewer plugin for Nushell") @@ -1553,28 +1568,28 @@ underline).") "This package provides a binary viewer plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-chart-0.35 +(define-public rust-nu-plugin-chart-0.36 (package (name "rust-nu-plugin-chart") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_chart" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1d0shl0fsk4j89vqan8fv5pipm2rrq1gf689hf42yrkh5h8ciwya")))) + (base32 "0m8mvvnxipzxyigzfzb0xp4d8zb71lbxrs62k8jqkrb79j82rlfr")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-crossterm" ,rust-crossterm-0.19) - ("rust-nu-data" ,rust-nu-data-0.35) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.35) + ("rust-nu-data" ,rust-nu-data-0.36) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.36) ("rust-tui" ,rust-tui-0.15)))) (home-page "https://www.nushell.sh") (synopsis "Plugin to display charts") @@ -1582,17 +1597,17 @@ underline).") "This package provides a plugin to display charts in Nushell.") (license license:expat))) -(define-public rust-nu-plugin-fetch-0.35 +(define-public rust-nu-plugin-fetch-0.36 (package (name "rust-nu-plugin-fetch") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_fetch" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1wsns5dh9727z1v88y1hcjw45h6bvrh0a4izx5p7b1ygfl0j8db5")))) + (base32 "1zi86kcsj7ys103w9q9f59p7nmjpssbdrkmj6dh60n2nbwcc9i49")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1600,10 +1615,10 @@ underline).") (("rust-base64" ,rust-base64-0.13) ("rust-futures" ,rust-futures-0.3) ("rust-mime" ,rust-mime-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-surf" ,rust-surf-2) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") @@ -1611,28 +1626,28 @@ underline).") (description "This package provides a URL fetch plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-from-bson-0.35 +(define-public rust-nu-plugin-from-bson-0.36 (package (name "rust-nu-plugin-from-bson") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_from_bson" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "04v98rj6gks9rpawzsiwlhhqbl5pqjvhwhadad98nw7bqicd8miw")))) + (base32 "08pk0hcpkyg5i6z6k7bknwrn490sj9i7wn3cxpj53mxyb0lvjs06")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.2) + (("rust-bigdecimal-rs" ,rust-bigdecimal-rs-0.2) ("rust-bson" ,rust-bson-0.14) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.36) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "Converter plugin to the bson format for Nushell") @@ -1641,27 +1656,27 @@ underline).") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-from-sqlite-0.35 +(define-public rust-nu-plugin-from-sqlite-0.36 (package (name "rust-nu-plugin-from-sqlite") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_from_sqlite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "04s5733il9hamhpq32phisa9vfprlq8fy3b4887145d0fn4d10nz")))) + (base32 "1asbwimvj5fk9vafq67rfr13pg3sw53f97a56snspnlgx31v5zwn")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.2) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.35) + (("rust-bigdecimal-rs" ,rust-bigdecimal-rs-0.2) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.36) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rusqlite" ,rust-rusqlite-0.25) ("rust-tempfile" ,rust-tempfile-3)))) @@ -1672,28 +1687,28 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-inc-0.35 +(define-public rust-nu-plugin-inc-0.36 (package (name "rust-nu-plugin-inc") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_inc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0414skx1qffmddp81kaacjd6bfcf9843xdq65kkaxc4lp1zs03i5")))) + (base32 "1vrvrdyhb9rvrbdaq25b1b9ibpwr52hz3p60kl3xn0zs437vqhzs")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + (("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-nu-test-support" - ,rust-nu-test-support-0.35) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.35) + ,rust-nu-test-support-0.36) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.36) ("rust-semver" ,rust-semver-0.11)))) (home-page "https://www.nushell.sh") (synopsis "Version incrementer plugin for Nushell") @@ -1702,25 +1717,25 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-match-0.35 +(define-public rust-nu-plugin-match-0.36 (package (name "rust-nu-plugin-match") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_match" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ycqw59ngkmqrwqbxaijl3b0l1vymxa3z7irf907fzw3qyx3w86v")))) + (base32 "1lvmg155kriqgddhnmx2b7c2qsfsv75hdlb3wnrwlg8yqbl5kl9a")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + (("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-regex" ,rust-regex-1)))) (home-page "https://www.nushell.sh") (synopsis "Regex match plugin for Nushell") @@ -1728,17 +1743,17 @@ Nushell.") "This package provides a regex match plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-post-0.35 +(define-public rust-nu-plugin-post-0.36 (package (name "rust-nu-plugin-post") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_post" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ny6d1fg303xwv7hsmajphy0s934dyiqz2apm0zv505v0wz7k3r9")))) + (base32 "0f1nh4227a5if3sg9214nqkd0ry6x79xvz2pgwqnbcwmps98nc26")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1746,10 +1761,10 @@ Nushell.") (("rust-base64" ,rust-base64-0.13) ("rust-futures" ,rust-futures-0.3) ("rust-mime" ,rust-mime-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde-json" ,rust-serde-json-1) ("rust-surf" ,rust-surf-2) @@ -1759,27 +1774,27 @@ Nushell.") (description "This package is an HTTP POST plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-ps-0.35 +(define-public rust-nu-plugin-ps-0.36 (package (name "rust-nu-plugin-ps") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_ps" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0mlfax0j855n3r5mx0f4498ydb735xj2nrcfsh0zr3w5fkdff3l9")))) + (base32 "1hw6adsvsl1hpxyw06r0g9x1n14nkfin44ckxpr5605wbv89yrbx")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-futures-timer" ,rust-futures-timer-3) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-sysinfo" ,rust-sysinfo-0.16)))) (home-page "https://www.nushell.sh") @@ -1788,105 +1803,105 @@ Nushell.") "This package provides a process list plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-query-json-0.35 +(define-public rust-nu-plugin-query-json-0.36 (package (name "rust-nu-plugin-query-json") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_query_json" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1xjk1lcq6pf7a94397p8hdypkn38g4wv859qwcrh9llz9awi23n1")))) + (base32 "0ij135vx94gyaypryn24imgkq6r68j66d2nfymg98acn85ynv31q")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-gjson" ,rust-gjson-0.7) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35)))) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36)))) (home-page "https://www.nushell.sh") (synopsis "Query JSON files with Gjson") (description "query json files with gjson") (license license:expat))) -(define-public rust-nu-plugin-s3-0.35 +(define-public rust-nu-plugin-s3-0.36 (package (name "rust-nu-plugin-s3") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_s3" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "027d2pdbxr1qxfk4fby10r1yvm95sbna0in762b3c84461ci3kj5")))) + (base32 "0yl1jkmr88ri22fzi78q5wqwv9j6589k0rsqydv5711dllkdgcp5")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-s3handler" ,rust-s3handler-0.7)))) (home-page "https://www.nushell.sh") (synopsis "S3 plugin for Nushell") (description "This package is an S3 plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-selector-0.35 +(define-public rust-nu-plugin-selector-0.36 (package (name "rust-nu-plugin-selector") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_selector" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1pabiyb67cpf0d4cj4w6v8d402imvy844ixilvrhl6pgyg2a8mvj")))) + (base32 "02sx6mdwgnaixfrkglin2l5svly1mn58swp0c9zqvhqyp0k8f09r")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-nipper" ,rust-nipper-0.1) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35)))) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36)))) (home-page "https://www.nushell.sh") (synopsis "Web scraping using CSS selector") (description "This package provides web scraping using CSS selector.") (license license:expat))) -(define-public rust-nu-plugin-start-0.35 +(define-public rust-nu-plugin-start-0.36 (package (name "rust-nu-plugin-start") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_start" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1g5j74jbadm9ckgz7yp1bc773hnpplwk8p94xxihsxjmy29nqvbd")))) + (base32 "0qk32snivd4r4jbmbmvx457qfvb2cycsl8l2bnghashh0x6jyc8b")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-glob" ,rust-glob-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-open" ,rust-open-1) ("rust-url" ,rust-url-2) ("rust-webbrowser" ,rust-webbrowser-0.5)))) @@ -1897,10 +1912,10 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-sys-0.35 +(define-public rust-nu-plugin-sys-0.36 (package (name "rust-nu-plugin-sys") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) @@ -1908,17 +1923,17 @@ Nushell.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1wvnxb6dnd3vqci00glrli6l7n4r9gbb4s7ihm5rqvsi9qyfbsfp")))) + (base32 "07jsg3a8s5aa9ykvfama7i3pkz947md7ryfvffpbrd66r0szxrag")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-sysinfo" ,rust-sysinfo-0.18)))) (home-page "https://www.nushell.sh") @@ -1926,28 +1941,28 @@ Nushell.") (description "This package provides a system info plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-textview-0.35 +(define-public rust-nu-plugin-textview-0.36 (package (name "rust-nu-plugin-textview") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_textview" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0kwzpybxkc8bbv6aa7ijkyiy2wrcbjv9nfjs32wzvcvchg6f5k75")))) + (base32 "0bz6khgjvr8qbybg8hd8m26w5xd3g3xk9m2xpjmmgw5a5mvfdrck")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("bat" ,bat) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.35) - ("rust-nu-data" ,rust-nu-data-0.35) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.36) + ("rust-nu-data" ,rust-nu-data-0.36) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-term-size" ,rust-term-size-0.3) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") @@ -1956,27 +1971,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-to-bson-0.35 +(define-public rust-nu-plugin-to-bson-0.36 (package (name "rust-nu-plugin-to-bson") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_to_bson" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0yq04z02wl1nwm5k75766x6d24xwji9znqgbyz21mwri1hy85afw")))) + (base32 "1kardsbic0wv8704m81cnbzlhs6qrb93130x30wfs89z400xfn43")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bson" ,rust-bson-0.14) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.36) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "Converter plugin to the bson format for Nushell") @@ -1985,27 +2000,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-to-sqlite-0.35 +(define-public rust-nu-plugin-to-sqlite-0.36 (package (name "rust-nu-plugin-to-sqlite") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_to_sqlite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1nq1z8bxjw6gg0hay75g1230h7nxa4ggcvqp8wd09zicwk0pd8f0")))) + (base32 "193prp16msshw3n2nfmlckphhkm7bzwrc3qza2g7s4mnyh7d88x5")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-hex" ,rust-hex-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.36) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rusqlite" ,rust-rusqlite-0.25) ("rust-tempfile" ,rust-tempfile-3)))) @@ -2016,26 +2031,26 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-tree-0.35 +(define-public rust-nu-plugin-tree-0.36 (package (name "rust-nu-plugin-tree") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_tree" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "08rcgy3d3nk0h232bnv42pr3qzrs34dbw3ghmrk8n2lr3a0i88zb")))) + (base32 "0vz8ncglzhq4nvbr3xi9zv3nqpgyf8vyxjnhjd9kjy91d0inj869")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-ptree" ,rust-ptree-0.3)))) (home-page "https://www.nushell.sh") (synopsis "Tree viewer plugin for Nushell") @@ -2043,27 +2058,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-xpath-0.35 +(define-public rust-nu-plugin-xpath-0.36 (package (name "rust-nu-plugin-xpath") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_xpath" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0vzvs008w1p4fg0icax6qllri2xpj504xl6nql3w7rm7m4hg8liq")))) + (base32 "19dqw28y5qfpd8a432qkjjf1hmjh7ghsyr1dpb7jr8b0dv68h4lb")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.2) + (("rust-bigdecimal-rs" ,rust-bigdecimal-rs-0.2) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-plugin" ,rust-nu-plugin-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-plugin" ,rust-nu-plugin-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-sxd-document" ,rust-sxd-document-0.3) ("rust-sxd-xpath" ,rust-sxd-xpath-0.4)))) (home-page "https://www.nushell.sh") @@ -2071,23 +2086,23 @@ Nushell.") (description "Traverses XML") (license license:expat))) -(define-public rust-nu-pretty-hex-0.35 +(define-public rust-nu-pretty-hex-0.36 (package (name "rust-nu-pretty-hex") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-pretty-hex" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0mg1xdrss9jvc7kmn65b14abm2yhjgdx7yzpz1iry9907hfvkwvc")))) + (base32 "1d4qvry8xknlsqr1dmqjsfwz3l2avxwwa5jg9p3rrbwcqxppvsq1")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-heapless" ,rust-heapless-0.6) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.35) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.36) ("rust-rand" ,rust-rand-0.8)))) (home-page "https://www.nushell.sh") (synopsis "Pretty hex dump of bytes slice in the common style") @@ -2096,22 +2111,22 @@ Nushell.") style.") (license license:expat))) -(define-public rust-nu-protocol-0.35 +(define-public rust-nu-protocol-0.36 (package (name "rust-nu-protocol") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-protocol" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1cqngmqrkqjvkf76vw9j0pjjw3r766nqpk2j33kfapzw33bsxlpi")))) + (base32 "1r50ybwipk63ryq6zjkjym2dph84y7x26bmn679p9vcglys7rhn7")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.2) + (("rust-bigdecimal-rs" ,rust-bigdecimal-rs-0.2) ("rust-byte-unit" ,rust-byte-unit-4) ("rust-chrono" ,rust-chrono-0.4) ("rust-chrono-humanize" @@ -2120,12 +2135,12 @@ style.") ("rust-getset" ,rust-getset-0.1) ("rust-indexmap" ,rust-indexmap-1) ("rust-log" ,rust-log-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-integer" ,rust-num-integer-0.1) ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-polars" ,rust-polars-0.14) + ("rust-polars" ,rust-polars-0.15) ("rust-serde" ,rust-serde-1) ("rust-serde-bytes" ,rust-serde-bytes-0.11) ("rust-serde-json" ,rust-serde-json-1) @@ -2136,17 +2151,45 @@ style.") (description "Core values and protocols for Nushell") (license license:expat))) -(define-public rust-nu-source-0.35 +(define-public rust-nu-serde-0.36 + (package + (name "rust-nu-serde") + (version "0.36.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "nu-serde" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1271qkyphjd3w5as0kwkdzmhcv0fx5j2nak07mm476qf63naprhz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bigdecimal-rs" ,rust-bigdecimal-rs-0.2) + ("rust-insta" ,rust-insta-1) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://www.nushell.sh") + (synopsis "Turn any value into a @code{nu-protocol::Value} with Serde") + (description + "This crate turns any value into a @code{nu-protocol::Value} with +Serde.") + (license license:expat))) + +(define-public rust-nu-source-0.36 (package (name "rust-nu-source") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-source" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1y4r5g146fcqs999z6nr6pvqp26yff5a01i18sp4n3qsr5h9n3di")))) + (base32 "0vs05k2ld5big5byf083wnb2i0pvz0lpmgp34vmw8x5ca4aw4hij")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2163,46 +2206,46 @@ style.") Nushell.") (license license:expat))) -(define-public rust-nu-stream-0.35 +(define-public rust-nu-stream-0.36 (package (name "rust-nu-stream") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-stream" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1l1lc4p3jylfb6x56527vjphqjr3a5yh8ci1rgysargh3jnzj990")))) + (base32 "0siqhyxdbl9zpyxkdlysrd1369lrvikp72awx7pii5dzvgv2aaaj")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35)))) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36)))) (home-page "https://www.nushell.sh") (synopsis "Nushell stream") (description "This package provides Nushell stream.") (license license:expat))) -(define-public rust-nu-table-0.35 +(define-public rust-nu-table-0.36 (package (name "rust-nu-table") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-table" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0w85lkvzw6l8zzarnbymw7kx0hzizfxz0lqiy4h7d6vk33fn7yav")))) + (base32 "1akxq806gix38b6663ijs02ma0zbzq9yvyvr39bgjyikyqahwkpw")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nu-ansi-term" ,rust-nu-ansi-term-0.35) + (("rust-nu-ansi-term" ,rust-nu-ansi-term-0.36) ("rust-regex" ,rust-regex-1) ("rust-unicode-width" ,rust-unicode-width-0.1)))) (home-page "https://www.nushell.sh") @@ -2210,32 +2253,32 @@ Nushell.") (description "Nushell table printing") (license license:expat))) -(define-public rust-nu-test-support-0.35 +(define-public rust-nu-test-support-0.36 (package (name "rust-nu-test-support") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) (uri (crate-uri "nu-test-support" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1lyjv27d2xa31sjf80cca74v88bgkar81i41fyjql2zc6gvf8pq1")))) + (base32 "0ip2fm8r26s5y0qbfn8r7yhacg82aa998kyic70y60j9kmnwk4q1")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.2) + (("rust-bigdecimal-rs" ,rust-bigdecimal-rs-0.2) ("rust-chrono" ,rust-chrono-0.4) ("rust-dunce" ,rust-dunce-1) ("rust-getset" ,rust-getset-0.1) ("rust-glob" ,rust-glob-0.3) ("rust-hamcrest2" ,rust-hamcrest2-0.3) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.36) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://www.nushell.sh") @@ -2244,10 +2287,10 @@ Nushell.") tests.") (license license:expat))) -(define-public rust-nu-value-ext-0.35 +(define-public rust-nu-value-ext-0.36 (package (name "rust-nu-value-ext") - (version "0.35.0") + (version "0.36.0") (source (origin (method url-fetch) @@ -2255,16 +2298,16 @@ tests.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "00xvygh7vya1xgng7bplcq63ipsavcqqwgzilvyay60wvfhxqx5y")))) + (base32 "1cd09378h4lfb58s0dl87mgiwldfk60h9z1a0vi4v7k10v9xhsis")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-indexmap" ,rust-indexmap-1) ("rust-itertools" ,rust-itertools-0.10) - ("rust-nu-errors" ,rust-nu-errors-0.35) - ("rust-nu-protocol" ,rust-nu-protocol-0.35) - ("rust-nu-source" ,rust-nu-source-0.35) + ("rust-nu-errors" ,rust-nu-errors-0.36) + ("rust-nu-protocol" ,rust-nu-protocol-0.36) + ("rust-nu-source" ,rust-nu-source-0.36) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "@code{Extension} traits for values in Nushell") -- cgit v1.2.3 From 4b51d045a865892f898e758dc9f379ab0f06cd52 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Aug 2021 16:43:33 +0200 Subject: gnu: colobot: Update to 0.2.0-alpha. * gnu/packages/games.scm (colobot): Update to 0.2.0-alpha. --- gnu/packages/games.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0249662d23..dd67931110 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7268,7 +7268,7 @@ Github or Gitlab.") (define-public colobot (package (name "colobot") - (version "0.1.12-alpha") + (version "0.2.0-alpha") (source (origin (method git-fetch) @@ -7278,8 +7278,7 @@ Github or Gitlab.") (recursive? #t))) ;for "data/" subdir (file-name (git-file-name name version)) (sha256 - (base32 - "1c181cclkrnspgs07lvndg2c81cjq3smkv7qim8c470cj88rcrp2")))) + (base32 "02z21pw47j2afjsikn5b162gacwgiahdrlhmfxhq4xqlzsvz58z6")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no test -- cgit v1.2.3 From d1d9206180763f8291c82b1a6240b3640bd4f238 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 18 Aug 2021 23:39:20 +0100 Subject: gnu: mc: Update to 4.8.27. Switched to direct mirror URI to match SSL certificate issuer (home page does not provide a download link over secure protocols). While at it added 'release-monitoing-url property to allow 'generic-html updater to fetch latest version from correct location. Otherwise the only available updater is 'gnu-ftp (which forces downgrade to ancient 4.6.1 release). * gnu/packages/mc.scm (mc): Update to 4.8.27. Explicitly set release-monitoing-url to up to date location. --- gnu/packages/mc.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm index b9dea3b446..e07191e344 100644 --- a/gnu/packages/mc.scm +++ b/gnu/packages/mc.scm @@ -38,14 +38,14 @@ (define-public mc (package (name "mc") - (version "4.8.26") + (version "4.8.27") (source (origin (method url-fetch) - (uri (string-append "https://ftp.midnight-commander.org/mc-" + (uri (string-append "https://ftp.osuosl.org/pub/midnightcommander/mc-" version ".tar.xz")) (sha256 - (base32 "09vc2vf6k12a8k5gdss6hcskwfcbyalrkhn65nidkwlm0p2svpn6")))) + (base32 "1x2g5ahgzg951y4ldbsgkv8icni2mgh3p2wsds0j16gsbwi5kgii")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -97,6 +97,8 @@ (("usr/bin") "/")) #t))))) (home-page "https://www.midnight-commander.org") + (properties + `((release-monitoring-url . "https://ftp.osuosl.org/pub/midnightcommander/"))) (synopsis "Graphical file manager") (description "GNU Midnight Commander is a command-line file manager laid out in a -- cgit v1.2.3 From f3b9db9ca1f8096fb21ff097a7d600dc1c7af22b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 22 Aug 2021 08:39:44 +0100 Subject: gnu: ccache: Update to 3.4. * gnu/packages/ccache.scm: Update to 3.4. --- gnu/packages/ccache.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 4ff0fb2ae0..77098658cf 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -31,21 +31,26 @@ (define-public ccache (package (name "ccache") - (version "4.3") + (version "4.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/ccache/ccache/releases/download/v" version "/ccache-" version ".tar.xz")) (sha256 - (base32 "1d4995lkmqshzfxlmbyn101m1rxs02yb8dgh4rl30p26hhhhyjjh")))) + (base32 "0qbmcs6c3m071vsd1ppa31r8s0dzpaw5y38z8ga1bz48rwpfl2xl")))) (build-system cmake-build-system) (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) (inputs `(("zlib" ,zlib) ("zstd" ,zstd "lib"))) (arguments - '(#:phases + '(;; Disable redis backend explicitly. Build system insists on present dependency + ;; or on explicit flag. + #:configure-flags + '("-DREDIS_STORAGE_BACKEND=OFF") + + #:phases (modify-phases %standard-phases (add-before 'configure 'setup-tests (lambda _ @@ -56,7 +61,7 @@ ;; Tests require a writable HOME. (lambda _ (setenv "HOME" (getenv "TMPDIR")) - #t))))) + #t))))) (home-page "https://ccache.dev/") (synopsis "Compiler cache") (description -- cgit v1.2.3 From 399e3ee7b793022b22937901ab4c477ece1ad226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20A=2E=20Gomes?= Date: Sat, 14 Aug 2021 14:10:14 +0300 Subject: gnu: emacs-guix: Update to 0.5.2.5-c9aef52. Fixes . * gnu/packages/emacs-xyz.scm (emacs-guix): Update to c9aef52. [source]: Use gitlab. Co-authored-by: Brice Waegeneire --- gnu/packages/emacs-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0e284a6a9c..3657d2b2f2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3484,21 +3484,20 @@ type, for example: packages, buffers, files, etc.") (license license:gpl3+))) (define-public emacs-guix - (let ((commit "8ce6d219e87c5097abff9ce6f1f5a4293cdfcb31") - (revision "4")) + (let ((commit "c9aef52121b458297e70bb50f49f7276b4a8d759") + (revision "5")) (package (name "emacs-guix") (version (git-version "0.5.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference - ;; TODO: Use the official version when it has a new home - (url "https://github.com/alezost/guix.el") + (url "https://gitlab.com/emacs-guix/emacs-guix.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0awbd8x154c4dk4av7inpgd63n07xzng84vvc8qckmgljknc0j7k")))) + "00xdxadbi9fxpfp60zah9190rcz3w08vl1blbhmaiy7c1hd2gi39")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From b4d132f98e03fae559db832e88897f1e166c4d47 Mon Sep 17 00:00:00 2001 From: Alexandr Vityazev Date: Sat, 21 Aug 2021 21:58:41 +0000 Subject: gnu: emacs-vertico: Add new phase after unpack. * gnu/packages/emacs-xyz.scm (emacs-vertico)[arguments]: After the unpack phase add a move-source-files phase. --- gnu/packages/emacs-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3657d2b2f2..532440462e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29187,6 +29187,18 @@ and preferred services can easily be configured.") (sha256 (base32 "0rddk76ih44b574lsr6d6r9wa2l7c9zlb9kcyw5xvly17ciiq16h")))) (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Move the extensions source files to the top level, which is included in + ;; the EMACSLOADPATH. + (add-after 'unpack 'move-source-files + (lambda _ + (let ((el-files (find-files "./extensions" ".*\\.el$"))) + (for-each (lambda (f) + (rename-file f (basename f))) + el-files)) + #t))))) (native-inputs `(("texinfo" ,texinfo))) (home-page "https://github.com/minad/vertico") -- cgit v1.2.3 From db600ee2c1b690293c2c94a72beec7e76165f5f1 Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 26 Aug 2021 11:15:36 -0400 Subject: gnu: python-pytest-timeout: Update to 1.4.2. * gnu/packages/check.scm (python-pytest-timeout): Update to 1.4.2. [propagated-inputs]:Add python-pytest-cov. Signed-off-by: Efraim Flashner --- gnu/packages/check.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 894d8397e6..fd4bb4cfda 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1346,14 +1346,14 @@ result back.") (define-public python-pytest-timeout (package (name "python-pytest-timeout") - (version "1.3.4") + (version "1.4.2") (source (origin (method url-fetch) (uri (pypi-uri "pytest-timeout" version)) (sha256 (base32 - "13n42azbvs5slvy2n1a9nw17r4qdq10dd68nln3jp925safa3yl0")))) + "0xnsigs0kmpq1za0d4i522sp3f71x5bgpdh3ski0rs74yqy13cr0")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -1363,7 +1363,8 @@ result back.") (add-installed-pythonpath inputs outputs) (invoke "pytest" "-vv")))))) (propagated-inputs - `(("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) (native-inputs `(("python-pexpect" ,python-pexpect))) (home-page "https://github.com/pytest-dev/pytest-timeout") -- cgit v1.2.3 From 0e02ce8d49cf3af0de9a976acc3529136a741d4b Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 26 Aug 2021 11:15:38 -0400 Subject: gnu: python-pytest-xprocess: Update to 0.18.1. * gnu/packages/check.scm (python-pytest-xprocess): Update to 0.18.1. [native-inputs]: Add python-setuptools-scm. [home-page]: Fix linter warning to follow permanent redirect. Co-authored-by: Raghav Gururajan Signed-off-by: Efraim Flashner --- gnu/packages/check.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index fd4bb4cfda..0ced2a4562 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1908,14 +1908,16 @@ framework which enables you to test server connections locally.") (define-public python-pytest-xprocess (package (name "python-pytest-xprocess") - (version "0.9.1") + (version "0.18.1") (source (origin (method url-fetch) (uri (pypi-uri "pytest-xprocess" version)) (sha256 (base32 - "17zlql1xqw3ywcgwwbqmw633aly99lab12hm02asr8awvg5603pp")))) + "0rm2rchrr63imn44xk5slwydxf8gvy579524qcxq7dc42pnk17zx")))) (build-system python-build-system) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs `(("python-pytest" ,python-pytest) ("python-pytest-cache" ,python-pytest-cache) @@ -1923,7 +1925,7 @@ framework which enables you to test server connections locally.") (synopsis "Pytest plugin to manage external processes across test runs") (description "Pytest-xprocess is an experimental py.test plugin for managing processes across test runs.") - (home-page "https://bitbucket.org/pytest-dev/pytest-xprocess") + (home-page "https://github.com/pytest-dev/pytest-xprocess") (license license:expat))) (define-public python-pytest-subtesthack -- cgit v1.2.3 From 4716d544443f25a4cd1397d9f8deb856e28bb515 Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 26 Aug 2021 11:15:41 -0400 Subject: gnu: python-greenlet: Update to 1.1.1. * gnu/packages/python-xyz.scm (python-greenlet): Update to 1.1.1. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 87a90ab680..59eb473857 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14226,13 +14226,13 @@ multiple processes (imagine multiprocessing, billiard, futures, celery etc). (define-public python-greenlet (package (name "python-greenlet") - (version "1.0.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (pypi-uri "greenlet" version)) (sha256 (base32 - "1y6wbg9yhm9dw6m768n4yslp56h85pnxkk3drz6icn15g6f1d7ki")))) + "10gllbrcbazxck84nr7dw3js3gq0rxrsr4kkvy5hg542rms2gwn0")))) (build-system python-build-system) (home-page "https://greenlet.readthedocs.io/") (synopsis "Lightweight in-process concurrent programming") -- cgit v1.2.3 From 70ec9d87b742b2a6ca2210b065f94cf5c40cd8a1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 27 Aug 2021 08:18:32 +0200 Subject: gnu: emacs-auctex: Update to 13.0.14. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 13.0.14. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 532440462e..b3cf6becbf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2613,14 +2613,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "13.0.13") + (version "13.0.14") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "06cb9jphqd0nysc60b4x24zmdryljb168cw66adl7b2x7sdzpkmn")))) + (base32 "1gmqdcg9s6xf8kvzh1j27nbimakd5cy8pwsn0il19l026kxjimr8")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). -- cgit v1.2.3 From 03f86ad65c99987fe8b31ee8939c95b9b5e78004 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 27 Aug 2021 08:25:19 +0200 Subject: gnu: emacs-dash: Update to 2.19.1. * gnu/packages/emacs-xyz.scm (emacs-dash): Update to 2.19.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b3cf6becbf..7672168a0e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3442,7 +3442,7 @@ restore the saved place.") (define-public emacs-dash (package (name "emacs-dash") - (version "2.19.0") + (version "2.19.1") (source (origin (method git-fetch) (uri (git-reference @@ -3451,7 +3451,7 @@ restore the saved place.") (file-name (git-file-name name version)) (sha256 (base32 - "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h")))) + "0z6f8y1m9amhg427iz1d4xcyr6n0kj5w7kmiz134p320ixsdnzd8")))) (build-system emacs-build-system) (arguments `(#:tests? #t)) (home-page "https://github.com/magnars/dash.el") -- cgit v1.2.3 From 63a5090869fac4f2b1c310d02b41d29669f3f389 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Aug 2021 13:24:08 +0200 Subject: gnu: Add r-emdist. * gnu/packages/cran.scm (r-emdist): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8dd37434f2..4fb5b2d25b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -231,6 +231,26 @@ wrangling backend for the packages in the @code{easystats} ecosystem.") visualization of their differences.") (license license:gpl2+))) +(define-public r-emdist + (package + (name "r-emdist") + (version "0.3-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "emdist" version)) + (sha256 + (base32 + "1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq")))) + (properties `((upstream-name . "emdist"))) + (build-system r-build-system) + (home-page "http://www.rforge.net/emd") + (synopsis "Earth mover's distance") + (description + "This package provides tools to calculate the Earth Mover's +Distance (EMD).") + (license license:expat))) + (define-public r-googledrive (package (name "r-googledrive") -- cgit v1.2.3 From 17c765e2e1b425c5be06bb1701749656e3d84f4b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Aug 2021 13:24:19 +0200 Subject: gnu: Add r-cytonorm. * gnu/packages/bioinformatics.scm (r-cytonorm): New variable. --- gnu/packages/bioinformatics.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e663ff2591..1775f5a15e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14903,3 +14903,42 @@ copy number estimation, as described by integration, exploration, and analysis of high-dimensional single-cell cytometry and imaging data.") (license license:expat)))) + +(define-public r-cytonorm + (let ((commit "e4b9d343ee65db3c422800f1db3e77c25abde987") + (revision "1")) + (package + (name "r-cytonorm") + (version (git-version "0.0.7" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/saeyslab/CytoNorm") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h2rdy15i4zymd4dv60n5w0frbsdbmzpv99dgm0l2dn041qv7fah")))) + (properties `((upstream-name . "CytoNorm"))) + (build-system r-build-system) + (propagated-inputs + `(("r-cytoml" ,r-cytoml) + ("r-dplyr" ,r-dplyr) + ("r-emdist" ,r-emdist) + ("r-flowcore" ,r-flowcore) + ("r-flowsom" ,r-flowsom) + ("r-flowworkspace" ,r-flowworkspace) + ("r-ggplot2" ,r-ggplot2) + ("r-gridextra" ,r-gridextra) + ("r-pheatmap" ,r-pheatmap) + ("r-stringr" ,r-stringr))) + (home-page "https://github.com/saeyslab/CytoNorm") + (synopsis "Normalize cytometry data measured across multiple batches") + (description + "This package can be used to normalize cytometry samples when a control +sample is taken along in each of the batches. This is done by first +identifying multiple clusters/cell types, learning the batch effects from the +control samples and applying quantile normalization on all markers of +interest.") + (license license:gpl2+)))) -- cgit v1.2.3 From db13eb962f5822647cbc88321031615a39d1ff15 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Aug 2021 13:24:33 +0200 Subject: gnu: Add python-strawc. * gnu/packages/bioinformatics.scm (python-strawc): New variable. --- gnu/packages/bioinformatics.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1775f5a15e..0979a86d8d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14773,6 +14773,28 @@ produced by Oxford Nanopore Technologies’ MinION, GridION or PromethION instruments, or Pacific Biosciences RSII or Sequel sequencers.") (license license:expat))) +(define-public python-strawc + (package + (name "python-strawc") + (version "0.0.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "strawC" version)) + (sha256 + (base32 + "1z1gy8n56lhriy6hdkh9r82ndikndipq2cy2wh8q185qig4rimr6")))) + (build-system python-build-system) + (inputs + `(("curl" ,curl) + ("pybind11" ,pybind11) + ("zlib" ,zlib))) + (home-page "https://github.com/aidenlab/straw") + (synopsis "Stream data from .hic files") + (description "Straw is library which allows rapid streaming of contact +data from @file{.hic} files. This package provides Python bindings.") + (license license:expat))) + (define-public r-ascat (package (name "r-ascat") -- cgit v1.2.3 From 5795fbbd0ff915ffd5a0271f46198455b94e2555 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Aug 2021 13:37:08 +0200 Subject: gnu: Add python-hmmlearn. * gnu/packages/machine-learning.scm (python-hmmlearn): New variable. --- gnu/packages/machine-learning.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index fd06582e50..e1dff82bfc 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -2719,3 +2719,39 @@ PyTorch when needed. Note: currently this package does not provide GPU support.") (license license:bsd-3))) + +(define-public python-hmmlearn + (package + (name "python-hmmlearn") + (version "0.2.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "hmmlearn" version)) + (sha256 + (base32 + "1my0j3rzp17438idr32ssh0j969a98yjblx5igx5kgiiigr9qa1a")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (with-directory-excursion (string-append (assoc-ref outputs "out") "/lib") + (invoke "python" "-m" "pytest")))))))) + (propagated-inputs + `(("python-cython" ,python-cython) + ("python-numpy" ,python-numpy) + ("python-scikit-learn" ,python-scikit-learn) + ("python-scipy" ,python-scipy) + ("python-setuptools-scm" ,python-setuptools-scm))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/hmmlearn/hmmlearn") + (synopsis "Hidden Markov Models with scikit-learn like API") + (description + "Hmmlearn is a set of algorithms for unsupervised learning and inference +of Hidden Markov Models.") + (license license:bsd-3))) -- cgit v1.2.3 From 3a58a0ed6ae5997f35110e7198c092e47d00fa7f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 27 Aug 2021 15:02:44 +0300 Subject: gnu: postgresql-11: Update to 11.13. * gnu/packages/databases.scm (postgresql-11): Update to 11.13. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index adb15c03ce..6b6c13f0dc 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1112,14 +1112,14 @@ pictures, sounds, or video.") (package (inherit postgresql-13) (name "postgresql") - (version "11.12") + (version "11.13") (source (origin (inherit (package-source postgresql-13)) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "016bacpmqxc676ipzc1l8zv1jj44mjz7dv7jhqazg3ibdfqxiyc7")))))) + "0j5wnscnxa3sx8d39s55654df8aikmvkihfb0a02hrgmyygnihx0")))))) (define-public postgresql-10 (package -- cgit v1.2.3 From bb418a20ee628ed11724d7f77a8150a55560d603 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 27 Aug 2021 15:02:44 +0300 Subject: gnu: postgresql-10: Update to 10.18. * gnu/packages/databases.scm (postgresql-10): Update to 10.18. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6b6c13f0dc..8ad9dbee8e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1124,14 +1124,14 @@ pictures, sounds, or video.") (define-public postgresql-10 (package (inherit postgresql-11) - (version "10.17") + (version "10.18") (source (origin (inherit (package-source postgresql-11)) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0v5jahkqm6gkq67s4bac3h7297bscn2ab6y128idi73cc1qq1wjs")))))) + "009qpb02bq0rx0aaw5ck70gk07xwparhfxvlfimgihw2vhp7qisp")))))) (define-public postgresql-9.6 (package -- cgit v1.2.3 From 1e0b98459165af366c7064a0c267e4522e548d24 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 27 Aug 2021 15:02:45 +0300 Subject: gnu: postgresql-9.6: Update to 9.6.23. * gnu/packages/databases.scm (postgresql-9.6): Update to 9.6.23. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8ad9dbee8e..884830262e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1136,14 +1136,14 @@ pictures, sounds, or video.") (define-public postgresql-9.6 (package (inherit postgresql-10) - (version "9.6.22") + (version "9.6.23") (source (origin (inherit (package-source postgresql-10)) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0c19kzrj5ib5ygmavf5d6qvxdwrxzzz6jz1r2dl5b815208cscix")))))) + "1fa735lrmv2vrfiixg73nh024gxlagcbrssklvgwdf0s82cgfjd8")))))) (define-public postgresql postgresql-13) -- cgit v1.2.3 From c9f6fe2c57783812c23caedb94182eb77a800f1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Fri, 27 Aug 2021 16:23:31 +0200 Subject: gnu: java-opening-hours-parser: Update to 0.23.0. * gnu/packages/geo.scm (java-opening-hours-parser): Update to 0.23.0. --- gnu/packages/geo.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 1be6d14974..eda50af318 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020, 2021 Felix Gruber ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Vinicius Monego +;;; Copyright © 2021 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -1361,7 +1362,7 @@ an independent project by the JOSM team.") (define-public java-opening-hours-parser (package (name "java-opening-hours-parser") - (version "0.21.4") + (version "0.23.0") (source (origin (method git-fetch) (uri (git-reference @@ -1370,7 +1371,7 @@ an independent project by the JOSM team.") (file-name (git-file-name name version)) (sha256 (base32 - "1m8sp0jbjyv1nq3ddj8rk6rf3sva3mkacc6vw7rsj0c2n57k3i50")))) + "0yhbd2ix6h506aljh0jkrnp28m4xcqdcdpnqm30fn08kawdgxgsh")))) (build-system ant-build-system) (arguments `(#:jar-name "java-opening-hours-parser.jar" -- cgit v1.2.3 From 7125b0d8a1be58e3f5b66a00fc5912aed9b330e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Fri, 27 Aug 2021 16:23:40 +0200 Subject: gnu: josm: Update to 18118. * gnu/packages/geo.scm (josm): Update to 18118. [inputs]: Add java-jsr305. [arguments]<#:phases>{fix-jcs}: Replace ICache.NAME_COMPONENT_DELIMITER with what it points to (":") because its location changed with jcs3. --- gnu/packages/geo.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index eda50af318..bf864f246c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1407,7 +1407,7 @@ to the OSM opening hours specification.") (define-public josm (package (name "josm") - (version "17329") + (version "18118") (source (origin (method svn-fetch) (uri (svn-reference @@ -1416,7 +1416,7 @@ to the OSM opening hours specification.") (recursive? #f))) (sha256 (base32 - "0bq6mirdsi0kmhjfzfp3innxi5a4395d7mas7ikxaz0cziljrz1i")) + "0109ddpxilm7f57n1kl4nf4lw0lh7jfmhfwf724nzlcz4k23mrs0")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet @@ -1432,6 +1432,7 @@ to the OSM opening hours specification.") ("java-jmapviewer" ,java-jmapviewer) ("java-jsonp-api" ,java-jsonp-api) ("java-jsonp-impl" ,java-jsonp-impl); runtime dependency + ("java-jsr305" ,java-jsr305) ("java-metadata-extractor" ,java-metadata-extractor) ("java-opening-hours-parser" ,java-opening-hours-parser) ("java-openjfx-media" ,java-openjfx-media) @@ -1461,7 +1462,8 @@ to the OSM opening hours specification.") ;; which has renamed its classes to another namespace. Rename them ;; back so they can be used with our version of jcs. (substitute* (find-files "." ".*.java$") - (("jcs3") "jcs")) + (("jcs3") "jcs") + (("ICache.NAME_COMPONENT_DELIMITER") "\":\"")) #t)) (add-before 'build 'fix-classpath (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From ad7d478d86590899fedb037dd6e3fd3960231d59 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 27 Aug 2021 18:21:52 +0200 Subject: gnu: man-pages: Update to 5.13. * gnu/packages/man.scm (man-pages): Update to 5.13. --- gnu/packages/man.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index caaa6da5ed..50295b55f7 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -269,7 +269,7 @@ PostScript, and PDF. Additional tools include the @command{man} viewer, and (define-public man-pages (package (name "man-pages") - (version "5.12") + (version "5.13") (source (origin (method url-fetch) @@ -279,7 +279,7 @@ PostScript, and PDF. Additional tools include the @command{man} viewer, and (string-append "mirror://kernel.org/linux/docs/man-pages/Archive/" "man-pages-" version ".tar.xz"))) (sha256 - (base32 "07ip4f70nyxn24wy0fin6klq1hm1cjjvzr9zh5baqzssl1hckxbs")))) + (base32 "12vb15gs56g8wl5nqlm4llr508brh4m2lfknhq4lizbxzqzawkb1")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From ac52d4b95cac6b2eae67f4188cfc2a1db46cfd6e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 11 Aug 2021 09:40:54 +0200 Subject: gnu: opencl-headers: Update to 2021.06.30 and switch to CMake. * gnu/packages/opencl.scm (opencl-headers)[version]: Update to 2021.06.30. [build-system]: Switch to CMake. --- gnu/packages/opencl.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index e95d19db47..4535f03959 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -48,10 +48,13 @@ ;; tests that require such devices are all disabled. ;; Check https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00293.html +;; If you update either of opencl-headers, opencl-clhpp or opencl-icd-loader +;; note that they are released together (lockstep) and must be updated +;; together. (define-public opencl-headers (package (name "opencl-headers") - (version "2020.12.18") + (version "2021.06.30") (source (origin (method git-fetch) @@ -60,11 +63,9 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1zslxfzvbb1mrzmsik4pjzj88ds8y3p94ry5nnrnkhv6qm4n4lw9")))) - (build-system copy-build-system) - (arguments - '(#:install-plan - '(("CL" "include/")))) ; TODO: add phase for tests + (base32 "1nrvx0x9r1nz1qpmzbgffnn9h9pn2fwcxsksf101bkpmqziq5lii")))) + (build-system cmake-build-system) + (arguments `(#:tests? #f)) ; Not enabled during build. (synopsis "The Khronos OpenCL headers") (description "This package provides the C headers by Khronos for OpenCL programming.") -- cgit v1.2.3 From 95a86b9bab598f8d6b1414f489e901354626dfe9 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 11 Aug 2021 09:41:38 +0200 Subject: gnu: opencl-clhpp: Update to 2.0.15. Note that this version bump removes the deprecated cl.hpp header interface. * gnu/packages/opencl.scm (opencl-clhpp): Update to 2.0.15. [#:configure-flags]: Remove prefix. --- gnu/packages/opencl.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 4535f03959..484a766aa2 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -95,7 +95,7 @@ (define-public opencl-clhpp (package (name "opencl-clhpp") - (version "2.0.10") + (version "2.0.15") (source (origin (method git-fetch) @@ -103,21 +103,14 @@ (url "https://github.com/KhronosGroup/OpenCL-CLHPP") (commit (string-append "v" version)))) (sha256 - (base32 "0h5kpg5cl8wzfnqmv6i26aig2apv06ffm9p3rh35938n9r8rladm")) + (base32 "1wycdbvwbdn7lqdd3sby8471qg2zdisr70218ava6cfvxdsqcp83")) (file-name (git-file-name name version)))) (native-inputs `(("python" ,python-wrapper))) (propagated-inputs `(("opencl-headers" ,opencl-headers))) (arguments - `(#:configure-flags - (let ((out (assoc-ref %outputs "out"))) - (list - "-DBUILD_EXAMPLES=OFF" - "-DBUILD_TESTS=OFF" - (string-append "-DCMAKE_INSTALL_PREFIX=" - (assoc-ref %outputs "out") - "/include"))) + `(#:configure-flags (list "-DBUILD_EXAMPLES=OFF" "-DBUILD_TESTS=OFF") ;; The regression tests require a lot more dependencies. #:tests? #f)) (build-system cmake-build-system) -- cgit v1.2.3 From d8c63f8771242bf8954445a4850539686cae500e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 11 Aug 2021 09:42:44 +0200 Subject: gnu: clinfo: Update to 3.0.21.02.21 and simplify package. * gnu/packages/opencl.scm (clinfo) [version]: Update to 3.0.21.02.21. [arguments]: Simplify #:phases by adding make arguments to #:make-flags. --- gnu/packages/opencl.scm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 484a766aa2..ee88d92251 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -23,6 +23,7 @@ #:use-module (guix build-system copy) #:use-module (guix build-system python) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -160,7 +161,7 @@ Loader as provided by this package.") (define-public clinfo (package (name "clinfo") - (version "2.2.18.04.06") + (version "3.0.21.02.21") (source (origin (method git-fetch) @@ -169,26 +170,17 @@ Loader as provided by this package.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0y2q0lz5yzxy970b7w7340vp4fl25vndahsyvvrywcrn51ipgplx")))) + (base32 "1sfxp6ai83i0vwdg7b05h0k07q6873q1z1avnyksj5zmzdnxya6j")))) (build-system gnu-build-system) (native-inputs `(("opencl-headers" ,opencl-headers))) (inputs `(("ocl-icd" ,ocl-icd))) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda _ - (let ((cores (number->string (parallel-job-count)))) - (setenv "CC" "gcc") - (invoke "make" "-j" cores)))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" "install" (string-append - "PREFIX=" - (assoc-ref outputs "out")))))) + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases (delete 'configure)) #:tests? #f)) (home-page "https://github.com/Oblomov/clinfo") (synopsis "Print information about OpenCL platforms and devices") -- cgit v1.2.3 From 2c6c1f8d91cbe6fc43162f1ca8f5e4cfc8bd07e7 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 11 Aug 2021 09:48:01 +0200 Subject: gnu: Add opencl-icd-loader. * gnu/packages/opencl.scm (opencl-icd-loader): New variable. --- gnu/packages/opencl.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index ee88d92251..e550e979e5 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -121,6 +121,43 @@ "This package provides the @dfn{host API} C++ headers for OpenCL.") (license license:expat))) +(define-public opencl-icd-loader + (package + (name "opencl-icd-loader") + (version "2021.06.30") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/OpenCL-ICD-Loader.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "007ws357n1ijrxal1bf9lwy68p0dz1sm9cfcfnnz5f88iwc9xd6m")))) + (build-system cmake-build-system) + (arguments `(#:tests? #f)) ; Tests need stub loader setup. + (native-search-paths + (list (search-path-specification + (variable "OCL_ICD_VENDORS") + (files '("etc/OpenCL/vendors"))))) + (home-page "https://github.com/KhronosGroup/OpenCL-ICD-Loader") + (inputs `(("opencl-headers" ,opencl-headers))) + (synopsis "OpenCL Installable Client Driver") + (description + "OpenCL defines an Installable Client Driver (ICD) mechanism to allow +developers to build applications against an Installable Client Driver loader +(ICD loader) rather than linking their applications against a specific OpenCL +implementation. The ICD Loader is responsible for: + +@itemize +@item Exporting OpenCL API entry points +@item Enumerating OpenCL implementations +@item Forwarding OpenCL API calls to the correct implementation +@end itemize + +This package contains the Khronos official OpenCL ICD Loader.") + (license license:asl2.0))) + (define-public ocl-icd (package (name "ocl-icd") -- cgit v1.2.3 From 4d1157fca7627c11672df0cd80fae4f4d27e2185 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 11 Aug 2021 10:17:25 +0200 Subject: gnu: ocl-icd: Replace with opencl-icd-loader. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocl-icd’s project page is dead and the source code is unavailable. * gnu/packages/opencl.scm (ocl-icd): Alias to opencl-icd-loader. (clinfo)[inputs]: Use opencl-icd-loader. (beignet)[inputs]: Dito. (pocl)[inputs]: Dito. (python-pyopencl)[inputs]: Dito. * gnu/packages/games.scm (leela-zero)[inputs]: Dito. * gnu/packages/photo.scm (darktable)[inputs]: Dito. * gnu/packages/rocm.scm (rocm-opencl-runtime)[inputs]: Dito. --- gnu/packages/games.scm | 2 +- gnu/packages/opencl.scm | 44 +++++--------------------------------------- gnu/packages/photo.scm | 5 +++-- gnu/packages/rocm.scm | 2 +- 4 files changed, 10 insertions(+), 43 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index dd67931110..07a61f2c0b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10031,7 +10031,7 @@ remake of that series or any other game.") `(("googletest" ,googletest))) (inputs `(("boost" ,boost) - ("ocl-icd" ,ocl-icd) + ("opencl-icd-loader" ,opencl-icd-loader) ("openblas" ,openblas) ("opencl-headers" ,opencl-headers) ("qtbase" ,qtbase-5) diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index e550e979e5..7504d33d01 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -159,41 +159,7 @@ This package contains the Khronos official OpenCL ICD Loader.") (license license:asl2.0))) (define-public ocl-icd - (package - (name "ocl-icd") - (version "2.2.12") - (source (origin - (method url-fetch) - (uri (string-append - "https://forge.imag.fr/frs/download.php/836/ocl-icd-" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1x2dr8p4dkfds56r38av360i3nv1y3326jmshxvjngaf6mlg6rbn")) - (modules '((guix build utils))) - (snippet - '(delete-file-recursively "khronos-headers")))) - (native-inputs - `(("opencl-headers" ,opencl-headers) - ("ruby" ,ruby))) - (inputs - `(("libgcrypt" ,libgcrypt))) - (build-system gnu-build-system) - (arguments - '(#:configure-flags '("DEBUG_OCL_ICD=1"))) - (native-search-paths - (list (search-path-specification - (variable "OPENCL_VENDOR_PATH") - (files '("etc/OpenCL/vendors"))))) - (search-paths native-search-paths) - (home-page "https://forge.imag.fr/projects/ocl-icd/") - (synopsis "OpenCL loader for Installable Client Drivers (ICDs)") - (description - "OpenCL implementations are provided as ICDs (Installable Client -Drivers). An OpenCL program can use several ICDs thanks to the use of an ICD -Loader as provided by this package.") - (license license:bsd-2))) + (deprecated-package "ocl-icd" opencl-icd-loader)) (define-public clinfo (package @@ -212,7 +178,7 @@ Loader as provided by this package.") (native-inputs `(("opencl-headers" ,opencl-headers))) (inputs - `(("ocl-icd" ,ocl-icd))) + `(("opencl-icd-loader" ,opencl-icd-loader))) (arguments `(#:make-flags (list ,(string-append "CC=" (cc-for-target)) @@ -262,7 +228,7 @@ the system.") ("libxext" ,libxext) ("mesa-utils" ,mesa-utils) ("ncurses" ,ncurses) - ("ocl-icd" ,ocl-icd) + ("opencl-icd-loader" ,opencl-icd-loader) ("opencl-headers" ,opencl-headers) ("xextproto" ,xextproto) ("zlib" ,zlib))) @@ -329,7 +295,7 @@ back-end for the LLVM compiler framework.") `(("clang" ,clang) ("hwloc" ,hwloc-2 "lib") ("llvm" ,llvm) - ("ocl-icd" ,ocl-icd))) + ("opencl-icd-loader" ,opencl-icd-loader))) (arguments `(#:configure-flags (list "-DENABLE_ICD=ON" @@ -431,7 +397,7 @@ A lexer, @code{pytools.lex}. (inputs `(("opencl-headers" ,opencl-headers-1.2) ;POCL only supports OpenCL 1.2 ("pybind11" ,pybind11) - ("ocl-icd" ,ocl-icd))) ;libOpenCL + ("opencl-icd-loader" ,opencl-icd-loader))) ;libOpenCL (propagated-inputs `(("python-appdirs" ,python-appdirs) ("python-decorator" ,python-decorator) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index bf51e6885f..9a059b728c 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -491,7 +491,8 @@ photographic equipment.") ;; Statically link to libOpenCL. (substitute* "./src/common/dlopencl.c" (("\"libOpenCL\"") - (string-append "\"" (assoc-ref inputs "ocl-icd") "/lib/libOpenCL.so\""))) + (string-append "\"" (assoc-ref inputs "opencl-icd-loader") + "/lib/libOpenCL.so\""))) #t)) ;; The use of inline is wrong and darktable cannot compile its kernels ;; with ROCm. See upstream commit @@ -580,7 +581,7 @@ photographic equipment.") ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("lua" ,lua) ;optional, for plugins - ("ocl-icd" ,ocl-icd) ;optional, for OpenCL support + ("opencl-icd-loader" ,opencl-icd-loader) ;optional, for OpenCL support ("openexr" ,openexr) ;optional, for EXR import/export ("openjpeg" ,openjpeg) ;optional, for JPEG2000 export ("osm-gps-map" ,osm-gps-map) ;optional, for geotagging view diff --git a/gnu/packages/rocm.scm b/gnu/packages/rocm.scm index 66a28fc169..05dbb00be4 100644 --- a/gnu/packages/rocm.scm +++ b/gnu/packages/rocm.scm @@ -297,7 +297,7 @@ allows runtimes to work on Windows as well as on Linux without much effort.") ("rocm-comgr" ,rocm-comgr) ("rocr-runtime" ,rocr-runtime) ("rocclr" ,rocclr) - ("ocl-icd" ,ocl-icd) + ("opencl-icd-loader" ,opencl-icd-loader) ("glew" ,glew))) (native-inputs `()) (synopsis "ROCm OpenCL Runtime") -- cgit v1.2.3 From 842d27fd20690fe8c858c56f73c512d7632170b5 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 11 Aug 2021 10:19:09 +0200 Subject: gnu: Add clpeak. * gnu/packages/benchmark.scm (clpeak): New variable. --- gnu/packages/benchmark.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 36465e4e7d..b8f5d7f687 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) + #:use-module (gnu packages opencl) #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages python-science) @@ -385,3 +386,31 @@ It is designed to measure the effect of changes in Linux kernel design or system configuration changes such as CPU, I/O scheduler and filesystem changes and options. With careful benchmarking, different hardware can be compared.") (license license:gpl2+))) + +(define-public clpeak + ;; Release 1.1.0 is too old for our opencl-clhpp. This commit supports + ;; cl2.hpp. + (let ((commit "6d59cb64997a53c35207b77a63d2e9f0e84de5fd")) + (package + (name "clpeak") + (version (git-version "1.1.0" "0" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/krrishnarraj/clpeak.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qmhdjyhwl7gfgyqxsddqn6zpp3b57503m16h7jv6illy3lfvji1")))) + (build-system cmake-build-system) + (home-page "https://github.com/krrishnarraj/clpeak") + (inputs + `(("opencl-clhpp" ,opencl-clhpp) + ("opencl-icd-loader" ,opencl-icd-loader))) + (synopsis "OpenCL benchmark tool") + (description + "A synthetic benchmarking tool to measure peak capabilities of OpenCL + devices. It only measures the peak metrics that can be achieved using + vector operations and does not represent a real-world use case.") + (license license:unlicense)))) -- cgit v1.2.3 From 65a5eec0a1dca47716767fe9b76ea817843d3942 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 11 Aug 2021 21:34:38 +0200 Subject: gnu: python-pytools: Update to 2021.2.7. * gnu/packages/opencl.scm (python-pytools)[version]: Update to 2021.2.7. [propagated-inputs]: Remove unused inputs. --- gnu/packages/opencl.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 7504d33d01..70d917c11f 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -327,20 +327,18 @@ pocl.") (define-public python-pytools (package (name "python-pytools") - (version "2020.4") + (version "2021.2.7") (source (origin (method url-fetch) (uri (pypi-uri "pytools" version)) (sha256 - (base32 "0q7439iy365a874ckpavx6h1mhnnngfy8nl7xj5grdd127zkknrp")))) + (base32 "1yyr4k6sqx859gjhc02633l2vxwdnj6m2f5blmf7dgq0gzzgcf05")))) (build-system python-build-system) + (arguments `(#:tests? #f)) ; Tests depend on packages not present in Guix. (propagated-inputs `(("python-appdirs" ,python-appdirs) - ("python-decorator" ,python-decorator) - ("python-numpy" ,python-numpy) - ("python-six" ,python-six) - ("python-mpi4py" ,python-mpi4py))) + ("python-numpy" ,python-numpy))) (home-page "https://pypi.org/project/pytools/") (synopsis "Assorted tools for Python") (description -- cgit v1.2.3 From 9c7c3f771c0a9f0ec94106127f4ac25b8dcf7557 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 11 Aug 2021 21:35:58 +0200 Subject: gnu: python-pyopencl: Update to 2021.2.6. * gnu/packages/opencl.scm (python-pyopencl)[version]: Update to 2021.2.6. [source]: Point to new git repository. [#:phases]: Remove unused phases. [inputs]: Use unversioned opencl-headers. [propagated-inputs]: Remove unused inputs. --- gnu/packages/opencl.scm | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 70d917c11f..2d5ccf0105 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -364,44 +364,29 @@ A lexer, @code{pytools.lex}. (define-public python-pyopencl (package (name "python-pyopencl") - (version "2019.1.1") + (version "2021.2.6") (source (origin - ;; The tarball on PyPI lacks test programs such as - ;; 'pygpu_language_opencl.cpp' so fetch it from Git. - ;; XXX: The server at git.tiker.net is unreliable. (method git-fetch) (uri (git-reference - (url "http://git.tiker.net/trees/pyopencl.git") + (url "https://github.com/inducer/pyopencl.git") (commit (string-append "v" version)) (recursive? #t))) (file-name (git-file-name name version)) (sha256 (base32 - "12q0rs8yla571vcfpsh0mfrjbdiayv0hi8r1rq0f178m3i3qjz80")))) + "1s2cls7avxvf753zzpx422ikslaxdnm8rz58zg7mal15yak0wv2x")))) (build-system python-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-before 'build 'set-home - (lambda _ - ;; Some of the Python build scripts expect 'HOME' to be - ;; set. - (setenv "HOME" (getcwd)) - #t))) - - ;; Tests in 'compyte/ndarray/setup_opencl.py' appear to rely on - ;; 'nvcc', which is not an option. - #:tests? #f)) + `(#:tests? #f)) ; Tests cannot find pygpu_language_opencl.cpp (inputs - `(("opencl-headers" ,opencl-headers-1.2) ;POCL only supports OpenCL 1.2 + `(("opencl-headers" ,opencl-headers) ("pybind11" ,pybind11) ("opencl-icd-loader" ,opencl-icd-loader))) ;libOpenCL (propagated-inputs `(("python-appdirs" ,python-appdirs) - ("python-decorator" ,python-decorator) ("python-numpy" ,python-numpy) ("python-pytools" ,python-pytools) - ("python-six" ,python-six) ("python-mako" ,python-mako))) (home-page "http://mathema.tician.de/software/pyopencl") (synopsis "Python wrapper for OpenCL") -- cgit v1.2.3 From 75a3413b4e5c1f7443eb944a36ff364f4c4085f4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 28 Aug 2021 11:01:06 +0200 Subject: gnu: mame: Update to 0.235. * gnu/packages/emulators.scm (mame): Update to 0.235. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index ba5c7663ee..28ecb0c563 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1772,7 +1772,7 @@ This is a part of the TiLP project.") (define-public mame (package (name "mame") - (version "0.234") + (version "0.235") (source (origin (method git-fetch) @@ -1781,7 +1781,7 @@ This is a part of the TiLP project.") (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "010ing14pfwc0j7jnghjdcvq0qr7g4dplnggl545apyy61zigdkn")) + (base32 "1iz5p51am7gh19i0zx96vfpfpza8xvrz9f2pd908jsc4xpr36agd")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From 63fec9fd6a76a70da737c3ac45959c9a1d0ae829 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 28 Aug 2021 15:48:56 +0300 Subject: gnu: Add lsofgraph. * gnu/packages/admin.scm (lsofgraph): New variable. --- gnu/packages/admin.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1d5fe5990f..5a97cbfe3b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4612,3 +4612,49 @@ the XMODEM/YMODEM/ZMODEM file transfer protocols.") setup, maintenance, supervision, or any long-running processes.") (home-page "https://github.com/leahneukirchen/nq") (license license:public-domain))) + +(define-public lsofgraph + (let ((commit "1d414bdc727c00a8c6cbfffc3c43128c60d6f0de") + (revision "1")) + (package + (name "lsofgraph") + (version (git-version "0.0.1" revision commit)) ;no upstream release + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zevv/lsofgraph") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "058x04yp6bc77hbl3qchqm7pa8f9vqfl9jryr88m8pzl7kvpif54")))) + (build-system trivial-build-system) + (inputs + `(("lua" ,lua))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + ;; copy source + (copy-recursively (assoc-ref %build-inputs "source") ".") + ;; patch-shebang phase + (setenv "PATH" + (string-append (assoc-ref %build-inputs "lua") "/bin" + ":" (getenv "PATH"))) + (substitute* "lsofgraph" + (("#!/usr/bin/env lua") + (string-append "#!" (which "lua")))) + ;; install phase + (install-file "lsofgraph" (string-append %output "/bin")) + (let ((doc (string-append + %output "/share/doc/" ,name "-" ,version))) + (mkdir-p doc) + (install-file "LICENSE" doc) + (install-file "README.md" doc)) + #t))) + (home-page "https://github.com/zevv/lsofgraph") + (synopsis "Convert @code{lsof} output to @code{graphviz}") + (description "Utility to convert @code{lsof} output to a graph showing +FIFO and UNIX interprocess communication.") + (license license:bsd-2)))) -- cgit v1.2.3 From 76114232d7c140fb9fee84510b72fcfe6ee27714 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 29 Aug 2021 00:52:20 +0300 Subject: gnu: Add emacs-company-org-block. * gnu/packages/emacs-xyz.scm (emacs-company-org-block): New variable. --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7672168a0e..c4e632d820 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28726,6 +28726,30 @@ label references and citations in LaTeX. It is based on RefTeX, which is included with Emacs.") (license license:gpl3+))) +(define-public emacs-company-org-block + (let ((commit "115af0a3625f4669358eca568466d468cacc78bd") + (revision "1")) + (package + (name "emacs-company-org-block") + (version (git-version "0.3" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xenodium/company-org-block") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13kdwi4d1pvba6wv9yn1s0dl4cnq61zwf3j647d1s5ybqlrw5f4r")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-company" ,emacs-company))) + (home-page "https://github.com/xenodium/company-org-block") + (synopsis "Emacs @code{company-complete} for Org blocks") + (description + "Insert Emacs Org blocks with completion via @code{company} mode.") + (license license:gpl3+)))) + (define-public emacs-html-to-hiccup ;; Package has no release. Version is extracted from "Version:" keyword in ;; main file. -- cgit v1.2.3 From bf99f80a1688e2139e1893219faa995b136db530 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 24 Aug 2021 10:00:53 -0400 Subject: gnu: Add python-commentjson. * gnu/packages/python-xyz.scm (python-commentjson): New variable. --- gnu/packages/python-xyz.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 59eb473857..3215d91bdd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -53,7 +53,7 @@ ;;; Copyright © 2018, 2019, 2020, 2021 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019 Clément Lassieur -;;; Copyright © 2018, 2019, 2020 Maxim Cournoyer +;;; Copyright © 2018, 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2015, 2018 Pjotr Prins @@ -10134,6 +10134,60 @@ Supported netlink families and protocols include: (define-public python2-wrapt (package-with-python2 python-wrapt)) +(define-public python-commentjson + (package + (name "python-commentjson") + (version "0.9.0") + (source (origin + ;; The PyPI release is missing some test files. + (method git-fetch) + (uri (git-reference + (url "https://github.com/vaidik/commentjson") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01iscgrc6bkyrxbzmf46csbf9c0n7g6dygdmxs3fq8fkzrrciybl")))) + (build-system python-build-system) + (arguments + `(#:modules ((guix build python-build-system) + (guix build utils) + (ice-9 ftw) + (ice-9 textual-ports)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "setup.py" + (("lark-parser>=0.7.1,<0.8.0") + "lark-parser>=0.7.1")))) + (add-after 'unpack 'delete-unspported-tests + ;; Some tests rely on the 'test' module of Python itself, + ;; which is not available with the Python package in Guix; + ;; remove them. + (lambda _ + ;; XXX: Copied from (guix build dub-build-system). + (define (grep string file-name) + (string-contains (call-with-input-file file-name get-string-all) + string)) + + (with-directory-excursion "commentjson/tests/test_json" + (let* ((dot? (lambda (x) (member x '("." "..")))) + (test-files (scandir "." (negate dot?)))) + (for-each delete-file + (filter (lambda (f) (grep "from test." f)) + test-files))))))))) + (propagated-inputs + `(("python-lark-parser" ,python-lark-parser))) + (native-inputs + `(("python-six" ,python-six))) + (home-page "https://github.com/vaidik/commentjson") + (synopsis "Python library for adding comments to JSON files") + (description "Comment JSON is a Python package that helps you create JSON +files with Python and JavaScript style inline comments. Its API is very +similar to the Python standard library's @code{json} module.") + (license license:expat))) + (define-public python-commonmark (package (name "python-commonmark") -- cgit v1.2.3 From afcbaadac5d6add0bb493471220d81d4acb630e5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 24 Aug 2021 10:12:16 -0400 Subject: gnu: Add python-resolvelib. * gnu/packages/python-xyz.scm (python-resolvelib): New variable. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3215d91bdd..83db31a737 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10188,6 +10188,40 @@ files with Python and JavaScript style inline comments. Its API is very similar to the Python standard library's @code{json} module.") (license license:expat))) +(define-public python-resolvelib + (package + (name "python-resolvelib") + (version "0.7.1") + (source + (origin + ;; Tests are missing from the PyPI release. + (method git-fetch) + (uri (git-reference + (url "https://github.com/sarugaku/resolvelib") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fqz75riagizihvf4j7wc3zjw6kmg1dd8sf49aszyml105kb33n8")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest"))))))) + (native-inputs + `(("python-commentjson" ,python-commentjson) + ("python-packaging" ,python-packaging) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/sarugaku/resolvelib") + (synopsis "Abstract dependencies resolver") + (description "The ResolveLib library provides a @code{Resolver} class that +includes dependency resolution logic.") + (license license:isc))) + (define-public python-commonmark (package (name "python-commonmark") -- cgit v1.2.3 From 165cbdfdc11a4826b64b42bd15af64b9e5930de4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 24 Aug 2021 20:30:49 -0400 Subject: gnu: Add python-resolvelib-0.5. * gnu/packages/python-xyz.scm (python-resolvelib-0.5): New variable. --- gnu/packages/python-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 83db31a737..da27b1755d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10222,6 +10222,22 @@ similar to the Python standard library's @code{json} module.") includes dependency resolution logic.") (license license:isc))) +;;; This older version is required by ansible-core. +(define-public python-resolvelib-0.5 + (package/inherit python-resolvelib + (name "python-resolvelib") + (version "0.5.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sarugaku/resolvelib") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0697y330sqhiclk25v151qxg7aixzpj434lbg5qib0qlna5zg9la")))))) + (define-public python-commonmark (package (name "python-commonmark") -- cgit v1.2.3 From 5abe149b4ef5c4c96b692827bd27227bf1af3ddf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 24 Aug 2021 23:06:49 -0400 Subject: gnu: Add python-ncclient. * gnu/packages/python-xyz.scm (python-ncclient): New variable. --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index da27b1755d..05def693fa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1414,6 +1414,39 @@ to users of that module.") ;; by the Expat license. (license (list license:isc license:expat)))) +(define-public python-ncclient + (package + (name "python-ncclient") + (version "0.6.12") + (source + (origin + (method git-fetch) ;no tests in PyPI release + (uri (git-reference + (url "https://github.com/ncclient/ncclient") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cb568z5syg6hh0dv813bw7s1mjy7ga5xzxbm9naf4zz2qfdg4js")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest"))))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-lxml" ,python-lxml) + ("python-paramiko" ,python-paramiko))) + (home-page "https://github.com/ncclient/ncclient") + (synopsis "Python library for NETCONF clients") + (description "@code{ncclient} is a Python library that facilitates +client-side scripting and application development around the NETCONF +protocol.") + (license license:asl2.0))) + (define-public python-license-expression (package (name "python-license-expression") -- cgit v1.2.3 From 97a675df1b6e8b2c83c6e8137123433f981609e8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 24 Aug 2021 23:15:40 -0400 Subject: gnu: Add python-pyspnego. * gnu/packages/python-xyz.scm (python-pyspnego): New variable. --- gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 05def693fa..beb70c9d84 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5332,6 +5332,42 @@ color scales, and color space conversion easy. It has support for: (define-public python2-spectra (package-with-python2 python-spectra)) +(define-public python-pyspnego + (package + (name "python-pyspnego") + (version "0.1.6") + (source + (origin + (method git-fetch) ;no tests in PyPI release + (uri (git-reference + (url "https://github.com/jborean93/pyspnego") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pfh2x0539f0k2qi2pbjm64b2fqp64c63xxpinvg1yfaw915kgpb")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest"))))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-mock" ,python-pytest-mock))) + (propagated-inputs + `(("python-cryptography" ,python-cryptography) + ("python-gssapi" ,python-gssapi) + ("python-ruamel.yaml" ,python-ruamel.yaml))) + (home-page "https://github.com/jborean93/pyspnego") + (synopsis "Python SPNEGO library") + (description "The @code{pyspnego} Python library handles Negotiate, NTLM, +Kerberos (SPNEGO) and CredSSP authentication. It also includes a packet +parser that can be used to decode raw NTLM/SPNEGO/Kerberos tokens into a human +readable format.") + (license license:expat))) + (define-public python-numpy-documentation (package (name "python-numpy-documentation") -- cgit v1.2.3 From 66071cd85ea323292eb60258d3cef9ffaf8306d4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 25 Aug 2021 13:12:57 -0400 Subject: gnu: python-pytest-6: Update to 6.2.4 and propagate iniconfig. * gnu/packages/check.scm (python-pytest-6): Update to 6.2.4. Fix typo. Removing trailing #t. [native-inputs]: Delete the extraneous python-mock input. Move python-iniconfig to... [propagated-inputs]: ... here. --- gnu/packages/check.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0ced2a4562..0480fae290 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1002,14 +1002,14 @@ and many external plugins.") (define-public python-pytest-6 (package (inherit (strip-python2-variant python-pytest)) - (version "6.1.2") + (version "6.2.4") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "0gl2sdm322vzmsh5k4f8kj9raiq2y7kdinnca4m45ifvii5fk9y0")))) + "0jy5f83la1864ss42dhsi1mcm5nl79d8bjg7wk474nlw1c5avg2h")))) (arguments `(#:phases (modify-phases %standard-phases @@ -1019,24 +1019,24 @@ and many external plugins.") (if tests? (invoke "pytest" "-vv" "-k" (string-append - ;; This test involve the /usr directory, and fails. + ;; This test involves the /usr directory, and fails. " not test_argcomplete" ;; These test do not honor the isatty detection and ;; fail. " and not test_code_highlight" " and not test_color_yes")) - (format #t "test suite not run~%")) - #t))))) + (format #t "test suite not run~%"))))))) (propagated-inputs (append (alist-delete "python-py" (package-propagated-inputs python-pytest)) - `(("python-py" ,python-py-next)))) + `(("python-iniconfig" ,python-iniconfig) + ("python-py" ,python-py-next)))) (native-inputs - (append (alist-delete "python-pytest" - (package-native-inputs python-pytest)) - `(("python-pytest" ,python-pytest-6-bootstrap) - ("python-toml" ,python-toml) - ("python-iniconfig" ,python-iniconfig)))))) + (append (fold alist-delete (package-native-inputs python-pytest) + '("python-mock" + "python-pytest")) + `(("python-pytest" ,python-pytest-6-bootstrap) + ("python-toml" ,python-toml)))))) ;; Pytest 4.x are the last versions that support Python 2. (define-public python2-pytest -- cgit v1.2.3 From 1d94000d875fa5372b6562284f15c0c2c90ebaf2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 25 Aug 2021 13:40:53 -0400 Subject: gnu: python-execnet: Update to 1.9.0 and enable tests. * gnu/packages/patches/python-execnet-read-only-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/python-xyz.scm (python-execnet): Update to 1.9.0. [source]: Fix indentation. [arguments]: Enable tests, replacing the default check phase. --- .../patches/python-execnet-read-only-fix.patch | 77 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 26 ++++---- 2 files changed, 91 insertions(+), 12 deletions(-) create mode 100644 gnu/packages/patches/python-execnet-read-only-fix.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/python-execnet-read-only-fix.patch b/gnu/packages/patches/python-execnet-read-only-fix.patch new file mode 100644 index 0000000000..58a4b129a7 --- /dev/null +++ b/gnu/packages/patches/python-execnet-read-only-fix.patch @@ -0,0 +1,77 @@ +From 0d6562a20b0610c5a83d1c66ac879223b84a2746 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Thu, 26 Aug 2021 00:43:26 -0400 +Subject: [PATCH] rsync_remote: Fix a problem when receiving read-only + directories. + +Before this change, when the source directories hierarchy was +read-only, the read-only mode would be preserved at the destination, +preventing child directories to be recreated by a normal user (a +permission denied error, EACCES would be raised). + +* execnet/rsync_remote.py (serve_rsync.receive_directory_structure): +Bitwise OR to ensure the write bit is set on received directories. +* testing/test_rsync.py (TestRSync) +: New test. +--- + execnet/rsync_remote.py | 8 ++++++-- + testing/test_rsync.py | 17 +++++++++++++++++ + 2 files changed, 23 insertions(+), 2 deletions(-) + +diff --git a/execnet/rsync_remote.py b/execnet/rsync_remote.py +index cd5e765..55d154c 100644 +--- a/execnet/rsync_remote.py ++++ b/execnet/rsync_remote.py +@@ -35,7 +35,11 @@ def serve_rsync(channel): + os.makedirs(path) + mode = msg.pop(0) + if mode: +- os.chmod(path, mode) ++ # Ensure directories are writable, otherwise a ++ # permission denied error (EACCES) would be raised ++ # when attempting to receive read-only directory ++ # structures. ++ os.chmod(path, mode | 0o700) + entrynames = {} + for entryname in msg: + destpath = os.path.join(path, entryname) +@@ -59,7 +63,7 @@ def serve_rsync(channel): + checksum = md5(f.read()).digest() + f.close() + elif msg_mode and msg_mode != st.st_mode: +- os.chmod(path, msg_mode) ++ os.chmod(path, msg_mode | 0o700) + return + else: + return # already fine +diff --git a/testing/test_rsync.py b/testing/test_rsync.py +index 995f229..1d6c30c 100644 +--- a/testing/test_rsync.py ++++ b/testing/test_rsync.py +@@ -157,6 +157,23 @@ class TestRSync: + mode = destdir.stat().mode + assert mode & 511 == 504 + ++ @py.test.mark.skipif("sys.platform == 'win32' or getattr(os, '_name', '') == 'nt'") ++ def test_read_only_directories(self, dirs, gw1): ++ source = dirs.source ++ dest = dirs.dest1 ++ source.ensure("sub", "subsub", dir=True) ++ source.join("sub").chmod(0o500) ++ source.join("sub", "subsub").chmod(0o500) ++ ++ # The destination directories should be created with the write ++ # permission forced, to avoid raising an EACCES error. ++ rsync = RSync(source) ++ rsync.add_target(gw1, dest) ++ rsync.send() ++ ++ assert dest.join("sub").stat().mode & 0o700 ++ assert dest.join("sub").join("subsub").stat().mode & 0o700 ++ + @needssymlink + def test_symlink_rsync(self, dirs, gw1): + source = dirs.source +-- +2.32.0 + diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index beb70c9d84..dd1b741310 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12193,24 +12193,26 @@ pure Python module that works on virtually all Python versions.") (define-public python-execnet (package (name "python-execnet") - (version "1.4.1") + (version "1.9.0") (source (origin - (method url-fetch) - (uri (pypi-uri "execnet" version)) - (sha256 - (base32 - "1rpk1vyclhg911p3hql0m0nrpq7q7mysxnaaw6vs29cpa6kx8vgn")))) + (method url-fetch) + (uri (pypi-uri "execnet" version)) + (sha256 + (base32 + "1ia7dvrh0gvzzpi758mx55f9flr16bzdqlmi12swm4ncm4xlyscg")) + (patches (search-patches "python-execnet-read-only-fix.patch")))) (build-system python-build-system) (arguments - `(;; 2 failed, 275 passed, 670 skipped, 4 xfailed - ;; The two test failures are caused by the lack of an `ssh` executable. - ;; The test suite can be run with pytest after the 'install' phase. - #:tests? #f)) + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv"))))))) (native-inputs `(("python-pytest" ,python-pytest) ("python-setuptools-scm" ,python-setuptools-scm))) - (propagated-inputs - `(("python-apipkg" ,python-apipkg))) (synopsis "Rapid multi-Python deployment") (description "Execnet provides a share-nothing model with channel-send/receive communication for distributing execution across many -- cgit v1.2.3 From 3d0fd83f243b7a2fddb02939f7f937ce8fb8965c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 25 Aug 2021 13:50:52 -0400 Subject: gnu: python-rope: Update to 0.19.0 and remove python2-rope. * gnu/packages/python-xyz.scm (python-rope): Update to 0.19.0. [source]: Fix indentation. [arguments]: Remove. [native-inputs]: Remove. [license]: Correct license. (python2-rope): Delete variable. --- gnu/packages/python-xyz.scm | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dd1b741310..917fcf3de6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14265,39 +14265,25 @@ respectively.") Python. It generates C++ code and a Makefile.")) (license (list license:gpl3 license:bsd-3 license:expat)))) -(define-public python2-rope +(define-public python-rope (package - (name "python2-rope") - (version "0.11.0") + (name "python-rope") + (version "0.19.0") (source (origin - (method url-fetch) - (uri (pypi-uri "rope" version)) - (sha256 + (method url-fetch) + (uri (pypi-uri "rope" version)) + (sha256 (base32 - "1cppm0pa9aqgsbkq130lskrzmrvjs5vpiavjjbhpz2fdw52w8251")))) - (arguments - ;; Rope has only partial python3 support, see `python-rope' - `(#:python ,python-2)) + "1nlhkmsfvn2p1msrmwqnypnvr993alzawnpc1605q7rfad3xgrk4")))) (build-system python-build-system) - (native-inputs - `(("python2-unittest2" ,python2-unittest2))) (home-page "https://github.com/python-rope/rope") (synopsis "Refactoring library for Python") (description "Rope is a refactoring library for Python. It facilitates the renaming, moving and extracting of attributes, functions, modules, fields and parameters in Python 2 source code. These refactorings can also be applied to occurrences in strings and comments.") - (license license:gpl2))) - -(define-public python-rope - (package/inherit python2-rope - (name "python-rope") - (arguments `(#:python ,python-wrapper - ;; XXX: Only partial python3 support, results in some failing - ;; tests: . - #:tests? #f)) - (properties `((python2-variant . ,(delay python2-rope)))))) + (license license:lgpl3+))) (define-public python-py3status (package -- cgit v1.2.3 From 399a844aadad0f27f6156b807596db12a8cba834 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 25 Aug 2021 15:02:56 -0400 Subject: gnu: python-mock: Update description. * gnu/packages/check.scm (python-mock) [description]: Mention this library is now part of Python 3.3 onward. --- gnu/packages/check.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0480fae290..86d468dbb0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -845,7 +845,8 @@ doctest.") (description "Mock is a library for testing in Python. It allows you to replace parts of your system under test with mock objects and make assertions about how they -have been used.") +have been used. This library is now part of Python (since Python 3.3), +available via the @code{unittest.mock} module.") (properties `((python2-variant . ,(delay python2-mock)))) (license license:expat))) -- cgit v1.2.3 From bece6dd70d5dc7043283f78de158d19c56d89408 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 25 Aug 2021 15:06:08 -0400 Subject: gnu: python-py-next: Update to 1.10.0. * gnu/packages/python-xyz.scm (python-py-next): Update to 1.10.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 917fcf3de6..1d1a679133 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3070,14 +3070,14 @@ code introspection, and logging.") (define-public python-py-next (package (inherit python-py) - (version "1.9.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (pypi-uri "py" version)) (sha256 (base32 - "0hpk0gzd4v1pcnq7zinwg5n219czi23qghcswykqskkbwly8i9lw")))))) + "1lqvkqk3b440g9z82gqbzlzas84wrm6ir8kplzhzavmn2pd1pf11")))))) (define-public python2-py (package-with-python2 python-py)) -- cgit v1.2.3 From 0a2c8b10fc74606ec41c7b4d8d9b11bb91ba86ee Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 25 Aug 2021 15:36:58 -0400 Subject: gnu: python-pytest-forked: Update to 1.3.0 and run test suite. * gnu/packages/check.scm (python-pytest-forked)[origin]: Use git. [phases]{disable-setuptools-scm}: New phase. {check}: Override phase. [propagated-inputs]: Remove field. [native-inputs]: Remove ??? and add python-pytest-bootstrap. [home-page]: Fix indentation. [synopsis]: Update. [description]: Expound. --- gnu/packages/check.scm | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 86d468dbb0..b384b8297a 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1378,26 +1378,45 @@ timeout has been exceeded.") (define-public python-pytest-forked (package (name "python-pytest-forked") - (version "1.1.3") + (version "1.3.0") (source (origin - (method url-fetch) - (uri (pypi-uri "pytest-forked" version)) + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/pytest-dev/pytest-forked") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "000i4q7my2fq4l49n8idx2c812dql97qv6qpm2vhrrn9v6g6j18q")))) + "1aip4kx50ynvykl7kq2mlbsi82vx701dvb8mm64lhp69bbv105rc")))) (build-system python-build-system) - (propagated-inputs - `(("python-pytest" ,python-pytest))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-setuptools-scm + (lambda _ + (substitute* "setup.py" + (("use_scm_version=True") + (format #f "version=~s" ,version)) + (("setup_requires=\\['setuptools_scm'\\],.*") + "")))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv"))))))) (native-inputs - `(("python-setuptools-scm" ,python-setuptools-scm))) - (home-page - "https://github.com/pytest-dev/pytest-forked") - (synopsis - "Run tests in isolated forked subprocesses") - (description - "Pytest plugin which will run each test in a subprocess and will report if -a test crashed the process.") + ;; XXX: The bootstrap variant of Pytest is used to ensure the + ;; 'hypothesis' plugin is not in the environment (due to + ;; ), which would cause the test suite + ;; to fail (see: https://github.com/pytest-dev/pytest-forked/issues/54). + `(("python-pytest" ,python-pytest-bootstrap))) + (home-page "https://github.com/pytest-dev/pytest-forked") + (synopsis "Pytest plugin to run tests in isolated forked subprocesses") + (description "This package provides a Pytest plugin which enables running +each test in a subprocess and will report if a test crashed the process. It +can be useful to isolate tests against undesirable global environment +side-effects (such as setting environment variables).") (license license:expat))) (define-public python-scripttest -- cgit v1.2.3 From b1ef8b410c334debee1e9ff577a69c6a21220100 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 26 Aug 2021 09:50:14 -0400 Subject: gnu: python-pytest-asyncio: Enable tests and patch for Python 3.8. * gnu/packages/patches/python-pytest-asyncio-python-3.8.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/check.scm (python-pytest-asyncio) [source]: Fetch from git and apply above patch. [phases]: Override the check phase, enabling tests. --- gnu/packages/check.scm | 21 +- .../patches/python-pytest-asyncio-python-3.8.patch | 238 +++++++++++++++++++++ 2 files changed, 256 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/python-pytest-asyncio-python-3.8.patch (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index b384b8297a..43689c3670 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1730,14 +1730,29 @@ executed.") (define-public python-pytest-asyncio (package (name "python-pytest-asyncio") + ;; Version 0.10.0 is the last version which is compatible with Pytest <= + ;; 5.4.0. (version "0.10.0") (source (origin - (method url-fetch) - (uri (pypi-uri "pytest-asyncio" version)) + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/pytest-dev/pytest-asyncio") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1bysy4nii13bm7h345wxf8fxcjhab7l374pqdv7vwv3izl053b4z")))) + (base32 + "1m63b7nbph5z20mn8jgh6j9ac873i1k4in29x44vrkw3qwfwg13y")) + (patches (search-patches "python-pytest-asyncio-python-3.8.patch")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv"))))))) (native-inputs `(("python-coverage" ,python-coverage) ("python-async-generator" ,python-async-generator) diff --git a/gnu/packages/patches/python-pytest-asyncio-python-3.8.patch b/gnu/packages/patches/python-pytest-asyncio-python-3.8.patch new file mode 100644 index 0000000000..519f92c047 --- /dev/null +++ b/gnu/packages/patches/python-pytest-asyncio-python-3.8.patch @@ -0,0 +1,238 @@ +# Modified to apply on 0.10.0. + +From c7a111180b3f35f2fe5a07ead185e4e792f9dfa0 Mon Sep 17 00:00:00 2001 +From: Andrew Svetlov +Date: Thu, 9 Apr 2020 08:44:46 +0200 +Subject: [PATCH] Test on Python 3.8, drop 3.3 and 3.4 + +--- + .travis.yml | 7 +++--- + setup.py | 1 + + tests/conftest.py | 2 +- + tests/test_hypothesis_integration.py | 2 +- + tests/test_simple.py | 32 +++++++++++----------------- + tests/test_simple_35.py | 17 ++++++--------- + tests/test_subprocess.py | 6 ++---- + tox.ini | 5 +++-- + 8 files changed, 29 insertions(+), 43 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index fe90234..b93377a 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -1,4 +1,5 @@ + language: python ++ + matrix: + include: + - python: 3.5 +@@ -7,10 +8,8 @@ matrix: + env: TOX_ENV=py36 + - python: 3.7 + env: TOX_ENV=py37 +- # TODO: the dist and sudo keys are currently needed to use Python 3.7. +- # They should be removed once Travis-CI supports 3.7 on the default image. +- dist: xenial +- sudo: true ++ - python: 3.8 ++ env: TOX_ENV=py38 + + install: pip install tox-travis coveralls + +diff --git a/setup.py b/setup.py +index 18566bf..6175711 100644 +--- a/setup.py ++++ b/setup.py +@@ -36,6 +36,7 @@ def find_version(): + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", ++ "Programming Language :: Python :: 3.8", + "Topic :: Software Development :: Testing", + "Framework :: Pytest", + ], +diff --git a/tests/conftest.py b/tests/conftest.py +index 6203cf8..cc2ec16 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -17,7 +17,7 @@ def dependent_fixture(event_loop): + async def just_a_sleep(): + """Just sleep a little while.""" + nonlocal event_loop +- await asyncio.sleep(0.1, loop=event_loop) ++ await asyncio.sleep(0.1) + nonlocal counter + counter += 1 + +diff --git a/tests/test_simple.py b/tests/test_simple.py +index 1627139..00c07fc 100644 +--- a/tests/test_simple.py ++++ b/tests/test_simple.py +@@ -1,28 +1,26 @@ + """Quick'n'dirty unit tests for provided fixtures and markers.""" + import asyncio +-import os + import pytest + + import pytest_asyncio.plugin + + +-async def async_coro(loop=None): +- """A very simple coroutine.""" +- await asyncio.sleep(0, loop=loop) ++async def async_coro(): ++ await asyncio.sleep(0) + return 'ok' + + + def test_event_loop_fixture(event_loop): + """Test the injection of the event_loop fixture.""" + assert event_loop +- ret = event_loop.run_until_complete(async_coro(event_loop)) ++ ret = event_loop.run_until_complete(async_coro()) + assert ret == 'ok' + + + @pytest.mark.asyncio +-def test_asyncio_marker(): ++async def test_asyncio_marker(): + """Test the asyncio pytest marker.""" +- yield # sleep(0) ++ await asyncio.sleep(0) + + + @pytest.mark.xfail(reason='need a failure', strict=True) +@@ -45,13 +43,11 @@ async def closer(_, writer): + writer.close() + + server1 = await asyncio.start_server(closer, host='localhost', +- port=unused_tcp_port, +- loop=event_loop) ++ port=unused_tcp_port) + + with pytest.raises(IOError): + await asyncio.start_server(closer, host='localhost', +- port=unused_tcp_port, +- loop=event_loop) ++ port=unused_tcp_port) + + server1.close() + await server1.wait_closed() +@@ -68,20 +64,16 @@ async def closer(_, writer): + unused_tcp_port_factory()) + + server1 = await asyncio.start_server(closer, host='localhost', +- port=port1, +- loop=event_loop) ++ port=port1) + server2 = await asyncio.start_server(closer, host='localhost', +- port=port2, +- loop=event_loop) ++ port=port2) + server3 = await asyncio.start_server(closer, host='localhost', +- port=port3, +- loop=event_loop) ++ port=port3) + + for port in port1, port2, port3: + with pytest.raises(IOError): + await asyncio.start_server(closer, host='localhost', +- port=port, +- loop=event_loop) ++ port=port) + + server1.close() + await server1.wait_closed() +@@ -117,7 +109,7 @@ class Test: + @pytest.mark.asyncio + async def test_asyncio_marker_method(self, event_loop): + """Test the asyncio pytest marker in a Test class.""" +- ret = await async_coro(event_loop) ++ ret = await async_coro() + assert ret == 'ok' + + +diff --git a/tests/test_simple_35.py b/tests/test_simple_35.py +index 1e4d697..4141fb0 100644 +--- a/tests/test_simple_35.py ++++ b/tests/test_simple_35.py +@@ -6,7 +6,7 @@ + + @pytest.mark.asyncio + async def async_coro(loop): +- await asyncio.sleep(0, loop=loop) ++ await asyncio.sleep(0) + return 'ok' + + +@@ -27,8 +27,7 @@ async def closer(_, writer): + writer.close() + + server1 = await asyncio.start_server(closer, host='localhost', +- port=unused_tcp_port, +- loop=event_loop) ++ port=unused_tcp_port) + + server1.close() + await server1.wait_closed() +@@ -45,20 +44,16 @@ async def closer(_, writer): + + async def run_test(): + server1 = await asyncio.start_server(closer, host='localhost', +- port=port1, +- loop=event_loop) ++ port=port1) + server2 = await asyncio.start_server(closer, host='localhost', +- port=port2, +- loop=event_loop) ++ port=port2) + server3 = await asyncio.start_server(closer, host='localhost', +- port=port3, +- loop=event_loop) ++ port=port3) + + for port in port1, port2, port3: + with pytest.raises(IOError): + await asyncio.start_server(closer, host='localhost', +- port=port, +- loop=event_loop) ++ port=port) + + server1.close() + await server1.wait_closed() +diff --git a/tests/test_subprocess.py b/tests/test_subprocess.py +index 83490e8..069c6c2 100644 +--- a/tests/test_subprocess.py ++++ b/tests/test_subprocess.py +@@ -21,8 +21,7 @@ def event_loop(): + async def test_subprocess(event_loop): + """Starting a subprocess should be possible.""" + proc = await asyncio.subprocess.create_subprocess_exec( +- sys.executable, '--version', stdout=asyncio.subprocess.PIPE, +- loop=event_loop) ++ sys.executable, '--version', stdout=asyncio.subprocess.PIPE) + await proc.communicate() + + +@@ -30,6 +29,5 @@ async def test_subprocess(event_loop): + async def test_subprocess_forbid(event_loop): + """Starting a subprocess should be possible.""" + proc = await asyncio.subprocess.create_subprocess_exec( +- sys.executable, '--version', stdout=asyncio.subprocess.PIPE, +- loop=event_loop) ++ sys.executable, '--version', stdout=asyncio.subprocess.PIPE) + await proc.communicate() +diff --git a/tox.ini b/tox.ini +index 13d5155..eed6fb6 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -1,6 +1,7 @@ + [tox] +-envlist = py35, py36, py37 +-minversion = 2.5.0 ++minversion = 3.14.0 ++envlist = py35, py36, py37, py38 ++skip_missing_interpreters = true + + [testenv] + extras = testing -- cgit v1.2.3 From 48461816e4886453726a81d98a1d6846fa709579 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 26 Aug 2021 14:44:48 -0400 Subject: gnu: python-pytest-mock: Update to 3.6.1 and run test suite. * gnu/packages/check.scm (python-pytest-mock): Update to 3.6.1. [phases]{check}: Override to run test suite. [propagated-inputs]: Add python-pytest-asyncio. --- gnu/packages/check.scm | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 43689c3670..3dc4319160 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1261,19 +1261,33 @@ contacting the real http server.") (define-public python-pytest-mock (package (name "python-pytest-mock") - (version "1.10.1") + (version "3.6.1") (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest-mock" version)) - (sha256 - (base32 - "1i5mg3ff1qk0wqfcxfz60hwy3q5dskdp36i10ckigkzffg8hc3ad")))) + (origin + (method url-fetch) + (uri (pypi-uri "pytest-mock" version)) + (sha256 (base32 + "0qhfmd05z3g88bnwq6644jl6p5wy01i4yy7h8883z9jjih2pl8a0")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + ;; Skip the assertion rewriting tests, which don't work in the + ;; presence of read-only Python modules (a limitation of + ;; Pytest). Also skip the "test_standalone_mock" test, which + ;; can only work when 'python-mock' is not available + ;; (currently propagated by Pytest 5). + (invoke "pytest" "--assert=plain" + "-k" "not test_standalone_mock"))))))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs - `(("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest) + ("python-pytest-asyncio" ,python-pytest-asyncio))) (home-page "https://github.com/pytest-dev/pytest-mock/") (synopsis "Thin-wrapper around the mock package for easier use with py.test") (description -- cgit v1.2.3 From 9482c5ad038a7ca65b33026d1475d55f57868ede Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 26 Aug 2021 14:47:31 -0400 Subject: gnu: python-pytest-xdist: Fix by downgrading to 1.34.0, run test suite. Commit ed72e558313 updated the package to 2.1.0, but this version doesn't work with Pytest 5, the version currently used in Guix. Downgrade to the last version that is compatible with Pytest 5. * gnu/packages/check.scm (python-pytest-xdist): Downgrade to 1.34.0, with a comment explaining why. Strip trailing #t. [source]: Remove origin modules and snippet field, no longer necessary. [phases]{check}: Override to run the test suite. [propagated-inputs]: Remove python-py and add python-pytest-forked. --- gnu/packages/check.scm | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 3dc4319160..57477281ab 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1310,38 +1310,32 @@ same arguments.") (define-public python-pytest-xdist (package (name "python-pytest-xdist") - (version "2.1.0") + ;; There is an issue that causes all releases after 1.34 to fail on Pytest + ;; 5 (see: https://github.com/pytest-dev/pytest-xdist/issues/697). + (version "1.34.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest-xdist" version)) (sha256 (base32 - "0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove pre-compiled .pyc files from source. - (for-each delete-file-recursively - (find-files "." "__pycache__" #:directories? #t)) - (for-each delete-file (find-files "." "\\.pyc$")) - #t)))) + "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ;FIXME: Some tests are failing. - ;; #:phases - ;; (modify-phases %standard-phases - ;; (delete 'check) - ;; (add-after 'install 'check - ;; (lambda* (#:key inputs outputs #:allow-other-keys) - ;; (add-installed-pythonpath inputs outputs) - ;; (zero? (system* "py.test" "-v"))))) + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" + "-n" (number->string (parallel-job-count))))))))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs `(("python-execnet" ,python-execnet) ("python-pytest" ,python-pytest) - ("python-py" ,python-py))) + ("python-pytest-forked" ,python-pytest-forked))) (home-page "https://github.com/pytest-dev/pytest-xdist") (synopsis -- cgit v1.2.3 From fa4c3deb8b8194415a475e86b4b3a103cde28ead Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 26 Aug 2021 22:51:45 -0400 Subject: gnu: Add python-pytest-xdist-next. * gnu/packages/check.scm (python-pytest-xdist-next): New variable. --- gnu/packages/check.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 57477281ab..b49f9de157 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1352,6 +1352,22 @@ result back.") (define-public python2-pytest-xdist (package-with-python2 python-pytest-xdist)) +(define-public python-pytest-xdist-next + (package/inherit python-pytest-xdist + (name "python-pytest-xdist") + (version "2.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-xdist" version)) + (sha256 + (base32 + "19cy57jrf3pwi7x6fnbxryjvqagsl0yv736jnynvr3yqhlpxxv78")))) + (propagated-inputs + `(("python-execnet" ,python-execnet) + ("python-pytest" ,python-pytest-6) + ("python-pytest-forked" ,python-pytest-forked))))) + (define-public python-pytest-timeout (package (name "python-pytest-timeout") -- cgit v1.2.3 From 83bf3c63dab980cf129dc18e87ee8ff515740995 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 26 Aug 2021 21:31:27 -0400 Subject: gnu: Add ansible-core. * gnu/packages/admin.scm (ansible-core): New variable. --- gnu/packages/admin.scm | 135 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5a97cbfe3b..8b9cfea123 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2021 David Larsson ;;; Copyright © 2021 WinterHound ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -134,11 +135,14 @@ #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages ruby) + #:use-module (gnu packages selinux) #:use-module (gnu packages serialization) + #:use-module (gnu packages ssh) #:use-module (gnu packages sphinx) #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages web) @@ -2462,6 +2466,137 @@ Statsd, Librato and InfluxDB. Graphios can emit Nagios metrics to any number of supported upstream metrics systems simultaneously.") (license license:gpl2+))) +(define-public ansible-core + (package + (name "ansible-core") + (version "2.11.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ansible-core" version)) + (sha256 + (base32 + "0jgahcv2pyc5ky0wir55a1h9q9d6rgqj60rqmvlpbj76vz1agsi2")))) + (build-system python-build-system) + (arguments + `(#:modules ((guix build python-build-system) + (guix build utils) + (ice-9 ftw)) + #:phases + (modify-phases %standard-phases + ;; Several ansible commands (ansible-config, ansible-console, etc.) + ;; are just symlinks to a single ansible executable. The ansible + ;; executable behaves differently based on the value of sys.argv[0]. + ;; This does not work well with our wrap phase, and therefore the + ;; following two phases are required as a workaround. + (add-after 'unpack 'hide-wrapping + (lambda _ + ;; Overwrite sys.argv[0] to hide the wrapper script from it. + (substitute* "bin/ansible" + (("import traceback" all) + (string-append all " +import re +sys.argv[0] = re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0]) +"))))) + (add-after 'install 'replace-symlinks + (lambda* (#:key outputs #:allow-other-keys) + ;; Replace symlinks with duplicate copies of the ansible + ;; executable so that sys.argv[0] has the correct value. + (define bin (string-append (assoc-ref outputs "out") "/bin")) + (with-directory-excursion bin + (for-each + (lambda (ansible-symlink) + (delete-file ansible-symlink) + (copy-file "ansible" ansible-symlink)) + (scandir "." (lambda (x) + (and (eq? 'symlink (stat:type (lstat x))) + (string-prefix? "ansible-" x) + (string=? "ansible" (readlink x))))))))) + (add-after 'unpack 'preserve-pythonpath + (lambda _ + (substitute* "test/lib/ansible_test/_internal/ansible_util.py" + (("PYTHONPATH=get_ansible_python_path\\(args\\)" all) + (string-append all "+ ':' + os.environ['PYTHONPATH']"))))) + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "lib/ansible/module_utils/compat/selinux.py" + (("libselinux.so.1" name) + (string-append (assoc-ref inputs "libselinux") + "/lib/" name))) + (substitute* "test/units/modules/test_async_wrapper.py" + (("/usr/bin/python") + (which "python"))))) + (replace 'check + ;; The environment for the test suite can be tricky to get right. + ;; The environment used for Ansible's CI defined in the following + ;; Dockerfile can be used as a reference: + ;; https://raw.githubusercontent.com/ansible/ + ;; default-test-container/master/Dockerfile. + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + ;; Otherwise Ansible fails to create its config directory. + (setenv "HOME" "/tmp") + (setenv "PATH" (string-append (getenv "PATH") ":" + (assoc-ref outputs "out") "/bin")) + (add-installed-pythonpath inputs outputs) + ;; This test module messes up with sys.path and causes many + ;; test failures. + (delete-file "test/units/_vendor/test_vendor.py") + ;; The test fails when run in the container, for reasons + ;; unknown. + (delete-file "test/units/utils/test_display.py") + ;; This test fail for reasons unknown. + (delete-file "test/units/cli/test_adhoc.py") + ;; The test suite needs to be run with 'ansible-test', which + ;; does some extra environment setup. Taken from + ;; https://raw.githubusercontent.com/ansible/ansible/\ + ;; devel/test/utils/shippable/shippable.sh. + (invoke "ansible-test" "units" "-v"))))))) + (native-inputs + `(("openssh" ,openssh) + ("openssl" ,openssl) + ("python-mock" ,python-mock) + ("python-pycrypto" ,python-pycrypto) + ("python-pytest" ,python-pytest) + ("python-pytest-forked" ,python-pytest-forked) + ("python-pytest-mock" ,python-pytest-mock) + ("python-pytest-xdist" ,python-pytest-xdist) + ("python-pytz" ,python-pytz))) + (inputs ;optional dependencies captured in wrap scripts + `(("libselinux" ,libselinux) + ("python-paramiko" ,python-paramiko) + ("python-passlib" ,python-passlib) + ("python-pexpect" ,python-pexpect) + ("sshpass" ,sshpass))) + (propagated-inputs ;core dependencies listed in egg-info/requires.txt + `(("python-cryptography" ,python-cryptography) + ("python-jinja2" ,python-jinja2) + ("python-pyyaml" ,python-pyyaml) + ("python-packaging" ,python-packaging) ;for version number parsing + ("python-resolvelib" ,python-resolvelib-0.5))) + (home-page "https://www.ansible.com/") + (synopsis "Radically simple IT automation") + (description "Ansible aims to be a radically simple IT automation system. +It handles configuration management, application deployment, cloud +provisioning, ad-hoc task execution, network automation, and multi-node +orchestration. Ansible facilitates complex changes like zero-downtime rolling +updates with load balancers. This package is the core of Ansible, which +provides the following commands: +@itemize +@item ansible +@item ansible-config +@item ansible-connection +@item ansible-console +@item ansible-doc +@item ansible-galaxy +@item ansible-inventory +@item ansible-playbook +@item ansible-pull +@item ansible-test +@item ansible-vault +@end itemize") + (license license:gpl3+))) + (define-public ansible (package (name "ansible") -- cgit v1.2.3 From 019bf9630044d99d98d34d3dcc51cf9a0017c153 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 26 Aug 2021 23:12:13 -0400 Subject: gnu: ansible: Update to 4.4.0. * gnu/packages/admin.scm (ansible): Update to 4.4.0. [native-inputs]: Remove field. [inputs]: Likewise. [arguments]: Likewise. [propagated-inputs]: New field. [native-search-paths]: New search path. [description]: Update description. --- gnu/packages/admin.scm | 73 +++++++++++++++----------------------------------- 1 file changed, 21 insertions(+), 52 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8b9cfea123..63cf85f64b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2600,66 +2600,35 @@ provides the following commands: (define-public ansible (package (name "ansible") - (version "2.9.18") + (version "4.4.0") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "0g6rsnh02zq5nizamgakl2wvgz7hk1lpnjn9akldrcpa55vygzjm")))) + (base32 "031n22j0lsmh69x6i6gkva81j68b4yzh1pbg3q2h4bknl85q46ag")))) (build-system python-build-system) - (native-inputs - `(("python-bcrypt" ,python-bcrypt) - ("python-pynacl" ,python-pynacl) - ("python-httplib2" ,python-httplib2) - ("python-passlib" ,python-passlib) - ("python-nose" ,python-nose) - ("python-mock" ,python-mock) - ("python-jinja2" ,python-jinja2) - ("python-pyyaml" ,python-pyyaml) - ("python-paramiko" ,python-paramiko))) - (inputs - `(("python-cryptography" ,python-cryptography) - ("python-jinja2" ,python-jinja2) - ("python-pyyaml" ,python-pyyaml) - ("python-paramiko" ,python-paramiko))) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; Several ansible commands (ansible-config, ansible-console, etc.) - ;; are just symlinks to a single ansible executable. The ansible - ;; executable behaves differently based on the value of - ;; sys.argv[0]. This does not work well with our wrap phase, and - ;; therefore the following two phases are required as a workaround. - (add-after 'unpack 'hide-wrapping - (lambda _ - ;; Overwrite sys.argv[0] to hide the wrapper script from it. - (substitute* "bin/ansible" - (("import traceback" all) - (string-append all " -import re -sys.argv[0] = re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0]) -"))) - #t)) - (add-after 'install 'replace-symlinks - (lambda* (#:key outputs #:allow-other-keys) - ;; Replace symlinks with duplicate copies of the ansible - ;; executable. - (let ((out (assoc-ref outputs "out"))) - (for-each - (lambda (subprogram) - (delete-file (string-append out "/bin/ansible-" subprogram)) - (copy-file (string-append out "/bin/ansible") - (string-append out "/bin/ansible-" subprogram))) - (list "config" "console" "doc" "galaxy" - "inventory" "playbook" "pull" "vault"))) - #t))))) + (propagated-inputs + `(("ansible-core" ,ansible-core))) + ;; The Ansible collections are found by ansible-core via PYTHONPATH; the + ;; following search path ensures that they are found even when Python is + ;; not present in the profile. + (native-search-paths + ;; XXX: Attempting to use (package-native-search-paths python) + ;; here would cause an error about python being an unbound + ;; variable in the tests/cpan.scm test. + (list (search-path-specification + (variable "PYTHONPATH") + (files (list "lib/python3.8/site-packages"))))) (home-page "https://www.ansible.com/") (synopsis "Radically simple IT automation") - (description "Ansible is a radically simple IT automation system. It -handles configuration management, application deployment, cloud provisioning, -ad hoc task execution, and multinode orchestration---including trivializing -things like zero-downtime rolling updates with load balancers.") + (description "Ansible aims to be a radically simple IT automation system. +It handles configuration management, application deployment, cloud +provisioning, ad-hoc task execution, network automation, and multi-node +orchestration. Ansible facilitates complex changes like zero-downtime rolling +updates with load balancers. This package provides a curated set of +community-maintained Ansible collections, which contain playbooks, roles, +modules and plugins that extend Ansible.") (license license:gpl3+))) (define-public debops -- cgit v1.2.3 From 352f72ac02400551eb8a06a5ac964444cf33ba78 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 28 Aug 2021 14:50:22 -0400 Subject: gnu: python-django: Update to 3.2.6. * gnu/packages/django.scm (python-django): Update to 3.2.6. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 7fb3f00c4c..790c17ec24 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -47,13 +47,13 @@ (define-public python-django (package (name "python-django") - (version "3.2.5") + (version "3.2.6") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "1kam3301jl53vm0mhflwwsqy5d7kb5dksmjanlaj7v7xakm5z81x")))) + "08p0gf1n548fjba76wspcj1jb3li6lr7xi87w2xq7hylr528azzj")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 0bc5448cf14c2f61eb591d47a5422fda638f08fc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 28 Aug 2021 14:53:42 -0400 Subject: gnu: python-pytest-django: Update to 4.4.0. * gnu/packages/django.scm (python-pytest-django): Update to 4.4.0. [tests?]: Disable test suite. [native-inputs]: Replace python-pytest-xdist by python-pytest-xdist-next. [home-page]: Update home page. --- gnu/packages/django.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 790c17ec24..dd48e0553a 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -318,16 +318,19 @@ size and quality.") (define-public python-pytest-django (package (name "python-pytest-django") - (version "3.10.0") + (version "4.4.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest-django" version)) (sha256 (base32 - "19nvqsb7b9kz3ikpb50m8ppf7mfhzrapdxsqd5hhd1pdfz8dprjd")))) + "0mglnz0w6k7dgw1jn6giv56pmdjd6a3zwwkhxb2kyzmzk0viw5xm")))) (build-system python-build-system) (arguments - `(#:phases + ;; The test suite is disabled because there are many test failures (see: + ;; https://github.com/pytest-dev/pytest-django/issues/943). + `(#:tests? #f + #:phases (modify-phases %standard-phases (replace 'check (lambda* (#:key tests? inputs outputs #:allow-other-keys) @@ -352,12 +355,11 @@ size and quality.") (native-inputs `(("python-django" ,python-django) ("python-setuptools-scm" ,python-setuptools-scm) - ;; For tests. - ("python-pytest-xdist" ,python-pytest-xdist))) + ("python-pytest-xdist" ,python-pytest-xdist-next))) (propagated-inputs `(("python-pytest" ,python-pytest-6))) - (home-page "https://pytest-django.readthedocs.org/") + (home-page "https://pytest-django.readthedocs.io/") (synopsis "Django plugin for py.test") (description "Pytest-django is a plugin for py.test that provides a set of useful tools for testing Django applications and projects.") -- cgit v1.2.3 From 7256d9d2049352e9a63594eb558dc44978bd6687 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Wed, 30 Jun 2021 15:43:42 +0200 Subject: isc-dhcp: Fix dhclient-script wrapper when cross-compiling. This causes many rebuilds, but only when cross-compiling. This should unbreak Internet access on cross-compiled pinebook images. Reported-By: Guest4977 (on IRC) * gnu/gnunet/packages/admin.scm (isc-dhcp)[arguments]<#:phases>{post-install}: Use the cross-compiled bash when cross-compiling. Work-around . Signed-off-by: Mathieu Othacehe --- gnu/packages/admin.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 63cf85f64b..f9b0abac34 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2021 WinterHound ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -1232,7 +1233,11 @@ connection alive.") "--owner=root:0" "--group=root:0"))))) (add-after 'install 'post-install - (lambda* (#:key inputs outputs #:allow-other-keys) + ;; TODO(core-updates): native-inputs isn't required anymore. + (lambda* (#:key ,@(if (%current-target-system) + '(native-inputs) + '()) + inputs outputs #:allow-other-keys) ;; Install the dhclient script for GNU/Linux and make sure ;; if finds all the programs it needs. (let* ((out (assoc-ref outputs "out")) @@ -1257,6 +1262,19 @@ connection alive.") (string-append dir "/bin:" dir "/sbin")) (list inetutils net-tools coreutils sed)))) + ;; TODO(core-updates): should not be required anymore, + ;; once has been merged. + ,@(if (%current-target-system) + '((for-each + (lambda (file) + (substitute* file + (((assoc-ref native-inputs "bash")) + (assoc-ref inputs "bash")))) + (list (string-append libexec + "/dhclient-script") + (string-append libexec + "/.dhclient-script-real")))) + '()) #t)))))) (native-inputs @@ -1264,6 +1282,11 @@ connection alive.") ("file" ,file))) (inputs `(("inetutils" ,inetutils) + ;; TODO(core-updates): simply make this unconditional + ,@(if (%current-target-system) + ;; for wrap-program + `(("bash" ,(canonical-package bash-minimal))) + '()) ,@(if (hurd-target?) '() `(("net-tools" ,net-tools) ("iproute" ,iproute))) -- cgit v1.2.3 From 8fe8f534545ee3ae40945a7bc8b5a29b3af46cdc Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 29 Aug 2021 14:00:43 +0200 Subject: gnu: rofi: Update to 1.7.0. * gnu/packages/xdisorg.scm (rofi): Update to 1.7.0. [inputs]: Add xcb-util-cursor. [source], [home-page]: Change URL to the redirected one. --- gnu/packages/xdisorg.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 71c2ea4cbc..acab64c110 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2020 David Wilson ;;; Copyright © 2020 Ivan Vilata i Balaguer -;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Damien Cassou ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Boris A. Dekshteyn @@ -1740,15 +1740,15 @@ connectivity of the X server running on a particular @code{DISPLAY}.") (define-public rofi (package (name "rofi") - (version "1.6.1") + (version "1.7.0") (source (origin (method url-fetch) - (uri (string-append "https://github.com/DaveDavenport/rofi/" + (uri (string-append "https://github.com/davatorium/rofi/" "releases/download/" version "/rofi-" version ".tar.xz")) (sha256 (base32 - "12p9z8bl1gg8k024m4a6zfz7gf1zbyffardh98raqgabn6knwk22")))) + "1929q3dks8fqd3pfkzs0ba06gwzhlgcrfar9fpga43f3byrrbfxa")))) (build-system gnu-build-system) (inputs `(("pango" ,pango) @@ -1760,6 +1760,7 @@ connectivity of the X server running on a particular @code{DISPLAY}.") ("libxkbcommon" ,libxkbcommon) ("libxcb" ,libxcb) ("xcb-util" ,xcb-util) + ("xcb-util-cursor" ,xcb-util-cursor) ("xcb-util-xrm" ,xcb-util-xrm) ("xcb-util-wm" ,xcb-util-wm))) (native-inputs @@ -1779,7 +1780,7 @@ connectivity of the X server running on a particular @code{DISPLAY}.") (("~") "") (("g_get_home_dir \\(\\)") "\"/\"")) #t))))) - (home-page "https://github.com/DaveDavenport/rofi") + (home-page "https://github.com/davatorium/rofi") (synopsis "Application launcher") (description "Rofi is a minimalist application launcher. It memorizes which applications you regularly use and also allows you to search for an application -- cgit v1.2.3 From 5fdc46a9fe6233060a7817322eab2b1ad339deae Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 29 Aug 2021 17:25:56 +0300 Subject: gnu: Add emacs-hideshowvis. * gnu/packages/emacs-xyz.scm (emacs-hideshowvis): New variable. --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c4e632d820..4ff4c02187 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18873,6 +18873,28 @@ blank slate) and is clearly highlighted with respect to the rest of the buffer.") (license license:gpl2+))) +(define-public emacs-hideshowvis + (let ((commit "614e856620445166a60c00a1c4653dbd59c871c9") + (revision "1")) + (package + (name "emacs-hideshowvis") + (version (git-version "0.7" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sheijk/hideshowvis") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ykj5jwcm03p5h7sd52qndmzihyan09lqg6rzgmyabvw7p56y90m")))) + (build-system emacs-build-system) + (home-page "https://github.com/sheijk/hideshowvis") + (synopsis "Add icons in the Emacs fringe which @code{hideshow} can hide") + (description "Emacs package to add clickable icons in the fringe for +regions which @code{hideshow} can hide.") + (license license:gpl2+)))) + (define-public emacs-know-your-http-well (package (name "emacs-know-your-http-well") -- cgit v1.2.3 From 994d8ce394e88b55985241b7b14f6a8459bcf9e8 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 29 Aug 2021 18:54:47 +0200 Subject: gnu: shadow: Use the cross-compiled shell at runtime. Make sure that the executed shell at runtime is the cross-compiled shell and not the native shell. * gnu/packages/admin.scm (shadow)[arguments]: Add a set-runtime-shell phase. [inputs]: Add bash-minimal when cross-compiling. --- gnu/packages/admin.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f9b0abac34..7910bb16a7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019, 2021 Guillaume Le Vaillant -;;; Copyright © 2019, 2020 Mathieu Othacehe +;;; Copyright © 2019, 2020, 2021 Mathieu Othacehe ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020, 2021 Michael Rohleder @@ -824,6 +824,17 @@ hostname.") #:phases (modify-phases %standard-phases + ,@(if (%current-target-system) + '((add-before 'configure 'set-runtime-shell + (lambda* (#:key inputs #:allow-other-keys) + (let ((shell (string-append + (assoc-ref inputs "bash") + "/bin/bash"))) + (setenv "RUNTIME_SHELL" shell) + (substitute* "configure.ac" + (("\\$SHELL") + "$RUNTIME_SHELL")))))) + '()) (add-before 'build 'set-nscd-file-name (lambda* (#:key inputs #:allow-other-keys) ;; Use the right file name for nscd. @@ -848,7 +859,10 @@ hostname.") (inputs `(,@(if (hurd-target?) '() - `(("linux-pam" ,linux-pam))))) + `(("linux-pam" ,linux-pam))) + ,@(if (%current-target-system) + `(("bash" ,bash-minimal)) + '()))) (home-page "https://github.com/shadow-maint/shadow") (synopsis "Authentication-related tools such as passwd, su, and login") (description -- cgit v1.2.3 From 7d5cb45b4988cfe640314515af7c83f7b4f0c042 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 29 Aug 2021 14:25:15 +0100 Subject: gnu: mu: Update to 1.6.5. * gnu/packages/mail.scm (mu): Update to 1.6.5. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c3bf8b3be7..c2d986effb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1146,7 +1146,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.6.3") + (version "1.6.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" @@ -1154,7 +1154,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") "mu-" version ".tar.xz")) (sha256 (base32 - "1djl0wh3g1vdjwvdm2ag23zf2vbsvpbswrf3cw50d8nrqbmnwa7y")))) + "0irqr1z1ljmij2vbj8dr8w9mbfalzikxr4s6340jjwmkmhaslh2h")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 663c4dc27f194ebbebb6590efcd8de4877a296a6 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 29 Aug 2021 14:25:41 +0100 Subject: gnu: Add emacs-helm-xref. * gnu/packages/emacs-xyz.scm (emacs-helm-xref): New variable. --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4ff4c02187..70c4c30bc2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27508,6 +27508,31 @@ with Helm and displays a buffer of all the different result types available to Wordnet.") (license license:gpl3+)))) +(define-public emacs-helm-xref + (let ((commit "23f1174cfca7667d95828dcd388c655a4a9c877d") + (revision "1")) + (package + (name "emacs-helm-xref") + (version (git-version "0.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/brotzeit/helm-xref") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0v0lkabpi1n4hgnp28jk19f7b78yk93ssm0gr0fr25yqx5zskdnk")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm))) + (home-page "https://github.com/brotzeit/helm-xref") + (synopsis "Helm interface for @code{xref}") + (description "This package provides a Helm interface for selecting +@code{xref} results.") + (license license:gpl3+)))) + (define-public emacs-metal-mercury-mode (let ((commit "99e2d8fb7177cae3bfa2dec2910fc28216d5f5a8") (revision "1") -- cgit v1.2.3 From 8ef38cd1bf7ec17b8d1bc1c0bcb42ac30ac30406 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 30 Aug 2021 07:10:41 +0200 Subject: gnu: guile-websocket: Update to 0.1-d17878f6. * gnu/packages/guile-xyz.scm (guile-websocket)[source]: Update to 0.1-d17878f6. Use https:// url. [phases]: Remove "update-guile-version" stage. [native-inputs]: Add pkg-config. --- gnu/packages/guile-xyz.scm | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index db31ada7b9..03391ad254 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017 Alex Kost ;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira ;;; Copyright © 2016, 2021 Amirouche -;;; Copyright © 2016, 2019 Jan Nieuwenhuizen +;;; Copyright © 2016, 2019, 2021 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017 David Thompson ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe @@ -4090,42 +4090,29 @@ Relay Chat} (IRC).") (license license:lgpl2.1+)))) (define-public guile-websocket - (let ((commit "c854e0f84a40d972cbd532bbb89c97ca0126a7cf")) + (let ((commit "d17878f6c12c10a49196bb08f737f36b11e61c31") + (revision "1")) (package (name "guile-websocket") - (version "0.1") + (version (git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url "git://dthompson.us/guile-websocket.git") + (url "https://git.dthompson.us/guile-websocket.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "1hymvsfrmq9qxr5cxnsgdz7y757yp1cpsgxmdp3f5wxxxpqgsmzx")))) + "0kcmhjyb6amm4b9k4ng0r5s38m041mvh5jgmjbz6ichz39k255v7")))) (build-system gnu-build-system) (arguments '(#:make-flags - '("GUILE_AUTO_COMPILE=0") - #:phases - (modify-phases %standard-phases - ;; The package was developed for Guile 2.0 and has this version - ;; hardcoded in the configure.ac and Makefile.am files. Substitute - ;; 3.0 instead so it can support Guile 3.0. - (add-after 'unpack 'update-guile-version - (lambda _ - (substitute* "configure.ac" - (("2.0.9") "3.0.0")) - (substitute* "Makefile.am" - (("2.0") "3.0") - - ;; Install .go files where they belong. - (("/ccache") "/site-ccache")) - #t))))) + '("GUILE_AUTO_COMPILE=0"))) (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake))) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-3.0))) (synopsis "Websocket server/client for Guile") -- cgit v1.2.3 From 541e2f9a01e108bffa923a30d9c658c7bd72ae55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 30 Aug 2021 12:15:39 +0200 Subject: gnu: extra-cmake-modules: Avoid dependency on qtbase when on armhf. * gnu/packages/kde-frameworks.scm (extra-cmake-modules)[native-inputs]: Remove QTBASE-5 on armhf-linux. [arguments]: Set #:tests? accordingly. --- gnu/packages/kde-frameworks.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 7a3b6b26a8..00d5eb049d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -98,9 +98,15 @@ "10c5xs5shk0dcshpdxg564ay5y8hgmvfvmlhmhjf0dy79kcah3c3")))) (build-system cmake-build-system) (native-inputs - `(("qtbase" ,qtbase-5))) ; For tests (needs qmake) + ;; Add test dependency, except on armhf where building it is too + ;; expensive. + (if (and (not (%current-target-system)) + (string=? (%current-system) "armhf-linux")) + '() + `(("qtbase" ,qtbase-5)))) ;for tests (needs qmake) (arguments - `(#:phases + `(#:tests? ,(not (null? (package-native-inputs this-package))) + #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-lib-path (lambda _ -- cgit v1.2.3 From 99160bc71370f37b02052b51a3cd16c3b2f7af5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 30 Aug 2021 14:30:53 +0200 Subject: gnu: scrot: Update to 1.6. * gnu/packages/xdisorg.scm (scrot): Update to 1.6. [native-inputs]: Add PKG-CONFIG. [inputs]: Add IMLIB2. --- gnu/packages/xdisorg.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index acab64c110..d960d265c1 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Alex Kost -;;; Copyright © 2013, 2015, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2015, 2017, 2018, 2019, 2021y Ludovic Courtès ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2015 Alexander I.Grafov ;;; Copyright © 2015 Andy Wingo @@ -766,7 +766,7 @@ move windows, switch between desktops, etc.).") (define-public scrot (package (name "scrot") - (version "1.5") + (version "1.6") (source (origin (method git-fetch) @@ -776,14 +776,16 @@ move windows, switch between desktops, etc.).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0x64b7xqi5cbq29pb8s8r2kzbxaday1f5k0j70n3s2p7sahjxy72")))) + (base32 "1qanx2xx9m5l995csqzfcm1ks2nhk90zga1wzbkjjl75ga4iik2h")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("autoconf-archive" ,autoconf-archive) - ("automake" ,automake))) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) (inputs `(("giblib" ,giblib) + ("imlib2" ,imlib2) ("libx11" ,libx11) ("libxcomposite" ,libxcomposite) ("libxext" ,libxext) -- cgit v1.2.3 From b12d856da9a9f088f15a29da87cf4304b5379e5d Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Wed, 11 Aug 2021 12:18:37 +0200 Subject: gnu: Add ocaml-odoc-parser. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (ocaml-odoc-parser): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c1cdc8f3f3..ecaf024b40 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6613,6 +6613,34 @@ advantage over ocamldoc is an accurate cross-referencer, which handles the complexity of the OCaml module system.") (license license:isc))) +(define-public ocaml-odoc-parser + (package + (name "ocaml-odoc-parser") + (version "0.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-doc/odoc-parser") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jlc6dp3v90r1ra7r0jfw0xs8rylwdz9gymw4rd53h0p17cw1wnj")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-astring" ,ocaml-astring) + ("ocaml-result" ,ocaml-result))) + (native-inputs + `(("ocaml-ppx-expect" ,ocaml-ppx-expect))) + (home-page "https://github.com/ocaml-doc/odoc-parser") + (synopsis "Parser for ocaml documentation comments") + (description + "This package provides a library for parsing the contents of OCaml +documentation comments, formatted using Odoc syntax, an extension of the +language understood by ocamldoc.") + (license license:isc))) + ;; version 1.5.2 requires ocaml-markdown 1.0.0 which does not compile ;; with old version of dune used in package-with-ocaml4.07 (define-public ocaml4.07-odoc -- cgit v1.2.3 From 07328706313bc52a1ad5842e02bd0c50e5312833 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 5 Aug 2021 21:10:05 +0200 Subject: gnu: wine: Update to 6.14. * gnu/packages/wine.scm (wine): Update to 6.14. [#:phases]: Patch Makefile to correctly locate ntdll.so. (wine64)[#:phases]: Likewise. --- gnu/packages/wine.scm | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 5c6d02eec5..fccdc186d2 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -75,7 +75,7 @@ (define-public wine (package (name "wine") - (version "6.8") + (version "6.14") (source (origin (method url-fetch) @@ -87,7 +87,7 @@ (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "1n7bd6kkhfgi23bz981qml3lajgvbs3ibqrc2mqjhhfqczg2shjv")))) + (base32 "00jjqbl0xzsp2swzxgx3a2b16p26qbxvcz82a7ihig23k69p3d34")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) @@ -194,7 +194,16 @@ (substitute* "include/config.h" (("(#define SONAME_.* )\"(.*)\"" _ defso soname) (format #f "~a\"~a\"" defso (find-so soname)))) - #t)))))) + #t))) + (add-after 'patch-generated-file-shebangs 'patch-makefile + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "Makefile") ; Makefile is first regenerated + (substitute* "Makefile" + (("-lntdll" id) + (string-append id + " -Wl,-rpath=" (assoc-ref outputs "out") + "/lib/wine32/wine/$(ARCH)-unix"))) + #t))))) (home-page "https://www.winehq.org/") (synopsis "Implementation of the Windows API (32-bit only)") (description @@ -254,6 +263,15 @@ integrate Windows applications into your desktop.") #t))))) (_ `())) + (add-after 'patch-generated-file-shebangs 'patch-makefile + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "Makefile") ; Makefile is first regenerated + (substitute* "Makefile" + (("-lntdll" id) + (string-append id + " -Wl,-rpath=" (assoc-ref outputs "out") + "/lib/wine64/wine/$(ARCH)-unix"))) + #t)) (add-after 'install 'copy-wine32-binaries (lambda* (#:key outputs #:allow-other-keys) (let* ((wine32 (assoc-ref %build-inputs "wine")) -- cgit v1.2.3 From 7c3cefde5a4f8a5a141561493435005b94b1c970 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Wed, 18 Aug 2021 03:13:56 +0200 Subject: gnu: Add h-client. * gnu/packages/hardware.scm (h-client): New variable. Signed-off-by: Leo Prikler --- gnu/packages/hardware.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 707a47fb4b..ff21c9c724 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2021 Evgeny Pisemsky ;;; Copyright © 2021 Léo Le Bouter +;;; Copyright © 2021 Denis Carikli ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,11 +39,14 @@ #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages openldap) + #:use-module (gnu packages pciutils) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages tls) #:use-module (gnu packages web) @@ -51,8 +55,10 @@ #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils)) @@ -169,6 +175,46 @@ through the Display Data Channel Command Interface (@dfn{DDC/CI}) protocol.") human-readable format and checks if it conforms to the standards.") (license license:expat)))) +(define-public h-client + (let ((version "0.0a0") + (revision 138)) + (package + (name "h-client") + (version (string-append version "-" (number->string revision))) + (source + (origin + (method svn-fetch) + (uri + (svn-reference + (url "https://svn.savannah.nongnu.org/svn/h-client/trunk/h-client") + (revision revision))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pdd2qhyaa5vh7z4rkpwjlby1flkwhzmp8zlglalx5y5sv95l4kp")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + ;; Tests depends on /etc/os-release which does not exist in the + ;; build container. + #:tests? #f)) + (inputs + `(("python2" ,python-2) + ("python2-pycurl", python2-pycurl) + ("python2-pygtk", python2-pygtk) + ("pciutils", pciutils) + ("usbutils", usbutils))) + (synopsis "Graphical client for the h-node hardware database +project") + (description + "The h-node project (https://www.h-node.org) aims to build a database of +hardware that works with fully free operating systems. +h-client is a GTK+ graphical client that is able to retrieves information on +the hardware inside the computer it's running on, and on peripherals connected +to it, and help you submit that information to the h-node project along with +whether the hardware works with a fully free operating system or not.") + (home-page "https://savannah.nongnu.org/projects/h-client/") + (license license:gpl3+)))) + (define-public i7z (let ((revision "0") (commit "1a41ff13db747e962456ddbb5ccb2b7fc43ca0cb")) -- cgit v1.2.3 From b8926ca6178e19d2add07593390409226383ed7e Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Mon, 30 Aug 2021 12:49:19 +0200 Subject: gnu: wine: Update to 6.16. * gnu/packages/wine.scm (wine): Update to 6.16. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index fccdc186d2..4361cccd8d 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -75,7 +75,7 @@ (define-public wine (package (name "wine") - (version "6.14") + (version "6.16") (source (origin (method url-fetch) @@ -87,7 +87,7 @@ (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "00jjqbl0xzsp2swzxgx3a2b16p26qbxvcz82a7ihig23k69p3d34")))) + (base32 "1s7sz1rimax4kxij1ngkwnx4hcljwjq3q5gksz22k8cq1l2r4l39")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From e85b35070caa41926b52625ef0fa828d6acc8271 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Aug 2021 14:28:28 +0200 Subject: gnu: Add python-pybbi. * gnu/packages/bioinformatics.scm (python-pybbi): New variable. --- gnu/packages/bioinformatics.scm | 47 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0979a86d8d..5d4b4e1316 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14795,6 +14795,53 @@ instruments, or Pacific Biosciences RSII or Sequel sequencers.") data from @file{.hic} files. This package provides Python bindings.") (license license:expat))) +(define-public python-pybbi + (package + (name "python-pybbi") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pybbi" version)) + (sha256 + (base32 + "1hvy2f28i2b41l1pq15vciqbj538n0lichp8yr6413jmgg06xdsk")))) + (build-system python-build-system) + (arguments + `(#:tests? #false ; tests require network access + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-cc + (lambda _ (setenv "CC" "gcc"))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (copy-recursively "tests" "/tmp/tests") + (with-directory-excursion "/tmp/tests" + (invoke "python" "-m" "pytest" "-v")))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python-pkgconfig" ,python-pkgconfig) + ("python-pytest" ,python-pytest))) + (inputs + `(("libpng" ,libpng) + ("openssl" ,openssl) + ("zlib" ,zlib))) + (propagated-inputs + `(("python-cython" ,python-cython) + ("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-six" ,python-six))) + (home-page "https://github.com/nvictus/pybbi") + (synopsis "Python bindings to UCSC Big Binary file library") + (description + "This package provides Python bindings to the UCSC Big +Binary (bigWig/bigBed) file library. This provides read-level access to local +and remote bigWig and bigBed files but no write capabilitites. The main +feature is fast retrieval of range queries into numpy arrays.") + (license license:expat))) + (define-public r-ascat (package (name "r-ascat") -- cgit v1.2.3 From abe1890a5726e5cf1021b408bb5847b2f76f08d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Aug 2021 14:28:37 +0200 Subject: gnu: Add python-svgutils. * gnu/packages/python-xyz.scm (python-svgutils): New variable. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1d1a679133..5da58d3f2d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24793,6 +24793,28 @@ For the most part it's transliterated from C, the major differences are: "Jinxed is an implementation of a subset of the Python curses library.") (license license:mpl2.0))) +(define-public python-svgutils + (package + (name "python-svgutils") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "svgutils" version)) + (sha256 + (base32 + "0lz0w2ajdvwd269a7ppnzawmx8px0116j0nx8xvhlihxrd28zx4y")))) + (build-system python-build-system) + (propagated-inputs + `(("python-lxml" ,python-lxml))) + (home-page "https://svgutils.readthedocs.io") + (synopsis "Python SVG editor") + (description "This is an utility package that helps with editing and +concatenating SVG files. It is especially directed at scientists preparing +final figures for submission to journals. So far it supports arbitrary +placement and scaling of SVG figures and adding markers, such as labels.") + (license license:expat))) + (define-public python-blessed (package (name "python-blessed") -- cgit v1.2.3 From d84ead81743cc76778241c73ac02c8c6c7e8f7ce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Aug 2021 14:30:04 +0200 Subject: gnu: Add python-dna-features-viewer. * gnu/packages/bioinformatics.scm (python-dna-features-viewer): New variable. --- gnu/packages/bioinformatics.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5d4b4e1316..1974978700 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14842,6 +14842,30 @@ and remote bigWig and bigBed files but no write capabilitites. The main feature is fast retrieval of range queries into numpy arrays.") (license license:expat))) +(define-public python-dna-features-viewer + (package + (name "python-dna-features-viewer") + (version "3.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "dna_features_viewer" version)) + (sha256 + (base32 + "0vci6kg2id6r6rh3cifq7ccnh7j0mb8iqg3hji6rva0ayrdqzafc")))) + (build-system python-build-system) + (arguments '(#:tests? #false)) ; there are none + (propagated-inputs + `(("python-biopython" ,python-biopython) + ("python-matplotlib" ,python-matplotlib))) + (home-page + "https://github.com/Edinburgh-Genome-Foundry/DnaFeaturesViewer") + (synopsis "Plot features from DNA sequences") + (description + "DNA Features Viewer is a Python library to visualize DNA features, +e.g. from GenBank or Gff files, or Biopython SeqRecords.") + (license license:expat))) + (define-public r-ascat (package (name "r-ascat") -- cgit v1.2.3 From 43a6152432259865e489fa4a62ce94e33376bf79 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Aug 2021 17:56:43 +0200 Subject: gnu: Add python-pytest-console-scripts. * gnu/packages/python-check.scm (python-pytest-console-scripts): New variable. --- gnu/packages/python-check.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 038ca177af..8577c8a15c 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1100,6 +1100,39 @@ also ensuring that the notebooks are running without errors.") "This pytest plugin provides fixtures to simplify Flask app testing.") (license license:expat))) +(define-public python-pytest-console-scripts + (package + (name "python-pytest-console-scripts") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-console-scripts" version)) + (sha256 + (base32 + "073l2cz11013dl30zjr575ms78j9b2bsbdl1w0gmig37spbkh8aa")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "--verbose" + ;; This one test fails because of PATH assumptions + "-k" "not test_elsewhere_in_the_path"))))))) + (propagated-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) + (home-page "https://github.com/kvas-it/pytest-console-scripts") + (synopsis "Pytest plugin for testing console scripts") + (description + "This package provides a pytest plugin for testing console scripts.") + (license license:expat))) + (define-public python-pytest-env (package (name "python-pytest-env") -- cgit v1.2.3 From c7d5e1a24c4805f02b7d9dd87cc8810264bdc7d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Aug 2021 17:56:51 +0200 Subject: gnu: Add python-pytest-tornasync. * gnu/packages/python-check.scm (python-pytest-tornasync): New variable. --- gnu/packages/python-check.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 8577c8a15c..b8d63b8479 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1133,6 +1133,38 @@ also ensuring that the notebooks are running without errors.") "This package provides a pytest plugin for testing console scripts.") (license license:expat))) +(define-public python-pytest-tornasync + (package + (name "python-pytest-tornasync") + (version "0.6.0.post2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-tornasync" version)) + (sha256 + (base32 + "0pdyddbzppkfqwa7g17sdfl4w2v1hgsky78l8f4c1rx2a7cvd0fp")))) + (build-system python-build-system) + (arguments + `(#:tests? #false ; TODO: fails at "from test import MESSAGE, PAUSE_TIME" + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "--verbose"))))))) + (propagated-inputs + `(("python-pytest" ,python-pytest) + ("python-tornado" ,python-tornado))) + (home-page "https://github.com/eukaryote/pytest-tornasync") + (synopsis "Pytest plugin for testing Tornado code") + (description + "This package provides a simple pytest plugin that provides some helpful +fixtures for testing Tornado (version 5.0 or newer) apps and easy handling of +plain (undecoratored) native coroutine tests.") + (license license:expat))) + (define-public python-pytest-env (package (name "python-pytest-env") -- cgit v1.2.3 From 76b5a14ad5677794b93fbf7014821258620f5258 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Aug 2021 17:57:03 +0200 Subject: gnu: Add python-pytest-mock-3. * gnu/packages/check.scm (python-pytest-mock-3): New variable. --- gnu/packages/check.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index b49f9de157..4e1b8e802c 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1307,6 +1307,33 @@ same arguments.") `(("python2-mock" ,python2-mock) ,@(package-propagated-inputs base)))))) +(define-public python-pytest-mock-3 + (package + (inherit python-pytest-mock) + (version "3.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-mock" version)) + (sha256 + (base32 + "0qhfmd05z3g88bnwq6644jl6p5wy01i4yy7h8883z9jjih2pl8a0")))) + (properties '()) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + ;; Make the installed plugin discoverable by Pytest. + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" + ;; TODO: these fail for unclear reasons + "-k" + (string-append + "not test_standalone_mock" + " and not test_detailed_introspection_async")))))))))) + (define-public python-pytest-xdist (package (name "python-pytest-xdist") -- cgit v1.2.3 From 5766296a166152c1e3e97f8a68dff9c9627ea4be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 29 Aug 2021 20:46:50 +0200 Subject: gnu: Add python-anyio. * gnu/packages/python-xyz.scm (python-anyio): New variable. --- gnu/packages/python-xyz.scm | 81 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5da58d3f2d..5acd237ac2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23036,6 +23036,87 @@ bindings for Python 3.") standard error channel (stderr) in your program.") (license license:expat)))) +(define-public python-anyio + (package + (name "python-anyio") + (version "3.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "anyio" version)) + (sha256 + (base32 + "0x03hsprdrs86wjjkj96zm2jswy3a5bgyrknyi58pzz5hdsscmxf")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-compatibility + (lambda _ + (substitute* "tests/test_taskgroups.py" + (("import pytest") + "import pytest\nimport _pytest\nfrom _pytest import logging") + (("pytest.LogCaptureFixture") + "_pytest.logging.LogCaptureFixture")))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" "-k" + (string-append + "not test_is_block_device" + + ;; These fail because of network (or specifically + ;; IPv6 network) access. + " and not test_accept" + " and not test_accept_after_close" + " and not test_close_during_receive" + " and not test_close_from_other_task" + " and not test_concurrent_receive" + " and not test_concurrent_send" + " and not test_connect_tcp_with_tls" + " and not test_connect_tcp_with_tls_cert_check_fail" + " and not test_connection_refused" + " and not test_extra_attributes" + " and not test_getaddrinfo" + " and not test_getnameinfo" + " and not test_happy_eyeballs" + " and not test_iterate" + " and not test_receive_after_close" + " and not test_receive_timeout" + " and not test_reuse_port" + " and not test_run_process" + " and not test_send_after_close" + " and not test_send_after_eof" + " and not test_send_after_peer_closed" + " and not test_send_eof" + " and not test_send_large_buffer" + " and not test_send_receive" + " and not test_socket_options")))))))) + (propagated-inputs + `(("python-idna" ,python-idna) + ("python-sniffio" ,python-sniffio) + ("python-typing-extensions" ,python-typing-extensions))) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-hypothesis" ,python-hypothesis) + ("python-iniconfig" ,python-iniconfig) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest-6) + ("python-pytest-mock" ,python-pytest-mock-3) + ("python-pytest-trio" ,python-pytest-trio) + ("python-setuptools-scm" ,python-setuptools-scm) + ("python-trustme" ,python-trustme) + ("python-uvloop" ,python-uvloop))) + (home-page "https://github.com/agronholm/anyio") + (synopsis "Compatibility layer for multiple asynchronous event loops") + (description + "AnyIO is an asynchronous networking and concurrency library that works +on top of either asyncio or trio. It implements trio-like structured +concurrency on top of asyncio, and works in harmony with the native SC of trio +itself.") + (license license:expat))) + (define-public python-argh ;; There are 21 commits since the latest release containing important ;; improvements. -- cgit v1.2.3 From 105d8196be46d3537ece6b3618b164cf04c2b3fc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 29 Aug 2021 20:47:03 +0200 Subject: gnu: Add python-jupyter-server. * gnu/packages/jupyter.scm (python-jupyter-server): New variable. --- gnu/packages/jupyter.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 8cb95f4681..1900c774db 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -29,11 +29,13 @@ #:use-module (gnu packages check) #:use-module (gnu packages cpp) #:use-module (gnu packages linux) + #:use-module (gnu packages monitoring) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-web) #:use-module (gnu packages rdf) @@ -249,6 +251,73 @@ Jupyter Python packages that require a pre-build step that may include JavaScript build steps.") (license license:bsd-3))) +(define-public python-jupyter-server + (package + (name "python-jupyter-server") + (version "1.10.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jupyter_server" version)) + (sha256 + (base32 + "1gvjbsw5nl94hz02rnkr4g4kkvh9fz7i45vz17hzwyvdpj7bd8yk")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (let ((home (string-append (getcwd) "/guix-home"))) + (setenv "HOME" home)) + ;; Add jupyter-server executable to PATH. + (setenv "PATH" + (string-append (assoc-ref outputs "out") "/bin:" + (getenv "PATH"))) + (with-directory-excursion "jupyter_server" + ;; The pytest fixtures are only loaded when the file is + ;; called conftest.py. + (rename-file "pytest_plugin.py" "conftest.py") + (invoke "pytest" "-vv" + ;; Fails with internal server error + "-k" "not test_list_formats" + ;; Integration tests require a server. + "-m" "not integration_test")))))))) + (propagated-inputs + `(("python-anyio" ,python-anyio) + ("python-argon2-cffi" ,python-argon2-cffi) + ("python-ipython-genutils" ,python-ipython-genutils) + ("python-jinja2" ,python-jinja2) + ("python-jupyter-client" ,python-jupyter-client) + ("python-jupyter-core" ,python-jupyter-core) + ("python-nbconvert" ,python-nbconvert) + ("python-nbformat" ,python-nbformat) + ("python-prometheus-client" ,python-prometheus-client) + ("python-pyzmq" ,python-pyzmq) + ("python-requests-unixsocket" ,python-requests-unixsocket) + ("python-send2trash" ,python-send2trash) + ("python-terminado" ,python-terminado) + ("python-tornado" ,python-tornado-6) + ("python-traitlets" ,python-traitlets) + ("python-websocket-client" ,python-websocket-client))) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-ipykernel" ,python-ipykernel) + ("python-pytest" ,python-pytest-6) + ("python-pytest-console-scripts" ,python-pytest-console-scripts) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-mock" ,python-pytest-mock) + ("python-pytest-tornasync" ,python-pytest-tornasync) + ("python-requests" ,python-requests))) + (home-page "https://jupyter.org") + (synopsis "Core services, APIs, and REST endpoints for Jupyter web applications") + (description + "This package provides the backend—i.e. core services, APIs, and REST +endpoints—to Jupyter web applications.") + (license license:expat))) + (define-public python-jupyterlab-widgets (package (name "python-jupyterlab-widgets") -- cgit v1.2.3 From b105655670636789524a375729010035972f5330 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 30 Aug 2021 18:25:09 +0200 Subject: gnu: python-scanpy: Update to 1.8.1. * gnu/packages/bioinformatics.scm (python-scanpy): Update to 1.8.1. [arguments]: Bulid with flit; update list of broken tests. [native-inputs]: Add python-flit and python-anndata:source. --- gnu/packages/bioinformatics.scm | 63 +++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1974978700..ac918eac8f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11452,38 +11452,53 @@ implementation differs in these ways: (define-public python-scanpy (package (name "python-scanpy") - (version "1.7.2") + (version "1.8.1") (source (origin - (method url-fetch) - (uri (pypi-uri "scanpy" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/theislab/scanpy") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0c66adnfizsyk0h8bv2yhmay876z0klpxwpn4z6m71wly7yplpmd")))) + "0w1qmv3djqi8q0sn5hv34ivzs157fwjjb9nflfnagnhpxmw8vx5g")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (replace 'build + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" ,version) + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "flit" "build"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (wheel) + (format #true wheel) + (invoke "python" "-m" "pip" "install" + wheel (string-append "--prefix=" out))) + (find-files "dist" "\\.whl$"))))) (replace 'check (lambda* (#:key inputs #:allow-other-keys) ;; These tests require Internet access. (delete-file-recursively "scanpy/tests/notebooks") (delete-file "scanpy/tests/test_clustering.py") (delete-file "scanpy/tests/test_datasets.py") + (delete-file "scanpy/tests/test_score_genes.py") (delete-file "scanpy/tests/test_highly_variable_genes.py") ;; TODO: I can't get the plotting tests to work, even with Xvfb. - (delete-file "scanpy/tests/test_plotting.py") + (delete-file "scanpy/tests/test_embedding_plots.py") (delete-file "scanpy/tests/test_preprocessing.py") (delete-file "scanpy/tests/test_read_10x.py") - ;; The following tests need anndata.tests, which aren't included - ;; in the final python-anndata package. - (delete-file "scanpy/tests/test_combat.py") - (delete-file "scanpy/tests/test_embedding_plots.py") - (delete-file "scanpy/tests/test_normalization.py") - (delete-file "scanpy/tests/test_pca.py") - (delete-file "scanpy/tests/external/test_scrublet.py") + ;; TODO: these fail with TypingError and "Use of unsupported + ;; NumPy function 'numpy.split'". + (delete-file "scanpy/tests/test_metrics.py") ;; The following tests requires 'scanorama', which isn't ;; packaged yet. @@ -11491,9 +11506,24 @@ implementation differs in these ways: (setenv "PYTHONPATH" (string-append (getcwd) ":" + (assoc-ref inputs "python-anndata:source") ":" (getenv "PYTHONPATH"))) - (invoke "pytest") - #t))))) + (invoke "pytest" "-vv" + "-k" + ;; Plot tests that fail. + (string-append "not test_dotplot_matrixplot_stacked_violin" + " and not test_violin_without_raw" + " and not test_correlation" + " and not test_scatterplots" + " and not test_scatter_embedding_add_outline_vmin_vmax_norm" + " and not test_paga" + " and not test_paga_compare" + + ;; These try to connect to the network + " and not test_plot_rank_genes_groups_gene_symbols" + " and not test_pca_chunked" + " and not test_pca_sparse" + " and not test_pca_reproducible"))))))) (propagated-inputs `(("python-anndata" ,python-anndata) ("python-h5py" ,python-h5py) @@ -11517,7 +11547,10 @@ implementation differs in these ways: ("python-tqdm" ,python-tqdm) ("python-umap-learn" ,python-umap-learn))) (native-inputs - `(("python-leidenalg" ,python-leidenalg) + `(;; This package needs anndata.tests, which is not installed. + ("python-anndata:source" ,(package-source python-anndata)) + ("python-flit" ,python-flit) + ("python-leidenalg" ,python-leidenalg) ("python-pytest" ,python-pytest) ("python-setuptools-scm" ,python-setuptools-scm) ("python-sinfo" ,python-sinfo))) -- cgit v1.2.3 From d3364b9c37f0c2ca005e90619ace9b5ed8326cd4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 30 Aug 2021 18:26:14 +0200 Subject: gnu: python-anndata: Fetch sources from git. * gnu/packages/python-xyz.scm (python-anndata)[source]: Fetch from git to include test data. [arguments]: Enable tests. Do not let setuptools_scm guess the version. --- gnu/packages/python-xyz.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5acd237ac2..577353e65d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21386,15 +21386,18 @@ N-dimensional arrays for Python.") (version "0.7.6") (source (origin - (method url-fetch) - (uri (pypi-uri "anndata" version)) + ;; The tarball from PyPi doesn't include tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/theislab/anndata") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1ch8yp0xmag6z0kl01pljm35lbbwax7lrimfhiclpkd4m6xngk53")))) + "1q30bsfsq9xfqm8nmabg3bjh9gix3yng0170xiiyw1lin4xncf0q")))) (build-system python-build-system) (arguments - `(#:tests? #f ; The tarball from PyPi doesn't include tests. - #:phases + `(#:phases (modify-phases %standard-phases (delete 'check) (add-before 'build 'relax-dependency-requirements @@ -21405,6 +21408,7 @@ N-dimensional arrays for Python.") (("pandas>=1.1.1") "pandas>=1.0.5")))) (replace 'build (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" ,version) ;; ZIP does not support timestamps before 1980. (setenv "SOURCE_DATE_EPOCH" "315532800") (invoke "flit" "build"))) -- cgit v1.2.3 From c9aee89abfb71036ed1e57fe7701dd5aae7c5760 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 30 Aug 2021 18:28:24 +0200 Subject: gnu: python-scikit-learn: Update to 0.24.2. * gnu/packages/machine-learning.scm (python-scikit-learn): Update to 0.24.2. [arguments]: Remove trailing #t. --- gnu/packages/machine-learning.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index e1dff82bfc..15e0d5fc38 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -941,7 +941,7 @@ computing environments.") (define-public python-scikit-learn (package (name "python-scikit-learn") - (version "0.24.1") + (version "0.24.2") (source (origin (method git-fetch) @@ -951,13 +951,13 @@ computing environments.") (file-name (git-file-name name version)) (sha256 (base32 - "0dd854hi9h81pa3y6gwa6r4qjwrwq5fndi312h6dkqzfh7jbvgvd")))) + "0hm92biqwwc87bqnr56lwa5bz77lr7k9q21rdwksnfzq3vsdp2nm")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'build 'build-ext - (lambda _ (invoke "python" "setup.py" "build_ext" "--inplace") #t)) + (lambda _ (invoke "python" "setup.py" "build_ext" "--inplace"))) (replace 'check (lambda _ ;; Restrict OpenBLAS threads to prevent segfaults while testing! @@ -973,8 +973,7 @@ computing environments.") ;; 'reset-gzip-timestamps' phase can do its work. (let ((out (assoc-ref outputs "out"))) (for-each make-file-writable - (find-files out "\\.gz$")) - #t)))))) + (find-files out "\\.gz$")))))))) (inputs `(("openblas" ,openblas))) (native-inputs -- cgit v1.2.3 From 0d2371d215c81c97b92d697330a561c91c2062c4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 30 Aug 2021 18:28:43 +0200 Subject: gnu: Add python-voila. * gnu/packages/jupyter.scm (python-voila): New variable. --- gnu/packages/jupyter.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 1900c774db..674bdbbe2b 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -539,3 +539,38 @@ Docker registry.") sending queries to an SPARQL endpoint and fetching & presenting the results in a notebook.") (license license:bsd-3))) + +(define-public python-voila + (package + (name "python-voila") + (version "0.2.10") + (source + (origin + (method url-fetch) + (uri (pypi-uri "voila" version)) + (sha256 + (base32 + "0krfc95yjlhjdmrsladhy6lpf4xs1zw49nmkyl4pkykndglvwa1m")))) + (build-system python-build-system) + (propagated-inputs + `(("python-jupyter-client" ,python-jupyter-client) + ("python-jupyter-server" ,python-jupyter-server) + ("python-nbclient" ,python-nbclient) + ("python-nbconvert" ,python-nbconvert))) + (native-inputs + `(("python-ipywidgets" ,python-ipywidgets) + ("python-jupyter-packaging" ,python-jupyter-packaging) + ("python-matplotlib" ,python-matplotlib) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-pytest-tornasync" ,python-pytest-tornasync) + ("python-setuptools" ,python-setuptools) + ("python-tornado" ,python-tornado-6))) + (home-page "https://github.com/voila-dashboards/voila") + (synopsis "Render live Jupyter notebooks with interactive widgets") + (description + "Voilà turns Jupyter notebooks into standalone web applications. Unlike +the usual HTML-converted notebooks, each user connecting to the Voilà tornado +application gets a dedicated Jupyter kernel which can execute the callbacks to +changes in Jupyter interactive widgets.") + (license license:bsd-3))) -- cgit v1.2.3 From 7712154ccb115e7d8d5b040fb45109369e42bc4b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 30 Aug 2021 18:29:25 +0200 Subject: gnu: Add python-coolbox. * gnu/packages/bioinformatics.scm (python-coolbox): New variable. --- gnu/packages/bioinformatics.scm | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ac918eac8f..eef22b8041 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -103,6 +103,7 @@ #:use-module (gnu packages java) #:use-module (gnu packages java-compression) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages jupyter) #:use-module (gnu packages linux) #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages logging) @@ -14899,6 +14900,54 @@ feature is fast retrieval of range queries into numpy arrays.") e.g. from GenBank or Gff files, or Biopython SeqRecords.") (license license:expat))) +(define-public python-coolbox + (package + (name "python-coolbox") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "coolbox" version)) + (sha256 + (base32 + "0gqp76285w9klswr47y6kxbzwhv033b26jfa179kccfhiaq5p2xa")))) + (build-system python-build-system) + (arguments '(#:tests? #false)) ; there are none + (inputs + `(("pybind11" ,pybind11))) + (propagated-inputs + `(("python-cooler" ,python-cooler) + ("python-dna-features-viewer" ,python-dna-features-viewer) + ("python-fire" ,python-fire) + ("python-h5py" ,python-h5py) + ("python-intervaltree" ,python-intervaltree) + ("python-ipywidgets" ,python-ipywidgets) + ("jupyter" ,jupyter) + ("python-matplotlib" ,python-matplotlib) + ("python-nbformat" ,python-nbformat) + ("python-numpy" ,python-numpy) + ("python-numpydoc" ,python-numpydoc) + ("python-pandas" ,python-pandas) + ("python-pybbi" ,python-pybbi) + ("python-pytest" ,python-pytest) + ("python-scipy" ,python-scipy) + ("python-statsmodels" ,python-statsmodels) + ("python-strawc" ,python-strawc) + ("python-svgutils" ,python-svgutils) + ("python-termcolor" ,python-termcolor) + ("python-voila" ,python-voila))) + (home-page "https://github.com/GangCaoLab/CoolBox") + (synopsis "Genomic data visualization toolkit") + (description + "CoolBox is a toolkit for visual analysis of genomics data. It aims to +be highly compatible with the Python ecosystem, easy to use and highly +customizable with a well-designed user interface. It can be used in various +visualization situations, for example, to produce high-quality genome track +plots or fetch common used genomic data files with a Python script or command +line, interactively explore genomic data within Jupyter environment or web +browser.") + (license license:gpl3+))) + (define-public r-ascat (package (name "r-ascat") -- cgit v1.2.3 From ff80e775dcea56be4d234b96e3b234364b435547 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 30 Aug 2021 14:54:11 -0400 Subject: gnu: go-github-com-gdamore-tcell: Correct license to Apache 2.0. * gnu/packages/golang.scm (go-github-com-gdamore-tcell) [license]: Correct from Expat to Apache 2.0. --- gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 72579d6bd2..aed7025f51 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5255,7 +5255,7 @@ non-UTF-friendly sources.") terminfo capability strings to avoid hard-coding escape strings for formatting. It also favors portability, and includes support for all POSIX systems.") - (license license:expat)))) + (license license:asl2.0)))) (define-public go-github-com-mattn-go-shellwords (let ((commit "2444a32a19f450fabaa0bb3e96a703f15d9a97d2") -- cgit v1.2.3 From cc71a54e9f900e905192f794c7bc5346c445e651 Mon Sep 17 00:00:00 2001 From: Guix Together Date: Mon, 30 Aug 2021 12:40:38 -0400 Subject: gnu: Add go-github-com-gdamore-tcell-v2. * gnu/packages/golang.scm (go-github-com-gdamore-tcell-v2): New variable. Co-authored-by: Arun Isaac Co-authored-by: Brice Waegeneire Co-authored-by: jgart Co-authored-by: Julien Lepiller Signed-off-by: Maxim Cournoyer --- gnu/packages/golang.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index aed7025f51..b6e8b84749 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5257,6 +5257,37 @@ formatting. It also favors portability, and includes support for all POSIX systems.") (license license:asl2.0)))) +(define-public go-github-com-gdamore-tcell-v2 + (package + (inherit go-github-com-gdamore-tcell) + (name "go-github-com-gdamore-tcell") + (version "2.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gdamore/tcell") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ypbl5080q9sd3irad8mv7zlg4242i8pmg5xyhbyq95kymwibaid")))) + (arguments + `(#:import-path "github.com/gdamore/tcell/v2" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'make-files-writable + (lambda* (#:key outputs #:allow-other-keys) + ;; Make sure .gz files are writable so that the + ;; 'reset-gzip-timestamps' phase can do its work. + (let ((out (assoc-ref outputs "out"))) + (for-each make-file-writable + (find-files out "\\.gz$")))))))) + (propagated-inputs + `(("go-golang-org-x-term" ,go-golang-org-x-term) + ("go-golang-org-x-sys" ,go-golang-org-x-sys) + ,@(package-inputs go-github-com-gdamore-tcell))))) + (define-public go-github-com-mattn-go-shellwords (let ((commit "2444a32a19f450fabaa0bb3e96a703f15d9a97d2") (version "1.0.5") -- cgit v1.2.3 From f48156dc9d52bdef97c3ec6c3462ccdd66f4d6e7 Mon Sep 17 00:00:00 2001 From: Guix Together Date: Mon, 30 Aug 2021 12:40:40 -0400 Subject: gnu: Add go-github-com-anaseto-gruid. * gnu/packages/games.scm (go-github-com-anaseto-gruid): New variable. Co-authored-by: Arun Isaac Co-authored-by: Brice Waegeneire Co-authored-by: jgart Co-authored-by: Julien Lepiller Signed-off-by: Maxim Cournoyer --- gnu/packages/games.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 07a61f2c0b..8c299c8b89 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -131,6 +131,7 @@ #:use-module (gnu packages gnu-doc) #:use-module (gnu packages gnupg) #:use-module (gnu packages gnuzilla) + #:use-module (gnu packages golang) #:use-module (gnu packages gperf) #:use-module (gnu packages graphics) #:use-module (gnu packages gsasl) @@ -9373,6 +9374,35 @@ and bring the war to your enemy.") license:expat license:fdl1.3+ license:public-domain license:zlib)))) +(define-public go-github-com-anaseto-gruid + (package + (name "go-github-com-anaseto-gruid") + (version "0.21.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/anaseto/gruid") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rvsavkvg2hziwdh8sjk3n5v92m5mfjb8v9m7ch22maxfwq5kv6y")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/anaseto/gruid")) + (propagated-inputs + `(("go-golang-org-x-image" ,go-golang-org-x-image))) + (home-page "https://github.com/anaseto/gruid") + (synopsis "Cross-platform grid-based UI and game framework") + (description "The gruid module provides packages for easily building +grid-based applications in Go. The library abstracts rendering and input for +different platforms. There are drivers available for terminal apps, native +graphical apps and browser apps. The original application for the library was +creating grid-based games, but it's also well suited for any grid-based +application.") + (license license:isc))) + (define-public harmonist (package (name "harmonist") -- cgit v1.2.3 From efb756554939e4caa7bb2998b99ab6a95c43a4ec Mon Sep 17 00:00:00 2001 From: Guix Together Date: Mon, 30 Aug 2021 12:40:39 -0400 Subject: gnu: Add go-github-com-anaseto-gruid-tcell. * gnu/packages/games.scm (go-github-com-anaseto-gruid-tcell): New variable. Co-authored-by: Arun Isaac Co-authored-by: Brice Waegeneire Co-authored-by: jgart Co-authored-by: Julien Lepiller Signed-off-by: Maxim Cournoyer --- gnu/packages/games.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8c299c8b89..93d0105d99 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9403,6 +9403,32 @@ creating grid-based games, but it's also well suited for any grid-based application.") (license license:isc))) +(define-public go-github-com-anaseto-gruid-tcell + (package + (name "go-github-com-anaseto-gruid-tcell") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/anaseto/gruid-tcell") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09ajr9mbldjfc44qprplbf8dr8yhlbn2nfnas2z62m9wmklc0qiv")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/anaseto/gruid-tcell")) + (propagated-inputs + `(("go-github-com-gdamore-tcell-v2" ,go-github-com-gdamore-tcell-v2) + ("go-github-com-anaseto-gruid" ,go-github-com-anaseto-gruid))) + (home-page "https://github.com/anaseto/gruid-tcell") + (synopsis "Gruid driver using the tcell library") + (description "The gruid-tcell module provides a Gruid driver for building +terminal full-window applications.") + (license license:isc))) + (define-public harmonist (package (name "harmonist") -- cgit v1.2.3 From 26119328aac147d2ef5bd7fd1466f113a3184db9 Mon Sep 17 00:00:00 2001 From: Guix Together Date: Mon, 30 Aug 2021 12:40:41 -0400 Subject: gnu: harmonist: Update to 0.4.1. * gnu/packages/games.scm (harmonist): Update to 0.4.1. [propagated-inputs]: Add go-github-com-gdamore-tcell-v2, go-github-com-anaseto-gruid, and go-github-com-anaseto-gruid-tcell. Co-authored-by: Arun Isaac Co-authored-by: Brice Waegeneire Co-authored-by: jgart Co-authored-by: Julien Lepiller Signed-off-by: Maxim Cournoyer --- gnu/packages/games.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 93d0105d99..a5e200f425 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9432,7 +9432,7 @@ terminal full-window applications.") (define-public harmonist (package (name "harmonist") - (version "0.3.0") + (version "0.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -9441,12 +9441,15 @@ terminal full-window applications.") (file-name (git-file-name name version)) (sha256 (base32 - "146wiyanag0zqj6fhyll2sw6sydnnll8mgxhhqf9sjqsl2rx4s5r")))) + "17ai39pw9xq4asfvhs0whx07hljlivygazbwrxjrnxwrn06483hr")))) (build-system go-build-system) (arguments '(#:import-path "git.tuxfamily.org/harmonist/harmonist")) (inputs - `(("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go))) + `(("go-github-com-gdamore-tcell-v2" ,go-github-com-gdamore-tcell-v2) + ("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go) + ("go-github-com-anaseto-gruid" ,go-github-com-anaseto-gruid) + ("go-github-com-anaseto-gruid-tcell" ,go-github-com-anaseto-gruid-tcell))) (home-page "https://harmonist.tuxfamily.org/") (synopsis "Stealth coffee-break roguelike game") (description "Harmonist: Dayoriah Clan Infiltration is a stealth -- cgit v1.2.3 From 34e56039fef4750bda93ae55bbdb8a495beb71e1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 30 Aug 2021 15:57:59 -0400 Subject: gnu: linux-libre: Update to 5.13.13. * gnu/packages/linux.scm (linux-libre-5.13-version): Update to 5.13.13. (linux-libre-5.13-pristine-source, deblob-scripts-5.13): Update hash. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7b92be4b9c..43f98fde30 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -357,15 +357,15 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.13-version "5.13.12") +(define-public linux-libre-5.13-version "5.13.13") (define deblob-scripts-5.13 (linux-libre-deblob-scripts linux-libre-5.13-version - (base32 "08xai5zqgk0y0rwhssf81lf8vivjg12wjkv7855l3ljkivgjclbf") + (base32 "0bdqgxpc2vnj6m1nnrw8l5jpdglm0nlvjl6g44xryhy230ds0p9l") (base32 "153jf5l5x4438zgxwggaky2ahjlfl48j438vhpzks6h77lzc51a5"))) (define-public linux-libre-5.13-pristine-source (let ((version linux-libre-5.13-version) - (hash (base32 "0948w1zc2gqnl8x60chjqngfzdi0kcxm12i1nx3nx4ksiwj5vc98"))) + (hash (base32 "0d1lr3rivgf9j3bn2a9hpzdf74nq8kybf3rfxxvw68vr1hhd4cam"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.13))) -- cgit v1.2.3 From ccc1ae559c8b03a0025c15b89612877ad2bc0d67 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 30 Aug 2021 15:58:40 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.61. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.61. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 43f98fde30..c9e7560f97 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -373,7 +373,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.60") +(define-public linux-libre-5.10-version "5.10.61") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -381,7 +381,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0c9x07gplzajm0h5if3fpw2rvfb7psw3yp7i2n6ws7ggq1dvmki2"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "13gpamqj0shvad4nd9v11iv8qdfbjgb242nbvcim2z3c7xszfvv9"))) + (hash (base32 "1lci78584c0rg5m5rkylssppnv001pzh4769m9mds4fdqn6f7sl2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From c30d1989de763b30c3cc24e2c74a6ba5c3ee9f7d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 30 Aug 2021 15:59:02 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.143. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.143. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c9e7560f97..f012ab1d2e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -386,7 +386,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.142") +(define-public linux-libre-5.4-version "5.4.143") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -394,7 +394,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0l8l4cg04p5vx890jm45r35js1v0nljd0lp5qwkvlr45jql5fy4r"))) + (hash (base32 "090x087p8hxnc1daf2xwj7vg8hg1jhz5i4andkbhdy550l5nalq9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From cf7437b3448012b4b1fd78bf10ac32d79bf09a52 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 30 Aug 2021 15:59:25 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.205. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.205. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f012ab1d2e..98d9306203 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -399,7 +399,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.204") +(define-public linux-libre-4.19-version "4.19.205") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -407,7 +407,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1rcx99sz4fgr2d138i92dw2vfplnqgys58hxywgmjb56c83l3qy4"))) + (hash (base32 "1ii9l44d6jxhyd5qkc5h83ixailma9v7hyl60wi3rskkafqnwv2m"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 0f903aa6521420095ddc556633eb81d880481cdc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 30 Aug 2021 15:59:49 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.245. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.245. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 98d9306203..766f91d61f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -412,7 +412,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.244") +(define-public linux-libre-4.14-version "4.14.245") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -420,7 +420,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0x554dck5f78ljknwahjvf49952s1w0zja3yh4vfz6lmf6hvzq5n"))) + (hash (base32 "085jls7b2rzxlmvp0zsp4l3wi5xdrqlv2qczzwvbhzna1f4n2x0d"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 341ac566c2bc02b8bf76106436a31ac54a340a09 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 30 Aug 2021 16:00:09 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.281. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.281. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 766f91d61f..386fa58852 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -425,7 +425,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.280") +(define-public linux-libre-4.9-version "4.9.281") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -433,7 +433,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0am9qg9j18j4fc5zi6bk1g0mi8dp31pl62wlihxhhkc5yspzrna3"))) + (hash (base32 "1dg70jv3bqanmjs31s0x2p7nd5g37bqzjn9rc1y6wvkgm4pwahi6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 6fd69dd81635878b7c65f7ec50a729b49a8a7040 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 30 Aug 2021 16:00:32 -0400 Subject: gnu: linux-libre 4.4: Update to 4.4.282. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.282. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 386fa58852..5688734b20 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -438,7 +438,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.281") +(define-public linux-libre-4.4-version "4.4.282") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -446,7 +446,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "12grr2vc2mcvy7k8w1apqs9mhfg0lvz6mrpksym234m4n5yy48ng"))) + (hash (base32 "1rgxznjb6gsi64wk7x2rylyi64y2nx5yiah5gfm40c6l2f7lb9cc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 590be0a1ed7f6467fe39cb95889e54d2addabd46 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 22 Aug 2021 10:55:33 +0300 Subject: gnu: global: Add ctags support. * gnu/packages/code.scm (global)[inputs]: Add bash-minimal, universal-ctags, python-pygments. [arguments]: Add configure-flags to find ctags. Add phases to install plugins and to wrap python script with PYTHONPATH. --- gnu/packages/code.scm | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index a414cde3de..04b354b71e 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -64,6 +64,7 @@ #:use-module (gnu packages perl-compression) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) @@ -137,17 +138,26 @@ highlighting your own code that seemed comprehensible when you wrote it.") (base32 "0g4aslm2zajq605py11s4rs1wdnzcqhkh7bc2xl5az42adzzg839")))) (build-system gnu-build-system) - (inputs `(("coreutils" ,coreutils) - ("ncurses" ,ncurses) - ("libltdl" ,libltdl) - ("sqlite" ,sqlite) - ("python-wrapper" ,python-wrapper))) + (inputs + `(("bash" ,bash-minimal) ; for wrap-program + ("coreutils" ,coreutils) + ("ctags" ,universal-ctags) + ("libltdl" ,libltdl) + ("ncurses" ,ncurses) + ("python-pygments" ,python-pygments) + ("python-wrapper" ,python-wrapper) + ("sqlite" ,sqlite))) (arguments `(#:configure-flags (list (string-append "--with-ncurses=" (assoc-ref %build-inputs "ncurses")) (string-append "--with-sqlite3=" (assoc-ref %build-inputs "sqlite")) + (string-append "--with-universal-ctags=" + (assoc-ref %build-inputs "ctags") "/bin/ctags") + (string-append "--sysconfdir=" + (assoc-ref %outputs "out") "/share/gtags") + "--localstatedir=/var" ; This needs to be a writable location. "--disable-static") #:phases @@ -158,6 +168,20 @@ highlighting your own code that seemed comprehensible when you wrote it.") (assoc-ref inputs "coreutils") "/bin/echo"))) (substitute* "globash/globash.in" (("/bin/echo") echo))))) + (add-after 'post-install 'install-plugins + (lambda _ + (with-directory-excursion "plugin-factory" + (invoke "make" "install")))) + (add-before 'install 'dont-install-to-/var + (lambda _ + (substitute* "gozilla/Makefile" + (("DESTDIR\\)\\$\\{localstatedir\\}") "TMPDIR)")))) + (add-after 'install-plugins 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program + (string-append (assoc-ref outputs "out") + "/share/gtags/script/pygments_parser.py") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))))) (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) ;; Install the plugin files in the right place. -- cgit v1.2.3 From 9af83d1cf98da8353a582c5cab62c2b01d7f8dc3 Mon Sep 17 00:00:00 2001 From: calum Date: Sun, 29 Aug 2021 23:39:14 +1200 Subject: gnu: kakoune: Update to v2021.08.28 * gnu/packages/text-editors.scm (kakoune): Update to v2021.08.28 [native-inputs]: Use gcc-10. [inputs]: Remove ncurses dependancy. Signed-off-by: Lars-Dominik Braun --- gnu/packages/text-editors.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 2074442da5..79d2ec4f68 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2021 aecepoglu ;;; Copyright © 2021 Leo Famulari ;;; Copyright © 2021 Pierre Langlois +;;; Copyright © 2021 Calum Irwin ;;; ;;; This file is part of GNU Guix. ;;; @@ -163,7 +164,7 @@ based command language.") (define-public kakoune (package (name "kakoune") - (version "2020.09.01") + (version "2021.08.28") (source (origin (method url-fetch) @@ -171,7 +172,7 @@ based command language.") "releases/download/v" version "/" "kakoune-" version ".tar.bz2")) (sha256 - (base32 "0x81rxy7bqnhd9374g5ypy4w4nxmm0vnqw6b52bf62jxdg2qj6l6")))) + (base32 "1jvn4b9rma5jjvg3xz8nf224pbq3ry570j6qvc834wn5v3gxfvkg")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -194,11 +195,10 @@ based command language.") (add-before 'build 'chdir (lambda _ (chdir "src") #t))))) (native-inputs - `(("asciidoc" ,asciidoc) + `(("gcc", gcc-10) ; See https://github.com/mawww/kakoune/issues/4318 + ("asciidoc" ,asciidoc) ("pkg-config" ,pkg-config) ("ruby" ,ruby))) - (inputs - `(("ncurses" ,ncurses))) (synopsis "Vim-inspired code editor") (description "Kakoune is a code editor heavily inspired by Vim, as such most of its -- cgit v1.2.3 From cb68d199d0f50e030fcb9d616ef73b3c0da722e0 Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Sat, 21 Aug 2021 16:38:26 -0700 Subject: gnu: ledger-agent: Remove usage from description. * gnu/packages/finance.scm (ledger-agent)[description]: Remove usage. Signed-off-by: Mathieu Othacehe --- gnu/packages/finance.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 53f022db12..a131eccb50 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1048,12 +1048,7 @@ the KeepKey Hardware Wallet.") ("python-trezor-agent" ,python-trezor-agent))) (home-page "https://github.com/romanz/trezor-agent") (synopsis "Ledger as hardware SSH/GPG agent") - (description "This package allows using Ledger as hardware SSH/GPG agent. - -Usage for SSH: trezor-agent foo@@example.com --connect -Usage for GPG: Initialize using trezor-gpg init \"Foo \" -Then set the environment variable GNUPGHOME to -\"${HOME}/.gnupg/trezor\".") + (description "This package allows using Ledger as hardware SSH/GPG agent.") (license license:lgpl3))) (define-public trezor-agent -- cgit v1.2.3 From 3b2d3f10868c57fe0b5641dfd9d37276b9ea6b3f Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Wed, 25 Aug 2021 16:59:32 +0000 Subject: gnu: Add h2c. * gnu/packages/curl.scm (h2c): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/curl.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index e6f1bb0c41..c61a56256c 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Dale Mellor ;;; Copyright © 2021 Jean-Baptiste Volatier +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (gnu packages) @@ -334,3 +336,30 @@ user+password authentication, file transfer resume, http proxy tunneling and more!") (home-page "http://www.curlpp.org") (license license:expat))) + +(define-public h2c + (package + (name "h2c") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/curl/h2c") + (commit version))) + (sha256 + (base32 + "1n8z6avzhg3yb330di2y9zymsps1qp1235p29kidcp4fkmn7fgb2")) + (file-name (git-file-name name version)))) + (build-system copy-build-system) + (arguments + '(#:install-plan + '(("./h2c" "bin/")))) + (inputs + `(("perl" ,perl))) + (home-page "https://curl.se/h2c/") + (synopsis "Convert HTTP headers to a curl command line") + (description + "Provided a set of HTTP request headers, h2c outputs how to invoke +curl to obtain exactly that HTTP request.") + (license license:expat))) -- cgit v1.2.3 From 94056224ea833d13ee7c10f2d2e7c690174d9067 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 31 Aug 2021 11:27:01 -0400 Subject: gnu: emacs-groovy-modes: Update to version 2.1. * gnu/packages/emacs-xyz.scm (emacs-groovy-modes): Update to version 2.1. [arguments]: Enable tests, running the test suite via 'ert-runner'. [native-inputs]: New field. [propagated-inputs]: Add emacs-dash. --- gnu/packages/emacs-xyz.scm | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 70c4c30bc2..ee5fb8597c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15979,25 +15979,34 @@ supports multiple backends such as @code{vlc}, @code{mpg123}, (define-public emacs-groovy-modes (package (name "emacs-groovy-modes") - (version "2.0") + (version "2.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes") - (commit version))) + (url "https://github.com/Groovy-Emacs-Modes\ +/groovy-emacs-modes") + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2")))) + "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk")))) (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("ert-runner"))) + (native-inputs + `(("emacs-ert-runner" ,emacs-ert-runner) + ("emacs-undercover" ,emacs-undercover) + ("emacs-shut-up" ,emacs-shut-up) + ("emacs-f" ,emacs-f))) (propagated-inputs - `(("emacs-s" ,emacs-s))) + `(("emacs-dash" ,emacs-dash) + ("emacs-s" ,emacs-s))) (home-page "https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes") (synopsis "Groovy related modes for Emacs") - (description - "This package provides @code{groovy-mode} for syntax highlighting in -Groovy source files, REPL integration with run-groovy and Grails project -navigation with the grails mode.") + (description "This package provides @code{groovy-mode} for syntax +highlighting in Groovy source files, REPL integration with run-groovy and +Grails project navigation with the grails mode.") (license license:gpl3+))) (define-public emacs-jenkinsfile-mode -- cgit v1.2.3 From bb38cb990a232743d7870750952b523b5a07a696 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 31 Aug 2021 11:26:39 -0400 Subject: gnu: emacs-jenkinsfile-mode: Update to commit 65bf392. * gnu/packages/emacs-xyz.scm (emacs-jenkinsfile-mode): Update to commit 65bf392. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ee5fb8597c..222be589d7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16010,7 +16010,7 @@ Grails project navigation with the grails mode.") (license license:gpl3+))) (define-public emacs-jenkinsfile-mode - (let ((commit "00d259ff9b870d234540e00e1d7c83cccdb063b8") + (let ((commit "65bf3925852c35c6bd499978f08f83c1193f4347") (revision "1")) (package (name "emacs-jenkinsfile-mode") @@ -16023,7 +16023,7 @@ Grails project navigation with the grails mode.") (file-name (git-file-name name version)) (sha256 (base32 - "0srf6xdjnrd4v4ks9pal7i48wmkcl4q5ry7d0yzfx1c9pz2qg9zx")))) + "0w38g88yykslg71xr99ff4vx1ffgy90b7xqvvdflr189gwk3avx1")))) (propagated-inputs `(("emacs-groovy-modes" ,emacs-groovy-modes))) (build-system emacs-build-system) -- cgit v1.2.3 From 1734853e92d1df9d1cb3c3bd747db6ed3feeab37 Mon Sep 17 00:00:00 2001 From: cage Date: Tue, 31 Aug 2021 18:33:52 +0200 Subject: gnu: telescope: Update to 0.5.1. * gnu/packages/web-browsers.scm (telescope): Update to 0.5.1. [native-inputs]: Add pkg-config. Co-authored-by: Brice Waegeneire --- gnu/packages/web-browsers.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index a0a5498039..be4fa61a37 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -881,19 +881,20 @@ interface.") (define-public telescope (package (name "telescope") - (version "0.4.1") + (version "0.5.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/omar-polo/telescope/releases/download/" version "/telescope-" version ".tar.gz")) (sha256 - (base32 "086zps4nslv5isfw1b5gvms7vp3fglm7x1a6ks0h0wxarzj350bl")))) + (base32 "1fgv7gg2lwrjcihq6mkraqm10a6a7h430ikrjpcwfcpv1gvj8ckz")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ;no tests (native-inputs - `(("gettext" ,gettext-minimal))) + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) (inputs `(("libevent" ,libevent) ("libressl" ,libressl) -- cgit v1.2.3 From 73995969b133e50c04ad8f1e8a1428aef0eadb43 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 31 Aug 2021 21:36:47 +0200 Subject: gnu: Remove python-pytest-mock-3. * gnu/packages/check.scm (python-pytest-mock-3): Remove variable. * gnu/packages/python-xyz.scm (python-anyio)[native-inputs]: Replace python-pytest-mock-3 with python-pytest-mock. --- gnu/packages/check.scm | 27 --------------------------- gnu/packages/python-xyz.scm | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 4e1b8e802c..b49f9de157 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1307,33 +1307,6 @@ same arguments.") `(("python2-mock" ,python2-mock) ,@(package-propagated-inputs base)))))) -(define-public python-pytest-mock-3 - (package - (inherit python-pytest-mock) - (version "3.6.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest-mock" version)) - (sha256 - (base32 - "0qhfmd05z3g88bnwq6644jl6p5wy01i4yy7h8883z9jjih2pl8a0")))) - (properties '()) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (when tests? - ;; Make the installed plugin discoverable by Pytest. - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv" - ;; TODO: these fail for unclear reasons - "-k" - (string-append - "not test_standalone_mock" - " and not test_detailed_introspection_async")))))))))) - (define-public python-pytest-xdist (package (name "python-pytest-xdist") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 577353e65d..07c9127c19 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23107,7 +23107,7 @@ standard error channel (stderr) in your program.") ("python-iniconfig" ,python-iniconfig) ("python-mock" ,python-mock) ("python-pytest" ,python-pytest-6) - ("python-pytest-mock" ,python-pytest-mock-3) + ("python-pytest-mock" ,python-pytest-mock) ("python-pytest-trio" ,python-pytest-trio) ("python-setuptools-scm" ,python-setuptools-scm) ("python-trustme" ,python-trustme) -- cgit v1.2.3 From c4f500d03211d7b4763a5443275e18b54e55f44c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 31 Aug 2021 22:54:14 +0200 Subject: gnu: python-anyio: Avoid failing tests. * gnu/packages/python-xyz.scm (python-anyio)[arguments]: Disable asyncio plugin, and explicitly disable network tests. --- gnu/packages/python-xyz.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 07c9127c19..7be4b6a1ff 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23066,7 +23066,9 @@ standard error channel (stderr) in your program.") (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv" "-k" + (invoke "pytest" "-vv" "-p" "no:asyncio" + "-m" "not network" + "-k" (string-append "not test_is_block_device" -- cgit v1.2.3 From 439f7c68871a4ab9c57046fd5956aafc35d27e51 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 31 Aug 2021 23:03:52 +0200 Subject: gnu: python-jupyter-server: Use older pytest. * gnu/packages/jupyter.scm (python-jupyter-server)[native-inputs]: Replace python-pytest-6 with python-pytest. --- gnu/packages/jupyter.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 674bdbbe2b..0de7ad998a 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -305,7 +305,7 @@ JavaScript build steps.") (native-inputs `(("python-coverage" ,python-coverage) ("python-ipykernel" ,python-ipykernel) - ("python-pytest" ,python-pytest-6) + ("python-pytest" ,python-pytest) ("python-pytest-console-scripts" ,python-pytest-console-scripts) ("python-pytest-cov" ,python-pytest-cov) ("python-pytest-mock" ,python-pytest-mock) -- cgit v1.2.3 From 55cb5a62a1d27190f2241a4748a7a64d94715530 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 31 Aug 2021 23:04:49 +0200 Subject: gnu: python-scanpy: Propagate sinfo. * gnu/packages/bioinformatics.scm (python-scanpy)[native-inputs]: Move python-sinfo from here... [propagated-inputs]: ...to here. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index eef22b8041..6fde9a474e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11542,6 +11542,7 @@ implementation differs in these ways: ("python-scikit-learn" ,python-scikit-learn) ("python-scipy" ,python-scipy) ("python-seaborn" ,python-seaborn) + ("python-sinfo" ,python-sinfo) ("python-statsmodels" ,python-statsmodels) ("python-tables" ,python-tables) ("python-pytoml" ,python-pytoml) @@ -11553,8 +11554,7 @@ implementation differs in these ways: ("python-flit" ,python-flit) ("python-leidenalg" ,python-leidenalg) ("python-pytest" ,python-pytest) - ("python-setuptools-scm" ,python-setuptools-scm) - ("python-sinfo" ,python-sinfo))) + ("python-setuptools-scm" ,python-setuptools-scm))) (home-page "https://github.com/theislab/scanpy") (synopsis "Single-Cell Analysis in Python.") (description "Scanpy is a scalable toolkit for analyzing single-cell gene -- cgit v1.2.3 From a1ee2121843d2b7eea2dc932f16d543ae7ff7007 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 31 Aug 2021 23:05:53 +0200 Subject: gnu: python-strawc: Propagate pybind11. * gnu/packages/bioinformatics.scm (python-strawc)[inputs]: Move pybind11 from here... [propagated-inputs]: ...to here. --- gnu/packages/bioinformatics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6fde9a474e..c199883829 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14821,8 +14821,9 @@ instruments, or Pacific Biosciences RSII or Sequel sequencers.") (build-system python-build-system) (inputs `(("curl" ,curl) - ("pybind11" ,pybind11) ("zlib" ,zlib))) + (propagated-inputs + `(("pybind11" ,pybind11))) (home-page "https://github.com/aidenlab/straw") (synopsis "Stream data from .hic files") (description "Straw is library which allows rapid streaming of contact -- cgit v1.2.3 From 4abf2268338f34fc85a24e14a3bbcc6803fa0e82 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 31 Aug 2021 23:10:42 +0200 Subject: gnu: Add scregseg. * gnu/packages/bioinformatics.scm (scregseg): New variable. --- gnu/packages/bioinformatics.scm | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c199883829..aef9625534 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14949,6 +14949,56 @@ line, interactively explore genomic data within Jupyter environment or web browser.") (license license:gpl3+))) +(define-public scregseg + (package + (name "scregseg") + (version "0.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/BIMSBbioinfo/scregseg") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1k8hllr5if6k2mm2zj391fv40sfc008cjm04l9vgfsdppb80i112")))) + (build-system python-build-system) + (arguments + `(#:tests? #false ; tests require network access + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-fail-to-find-sklearn + (lambda _ + ;; XXX: I have no idea why it cannot seem to find sklearn. + (substitute* "setup.py" + (("'sklearn',") ""))))))) + (native-inputs + `(("python-cython" ,python-cython))) + (propagated-inputs + `(("python-scikit-learn" ,python-scikit-learn) + ("python-scipy" ,python-scipy) + ("python-numpy" ,python-numpy) + ("python-hmmlearn" ,python-hmmlearn) + ("python-pandas" ,python-pandas) + ("python-numba" ,python-numba) + ("python-anndata" ,python-anndata) + ("python-scanpy" ,python-scanpy) + ("python-pybedtools" ,python-pybedtools) + ("python-pysam" ,python-pysam) + ("python-matplotlib" ,python-matplotlib) + ("python-seaborn" ,python-seaborn) + ("python-coolbox" ,python-coolbox))) + (home-page "https://github.com/BIMSBbioinfo/scregseg") + (synopsis "Single-cell regulatory landscape segmentation") + (description "Scregseg (Single-Cell REGulatory landscape SEGmentation) is a +tool that facilitates the analysis of single cell ATAC-seq data by an +HMM-based segmentation algorithm. Scregseg uses an HMM with +Dirichlet-Multinomial emission probabilities to segment the genome either +according to distinct relative cross-cell accessibility profiles or (after +collapsing the single-cell tracks to pseudo-bulk tracks) to capture distinct +cross-cluster accessibility profiles.") + (license license:gpl3+))) + (define-public r-ascat (package (name "r-ascat") -- cgit v1.2.3 From bca5d7dbb0fc919f954a8fe5f6236c0a89e451bd Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Mon, 30 Aug 2021 17:27:25 +0200 Subject: gnu: Add python-pyxel. * gnu/packages/game-development.scm (python-pyxel): New variable. --- gnu/packages/game-development.scm | 51 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 2a58848dce..40807450ea 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1484,6 +1484,57 @@ visual novels, while its Python scripting is enough for complex simulation games.") (license license:expat))) +(define-public python-pyxel + (package + (name "python-pyxel") + (version "1.4.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/kitao/pyxel") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bwsgb5yq5s479cnf046v379zsn5ybp5195kbfvzr9l11qbaicm9")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "pyxel/core/bin"))))) + (build-system python-build-system) + (arguments + `(#:tests? #f ; "Tests" are actually example programs that never halt. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-build-files + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "setup.py" + (("\"pyxel\\.core\\.bin\\.(.*)\"," all arch) + (if (string=? arch "linux") + all + ""))) + (substitute* "pyxel/core/Makefile" + (("`sdl2-config") + (string-append "`sdl2-config --prefix=" + (assoc-ref inputs "sdl2")))))) + (add-before 'build 'prebuild + (lambda _ + (invoke "make" "-C" "pyxel/core")))))) + (inputs + `(("gifsicle" ,gifsicle) + ("sdl2" ,(sdl-union (list sdl2 sdl2-image))))) + (native-inputs + `(("gcc" ,gcc-10))) ; for std::filesystem + (home-page "https://github.com/kitao/pyxel") + (synopsis "Retro game engine for Python") + (description "Pyxel is a game engine inspired by retro gaming consoles. +It has a fixed 16-color palette, can hold up to 3 image banks and 8 tilemaps +(256x256 pixels each) and 4 sound channels with 64 definable sounds. It +also comes with a built-in image and sound editor.") + (license license:expat))) + (define-public grafx2 (package (name "grafx2") -- cgit v1.2.3 From 1a657497acdead9afbeb24db6102f645d7e28ac9 Mon Sep 17 00:00:00 2001 From: jgart Date: Tue, 31 Aug 2021 10:00:54 -0400 Subject: gnu: Remove harmonist-tk. harmonist-tk has been superseded by harmonist-sdl. Current harmonist-tk package fails to build due to upgrade of harmonist to 0.4.1. * gnu/packages/games.scm (harmonist-tk): Remove variable. Signed-off-by: Julien Lepiller --- gnu/packages/games.scm | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a5e200f425..1a9cd36fee 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9460,26 +9460,6 @@ the game avoids complex inventory management and character building, relying on items and player adaptability for character progression.") (license license:isc))) -(define-public harmonist-tk - (package - (inherit harmonist) - (name "harmonist-tk") - (arguments - (append - (package-arguments harmonist) - `(#:phases - (modify-phases %standard-phases - (replace 'build - (lambda _ - (invoke "go" "install" "-v" "-x" "--tags" "tk" - "git.tuxfamily.org/harmonist/harmonist"))) - (replace 'check - (lambda _ - (invoke "go" "test" "--tags" "tk" - "git.tuxfamily.org/harmonist/harmonist"))))))) - (inputs - `(("go-github.com-nsf-gothic" ,go-github.com-nsf-gothic))))) - (define-public drascula (package (name "drascula") -- cgit v1.2.3 From 1f4996ed2e1180366669b454eebe1b0c3fcad78e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Sep 2021 10:29:37 +0200 Subject: gnu: emacs-crdt: Update to 0.1.1. * gnu/packages/emacs-xyz.scm (emacs-crdt): Update to 0.1.1. --- gnu/packages/emacs-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 222be589d7..fd17d9545a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18075,11 +18075,12 @@ confused by comments or @code{foo-bar} matching @code{foo}.") (license license:gpl3+))) (define-public emacs-crdt - (let ((commit "44068ae505adf2c3a7bdbf6723a25fc45d6d1666") - (revision "0")) + ;; XXX: Upstream has no tags but the commit below corresponds to the exact + ;; version of the package. + (let ((commit "8cbd0fd584257b484891a5062b64c63cf049e955")) (package (name "emacs-crdt") - (version (git-version "0.0.0" revision commit)) + (version "0.1.1") (source (origin (method git-fetch) @@ -18088,7 +18089,7 @@ confused by comments or @code{foo-bar} matching @code{foo}.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "130fkhvi757pfnbz70g6nw2n71k89cwwx7yzvsd5v177228c8w7w")))) + (base32 "0h2lmyxjrzv9253m4068b4np5vkmngmvly10xrc86mi1z9w24xc5")))) (build-system emacs-build-system) (home-page "https://code.librehq.com/qhong/crdt.el") (synopsis "Real-time collaborative editing environment") -- cgit v1.2.3 From 5296671f8f764e61b0a963aba9cd49e5407fcfbd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Sep 2021 10:33:10 +0200 Subject: gnu: emacs-crdt: Update to 0.1.3. * gnu/packages/emacs-xyz.scm (emacs-crdt): Update to 0.1.3. --- gnu/packages/emacs-xyz.scm | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fd17d9545a..cdc388fe2e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18075,31 +18075,28 @@ confused by comments or @code{foo-bar} matching @code{foo}.") (license license:gpl3+))) (define-public emacs-crdt - ;; XXX: Upstream has no tags but the commit below corresponds to the exact - ;; version of the package. - (let ((commit "8cbd0fd584257b484891a5062b64c63cf049e955")) - (package - (name "emacs-crdt") - (version "0.1.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://code.librehq.com/qhong/crdt.el") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0h2lmyxjrzv9253m4068b4np5vkmngmvly10xrc86mi1z9w24xc5")))) - (build-system emacs-build-system) - (home-page "https://code.librehq.com/qhong/crdt.el") - (synopsis "Real-time collaborative editing environment") - (description - "@code{crdt.el} is a real-time collaborative editing environment for + (package + (name "emacs-crdt") + (version "0.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://code.librehq.com/qhong/crdt.el") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18aa2pybgfamll0jb4l18nggr6whzqd8mmd3kh8if4d685pc50p5")))) + (build-system emacs-build-system) + (home-page "https://code.librehq.com/qhong/crdt.el") + (synopsis "Real-time collaborative editing environment") + (description + "@code{crdt.el} is a real-time collaborative editing environment for Emacs using Conflict-free Replicated Data Types. With it, you can share multiple buffer in one session, and see other users’ cursor and region. It also synchronizes Org mode folding status. It should work with all of Org mode.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-crux (package -- cgit v1.2.3 From d1b63c0401726ff527b124e2d5a3df6fb341fc80 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Sep 2021 10:34:05 +0200 Subject: gnu: emacs-elfeed-score: Update to 0.8.6. * gnu/packages/emacs-xyz.scm (emacs-elfeed-score): Update to 0.8.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cdc388fe2e..d0bc198c4a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10212,7 +10212,7 @@ with Elfeed.") (define-public emacs-elfeed-score (package (name "emacs-elfeed-score") - (version "0.8.4") + (version "0.8.6") (source (origin (method git-fetch) @@ -10221,7 +10221,7 @@ with Elfeed.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1whf7nxfpb003wk9v15ib4xy1a7dfygdkg7jf3ly5z5l81607ap8")))) + (base32 "1r77b5vj4klqww7q7flw8h5i9w6y36zv2n7hx36pp1sav6s3a4r9")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-elfeed" ,emacs-elfeed))) -- cgit v1.2.3 From 8e6bac249276f1a17d073220ba59a07c8b071642 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Sep 2021 10:34:40 +0200 Subject: gnu: emacs-olivetti: Update to 2.0.3. * gnu/packages/emacs-xyz.scm (emacs-olivetti): Update to 2.0.3. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d0bc198c4a..a1cb9a950f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3773,7 +3773,7 @@ a command.") (define-public emacs-olivetti (package (name "emacs-olivetti") - (version "2.0.2") + (version "2.0.3") (source (origin (method git-fetch) -- cgit v1.2.3 From e186347d2ca4b56a9ce5da340513dfd92e80b8cf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Sep 2021 10:35:32 +0200 Subject: gnu: emacs-olivetti: Update hash * gnu/packages/emacs-xyz.scm (emacs-olivetti): Update hash. This is a follow-up to last commit (8e6bac249276f1a17d073220ba59a07c8b071642). --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a1cb9a950f..160d8b0788 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3782,7 +3782,7 @@ a command.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nx16w2d1wrqa5cgpbwqfy2al49b9nx2pr9zygiz5qa8jdlzw86l")))) + (base32 "0qhv4ah9bn1mjvivgxp7z1gf91d0cdr2ma5cy5xaja97ispa4l3z")))) (build-system emacs-build-system) (home-page "https://github.com/rnkn/olivetti") (synopsis "Emacs minor mode for a nice writing environment") -- cgit v1.2.3 From fa56b20188a42751e1ebf7ae13272d4dd8599b46 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Sep 2021 10:37:15 +0200 Subject: gnu: emacs-org-mime: Update to 0.2.3. * gnu/packages/emacs-xyz.scm (emacs-org-mime): Update to 0.2.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 160d8b0788..f69eadc1f3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7497,7 +7497,7 @@ cards created in Org mode.") (define-public emacs-org-mime (package (name "emacs-org-mime") - (version "0.2.2") + (version "0.2.3") (source (origin (method git-fetch) @@ -7506,7 +7506,7 @@ cards created in Org mode.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0gvir8c8b2m5z784ml5h957f7mxgp3vn7v91p6igaq5bjf5xcfpp")))) + (base32 "1g32chan6rhlp3kvzd2lvf104i3p37q1sm0d89pq6sya0ia2as1n")))) (build-system emacs-build-system) (home-page "https://github.com/org-mime/org-mime") (synopsis "Send HTML email using Org mode HTML export") -- cgit v1.2.3 From d4c6e90a7bcd5aea21d5ca3b642869a9ee2f6e35 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Sep 2021 10:38:51 +0200 Subject: gnu: emacs-tramp: Update to 2.5.1.2. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.5.1.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f69eadc1f3..d8e7300fd4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25157,14 +25157,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.5.1.1") + (version "2.5.1.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "0v3rvvhjcnyvg6l4vyxz6513mxzvv9n0skkmr62ry8yi5x9wnqp1")))) + (base32 "0p8m8prxrvrr455ahb626c1dry04m80y017h16ngr4i5ais0r85g")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs ;need D-Bus -- cgit v1.2.3 From f56c8ba0440e4a076c1e58b31d3ec879b29bcca1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Sep 2021 10:40:08 +0200 Subject: gnu: emacs-boon: Update to 1.2. * gnu/packages/emacs-xyz.scm (emacs-boon): Update to 1.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d8e7300fd4..c106e81fa5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13601,7 +13601,7 @@ configuration of Chinese fonts.") (define-public emacs-boon (package (name "emacs-boon") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) @@ -13610,7 +13610,7 @@ configuration of Chinese fonts.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ss9bjs34q41pa0g0nbdzd8fwpjcbd2239rdlx5aykfv9v0b8j77")))) + (base32 "18il2licf8pgfcrpx2bk55gpf8f537kb9cxqz83jldkhiyry74il")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From 0e801db11e358ccf6f6ebd8cbc75e5e54c75afc0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 1 Sep 2021 10:41:46 +0200 Subject: gnu: cataclysm-dda: Update to 0.F-2. * gnu/packages/games.scm (cataclysm-dda): Update to 0.F-2. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1a9cd36fee..79754d3185 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -880,7 +880,7 @@ high a score as possible.") (define-public cataclysm-dda (package (name "cataclysm-dda") - (version "0.F-1") + (version "0.F-2") (source (origin (method git-fetch) @@ -888,7 +888,7 @@ high a score as possible.") (url "https://github.com/CleverRaven/Cataclysm-DDA") (commit version))) (sha256 - (base32 "03a4q0y6vci278yb6b6d0qwk9abn1qgqifcmbrm5wrqbqygjalkd")) + (base32 "1wzsri6rh2fm7078hw0y4x7lqjs6ak4a66d05szfiinnxyn4w1ph")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From e265ca6414d544ef56ca6bb85898c26baaa97bc8 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 25 Aug 2021 01:22:42 +0530 Subject: gnu: artanis: Remove hard-coded guile effective version. * gnu/packages/guile-xyz.scm (artanis)[arguments]: Import target-guile-effective-version from (guix build guile-build-system). Use target-guile-effective-version to determine the guile effective version. --- gnu/packages/guile-xyz.scm | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 03391ad254..ce62cfcbcc 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2017 Nikita ;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2021 Maxim Cournoyer -;;; Copyright © 2018, 2019, 2020 Arun Isaac +;;; Copyright © 2018, 2019, 2020, 2021 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 swedebugia @@ -182,11 +182,20 @@ ("pkgconfig" ,pkg-config) ("util-linux" ,util-linux))) ;for the `script' command (arguments - '(#:make-flags + `(#:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:make-flags ;; TODO: The documentation must be built with the `docs' target. (let* ((out (assoc-ref %outputs "out")) - (scm (string-append out "/share/guile/site/2.2")) - (go (string-append out "/lib/guile/2.2/site-ccache"))) + ;; We pass guile explicitly here since this executes before the + ;; set-paths phase and therefore guile is not yet in PATH. + (effective-version (target-guile-effective-version + (assoc-ref %build-inputs "guile"))) + (scm (string-append out "/share/guile/site/" effective-version)) + (go (string-append out "/lib/guile/" effective-version "/site-ccache"))) ;; Don't use (%site-dir) for site paths. (list (string-append "MOD_PATH=" scm) (string-append "MOD_COMPILED_PATH=" go))) @@ -199,7 +208,9 @@ (("\\(%site-dir\\)") (string-append "\"" (assoc-ref outputs "out") - "/share/guile/site/2.2\""))))) + "/share/guile/site/" + (target-guile-effective-version) + "\""))))) (add-after 'unpack 'patch-reference-to-libnss (lambda* (#:key inputs #:allow-other-keys) (substitute* "artanis/security/nss.scm" @@ -221,9 +232,11 @@ (add-after 'install 'wrap-art (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) + (effective-version (target-guile-effective-version)) (bin (string-append out "/bin")) - (scm (string-append out "/share/guile/site/2.2")) - (go (string-append out "/lib/guile/2.2/site-ccache"))) + (scm (string-append out "/share/guile/site/" effective-version)) + (go (string-append out "/lib/guile/" effective-version + "/site-ccache"))) (wrap-program (string-append bin "/art") `("GUILE_LOAD_PATH" ":" prefix (,scm ,(getenv "GUILE_LOAD_PATH"))) -- cgit v1.2.3 From 96e487b310d6f70fb6fb4c88cdd936225450706f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Le=20Bouter?= Date: Wed, 3 Mar 2021 02:15:02 +0100 Subject: gnu: artanis: Update to 0.5. * gnu/packages/guile-xyz.scm (artanis): Update to 0.5. [inputs]: Replace guile-2.2 with guile-3.0. Add nspr. [propagated-inputs]: Replace guile-json-1 with guile-json-3, guile2.2-readline with guile-readline, and guile2.2-redis with guile-redis. [arguments]: Do not return #t from custom phases. Signed-off-by: Arun Isaac --- gnu/packages/guile-xyz.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index ce62cfcbcc..4131d57626 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -128,14 +128,14 @@ (define-public artanis (package (name "artanis") - (version "0.4.1") + (version "0.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/artanis/artanis-" version ".tar.gz")) (sha256 (base32 - "0nnmdfx5xwcc3kck64var7msz7g3qk817d7bv9l159nkmic0v9w4")) + "1vk1kp2xhz35xa5n27cxlq9c88wk6qm7fqaac8rb0pb6k9pvsv7v")) (modules '((guix build utils))) (snippet '(begin @@ -167,16 +167,17 @@ #t)))) (build-system gnu-build-system) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) + ("nspr" ,nspr) ("nss" ,nss))) ;; FIXME the bundled csv contains one more exported procedure ;; (sxml->csv-string) than guile-csv. The author is maintainer of both ;; projects. ;; TODO: Add guile-dbi and guile-dbd optional dependencies. (propagated-inputs - `(("guile-json" ,guile-json-1) ; This is already using guile-2.2. - ("guile-readline" ,guile2.2-readline) - ("guile-redis" ,guile2.2-redis))) + `(("guile-json" ,guile-json-3) + ("guile-readline" ,guile-readline) + ("guile-redis" ,guile-redis))) (native-inputs `(("bash" ,bash) ;for the `source' builtin ("pkgconfig" ,pkg-config) @@ -218,8 +219,10 @@ (string-append "ffi-binding \"" (assoc-ref inputs "nss") "/lib/nss/libnss3.so" - "\""))) - #t)) + "\"")) + (("ffi-binding \"libssl3\"") + (string-append + "ffi-binding \"" (assoc-ref inputs "nss") "/lib/nss/libssl3.so\""))))) (add-before 'install 'substitute-root-dir (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -227,8 +230,7 @@ ((" /etc/bash.bashrc") " /dev/null")) (substitute* "Makefile" ;set the root of config files to OUT ((" /etc") (string-append " " out "/etc"))) - (mkdir-p (string-append out "/bin")) ;for the `art' executable - #t))) + (mkdir-p (string-append out "/bin")) ))) (add-after 'install 'wrap-art (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -241,8 +243,7 @@ `("GUILE_LOAD_PATH" ":" prefix (,scm ,(getenv "GUILE_LOAD_PATH"))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))) - #t)))))) + (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))))))) (synopsis "Web application framework written in Guile") (description "GNU Artanis is a web application framework written in Guile Scheme. A web application framework (WAF) is a software framework that is -- cgit v1.2.3 From c75b30d58f0becb0a5cd6a8bfe69d1063b0d1ada Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Sep 2021 14:52:12 +0200 Subject: gnu: Add r-catch. * gnu/packages/bioinformatics.scm (r-catch): New variable. --- gnu/packages/bioinformatics.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index aef9625534..b74d8925db 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15058,6 +15058,34 @@ copy number estimation, as described by @url{doi:10.1016/j.cell.2012.04.023,Nik-Zainal et al.}") (license license:gpl3))) +(define-public r-catch + (let ((commit "196ddd5a51b1a5f5daa01de53fdaad9b7505e084") + (revision "1")) + (package + (name "r-catch") + (version (git-version "1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zhanyinx/CaTCH") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11c7f1fc8f57wnwk1hrgr5y814m80zj8gkz5021vxyxy2v02cqgd")))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "CaTCH")))))) + (home-page "https://github.com/zhanyinx/CaTCH_R") + (synopsis "Call a hierarchy of domains based on Hi-C data") + (description "This package allows building the hierarchy of domains +starting from Hi-C data. Each hierarchical level is identified by a minimum +value of physical insulation between neighboring domains.") + (license license:gpl2+)))) + (define-public r-spectre (let ((commit "f6648ab3eb9499300d86502b5d60ec370ae9b61a") (revision "1")) -- cgit v1.2.3 From 09028f0a8356e60b8444dc04dfdb5f4685281654 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Sep 2021 19:12:28 +0200 Subject: gnu: monero: Update to 0.17.2.3. * gnu/packages/finance.scm (monero): Update to 0.17.2.3. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index a131eccb50..b0f0a0c9de 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -642,7 +642,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch ;; the system's dynamically linked library. (package (name "monero") - (version "0.17.2.0") + (version "0.17.2.3") (source (origin (method git-fetch) @@ -662,7 +662,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch "external/unbound")) #t)) (sha256 - (base32 "0jwlmrpzisvw1c06cvd5b3s3hd4w0pa1qmrypfwah67qj3x6hnb6")))) + (base32 "0nax991fshfh51grhh2ryfrwwws35k16gzl1l3niva28zff2xmq6")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From 65479200648de179d8c2f1d6767d21c9c784f8db Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Sep 2021 20:22:23 +0200 Subject: gnu: monero-gui: Update to 0.17.2.3. * gnu/packages/finance.scm (monero-gui): Update to 0.17.2.3. [arguments]: Update 'fix-build' phase. Remove 'generate-zxcvbn-c' phase. --- gnu/packages/finance.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index b0f0a0c9de..9863f16684 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -752,7 +752,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.17.2.2") + (version "0.17.2.3") (source (origin (method git-fetch) @@ -769,7 +769,7 @@ the Monero command line client and daemon.") (delete-file-recursively "monero") #t)) (sha256 - (base32 "0n7gfhm13y18ffqsqdajl4knd4h8m772fz6lh1lpkh198pwmw8f9")))) + (base32 "0qb746z1sxqrja7q9lqhhbm64v83sn67az4k7gs5q90iaw584qfc")))) (build-system qt-build-system) (native-inputs `(,@(package-native-inputs monero) @@ -807,16 +807,11 @@ the Monero command line client and daemon.") (substitute* "src/version.js.in" (("@VERSION_TAG_GUI@") ,version)) - (substitute* "src/zxcvbn-c/makefile" - (("\\?=") "=")) (substitute* "external/CMakeLists.txt" (("add_library\\(quirc" all) (string-append "set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\")\n" all))))) - (add-before 'configure 'generate-zxcvbn-c-header - (lambda _ - (invoke "make" "-C" "src/zxcvbn-c" "dict-src.h"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) -- cgit v1.2.3 From 771c14c93e5454e865685dae3aebe1c5a3a9746e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Sep 2021 20:26:19 +0200 Subject: gnu: txr: Update to 270. * gnu/packages/lisp.scm (txr): Update to 270. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6d78a83dcf..7eb8f54d49 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -907,7 +907,7 @@ the HTML documentation of TXR.") (define-public txr (package (name "txr") - (version "268") + (version "270") (source (origin (method git-fetch) @@ -916,7 +916,7 @@ the HTML documentation of TXR.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0q97qddbgk9356gx4xp8iip4pwj3ln03dvjfgrny76f3wmmiwsw6")))) + (base32 "1kp64h3ls8mddvrlaqqylrb3brckfrqvkk8049xn15mimfggg0xv")))) (build-system gnu-build-system) (native-inputs ;; Required to build the documentation. -- cgit v1.2.3 From 95c29d2746943733cbe8df7013854d45bb0df413 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 1 Sep 2021 20:30:06 +0200 Subject: gnu: electron-cash: Update to 4.2.5. * gnu/packages/finance.scm (electron-cash): Update to 4.2.5. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 9863f16684..befda1a079 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -567,7 +567,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (define-public electron-cash (package (name "electron-cash") - (version "4.2.4") + (version "4.2.5") (source (origin (method git-fetch) @@ -576,7 +576,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1a4jqsfadv6xr7ydj79my71jyrp0sjlznsbxdxjsjgnsqk8r48w6")))) + (base32 "1fj797hbinxsqjwhh4l1vjsx1vzmgzf2apq7fnqqwpv9g0v2pch0")))) (build-system python-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From a5fb1f4eeb7563bd8519660c452a45afecd296c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 1 Sep 2021 18:42:34 +0200 Subject: gnu: mailutils: Look up Scheme variables in the right module. Fixes . Reported by Maxime Devos . * gnu/packages/patches/mailutils-variable-lookup.patch: New file. * gnu/packages/mail.scm (mailutils)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/packages/mail.scm | 5 +++-- .../patches/mailutils-variable-lookup.patch | 26 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/mailutils-variable-lookup.patch (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c2d986effb..9d90192617 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2014, 2015, 2017, 2020 Mark H Weaver ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2014 Sou Bunnbu @@ -269,7 +269,8 @@ example, modify the message headers or body, or encrypt or sign the message.") "17smrxjdgbbzbzakik30vj46q4iib85ksqhb82jr4vjp57akszh9")) (patches ;; Fixes https://issues.guix.gnu.org/43088. - (search-patches "mailutils-fix-uninitialized-variable.patch")))) + (search-patches "mailutils-fix-uninitialized-variable.patch" + "mailutils-variable-lookup.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/mailutils-variable-lookup.patch b/gnu/packages/patches/mailutils-variable-lookup.patch new file mode 100644 index 0000000000..0069f3596d --- /dev/null +++ b/gnu/packages/patches/mailutils-variable-lookup.patch @@ -0,0 +1,26 @@ +Have 'send-message' look up 'mu-debug' & co. in the right +module: . + +Submitted: https://lists.gnu.org/archive/html/bug-mailutils/2021-09/msg00000.html + +--- + include/mailutils/guile.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/mailutils/guile.h b/include/mailutils/guile.h +index f05550678..47f89db39 100644 +--- a/include/mailutils/guile.h ++++ b/include/mailutils/guile.h +@@ -20,7 +20,8 @@ + + #include + +-#define MU_SCM_SYMBOL_VALUE(p) SCM_VARIABLE_REF(scm_c_lookup(p)) ++#define MU_SCM_SYMBOL_VALUE(p) \ ++ (scm_c_public_ref ("mailutils mailutils", p)) + + typedef struct + { +-- +2.33.0 + -- cgit v1.2.3 From 406f726cfb857e8b845a45d38d8f7d04867bd126 Mon Sep 17 00:00:00 2001 From: phodina Date: Tue, 31 Aug 2021 11:15:16 +0000 Subject: gnu: Add date2name. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (date2name): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7be4b6a1ff..3e839474b6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -106,6 +106,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Hugo Lecomte ;;; Copyright © 2021 Franck Pérignon +;;; Copyright © 2021 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -26544,3 +26545,39 @@ a (rather superficial) static analysis, and constructs a directed graph of the objects in the combined source, and how they define or use each other. The graph can be output for rendering by GraphViz or yEd.") (license license:gpl2))) + +(define-public date2name + (let ((commit "6c8f37277e8ec82aa50f90b8921422be30c4e798") + (revision "1")) + (package + (name "date2name") + (version (git-version "0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/novoid/date2name") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vq96b7n16d932nyfhnzwdwxff0zrqanidmwr4cxj2p67ad9y3w7")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((bindir (string-append (assoc-ref outputs "out") "/bin")) + (binary (string-append bindir "/date2name"))) + (mkdir-p bindir) + (copy-file "date2name/__init__.py" binary) + (chmod binary #o555))))))) + (synopsis "Handling time-stamps and date-stamps in file names") + (description "By default, date2name gets the modification time of matching +files and directories and adds a datestamp in standard ISO 8601+ format +YYYY-MM-DD at the beginning of the file or directory name.") + (home-page "https://github.com/novoid/date2name") + (license license:gpl3+)))) -- cgit v1.2.3 From 150cf64b04dcb370124e02a5bb347e0617bae20c Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Wed, 18 Aug 2021 00:43:16 +0200 Subject: gnu: python-pycryptodome: Unbundle libtomcrypt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-crypto.scm (pycryptodome-unbundle-tomcrypt-snippet): New variable. (python-pycryptodome)[source]{snippet}: Unbundle libtomcrypt. (python-pycryptodome)[source]{modules}: Add (guix build utils). Signed-off-by: Ludovic Courtès --- gnu/packages/python-crypto.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 6c25e0dd36..6d50ae682f 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2020 Justus Winter ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,6 +45,7 @@ (define-module (gnu packages python-crypto) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -938,6 +940,22 @@ protocol (Javascript Object Signing and Encryption).") (define-public python2-josepy (package-with-python2 python-josepy)) +(define pycryptodome-unbundle-tomcrypt-snippet + #~(begin + ;; Unbundle libtomcrypt. + (delete-file-recursively "src/libtom") + (substitute* "src/DES.c" + (("#include \"libtom/tomcrypt_des.c\"") + "#include ")) + (substitute* "setup.py" + (("include_dirs=\\['src/', 'src/libtom/'\\]") + ;; FIXME: why does '-ltomcrypt' need to be added + ;; manually, even when 'tomcrypt' is added to 'libraries'? + ;; This behaviour is not documented at + ;; . + "include_dirs=['src/'], libraries=['tomcrypt', 'tommath'], + extra_link_args=['-ltomcrypt', '-ltommath']")))) + (define-public python-pycryptodome (package (name "python-pycryptodome") @@ -948,8 +966,13 @@ protocol (Javascript Object Signing and Encryption).") (uri (pypi-uri "pycryptodome" version)) (sha256 (base32 - "1i4m74f88qj9ci8rpyzrbk2slmsdj5ipmwdkq6qk24byalm203li")))) + "1i4m74f88qj9ci8rpyzrbk2slmsdj5ipmwdkq6qk24byalm203li")) + (modules '((guix build utils))) + (snippet pycryptodome-unbundle-tomcrypt-snippet))) (build-system python-build-system) + (inputs + `(("libtomcrypt" ,libtomcrypt) + ("libtommath" ,libtommath))) (home-page "https://www.pycryptodome.org") (synopsis "Low-level cryptographic Python library") (description -- cgit v1.2.3 From 0e05bee4bed6c2a2df72296c15f6726c24e2bdc7 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Wed, 18 Aug 2021 12:46:51 +0200 Subject: gnu: python-pycryptodomex: Unbundle libtomcrypt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-crypto.scm (python-pycryptodomex)[source]{snippet}: Unbundle libtomcrypt. (python-pycryptodomex)[source]{modules}: Add (guix build utils). Signed-off-by: Ludovic Courtès --- gnu/packages/python-crypto.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 6d50ae682f..cec57f9fda 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1025,7 +1025,9 @@ PyCryptodome variants, the other being python-pycryptodomex.") (method url-fetch) (uri (pypi-uri "pycryptodomex" version)) (sha256 - (base32 "0lbx4qk3xmwqiidhmkj8qa7bh2lf8bwzg0xjpsh2w5zqjrc7qnvv")))) + (base32 "0lbx4qk3xmwqiidhmkj8qa7bh2lf8bwzg0xjpsh2w5zqjrc7qnvv")) + (modules '((guix build utils))) + (snippet pycryptodome-unbundle-tomcrypt-snippet))) (description "PyCryptodome is a self-contained Python package of low-level cryptographic primitives. It's not a wrapper to a separate C library like -- cgit v1.2.3 From fb77bf950e31a92a56233cdfd995e48ded3f884f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Sep 2021 11:51:21 +0300 Subject: gnu: parallel: Update to 20210822. * gnu/packages/parallel.scm (parallel): Update to 20210822. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 8f5d0aeb64..01609fcd50 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -61,14 +61,14 @@ (define-public parallel (package (name "parallel") - (version "20210722") + (version "20210822") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0jaa5137sjw2szvmnnslkqv1n3gg2rkkgr71j7hpp5a3q15hjf9j")))) + (base32 "08iqx2qq2p4a45nphlcj7xnhr2s8nacahzbyvapqxvr64znmj5kq")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 76ef6dc7160ad0ff81073c7ce6f56517b7dc7c90 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 21 Aug 2021 11:43:10 +0100 Subject: gnu: Add python-imaplib2. * gnu/packages/mail.scm (python-imaplib2): New variable. --- gnu/packages/mail.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 9d90192617..4541b55006 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -4360,6 +4360,24 @@ based on asyncio.") (license (list license:asl2.0 license:lgpl3)))) ; only for setup_helpers.py +(define-public python-imaplib2 + (package + (name "python-imaplib2") + (version "3.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "imaplib2" version)) + (sha256 + (base32 + "0nqyb274hq30agg1c0zkb5ijmcirgg35sp4dp4n292l665dlijwn")))) + (build-system python-build-system) + (home-page "https://github.com/jazzband/imaplib2/") + (synopsis "Threaded Python IMAP4 client") + (description "This package provides a threaded Python IMAP4 client, based +on RFC 3501 and original @code{imaplib} module.") + (license license:expat))) + (define-public rspamd (package (name "rspamd") -- cgit v1.2.3 From d8d124fb6521abafd8f6a1772717a0278d6d899b Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 21 Aug 2021 11:39:52 +0100 Subject: gnu: offlineimap: Replace with offlineimap3. * gnu/packages/mail.scm (offlineimap3): New variable. (offlineimap): Replace with deprecated package. --- gnu/packages/mail.scm | 96 +++++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 45 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4541b55006..87094cb9eb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -156,6 +156,7 @@ #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix deprecation) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix svn-download) @@ -1045,53 +1046,58 @@ content (body). The program is able to learn from the user's classifications and corrections. It is based on a Bayesian filter.") (license license:gpl3+))) -(define-public offlineimap - (package - (name "offlineimap") - (version "7.3.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/OfflineIMAP/offlineimap") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1gg8ry67i20qapj4z20am9bm67m2q28kixcj7ja75m897vhzarnq")))) - (build-system python-build-system) - (native-inputs - `(("asciidoc" ,asciidoc))) - (inputs - `(("python2-pysqlite" ,python2-pysqlite) - ("python2-rfc6555" ,python2-rfc6555) - ("python2-six" ,python2-six))) - (arguments - ;; The setup.py script expects python-2. - `(#:python ,python-2 - ;; Tests require a modifiable IMAP account. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'build 'build-documentation - (lambda _ - (substitute* "docs/Makefile" - ;; Prevent xmllint and xsltproc from downloading a DTD file. - (("a2x -v") "a2x --no-xmllint --xsltproc-opts=--nonet -v")) - (invoke "make" "-C" "docs" "man"))) - (add-after 'install 'install-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man"))) - (install-file "docs/offlineimap.1" (string-append man "/man1")) - (install-file "docs/offlineimapui.7" (string-append man "/man7")) - #t)))))) - (home-page "https://www.offlineimap.org") - (synopsis "Sync emails between two repositories") - (description - "OfflineImap synchronizes emails between two repositories, so that you +(define-public offlineimap3 + ;; The OfflineIMAP3 fork does not yet have a release, but it's likely to be + ;; 8.0.0 but the source still reports 7.3.0, see + ;; https://github.com/OfflineIMAP/offlineimap3/issues/10. + (let ((commit "4ca9c75c6f9a0cc8dc7b69dd6abf073e494cc0e5") + (revision "0")) + (package + (name "offlineimap3") + (version (git-version "7.3.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OfflineIMAP/offlineimap3") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nzh5dcc559jfw4yy12gc98s17w82b15zxikspc6apd8filmk9xg")))) + (build-system python-build-system) + (native-inputs + `(("asciidoc" ,asciidoc))) + (inputs + `(("python-distro" ,python-distro) + ("python-imaplib2" ,python-imaplib2) + ("python-rfc6555" ,python-rfc6555))) + (arguments + `(;; Tests require a modifiable IMAP account. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-documentation + (lambda _ + (substitute* "docs/Makefile" + ;; Prevent xmllint and xsltproc from downloading a DTD file. + (("a2x -v") "a2x --no-xmllint --xsltproc-opts=--nonet -v")) + (invoke "make" "-C" "docs" "man"))) + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man"))) + (install-file "docs/offlineimap.1" (string-append man "/man1")) + (install-file "docs/offlineimapui.7" (string-append man "/man7")))))))) + (home-page "https://www.offlineimap.org") + (synopsis "Sync emails between two repositories") + (description + "OfflineImap synchronizes emails between two repositories, so that you can read the same mailbox from multiple computers. It supports IMAP as REMOTE repository and Maildir/IMAP as LOCAL repository.") - (license license:gpl2+))) + (license license:gpl2+)))) + +(define-public offlineimap + (deprecated-package "offlineimap" offlineimap3)) (define-public emacs-mew (package -- cgit v1.2.3 From 99735609fc1c75c57eba71eaa988ddef4d14029b Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 21 Aug 2021 11:41:44 +0100 Subject: gnu: Remove python2-rfc6555. * gnu/packages/python-xyz.scm (python2-rfc6555): Remove variable. (python-rfc6555)[properties]: Remove field. --- gnu/packages/python-xyz.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3e839474b6..4702453e4d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -62,7 +62,7 @@ ;;; Copyright © 2019 Jack Hill ;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2019, 2020 Alex Griffin -;;; Copyright © 2019, 2020 Pierre Langlois +;;; Copyright © 2019, 2020, 2021 Pierre Langlois ;;; Copyright © 2019 Jacob MacDonald ;;; Copyright © 2019, 2020 Giacomo Leidi ;;; Copyright © 2019 Wiktor Żelazny @@ -18335,16 +18335,8 @@ validation of URIs (see RFC 3986) and IRIs (see RFC 3987).") "Python implementation of the Happy Eyeballs Algorithm described in RFC 6555. Provided with a single file and dead-simple API to allow easy vendoring and integration into other projects.") - (properties `((python2-variant . ,(delay python2-rfc6555)))) (license license:asl2.0)))) -(define-public python2-rfc6555 - (let ((base (package-with-python2 - (strip-python2-variant python-rfc6555)))) - (package/inherit base - (propagated-inputs - `(("python2-selectors2" ,python2-selectors2)))))) - (define-public python-bagit (package (name "python-bagit") -- cgit v1.2.3 From f6e80d4e1601346878aecc394c0855eda3ed75d9 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 21 Aug 2021 11:42:31 +0100 Subject: gnu: Remove python2-selectors2. * gnu/packages/python-xyz.scm (python2-selectors2): Remove variable. --- gnu/packages/python-xyz.scm | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4702453e4d..55858fbf8e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14319,29 +14319,6 @@ functionality in a modular way, allowing you to extend your panel with your own code, responding to click events and updating clock every second.") (license license:bsd-3))) -(define-public python2-selectors2 - (package - (name "python2-selectors2") - (version "2.0.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "selectors2" version)) - (sha256 - (base32 - "110qr00b9axz1f1jm12b495jkvrz80smknxvssqlhwk0dx67rdw1")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)) - (native-inputs - `(("python2-mock" ,python2-mock) - ("python2-psutil" ,python2-psutil))) - (home-page "https://www.github.com/SethMichaelLarson/selectors2") - (synopsis "Backport of the selectors module from Python 3.5+") - (description - "This package provides a drop-in replacement for the @code{selectors} -module in Python 3.5 and later.") - (license license:expat))) - (define-public python-tblib (package (name "python-tblib") -- cgit v1.2.3 From 9f7c4f380fdd86d81c805b72e4d05e9e658d3dc2 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Mon, 30 Aug 2021 00:25:58 +0100 Subject: gnu: esbuild: Disable race detector on 32-bit targets. * gnu/packages/web.scm (esbuild)[arguments]: Set the ESBUILD_RACE variable to an empty string to remove the -race option. --- gnu/packages/web.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f0ac9ccee2..5817d2dd95 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1672,13 +1672,17 @@ used to validate and fix HTML data.") #t)))) (build-system go-build-system) (arguments - '(#:import-path "github.com/evanw/esbuild/cmd/esbuild" + `(#:import-path "github.com/evanw/esbuild/cmd/esbuild" #:unpack-path "github.com/evanw/esbuild" #:phases (modify-phases %standard-phases (replace 'check (lambda* (#:key tests? unpack-path #:allow-other-keys) (when tests? + ;; The "Go Race Detector" is only supported on 64-bit + ;; platforms, this variable disables it. + (unless ,(target-64bit?) + (setenv "ESBUILD_RACE" "")) (with-directory-excursion (string-append "src/" unpack-path) (invoke "make" "test-go"))) #t))))) -- cgit v1.2.3 From 5ee38c467298091e98fa12be45facdcc63a59a87 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 11 Aug 2021 16:43:45 +0100 Subject: gnu: node: Enable cross-compilation. Node runs parts of itself on the host for bootstraping therefore for cross-compiling support we need to fidle with the rpath in the build system, as well as duplicating some of the dependencies as native-inputs and inputs. * gnu/pakcages/node.scm (node)[arguments]: Refer to /bin/sh and /bin/env directly instead of using (which). Add new 'set-bootstrap-host-rpath phase to correctly set the rpath for binaries that are meant to run on the host. Pass --cross-compiling and --dest-cpu to configure script if needed. Set the CC_host, CXX_host, CC, CCX and PKG_CONFIG variable for cross-compilation. Refer to the host python. Do not return #t from any phases. [native-inputs]: Add c-ares, http-parser, icu4c, libuv, nghttp2, openssl and zlib. Remove which. [inputs]: Add bash and coreutils. (llhttp-bootstrap)[arguments]: Refer to esbuild via (or native-inputs inputs). (node-lts)[arguments]: Add new 'set-bootstrap-host-rpath phase to correctly set the rpath for host binaries. Pass --cross-compiling and --dest-cpu to configure script if needed. Set the CC_host, CXX_host, CCX and PKG_CONFIG variable for cross-compilation. Refer to the host python. Do not return #t from any phases. Refer to /bin/sh and /bin/env directly instead of using (which). Do not return #t from any phases. [native-inputs]: Hardcode native inputs instead of inheriting them from node. [inputs]: Add bash and coreutils. --- gnu/packages/node.scm | 191 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 157 insertions(+), 34 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 36c45e9c7a..f8ac95884c 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Mike Gerwitz ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019, 2020, 2021 Marius Bakke -;;; Copyright © 2020 Pierre Langlois +;;; Copyright © 2020, 2021 Pierre Langlois ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2021 Simon Tournier ;;; @@ -38,6 +38,7 @@ #:use-module (gnu packages) #:use-module (gnu packages adns) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages icu4c) @@ -48,7 +49,9 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages tls) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (ice-9 match) + #:use-module (srfi srfi-26)) (define-public node (package @@ -111,14 +114,15 @@ "test/parallel/test-stdio-closed.js" "test/sequential/test-child-process-emfile.js") (("'/bin/sh'") - (string-append "'" (which "sh") "'"))) + (string-append "'" (assoc-ref inputs "bash") "/bin/sh'"))) ;; Fix hardcoded /usr/bin/env references. (substitute* '("test/parallel/test-child-process-default-options.js" "test/parallel/test-child-process-env.js" "test/parallel/test-child-process-exec-env.js") (("'/usr/bin/env'") - (string-append "'" (which "env") "'"))) + (string-append "'" (assoc-ref inputs "coreutils") + "/bin/env'"))) ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. @@ -155,23 +159,66 @@ ;; TODO: Regenerate certs instead. (for-each delete-file '("test/parallel/test-tls-passphrase.js" - "test/parallel/test-tls-server-verify.js")) - #t)) + "test/parallel/test-tls-server-verify.js")))) + (add-before 'configure 'set-bootstrap-host-rpath + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let* ((inputs (or native-inputs inputs)) + (c-ares (assoc-ref inputs "c-ares")) + (http-parser (assoc-ref inputs "http-parser")) + (icu4c (assoc-ref inputs "icu4c")) + (nghttp2 (assoc-ref inputs "nghttp2")) + (openssl (assoc-ref inputs "openssl")) + (libuv (assoc-ref inputs "libuv")) + (zlib (assoc-ref inputs "zlib"))) + (substitute* "deps/v8/gypfiles/v8.gyp" + (("'target_name': 'torque'," target) + (string-append target + "'ldflags': ['-Wl,-rpath=" + c-ares "/lib:" + http-parser "/lib:" + icu4c "/lib:" + nghttp2 "/lib:" + openssl "/lib:" + libuv "/lib:" + zlib "/lib" + "'],")))))) (replace 'configure ;; Node's configure script is actually a python script, so we can't ;; run it with bash. - (lambda* (#:key outputs (configure-flags '()) inputs + (lambda* (#:key outputs (configure-flags '()) native-inputs inputs #:allow-other-keys) (let* ((prefix (assoc-ref outputs "out")) + (xflags ,(if (%current-target-system) + `'("--cross-compiling" + ,(string-append + "--dest-cpu=" + (match (%current-target-system) + ((? (cut string-prefix? "arm" <>)) + "arm") + ((? (cut string-prefix? "aarch64" <>)) + "arm64") + ((? (cut string-prefix? "i686" <>)) + "ia32") + ((? (cut string-prefix? "x86_64" <>)) + "x64") + ((? (cut string-prefix? "powerpc64" <>)) + "ppc64") + (_ "unsupported")))) + ''())) (flags (cons (string-append "--prefix=" prefix) - configure-flags))) + (append xflags configure-flags)))) (format #t "build directory: ~s~%" (getcwd)) (format #t "configure flags: ~s~%" flags) ;; Node's configure script expects the CC environment variable to ;; be set. - (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) + (setenv "CC_host" "gcc") + (setenv "CXX_host" "g++") + (setenv "CC" ,(cc-for-target)) + (setenv "CXX" ,(cxx-for-target)) + (setenv "PKG_CONFIG" ,(pkg-config-for-target)) (apply invoke - (string-append (assoc-ref inputs "python") + (string-append (assoc-ref (or native-inputs inputs) + "python") "/bin/python") "configure" flags)))) (add-after 'patch-shebangs 'patch-npm-shebang @@ -181,29 +228,37 @@ (npm (string-append bindir "/npm")) (target (readlink npm))) (with-directory-excursion bindir - (patch-shebang target (list bindir)) - #t)))) + (patch-shebang target (list bindir)))))) (add-after 'install 'patch-node-shebang (lambda* (#:key outputs #:allow-other-keys) (let* ((bindir (string-append (assoc-ref outputs "out") "/bin")) (npx (readlink (string-append bindir "/npx")))) (with-directory-excursion bindir - (patch-shebang npx (list bindir)) - #t))))))) + (patch-shebang npx (list bindir))))))))) (native-inputs - `(("python" ,python-2) + `(;; Runtime dependencies for binaries used as a bootstrap. + ("c-ares" ,c-ares) + ("http-parser" ,http-parser) + ("icu4c" ,icu4c) + ("libuv" ,libuv) + ("nghttp2" ,nghttp2 "lib") + ("openssl" ,openssl) + ("zlib" ,zlib) + ;; Regular build-time dependencies. ("perl" ,perl) ("pkg-config" ,pkg-config) ("procps" ,procps) - ("util-linux" ,util-linux) - ("which" ,which))) + ("python" ,python-2) + ("util-linux" ,util-linux))) (native-search-paths (list (search-path-specification (variable "NODE_PATH") (files '("lib/node_modules"))))) (inputs - `(("c-ares" ,c-ares) + `(("bash" ,bash) + ("coreutils" ,coreutils) + ("c-ares" ,c-ares) ("http-parser" ,http-parser) ("icu4c" ,icu4c) ("libuv" ,libuv) @@ -551,9 +606,10 @@ parser definition into a C output.") #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key inputs #:allow-other-keys) - (let ((esbuild (string-append (assoc-ref inputs "esbuild") - "/bin/esbuild"))) + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let ((esbuild (string-append + (assoc-ref (or native-inputs inputs) "esbuild") + "/bin/esbuild"))) (invoke esbuild "--platform=node" "--outfile=bin/generate.js" @@ -625,21 +681,74 @@ source files.") "--with-intl=system-icu")) ((#:phases phases) `(modify-phases ,phases + (replace 'set-bootstrap-host-rpath + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let* ((inputs (or native-inputs inputs)) + (c-ares (assoc-ref inputs "c-ares")) + (google-brotli (assoc-ref inputs "google-brotli")) + (icu4c (assoc-ref inputs "icu4c")) + (nghttp2 (assoc-ref inputs "nghttp2")) + (openssl (assoc-ref inputs "openssl")) + (libuv (assoc-ref inputs "libuv")) + (zlib (assoc-ref inputs "zlib")) + (host-binaries '("torque" + "bytecode_builtins_list_generator" + "gen-regexp-special-case" + "node_mksnapshot" + "mksnapshot"))) + (substitute* '("node.gyp" "tools/v8_gypfiles/v8.gyp") + (((string-append "'target_name': '(" + (string-join host-binaries "|") + ")',") + target) + (string-append target + "'ldflags': ['-Wl,-rpath=" + c-ares "/lib:" + google-brotli "/lib:" + icu4c "/lib:" + nghttp2 "/lib:" + openssl "/lib:" + libuv "/lib:" + zlib "/lib" + "'],")))))) (replace 'configure ;; Node's configure script is actually a python script, so we can't ;; run it with bash. - (lambda* (#:key outputs (configure-flags '()) inputs + (lambda* (#:key outputs (configure-flags '()) native-inputs inputs #:allow-other-keys) (let* ((prefix (assoc-ref outputs "out")) - (flags (cons (string-append "--prefix=" prefix) - configure-flags))) + (xflags ,(if (%current-target-system) + `'("--cross-compiling" + ,(string-append + "--dest-cpu=" + (match (%current-target-system) + ((? (cut string-prefix? "arm" <>)) + "arm") + ((? (cut string-prefix? "aarch64" <>)) + "arm64") + ((? (cut string-prefix? "i686" <>)) + "ia32") + ((? (cut string-prefix? "x86_64" <>)) + "x64") + ((? (cut string-prefix? "powerpc64" <>)) + "ppc64") + (_ "unsupported")))) + ''())) + (flags (cons + (string-append "--prefix=" prefix) + (append xflags configure-flags)))) (format #t "build directory: ~s~%" (getcwd)) (format #t "configure flags: ~s~%" flags) ;; Node's configure script expects the CC environment variable to ;; be set. + (setenv "CC_host" "gcc") + (setenv "CXX_host" "g++") (setenv "CC" ,(cc-for-target)) + (setenv "CXX" ,(cxx-for-target)) + (setenv "PKG_CONFIG" ,(pkg-config-for-target)) (apply invoke - (string-append (assoc-ref inputs "python") + (string-append (assoc-ref (or native-inputs inputs) + "python") "/bin/python3") "configure" flags)))) (replace 'patch-files @@ -652,14 +761,15 @@ source files.") "test/parallel/test-stdio-closed.js" "test/sequential/test-child-process-emfile.js") (("'/bin/sh'") - (string-append "'" (which "sh") "'"))) + (string-append "'" (assoc-ref inputs "bash") "/bin/sh'"))) ;; Fix hardcoded /usr/bin/env references. (substitute* '("test/parallel/test-child-process-default-options.js" "test/parallel/test-child-process-env.js" "test/parallel/test-child-process-exec-env.js") (("'/usr/bin/env'") - (string-append "'" (which "env") "'"))) + (string-append "'" (assoc-ref inputs "coreutils") + "/bin/env'"))) ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. @@ -707,20 +817,33 @@ source files.") (copy-file (string-append llhttp "/src/http.c") "deps/llhttp/src/http.c") (copy-file (string-append llhttp "/include/llhttp.h") - "deps/llhttp/include/llhttp.h")) - #t)))))) + "deps/llhttp/include/llhttp.h")))))))) + (native-inputs + `(;; Runtime dependencies for binaries used as a bootstrap. + ("c-ares" ,c-ares) + ("google-brotli" ,google-brotli) + ("icu4c" ,icu4c-67) + ("libuv" ,libuv-for-node) + ("nghttp2" ,nghttp2 "lib") + ("openssl" ,openssl) + ("zlib" ,zlib) + ;; Regular build-time dependencies. + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("procps" ,procps) + ("python" ,python) + ("util-linux" ,util-linux))) (inputs - `(("c-ares" ,c-ares) + `(("bash" ,bash) + ("coreutils" ,coreutils) + ("c-ares" ,c-ares) ("icu4c" ,icu4c-67) ("libuv" ,libuv-for-node) ("llhttp" ,llhttp-bootstrap) ("google-brotli" ,google-brotli) ("nghttp2" ,nghttp2 "lib") ("openssl" ,openssl) - ("zlib" ,zlib))) - (native-inputs - (alist-replace "python" (list python-3) - (package-native-inputs node))))) + ("zlib" ,zlib))))) (define-public libnode (package/inherit node -- cgit v1.2.3 From bc68f23aadd51527843a75476fa9e3d422e86151 Mon Sep 17 00:00:00 2001 From: Simon South Date: Tue, 31 Aug 2021 14:52:57 -0400 Subject: gnu: Add emacs-dictionary. * gnu/packages/emacs-xyz.scm (emacs-dictionary): New variable. Signed-off-by: Arun Isaac --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c106e81fa5..030809f5ac 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -102,6 +102,7 @@ ;;; Copyright © 2021 Dhruvin Gandhi ;;; Copyright © 2021 Matthew James Kraai ;;; Copyright © 2021 Noisytoot +;;; Copyright © 2021 Simon South ;;; ;;; This file is part of GNU Guix. ;;; @@ -29358,6 +29359,27 @@ shorter than usual, using mostly unprefixed keys.") @acronym{CWL, Common Workflow Language} files.") (license license:gpl3+))) +(define-public emacs-dictionary + (package + (name "emacs-dictionary") + (version "1.11") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/myrkr/dictionary-el") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zsjbpq0s0xdxd9r541f04bj1khhgzhdlzr0m4p17zjh1zardbpi")))) + (build-system emacs-build-system) + (home-page "http://www.myrkr.in-berlin.de/dictionary/index.html") + (synopsis "Emacs client for dictionary servers") + (description "This package provides commands for interacting with a +dictionary server (as defined by RFC 2229; by default, the public server at +dict.org) from within Emacs.") + (license license:gpl2+))) + (define-public emacs-multitran (package (name "emacs-multitran") -- cgit v1.2.3 From 5dac09e263d566ccf99776df97c47eed0d30c172 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 5 Aug 2021 02:57:32 +0200 Subject: gnu: Add gitile. * gnu/packages/version-control.scm (gitile): New variable. --- gnu/packages/version-control.scm | 94 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 22bf9b408f..5f6379dbcd 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2021 LibreMiami ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 François J. +;;; Copyright © 2021 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,6 +94,7 @@ #:use-module (gnu packages golang) #:use-module (gnu packages groff) #:use-module (gnu packages guile) + #:use-module (gnu packages guile-xyz) #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages mail) @@ -114,6 +116,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages rsync) #:use-module (gnu packages sqlite) + #:use-module (gnu packages texinfo) #:use-module (gnu packages admin) #:use-module (gnu packages xml) #:use-module (gnu packages emacs) @@ -1524,6 +1527,97 @@ also walk each side of a merge and test those changes individually.") control to Git repositories.") (license license:gpl2))) +;; gitile requires a more recent version than the latest release. +(define guile-syntax-highlight-for-gitile + (let ((commit "897fa5156ff41588e0d281eb00e4e94de63ccd8a") + (revision "0")) + (package + (inherit guile-syntax-highlight) + (version (git-version "0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.dthompson.us/guile-syntax-highlight.git") + (commit commit))) + (file-name (git-file-name "guile-syntax-highlight" version)) + (sha256 + (base32 + "18zlg4mkgd3swgv2ggfz91ivnnzc0zhvc9ybgrxg1y762va9hyvj")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo) + ,@(package-native-inputs guile-syntax-highlight)))))) + +(define-public gitile + (package + (name "gitile") + (version "0.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.lepiller.eu/git/gitile") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fnmgrrsdc24mvicj2gkv3vasag7h5x27xc12w55i0id9vw7k9sw")))) + (build-system gnu-build-system) + (arguments + `(#:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:make-flags (list "GUILE_AUTO_COMPILE=0") + #:phases + (modify-phases %standard-phases + (add-after 'install-bin 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (use-modules (guix build guile-build-system)) + ;; Wrap the 'gitile' command to refer to the right modules. + (let* ((out (assoc-ref outputs "out")) + (commonmark (assoc-ref inputs "guile-commonmark")) + (git (assoc-ref inputs "guile-git")) + (bytes (assoc-ref inputs "guile-bytestructures")) + (fibers (assoc-ref inputs "guile-fibers")) + (gcrypt (assoc-ref inputs "guile-gcrypt")) + (syntax-highlight (assoc-ref inputs "guile-syntax-highlight")) + (deps (list out commonmark git bytes fibers gcrypt + syntax-highlight)) + (guile (assoc-ref inputs "guile")) + (effective (target-guile-effective-version)) + (mods (string-drop-right ;drop trailing colon + (string-join deps + (string-append "/share/guile/site/" + effective ":") + 'suffix) + 1)) + (objs (string-drop-right + (string-join deps + (string-append "/lib/guile/" effective + "/site-ccache:") + 'suffix) + 1))) + (wrap-program (string-append out "/bin/gitile") + `("GUILE_LOAD_PATH" ":" prefix (,mods)) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("guile" ,guile-3.0) + ("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-3.0) + ("guile-commonmark" ,guile-commonmark) + ("guile-fibers" ,guile-fibers) + ("guile-gcrypt" ,guile-gcrypt) + ("guile-git" ,guile-git) + ("guile-syntax-highlight" ,guile-syntax-highlight-for-gitile) + ("gnutls" ,gnutls))) + (home-page "https://git.lepiller.eu/gitile") + (synopsis "Simple Git forge written in Guile") + (description "Gitile is a Git forge written in Guile that lets you +visualize your public Git repositories on a web interface.") + (license license:agpl3+))) + (define-public pre-commit (package (name "pre-commit") -- cgit v1.2.3 From dc198e8e3bc0b2780298e9c8ad64a8d0f8765676 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 04:25:56 +0200 Subject: gnu: acpi-call-linux-module: Update to 1.2.2. * gnu/packages/linux.scm (acpi-call-linux-module): Update to 1.2.2. [arguments]: Stop returning #t from phases. [home-page]: Match source. --- gnu/packages/linux.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5688734b20..1b56a1e315 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1138,7 +1138,7 @@ It has been modified to remove all non-free binary blobs.") (define-public acpi-call-linux-module (package (name "acpi-call-linux-module") - (version "1.2.1") + (version "1.2.2") (source (origin (method git-fetch) @@ -1147,7 +1147,7 @@ It has been modified to remove all non-free binary blobs.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0mr4rjbv6fj4phf038addrgv32940bphghw2v9n1z4awvw7wzkbg")))) + (base32 "1s7h9y3adyfhw7cjldlfmid79lrwz3vqlvziw9nwd6x5qdj4w9vp")))) (build-system linux-module-build-system) (arguments `(#:tests? #f ; no tests @@ -1159,8 +1159,7 @@ It has been modified to remove all non-free binary blobs.") (lambda _ (substitute* (find-files "examples" ".") (("^(#! *)/[^ ]*/" _ shebang) - (string-append shebang "/usr/bin/env "))) - #t)) + (string-append shebang "/usr/bin/env "))))) (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -1169,9 +1168,8 @@ It has been modified to remove all non-free binary blobs.") (let ((target (string-append doc "/" file))) (mkdir-p (dirname target)) (copy-recursively file target))) - (list "README.md" "examples")) - #t)))))) - (home-page "https://github.com/teleshoes/acpi_call") + (list "README.md" "examples")))))))) + (home-page "https://github.com/nix-community/acpi_call") (synopsis "Linux kernel module to perform ACPI method calls") (description "This simple Linux kernel module allows calls from user space to any -- cgit v1.2.3 From ff68088eaabde73d7f107763f38034ce38800339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 3 Sep 2021 10:39:57 +0200 Subject: gnu: guile-syntax-highlight: Move Gitile variant to guile-xyz.scm. Fixes a regression introduced in 5dac09e263d566ccf99776df97c47eed0d30c172 whereby version-control.scm would inherit from GUILE-SYNTAX-HIGHLIGHT, which is in guile-xyz.scm, thereby leading to unbound variable errors. Reported by vivien on #guix. * gnu/packages/version-control.scm (guile-syntax-highlight-for-gitile): Move to... * gnu/packages/guile-xyz.scm (guile-syntax-highlight-for-gitile): ... here. New variable. Add 'properties' field. --- gnu/packages/guile-xyz.scm | 23 +++++++++++++++++++++++ gnu/packages/version-control.scm | 22 ---------------------- 2 files changed, 23 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 4131d57626..457701a436 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -755,6 +755,29 @@ HTML (via SXML) or any other format for rendering.") (home-page "https://dthompson.us/projects/guile-syntax-highlight.html") (license license:lgpl3+))) +;; gitile requires a more recent version than the latest release. +(define-public guile-syntax-highlight-for-gitile + (let ((commit "897fa5156ff41588e0d281eb00e4e94de63ccd8a") + (revision "0")) + (package + (inherit guile-syntax-highlight) + (version (git-version "0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.dthompson.us/guile-syntax-highlight.git") + (commit commit))) + (file-name (git-file-name "guile-syntax-highlight" version)) + (sha256 + (base32 + "18zlg4mkgd3swgv2ggfz91ivnnzc0zhvc9ybgrxg1y762va9hyvj")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo) + ,@(package-native-inputs guile-syntax-highlight))) + (properties '((hidden? . #t)))))) + (define-public guile2.2-syntax-highlight (package (inherit guile-syntax-highlight) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5f6379dbcd..8a6a8d8d60 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1527,28 +1527,6 @@ also walk each side of a merge and test those changes individually.") control to Git repositories.") (license license:gpl2))) -;; gitile requires a more recent version than the latest release. -(define guile-syntax-highlight-for-gitile - (let ((commit "897fa5156ff41588e0d281eb00e4e94de63ccd8a") - (revision "0")) - (package - (inherit guile-syntax-highlight) - (version (git-version "0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.dthompson.us/guile-syntax-highlight.git") - (commit commit))) - (file-name (git-file-name "guile-syntax-highlight" version)) - (sha256 - (base32 - "18zlg4mkgd3swgv2ggfz91ivnnzc0zhvc9ybgrxg1y762va9hyvj")))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo) - ,@(package-native-inputs guile-syntax-highlight)))))) - (define-public gitile (package (name "gitile") -- cgit v1.2.3 From 3b748152ac45d7903882e8f03098f0f754ee7a85 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 17:40:42 +0200 Subject: gnu: dash: Update to 0.5.11.5. * gnu/packages/shells.scm (dash): Update to 0.5.11.5. --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index ec3723031f..d29bd0532b 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -78,14 +78,14 @@ (define-public dash (package (name "dash") - (version "0.5.11.4") + (version "0.5.11.5") (source (origin (method url-fetch) (uri (string-append "http://gondor.apana.org.au/~herbert/dash/files/" "dash-" version ".tar.gz")) (sha256 - (base32 "13g06zqfy4n7jkrbb5l1vw0xcnjvq76i16al8fjc5g33afxbf5af")) + (base32 "1g93w4lpn3jfwn2gaq17a1lxdig11x0j7gr9byc3fy8zi4882xyv")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 49bb544b77c7dcd7d2a1bade00fb0844a2e8f7ee Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 3 Sep 2021 12:54:55 -0400 Subject: gnu: libssh: Update to 0.9.6 [fixes CVE-2021-3634]. * gnu/packages/ssh.scm (libssh): Update to 0.9.6. [source]: Use URL-FETCH. --- gnu/packages/ssh.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 854dd19067..0e55c23f35 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -127,16 +127,15 @@ file names. (define-public libssh (package (name "libssh") - (version "0.9.5") + (version "0.9.6") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.libssh.org/projects/libssh.git") - (commit (string-append "libssh-" version)))) + (method url-fetch) + (uri (string-append "https://www.libssh.org/files/" + (version-major+minor version) + "/libssh-" version ".tar.xz")) (sha256 (base32 - "1b2klflmn0mdkcyjl4dqfg116bf9nhmqm4qla5cqa9xis89a5bn6")) - (file-name (git-file-name name version)))) + "16w2mc7pyv9mijjlgacbz8dgczc7ig2m6m70w1pld04vpn2zig46")))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments -- cgit v1.2.3 From ed4dd53b1ee1dca1740b72ddc798a27cc4a012e6 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 27 Jan 2021 23:44:04 +0100 Subject: gnu: Add cpp-httplib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (cpp-httplib): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cpp.scm | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index ba921fac11..f4708eda91 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Milkey Mouse ;;; Copyright © 2021 Raghav Gururajan - +;;; Copyright © 2021 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,6 +66,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) + #:use-module (gnu packages python) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) @@ -556,6 +557,66 @@ tools: @end itemize\n") (license license:bsd-3))) +(define-public cpp-httplib + ;; this package is not graftable, as everything is implemented in a single + ;; header + (package + (name "cpp-httplib") + (version "0.8.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yhirose/cpp-httplib") + (commit (string-append "v" version)))) + (sha256 + (base32 "0c0gyfbvm34bgrqy9fhfxw1f8nb9zhf063j7xq91k892flb7qm1c")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + '("-DBUILD_SHARED_LIBS=ON" + "-DHTTPLIB_COMPILE=ON" + "-DHTTPLIB_REQUIRE_BROTLI=ON" + "-DHTTPLIB_REQUIRE_OPENSSL=ON" + "-DHTTPLIB_REQUIRE_ZLIB=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-network-tests + (lambda _ + (for-each + (lambda (test) + (substitute* "test/test.cc" + (((string-append "\\(" test)) + (string-append "(DISABLED_" test)))) + ;; There are tests requiring network access, disable them + '("AbsoluteRedirectTest" "BaseAuthTest" "CancelTest" + "ChunkedEncodingTest" "ChunkedEncodingTest" + "DecodeWithChunkedEncoding" "DefaultHeadersTest" + "DigestAuthTest" "HttpsToHttpRedirectTest" + "RangeTest" "RedirectTest" "RelativeRedirectTest" + "SSLClientTest" "SendAPI" "TooManyRedirectTest" "UrlWithSpace" + "YahooRedirectTest" "YahooRedirectTest")))) + (replace 'check + (lambda* (#:key source tests? #:allow-other-keys) + ;; openssl genrsa wants to write a file in the git checkout + (when tests? + (with-directory-excursion "../source/test" + (invoke "make")))))))) + (native-inputs + ;; required to build shared lib + `(("python" ,python))) + (inputs + `(("brotli" ,brotli) + ("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://github.com/yhirose/cpp-httplib") + (synopsis "C++ HTTP/HTTPS server and client library") + (description "cpp-httplib is a C++11 single-file cross platform blocking +HTTP/HTTPS library, easy to setup. It can also be used as a single-header +library.") + (license license:expat))) + (define-public cpplint (package (name "cpplint") -- cgit v1.2.3 From f9cc91128b6afc3633999e718c1fef816efab509 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 17:56:04 +0100 Subject: gnu: Add blurhash. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image.scm (blurhash): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/image.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index bbcf7d8aad..6e67c56d78 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2020 Zhu Zihao ;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2021 Sharlatan Hellseher +;;; Copyright © 2021 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) + #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gimp) #:use-module (gnu packages gl) @@ -2040,6 +2042,30 @@ SNG is implemented by a compiler/decompiler called sng that losslessly translates between SNG and PNG.") (license license:zlib))) +(define-public blurhash + (package + (name "blurhash") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Nheko-Reborn/blurhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jy2iigarskwfhskyladbb6l92x1fb3i3vz4bvcks0za4w5hfxk5")))) + (build-system meson-build-system) + (native-inputs + `(("cmake" ,cmake) + ("doctest" ,doctest) + ("gcc" ,gcc-8))) + (home-page "https://github.com/Nheko-Reborn/blurhash") + (synopsis "C++ blurhash encoder/decoder") + (description "Simple encoder and decoder for blurhashes. Contains a +command line program as well as a shared library.") + (license license:boost1.0))) + (define-public lodepng ;; There are no tags in the repository, so we take the version as defined in ;; lodepng.cpp. -- cgit v1.2.3 From 947b219ac5238cf5227ddc71fbedc2dd60003c9d Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 19:23:17 +0100 Subject: gnu: Add single-application-qt5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/qt.scm (single-application-qt5): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/qt.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 95618a9787..4625d2220d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -1960,6 +1961,61 @@ using the Chromium browser project. The Chromium source code has Google service and binaries removed, and adds modular support for using system libraries.") (license license:lgpl2.1+))) +(define-public single-application-qt5 + ;; Change in function signature, nheko requires at least this commit + (let ((commit "dc8042b5db58f36e06ba54f16f38b16c5eea9053")) + (package + (name "single-application-qt5") + (version (string-append "3.2.0-" (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/itay-grudev/SingleApplication") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "163aa2x2qb0h8w26si5ql833ilj427jjbdwlz1p2p8iaq6dh0vq1")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no check target + ;; Projects can decide how to build this library. You might need to + ;; override this flag (QApplication, QGuiApplication or + ;; QCoreApplication). + #:configure-flags '("-DQAPPLICATION_CLASS=QApplication") + #:phases + (modify-phases %standard-phases + ;; No install target, install things manually + (replace 'install + (lambda* (#:key inputs outputs source #:allow-other-keys) + (let* ((qt (assoc-ref inputs "qtbase")) + (qt-version ,(version-major (package-version qtbase-5))) + (out (assoc-ref outputs "out"))) + (install-file + "libSingleApplication.a" (string-append out "/lib")) + (for-each + (lambda (file) + (install-file + (string-append source "/" file) + (string-append out "/include"))) + '("SingleApplication" + "singleapplication.h" "singleapplication_p.h")) + #t)))))) + (inputs + `(("qtbase" ,qtbase-5))) + (home-page "https://github.com/itay-grudev/SingleApplication") + (synopsis "Replacement of QtSingleApplication for Qt5 and Qt6") + (description + "SingleApplication is a replacement of the QtSingleApplication for Qt5 and Qt6. + +It keeps the Primary Instance of your Application and kills each subsequent +instances. It can (if enabled) spawn secondary (non-related to the primary) +instances and can send data to the primary instance from secondary +instances.") + (license license:expat)))) + (define-public python-sip (package (name "python-sip") -- cgit v1.2.3 From c017e0b62c3cb42a46db7f7603b63bb17c966e4a Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 27 Jan 2021 23:54:55 +0100 Subject: gnu: nheko: Update to 0.8.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (nheko): Update to 0.8.2. [source snippet]: Remove third_party folder. [arguments]: Remove -fpermissive flag, remove remove-Werror phase, add phase wrap-program and unbundle-dependencies. [inputs]: Add gst-plugins-base, gst-plugins-bad, libnice, qtkeychain, and unbundle blurhash, cpp-httplib and single-application, remove tweeny. [native-inputs]: Add doxygen, graphviz used to build documentation. [description]: Simplify by removing the long list, add new features. (mtxclient): Update to 0.5.1. [arguments]: Remove set-home phase. * gnu/packages/databases.scm (lmdbxx): Update to 1.0.0. [source]: Change repository to a fork required by nheko. [home-page]: Update accordingly. Signed-off-by: Ludovic Courtès --- gnu/packages/databases.scm | 10 ++--- gnu/packages/messaging.scm | 91 ++++++++++++++++++++++++++-------------------- 2 files changed, 57 insertions(+), 44 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 884830262e..c75e1421d5 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -39,7 +39,7 @@ ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019, 2021 Guillaume Le Vaillant ;;; Copyright © 2020 Pierre Neidhardt -;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020, 2021 Nicolò Balzarotti ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Guy Fleury Iteriteka @@ -2497,16 +2497,16 @@ virtual address space — not physical RAM.") (define-public lmdbxx (package (name "lmdbxx") - (version "0.9.14.0") + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/drycpp/lmdbxx") + (url "https://github.com/hoytech/lmdbxx") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6")))) + (base32 "12k5rz74d1l0skcks9apry1svkl96g9lf5dcgylgjmh7v1jm0b7c")))) (arguments `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) @@ -2515,7 +2515,7 @@ virtual address space — not physical RAM.") (delete 'configure)))) (build-system gnu-build-system) (inputs `(("lmdb" ,lmdb))) - (home-page "http://lmdbxx.sourceforge.net") + (home-page "https://github.com/hoytech/lmdbxx") (synopsis "C++11 wrapper for the LMDB embedded B+ tree database library") (description "@code{lmdbxx} is a comprehensive @code{C++} wrapper for the @code{LMDB} embedded database library, offering both an error-checked diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3aa386ed6d..a7fed957a3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2019, 2020 Timotej Lazar -;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020, 2021 Nicolò Balzarotti ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Reza Alizadeh Majd @@ -2227,7 +2227,7 @@ QMatrixClient project.") (define-public mtxclient (package (name "mtxclient") - (version "0.3.1") + (version "0.5.1") (source (origin (method git-fetch) @@ -2236,7 +2236,7 @@ QMatrixClient project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x")))) + (base32 "1xznfx2bhw0ahwmkxm0rs05vz05ijk5k4190rj6qp3bvb9byiajh")))) (arguments `(#:configure-flags (list @@ -2249,12 +2249,6 @@ QMatrixClient project.") (substitute* "CMakeLists.txt" (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encryption|Pushrules)") "# add_test")) - #t)) - (add-before 'configure 'set-home - (lambda _ - ;; Tries to create package registry file - ;; So, set HOME. - (setenv "HOME" "/tmp") #t))))) (build-system cmake-build-system) (inputs @@ -2277,7 +2271,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (define-public nheko (package (name "nheko") - (version "0.7.2") + (version "0.8.2") (source (origin (method git-fetch) @@ -2286,30 +2280,60 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1cbhgaf9klgxdirrxj571fqwspm0byl75c1xc40l727a6qswvp7s")))) + (base32 "0362hkbprc6jqlgmvzwxyvify4b1ldjakyqdz55m25xsypbpv2f3")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "third_party"))))) (arguments `(#:tests? #f ;no test target #:configure-flags - (list - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_CXX_FLAGS=-fpermissive") + '("-DCMAKE_BUILD_TYPE=Release" + "-DBUILD_DOCS=ON" + ;; Fix required because we are using a static SingleApplication + "-DCMAKE_CXX_FLAGS= \"-DQAPPLICATION_CLASS=QApplication\" " + ;; Compile Qml will make Nheko faster, but you will need to recompile + ;; it, when you update Qt. That's fine for us. + "-DCOMPILE_QML=ON") #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-Werror - (lambda _ - (substitute* "CMakeLists.txt" - (("-Werror") "")) - #t)) + (add-after 'unpack 'unbundle-dependencies + (lambda* (#:key inputs #:allow-other-keys) + (let ((single-app (assoc-ref inputs "single-application"))) + (substitute* "CMakeLists.txt" + ;; Remove include and source dirs,replace with the correct one + (("third_party/blurhash/blurhash.cpp") "") + (("third_party/cpp-httplib-0.5.12") + (string-append "\"" single-app "/include\"")) + (("add_subdirectory.*third_party/SingleApplication.*") "") + ;; Link using the correct static/shared libs + (("SingleApplication::SingleApplication") + (string-append + ;; Dynamic libraries + "httplib" "\n" "blurhash" "\n" + ;; Static library + single-app "/lib/libSingleApplication.a")))))) (add-after 'unpack 'fix-determinism (lambda _ ;; Make Qt deterministic. - (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") - #t))))) + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1"))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/nheko") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))))))) (build-system qt-build-system) (inputs `(("boost" ,boost) + ("blurhash" ,blurhash) + ("cpp-httplib" ,cpp-httplib) ("cmark" ,cmark) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-bad" ,gst-plugins-bad) ; sdp & webrtc for voip + ("gst-plugins-good" ,gst-plugins-good) ; rtpmanager for voip ("json-modern-cxx" ,json-modern-cxx) + ("libnice" ,libnice) ; for voip ("libolm" ,libolm) ("lmdb" ,lmdb) ("lmdbxx" ,lmdbxx) @@ -2317,15 +2341,18 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") ("openssl" ,openssl) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) + ("qtkeychain" ,qtkeychain) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg) ("spdlog" ,spdlog) - ("tweeny" ,tweeny) + ("single-application" ,single-application-qt5) ("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("doxygen" ,doxygen) + ("graphviz" ,graphviz) + ("pkg-config" ,pkg-config) ("qtlinguist" ,qttools))) (home-page "https://github.com/Nheko-Reborn/nheko") (synopsis "Desktop client for Matrix using Qt and C++14") @@ -2333,22 +2360,8 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") Matrix protocol that feels more like a mainstream chat app and less like an IRC client. -There is support for: -@itemize -@item E2E encryption (text messages only: attachments are currently sent unencrypted). -@item User registration. -@item Creating, joining & leaving rooms. -@item Sending & receiving invites. -@item Sending & receiving files and emoji. -@item Typing notifications. -@item Username auto-completion. -@item Message & mention notifications. -@item Redacting messages. -@item Read receipts. -@item Basic communities support. -@item Room switcher (@key{ctrl-K}). -@item Light, Dark & System themes. -@end itemize") +Many matrix features are supported, including user registration, rooms, typing +notification, emojis, E2E encryption, and voip calls.") (license license:gpl3+))) (define-public quaternion -- cgit v1.2.3 From 45bb347099c638a6c480bbabd723c546da09219b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Wed, 1 Sep 2021 22:43:35 +0200 Subject: gnu: Add fatrace. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/monitoring.scm (fatrace): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/monitoring.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index d2aef0eaab..46dea5eeb8 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2021 Marius Bakke ;;; Copyright © 2021 Stefan Reichör +;;; Copyright © 2021 Raphaël Mélotte ;;; ;;; This file is part of GNU Guix. ;;; @@ -650,3 +651,35 @@ LAN, if wanted, and clients can switch between multiple hosts on the network. Hostscope features a bridge to Influx DB. So Grafana can be used to visualize the recorded data over time.") (license license:gpl3+))) + +(define-public fatrace + (package + (name "fatrace") + (version "0.16.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/martinpitt/fatrace") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bxz6v1z0icp716jnv3knjyqp8bv6xnkz8gqd8z3g2b6yxj5xff3")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + ;; tests need root to run as root, + ;; and there is no make target for them: + (delete 'check)) + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)))) + (synopsis "File access events monitor") + (description "This package provides a utility to report system wide file +access events from all running processes. Its main purpose is to find +processes which keep waking up the disk unnecessarily and thus prevent some +power saving.") + (home-page "https://github.com/martinpitt/fatrace") + (license license:gpl3+))) -- cgit v1.2.3 From ae81ec787bed0f4033b6d5c954691aedb2de5c15 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 23:06:47 +0200 Subject: gnu: ncdu: Update to 1.16. * gnu/packages/ncdu.scm (ncdu): Update to 1.16. --- gnu/packages/ncdu.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index 375b528805..9faa7131d3 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,14 +28,14 @@ (define-public ncdu (package (name "ncdu") - (version "1.15.1") + (version "1.16") (source (origin (method url-fetch) (uri (string-append "https://dev.yorhel.nl/download/ncdu-" version ".tar.gz")) (sha256 (base32 - "1c1zxalm5asyhn4p1hd51h7khw17515gbqmvdz63kc8xpx6xqbdh")))) + "1m0gk09jaz114piidiw8fkg0id5l6nhz1cg5nlaf1yl3l595g49b")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (synopsis "Ncurses-based disk usage analyzer") -- cgit v1.2.3 From 1b0a9985787d02294f0a93c6b2c7e4abdb8e68c1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 23:10:23 +0200 Subject: gnu: mtools: Update to 4.0.35. * gnu/packages/mtools.scm (mtools): Update to 4.0.35. --- gnu/packages/mtools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm index 147d19917b..a660606316 100644 --- a/gnu/packages/mtools.scm +++ b/gnu/packages/mtools.scm @@ -29,14 +29,14 @@ (define-public mtools (package (name "mtools") - (version "4.0.31") + (version "4.0.35") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mtools/mtools-" version ".tar.bz2")) (sha256 (base32 - "11nm5mhsq700f3dzvzjpcik89cfcn38mb249yc0sjbwggwkrk2ak")) + "0ja7lkbw6v36p0cq0hs3xsw2ks970k47d350j7cg1lji6wbrwxil")) (patches (search-patches "mtools-mformat-uninitialized.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 689dd9c207783f1f89f798245053103ffcb57610 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 23:12:57 +0200 Subject: gnu: nginx: Update to 1.21.2. * gnu/packages/web.scm (nginx): Update to 1.21.2. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5817d2dd95..47f7ce4286 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -371,15 +371,15 @@ the same, being completely separated from the Internet.") ;; Track the ‘mainline’ branch. Upstream considers it more reliable than ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) - ;; Consider updating the nginx-documentation package together with this one. - (version "1.21.0") + ;; Please update the nginx-documentation package together with this one! + (version "1.21.2") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "0w87zhm5nfx88x9hj6drrvm5f3m02kzbjp39x1lsglrbmi5jl6gy")))) + "11ail85iw6mg8fxd2qnxhcghi0frjk5r70cfar83dms61rb1qxri")))) (build-system gnu-build-system) (inputs `(("libxml2" ,libxml2) ("libxslt" ,libxslt) -- cgit v1.2.3 From afc46629c89fb67fd0d50c82b1bb4a34470669e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 23:21:12 +0200 Subject: gnu: nginx-documentation: Update to 1.21.2-2764-bc9c5d11b67c. * gnu/packages/web.scm (nginx-documentation): Update to 1.21.2-2764-bc9c5d11b67c. --- gnu/packages/web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 47f7ce4286..2cd5f073a9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -474,9 +474,9 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (define-public nginx-documentation ;; This documentation should be relevant for the current nginx package. - (let ((version "1.21.0") - (revision 2726) - (changeset "a7a36efd10af")) + (let ((version "1.21.2") + (revision 2764) + (changeset "bc9c5d11b67c")) (package (name "nginx-documentation") (version (simple-format #f "~A-~A-~A" version revision changeset)) @@ -488,7 +488,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (file-name (string-append name "-" version)) (sha256 (base32 - "1fl7rkbfdd26c78h85x4w3kas16rpj4pxzjhc071qvx7znwgm2pn")))) + "05n72q9vqxx37dyw3yl7jssmpqkw3rwxa2y3m6s0c0ih0z2bx58n")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite -- cgit v1.2.3 From 03c5f66afdb896111d0ed4dde49b3c60c9db5d29 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 23:24:58 +0200 Subject: gnu: nftables: Update to 1.0.0. * gnu/packages/linux.scm (nftables): Update to 1.0.0. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1b56a1e315..462d35ce51 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6846,7 +6846,7 @@ used by nftables.") (define-public nftables (package (name "nftables") - (version "0.9.9") + (version "1.0.0") (source (origin (method url-fetch) @@ -6855,7 +6855,7 @@ used by nftables.") (string-append "https://www.nftables.org/projects/nftables" "/files/nftables-" version ".tar.bz2"))) (sha256 - (base32 "1d7iwc8xlyfsbgn6qx1sdfcq7jhpl8wpfj39hcd06y8dzp3jvvvn")))) + (base32 "1x25zs2czmn14mmq1nqi4zibsvh04vqjbx5lxj42nylnmxym9gsq")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-man-doc"))) ; FIXME: Needs docbook2x. -- cgit v1.2.3 From 7be258c0ddae175450622884920d42a758bbced6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 23:25:34 +0200 Subject: gnu: nftables: Omit static library. * gnu/packages/linux.scm (nftables)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/linux.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 462d35ce51..fbe6d42336 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6858,7 +6858,8 @@ used by nftables.") (base32 "1x25zs2czmn14mmq1nqi4zibsvh04vqjbx5lxj42nylnmxym9gsq")))) (build-system gnu-build-system) (arguments `(#:configure-flags - '("--disable-man-doc"))) ; FIXME: Needs docbook2x. + '("--disable-man-doc" ; FIXME: needs docbook2x + "--disable-static"))) (inputs `(("gmp" ,gmp) ("libmnl" ,libmnl) ("libnftnl" ,libnftnl) -- cgit v1.2.3 From 9cd89b1206cf9288fc26b09f3f34883c6e309824 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:45:34 +0200 Subject: gnu: hplip: Update to 3.21.6. * gnu/packages/cups.scm (hplip): Update to 3.21.6. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index ff3fb2f2db..b9077b04f7 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -490,14 +490,14 @@ should only be used as part of the Guix cups-pk-helper service.") (define-public hplip (package (name "hplip") - (version "3.21.4") + (version "3.21.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "1lsa0g8lafnmfyia0vy9x1j9q2l80xjjm7clkrawrbg53y3x7ixx")) + "1jkvbq64pxn5rg25pk13xwn5xr2bn0sa95yvh2q4ys0kv79n0cyc")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 1962c2fdb5c7d42eff920c7afb20c6f2c45285b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 21:01:36 +0200 Subject: gnu: inxi-minimal: Update to 3.3.06-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.3.06-1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7910bb16a7..9b8adf1312 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3972,7 +3972,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.3.04-1") + (version "3.3.06-1") (source (origin (method git-fetch) @@ -3981,7 +3981,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "1rrhycp8i43yf9wi80n4pq2hkfhvb2rg1srz8if28bh6fhhasjzw")))) + (base32 "1qk40iyrdp52vmbiqwxicvlcycm2v2bf1gg4lzq0b4619sd6d1m7")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit v1.2.3 From 69f0534a9f20f09ce3531643418030e24a44bc66 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 21:01:51 +0200 Subject: gnu: igt-gpu-tools: Update to 1.26. * gnu/packages/admin.scm (igt-gpu-tools): Update to 1.26. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9b8adf1312..db820b28c1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3527,7 +3527,7 @@ buffers.") (define-public igt-gpu-tools (package (name "igt-gpu-tools") - (version "1.25") + (version "1.26") (source (origin (method git-fetch) @@ -3536,7 +3536,7 @@ buffers.") (commit (string-append "igt-gpu-tools-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1lvhkdhilw0fn4nzkpfwvrhiv8d92h811qs2v6ac3p5w7v86a9zm")))) + (base32 "0m124pqv7zna25jnvk566c4kk628jr0w8mgnp8mr5xqz9cprgczm")))) (build-system meson-build-system) (arguments `(#:tests? #f)) ; many of the tests try to load kernel modules -- cgit v1.2.3 From bb6257212fc821004bb0c2eee319b76f9ae185ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 21:07:53 +0200 Subject: gnu: lldpd: Update to 1.0.12. * gnu/packages/networking.scm (lldpd): Update to 1.0.12. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c941fbd2f9..204ef167c6 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3889,14 +3889,14 @@ thousands of connections is clearly realistic with today's hardware.") (define-public lldpd (package (name "lldpd") - (version "1.0.11") + (version "1.0.12") (source (origin (method url-fetch) (uri (string-append "https://media.luffy.cx/files/lldpd/lldpd-" version ".tar.gz")) (sha256 - (base32 "1r265ns6fh04xwrzj06p2l7kl5rkkns0cdawp1zwpvxs1xq1a7dm")) + (base32 "1wfs50b0694dm60ryjfmxgkxxsqpp9sxqbc4laad364wbddwd56i")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From a4ffe3d145b00736f5fdf53ee2c70a7e48592e83 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 22:58:13 +0200 Subject: gnu: bcachefs-tools: Update to 0.1-9.6c42566. * gnu/packages/file-systems.scm (bcachefs-tools): Update to 0.1-9.6c42566. [native-inputs]: Add python and python-docutils. --- gnu/packages/file-systems.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 8da2714cfd..63a3d4b93d 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -415,8 +415,8 @@ from a mounted file system.") (license license:gpl2+))) (define-public bcachefs-tools - (let ((commit "fe1bb39aa52d9140981ba1e96f3c95ddf14006ce") - (revision "8")) + (let ((commit "6c42566c6204bb5dcd6af3b97257e548b9d2db67") + (revision "9")) (package (name "bcachefs-tools") (version (git-version "0.1" revision commit)) @@ -428,7 +428,7 @@ from a mounted file system.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1ks6w2v76pfpp70cv1d6znxaw1g5alz1v6hf8z9gvj15r94vgpwz")))) + (base32 "0xagz0k3li10ydma55mnld0nb2pyfx90vsdvgjflgnx6jw3cq4dq")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -464,7 +464,11 @@ from a mounted file system.") ;; For tests. ("python-pytest" ,python-pytest) - ("valgrind" ,valgrind))) + ("valgrind" ,valgrind) + + ;; For generating documentation with rst2man. + ("python" ,python) + ("python-docutils" ,python-docutils))) (inputs `(("eudev" ,eudev) ("keyutils" ,keyutils) -- cgit v1.2.3 From 9a10a8192b5ef3cbb5d373b12df41294aab13ba5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 22:58:26 +0200 Subject: gnu: libostree: Update to 2021.3. * gnu/packages/package-management.scm (libostree): Update to 2021.3. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b068c4842b..2611951a52 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1306,7 +1306,7 @@ for packaging and deployment of cross-compiled Windows applications.") (define-public libostree (package (name "libostree") - (version "2021.2") + (version "2021.3") (source (origin (method url-fetch) @@ -1314,7 +1314,7 @@ for packaging and deployment of cross-compiled Windows applications.") "https://github.com/ostreedev/ostree/releases/download/v" (version-major+minor version) "/libostree-" version ".tar.xz")) (sha256 - (base32 "0z2x9krnd6nblwq0nz99igzhh3yv022rn3hgcyrzci0xqzkhhh45")))) + (base32 "1cyhr3s7xsgnsais5m4cjwdwcq46naf25r1k042c4n1y1jgs798g")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From be85c89023aa3828fdb182ce165f12ca6e1f2111 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 18:21:56 +0200 Subject: gnu: vsftpd: Update to 3.0.5. * gnu/packages/ftp.scm (vsftpd): Update to 3.0.5. --- gnu/packages/ftp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 81dc58dadc..b3b0068988 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -260,14 +260,14 @@ directory comparison and more.") (define-public vsftpd (package (name "vsftpd") - (version "3.0.4") + (version "3.0.5") (source (origin (method url-fetch) (uri (string-append "https://security.appspot.com/downloads/" "vsftpd-" version ".tar.gz")) (sha256 - (base32 "09kap2qsd80m0x80jv5224x002x2jkr584dksppcv9p84yyj353b")))) + (base32 "1lwipiq8q9qzvwv6f418fbvagpz0p6v0jjplkvcsc2sb8np05di6")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From fab0ab65c1fa425a69f0dd41c7711e267fc88605 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 18:32:34 +0200 Subject: gnu: xrandr-invert-colors: Update to 0.02. * gnu/packages/xdisorg.scm (xrandr-invert-colors): Update to 0.02. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d960d265c1..7bea31f11e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2208,7 +2208,7 @@ to automatically turn it on on login.") (define-public xrandr-invert-colors (package (name "xrandr-invert-colors") - (version "0.01") + (version "0.02") (source (origin (method git-fetch) (uri (git-reference @@ -2217,7 +2217,7 @@ to automatically turn it on on login.") (file-name (git-file-name name version)) (sha256 (base32 - "1br3x9vr6xm4ika06n8cfxx1b3wdchdqvyzjl4y1chmivrml8x9h")))) + "0gk1fgxb2kjyr78xn8m0ckjdic99ras7msa67piwnhj3j4scg1ih")))) (build-system gnu-build-system) (arguments `(#:make-flags (list ,(string-append "CC=" (cc-for-target))) -- cgit v1.2.3 From 0dafe48ee712cbc1c050a5aaed3369f472b7a4b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 18:34:13 +0200 Subject: gnu: xrandr-invert-colors: Fix executable name. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (xrandr-invert-colors)[arguments]: Remove ‘.bin’ suffix from the binary during the 'install phase, and don't return #t. --- gnu/packages/xdisorg.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 7bea31f11e..f630ae95a7 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2226,11 +2226,14 @@ to automatically turn it on on login.") (modify-phases %standard-phases (delete 'configure) (replace 'install + ;; It's simpler to install the single binary ourselves than to patch + ;; the Makefile's install target into working. (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) - (install-file "xrandr-invert-colors.bin" bin) - #t)))))) + (mkdir-p bin) + (copy-file "xrandr-invert-colors.bin" + (string-append bin "/xrandr-invert-colors")))))))) (inputs `(("libxrandr" ,libxrandr))) (home-page "https://github.com/zoltanp/xrandr-invert-colors") -- cgit v1.2.3 From 5b54a6d9e4962508f6f86ead8ffee2fd1561cd90 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 18:48:42 +0200 Subject: gnu: balsa: Update to 2.6.3. * gnu/packages/mail.scm (balsa): Update to 2.6.3. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 87094cb9eb..eb2732508b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3760,14 +3760,14 @@ tools and applications: (define-public balsa (package (name "balsa") - (version "2.6.2") + (version "2.6.3") (source (origin (method url-fetch) (uri (string-append "https://pawsa.fedorapeople.org/balsa/" - "balsa-" version ".tar.bz2")) + "balsa-" version ".tar.xz")) (sha256 - (base32 "1w0239i01mw4wwwy7xh8gz7zgl5khwvfm5wy35x0swvvax021mai")))) + (base32 "1m0x3rk7cp7slr47rmg4y91rbxgs652v706lyxj600m5r5v4bl6l")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 8fd5138f4b4d3b7b24fd97c81f5bfb1f4f0dcbd2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 19:17:07 +0200 Subject: gnu: 0xffff: Update to 0.9. * gnu/packages/flashing-tools.scm (0xffff): Update to 0.9. --- gnu/packages/flashing-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index e0a099e966..371bbb7ccb 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -99,7 +99,7 @@ programmer devices.") (define-public 0xffff (package (name "0xffff") - (version "0.8") + (version "0.9") (source (origin (method git-fetch) @@ -108,7 +108,7 @@ programmer devices.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1a5b7k96vzirb0m8lqp7ldn77ppz4ngf56wslhsj2c6flcyvns4v")))) + (base32 "0rl1xzbxl991pm2is98zbryac1lgjrc3zphmbd8agv07av0r6r6n")))) (build-system gnu-build-system) (inputs `(("libusb" ,libusb-0.1))) ; doesn't work with libusb-compat -- cgit v1.2.3 From 81cd1c580c30974568e5cf8e5ce39f22cad53268 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 19:17:39 +0200 Subject: gnu: 0xffff: Prepare for cross-compilation. * gnu/packages/flashing-tools.scm (0xffff)[arguments]: Use CC-FOR-TARGET for cross compilation. --- gnu/packages/flashing-tools.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 371bbb7ccb..32c17b5ddd 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2017 Jonathan Brielmaier ;;; Copyright © 2017 Julien Lepiller -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -29,6 +29,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -111,13 +112,16 @@ programmer devices.") (base32 "0rl1xzbxl991pm2is98zbryac1lgjrc3zphmbd8agv07av0r6r6n")))) (build-system gnu-build-system) (inputs - `(("libusb" ,libusb-0.1))) ; doesn't work with libusb-compat + ;; Building with libusb-compat will succeed but the result will be broken. + ;; See . + `(("libusb" ,libusb-0.1))) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (delete 'configure)) ; no configure #:make-flags - (list "CC=gcc" + (list (string-append "CC=" ,(cc-for-target)) + "HOST_CC=gcc" "BUILD_DATE=GNU Guix" (string-append "PREFIX=" %output)) #:tests? #f)) ; no 'check' target -- cgit v1.2.3 From dde56d8377d41a13371fe5a95feec719427e84c9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:08:33 +0200 Subject: gnu: cjson: Update to 1.7.15. * gnu/packages/javascript.scm (cjson): Update to 1.7.15. --- gnu/packages/javascript.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index a935d321c5..81de5b67a6 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -41,7 +41,7 @@ (define-public cjson (package (name "cjson") - (version "1.7.14") + (version "1.7.15") (source (origin (method git-fetch) (uri (git-reference @@ -49,7 +49,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1rlnailhjm180zb6pc17jwphjwivw8kfpqgixjfgq4iyryq46sah")))) + (base32 "0lmq7sx09rmsirimbyvaaia44i134ppkp10cw1d2rygr76k9qwq2")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DENABLE_CJSON_UTILS=On"))) -- cgit v1.2.3 From 90b86970eb6a024354a85e8dfa2d294bbda39162 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:08:59 +0200 Subject: gnu: benchmark: Update to 1.5.6. * gnu/packages/benchmark.scm (benchmark): Update to 1.5.6. [arguments]: Don't return #t from phases. --- gnu/packages/benchmark.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index b8f5d7f687..93be96eb85 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -222,7 +222,7 @@ This can give a much better understanding of the command's performance.") (define-public benchmark (package (name "benchmark") - (version "1.5.5") + (version "1.5.6") (source (origin (method git-fetch) (uri (git-reference @@ -231,7 +231,7 @@ This can give a much better understanding of the command's performance.") (file-name (git-file-name name version)) (sha256 (base32 - "1ijv4idcjsyy61dab59ywbx0xdbws44kxgqjr1ylaxzwknh745qf")))) + "030g4d8vpn2442dsap0qw86lsw7xfl36k0x0x9bn0vvm11qvjn8c")))) (build-system cmake-build-system) (native-inputs `(("googletest-source" ,(package-source googletest)) @@ -242,8 +242,7 @@ This can give a much better understanding of the command's performance.") (add-after 'unpack 'unpack-googletest (lambda* (#:key inputs #:allow-other-keys) (copy-recursively (assoc-ref inputs "googletest-source") - "googletest") - #t))))) + "googletest")))))) (home-page "https://github.com/google/benchmark") (synopsis "Microbenchmark support library") (description -- cgit v1.2.3 From 42eb6f62aa983a15bf17a3e652448b58501480e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:34:06 +0200 Subject: gnu: drumstick: Update to 2.3.1. * gnu/packages/music.scm (drumstick): Update to 2.3.1. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b95be813dc..827dde7ac3 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2893,14 +2893,14 @@ browser.") (define-public drumstick (package (name "drumstick") - (version "2.3.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/drumstick/" version "/drumstick-" version ".tar.bz2")) (sha256 (base32 - "12haksnf91ra5w5dwnlc3rcw4js8wj4hsl6kzyqrx4q4fnpvjahk")))) + "1rs248pkgn6d29nkvw9ab6dvi1vsz220jdmz1ddzr29cpyc0adfh")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target -- cgit v1.2.3 From 98da6e511cce4a962254e249f74fe441a631ea12 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:34:28 +0200 Subject: gnu: qtractor: Update to 0.9.23. * gnu/packages/music.scm (qtractor): Update to 0.9.23. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 827dde7ac3..56fcc6d91c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3292,14 +3292,14 @@ from the command line.") (define-public qtractor (package (name "qtractor") - (version "0.9.22") + (version "0.9.23") (source (origin (method url-fetch) (uri (string-append "https://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "0n73xn3205afi9vsy6ianixq36ddp8qv6iaq03ldc6mkkfvn0nc5")))) + "1d2d884x5kfa41skwyh0ihyx5jgc9467617gmfjm379qcgnxq00s")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target -- cgit v1.2.3 From 8608db8edd203b1bdaebebaa3216fc5e01854e49 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:34:50 +0200 Subject: gnu: synthv1: Update to 0.9.23. * gnu/packages/music.scm (synthv1): Update to 0.9.23. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 56fcc6d91c..d478c8518d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2219,7 +2219,7 @@ users to select LV2 plugins and run them with jalv.") (define-public synthv1 (package (name "synthv1") - (version "0.9.22") + (version "0.9.23") (source (origin (method url-fetch) (uri @@ -2227,7 +2227,7 @@ users to select LV2 plugins and run them with jalv.") "/synthv1-" version ".tar.gz")) (sha256 (base32 - "0cmxbsfhkkyqn97rc47cb7d3bv6bd9r71xp4z85mi2kl3q4k569i")))) + "03lvq84pg0agdn16i7ng6j7lp1ii3inf4pzjypnkywb2km7zcpni")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 1f6202e0014653742bce9a04200572c3912811a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:34:58 +0200 Subject: gnu: drumkv1: Update to 0.9.23. * gnu/packages/music.scm (drumkv1): Update to 0.9.23. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index d478c8518d..6427b5d428 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2251,7 +2251,7 @@ oscillators and stereo effects.") (define-public drumkv1 (package (name "drumkv1") - (version "0.9.22") + (version "0.9.23") (source (origin (method url-fetch) (uri @@ -2259,7 +2259,7 @@ oscillators and stereo effects.") "/drumkv1-" version ".tar.gz")) (sha256 (base32 - "0c13l814f5rhbmpmd4w0a07j1ki5wc092xcgy6p6zj5s03zvcrzy")))) + "1jgsml9wxzwnqyb6wjn9zk94qvxs6c898hyj10sza4d9l6r1rnw0")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 06d8a317c1cb8e5dd19165d7381f33c50a39ac79 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:35:03 +0200 Subject: gnu: samplv1: Update to 0.9.23. * gnu/packages/music.scm (samplv1): Update to 0.9.23. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6427b5d428..af93f27103 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2284,7 +2284,7 @@ effects.") (define-public samplv1 (package (name "samplv1") - (version "0.9.22") + (version "0.9.23") (source (origin (method url-fetch) (uri @@ -2292,7 +2292,7 @@ effects.") "/samplv1-" version ".tar.gz")) (sha256 (base32 - "19ajnwzd5w2jlazflh5r9qm4sflkn2s2zc5zh0vlqywxzvb9dp9g")))) + "1bgyz530mpmlabvy592zickrzk4x4rm2i0ixf3z6plgn265km43q")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 522a3bf99cbc21a9093f63280b9508cd69b94ff0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Sep 2021 20:35:07 +0200 Subject: gnu: padthv1: Update to 0.9.23. * gnu/packages/music.scm (padthv1): Update to 0.9.23. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index af93f27103..6236703f48 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2317,7 +2317,7 @@ effects.") (define-public padthv1 (package (name "padthv1") - (version "0.9.22") + (version "0.9.23") (source (origin (method url-fetch) (uri @@ -2325,7 +2325,7 @@ effects.") "/padthv1-" version ".tar.gz")) (sha256 (base32 - "1wky9v91qc3j866di8mcjz0pf3n8ah888lxg8dpvp6ryh1cm6i6x")))) + "0222n74kykirkhq4va09hr37rybxs0nxjbmamp38jf94bfz5y8gp")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 1943f17f90aaba64b0344edb71e6c3105e5b22ad Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Sep 2021 08:03:55 +0200 Subject: gnu: nauty: Update to 2.7r2. * gnu/packages/maths.scm (nauty): Update to 2.7r2. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ce9515fb35..86f6ff34c5 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6390,7 +6390,7 @@ management via the GIMPS project's Primenet server.") (define-public nauty (package (name "nauty") - (version "2.7r1") + (version "2.7r2") (source (origin (method url-fetch) @@ -6398,7 +6398,7 @@ management via the GIMPS project's Primenet server.") "https://pallini.di.uniroma1.it/" "nauty" (string-join (string-split version #\.) "") ".tar.gz")) (sha256 - (base32 "0xsfqfcknbd6g6wzpa5l7crmmk3bf3zjh37rhylq6b20dqcmvjkn")))) + (base32 "0s57rq7kk3rrwgrjygpwjvq9bbwq4wjbpcvgbz191jhwv8bnrhb9")))) (build-system gnu-build-system) (outputs '("out" "lib")) (arguments -- cgit v1.2.3 From 9cd32949661907bf0cb4e8d4a6ee0f8c89987f07 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Sep 2021 08:09:22 +0200 Subject: gnu: giac: Update to 1.7.0-29. * gnu/packages/algebra.scm (giac): Update to 1.7.0-29. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index d794f9b99c..92644c4f62 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -343,7 +343,7 @@ precision.") (define-public giac (package (name "giac") - (version "1.7.0-25") + (version "1.7.0-29") (source (origin (method url-fetch) @@ -355,7 +355,7 @@ precision.") "~parisse/debian/dists/stable/main/source/" "giac_" version ".tar.gz")) (sha256 - (base32 "0d11shsifnd5p23iym5h0kqa7bp7p0p25rwvya7hdji2kwvgr3cl")))) + (base32 "1dw0mh212ri9viks15cn75m38m4q4nj3hlv2bbrpdz8sgnnssz0a")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) -- cgit v1.2.3 From 526d1d78bb936233e2b525355b4a20b44c6d2531 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Sep 2021 08:11:06 +0200 Subject: gnu: emacs-dockerfile-mode: Update to 1.5. * gnu/packages/emacs-xyz.scm (emacs-dockerfile-mode): Update to 1.5. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 030809f5ac..7f51e81b13 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23522,7 +23522,7 @@ constant expressions.") (define-public emacs-dockerfile-mode (package (name "emacs-dockerfile-mode") - (version "1.4") + (version "1.5") (source (origin (method git-fetch) @@ -23532,7 +23532,7 @@ constant expressions.") (file-name (git-file-name name version)) (sha256 (base32 - "1ypkihd9si769r6k0lfrv8jq8mjv4gyhiwyi820sayfppvma5rj0")))) + "09pd8mfa45fy95mdg52fsafj3d1d5l52rskmw6q5np59dyzwch1b")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-s" ,emacs-s))) -- cgit v1.2.3 From 793b525b0f089eadf357f559d5266212953903de Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Sep 2021 08:13:27 +0200 Subject: gnu: emacs-crdt: Update to 0.1.4. * gnu/packages/emacs-xyz.scm (emacs-crdt): Update to 0.1.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7f51e81b13..e57262bd2e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18078,7 +18078,7 @@ confused by comments or @code{foo-bar} matching @code{foo}.") (define-public emacs-crdt (package (name "emacs-crdt") - (version "0.1.3") + (version "0.1.4") (source (origin (method git-fetch) @@ -18087,7 +18087,7 @@ confused by comments or @code{foo-bar} matching @code{foo}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18aa2pybgfamll0jb4l18nggr6whzqd8mmd3kh8if4d685pc50p5")))) + (base32 "0455n75nan7abwnp7zfvrdbqmvlvfp0sf1ififr57h3sqsx3llhk")))) (build-system emacs-build-system) (home-page "https://code.librehq.com/qhong/crdt.el") (synopsis "Real-time collaborative editing environment") -- cgit v1.2.3 From f108a50fa4d2811f3d2ff69aae85544b4cd470f2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Sep 2021 08:17:42 +0200 Subject: gnu: emacs-dart-mode: Update to 1.0.7. * gnu/packages/emacs-xyz.scm (emacs-dart-mode): Update to 1.0.7. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e57262bd2e..98014e06db 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12342,7 +12342,7 @@ known loosely as deftheme. Many mode-specific customizations are included.") (define-public emacs-dart-mode (package (name "emacs-dart-mode") - (version "1.0.5") + (version "1.0.7") (source (origin (method git-fetch) @@ -12351,7 +12351,7 @@ known loosely as deftheme. Many mode-specific customizations are included.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1qmdlwjmmqyyb65sqvfpygifai5m0llc815vp0jqwp8ldd8ls172")))) + (base32 "1vql8m4nj0brmv58b6lkbhykik8n6j4i7d3nylcls78y7ihc2cz8")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From e12ba46c4c0686271a7e420d10fdda2b427bcf4d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 4 Sep 2021 08:20:52 +0200 Subject: gnu: emacs-danneskjold-theme: Update to 0.0.0-2-e4d1f2c. * gnu/packages/emacs-xyz.scm (emacs-danneskjold-theme): Update to 0.0.0-2-e4d1f2c. [version]: Use git-version. [home-page]: Move below. --- gnu/packages/emacs-xyz.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 98014e06db..f04a0225b3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12365,29 +12365,28 @@ basic syntax highlighting and indentation.") (license license:gpl3+))) (define-public emacs-danneskjold-theme - (let* ((commit "8733d2fe8743e8a01826ea6d4430ef376c727e57") - (revision "1")) + (let* ((commit "e4d1f2c76245fe9d0d07133a841e789d139df28d") + (revision "2")) (package (name "emacs-danneskjold-theme") - (version (string-append "0.0.0-" revision "." (string-take commit 7))) - (home-page "https://github.com/rails-to-cosmos/danneskjold-theme") + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url home-page) + (url "https://github.com/rails-to-cosmos/danneskjold-theme") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 - "0s6rbsb0y8i8m5b9xm4gw1p1cxsxdqnqxqqb638pygz9f76mbir1")))) + (base32 "0s6rbsb0y8i8m5b9xm4gw1p1cxsxdqnqxqqb638pygz9f76mbir1")))) (build-system emacs-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'unpack 'delete-screenshots (lambda _ - (delete-file-recursively "screenshots") #t))))) + (delete-file-recursively "screenshots")))))) + (home-page "https://github.com/rails-to-cosmos/danneskjold-theme") (synopsis "High-contrast Emacs theme") (description "@code{danneskjold-theme} is a high-contrast theme for Emacs.") -- cgit v1.2.3 From 2226d5b9590840f6fdc0d5c03b14c9d050435c4e Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 15 Aug 2021 08:46:36 +0200 Subject: gnu: Add setroot. * gnu/packages/xorg.scm (setroot): New variable. --- gnu/packages/xorg.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6f9633985e..cae0fb3f73 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6925,3 +6925,38 @@ an existing user-specified one, writes a cookie to it, and then starts the the server and cleaning up before returning the exit status of the command.") (license (list license:x11 ; the script license:gpl2+)))) ; the man page + +(define-public setroot + (package + (name "setroot") + (version "2.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ttzhou/setroot") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0w95828v0splk7bj5kfacp4pq6wxpyamvyjmahyvn5hc3ycq21mq")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "DESTDIR=" (assoc-ref %outputs "out")) + "PREFIX=" + "xinerama=1") + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("imlib2" ,imlib2) + ("libx11" ,libx11) + ("libxinerama" ,libxinerama))) + (home-page "https://github.com/ttzhou/setroot") + (synopsis "Simple X background setter inspired by imlibsetroot and feh") + (description "Setroot is a lightweight X background setter with feh's +syntax without its image viewing capabilities. It supports multiple monitors +and can restore previously set wallpapers and options.") + (license license:gpl3+))) -- cgit v1.2.3 From 2ace5d7de74021955556f0a5d6c7d9359c9039fd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 Sep 2021 11:44:22 +0200 Subject: gnu: perl-io-socket-inet6: Propagate runtime dependency. * gnu/packages/networking.scm (perl-io-socket-inet6)[inputs]: Change to ... [propagated-inputs]: ... this. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 204ef167c6..0b130a9627 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2195,7 +2195,7 @@ It is intended primarily for use in testing.") `(("perl-module-build" ,perl-module-build) ("perl-test-pod" ,perl-test-pod) ("perl-test-pod-coverage" ,perl-test-pod-coverage))) - (inputs `(("perl-socket6" ,perl-socket6))) + (propagated-inputs `(("perl-socket6" ,perl-socket6))) (arguments `(;; Need network socket API #:tests? #f)) (home-page -- cgit v1.2.3 From 8ceb7651c2aff73644a49c1d72fe8b63948f0240 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 2 Sep 2021 09:03:14 +0200 Subject: gnu: python-confuse: Update to 1.5.0. * gnu/packages/python-xyz.scm (python-confuse)[version]: Update to 1.5.0. [propagated-inputs]: Remove python-pathlib. [synopsis]: Remove trailing dot. --- gnu/packages/python-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 55858fbf8e..12adafa892 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -107,6 +107,7 @@ ;;; Copyright © 2021 Hugo Lecomte ;;; Copyright © 2021 Franck Pérignon ;;; Copyright © 2021 Petr Hodina +;;; Copyright © 2021 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -25909,20 +25910,19 @@ Qt applications.") (define-public python-confuse (package (name "python-confuse") - (version "1.4.0") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "confuse" version)) (sha256 (base32 - "0r74djc8r6lfx6ldsqnhpvfsn256gsfzbl33qcm77hp2qr8h9z4j")))) + "0bh2kyj8wd7h9gg4nsvrbykl5ly0f70f0wi3fbm204b1f0fcmywj")))) (build-system python-build-system) (propagated-inputs - `(("python-pathlib" ,python-pathlib) - ("python-pyyaml" ,python-pyyaml))) + `(("python-pyyaml" ,python-pyyaml))) (home-page "https://github.com/beetbox/confuse") - (synopsis "Painless YAML configuration.") + (synopsis "Painless YAML configuration") (description "Confuse is a configuration library for Python that uses YAML. It takes care of defaults, overrides, type checking, command-line integration, human-readable errors, and standard OS-specific locations.") -- cgit v1.2.3 From 9f543674ff0f2f178b656597fef24e834635d60b Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 2 Sep 2021 13:42:43 +0200 Subject: gnu: python-pyacoustid: Update to 1.2.2. * gnu/packages/mp3.scm (python-pyacoustid) [version]: Update to 1.2.2. [arguments]: Add phase 'chromaprint-path. [inputs]: Add chromaprint. [home-page]: Update. --- gnu/packages/mp3.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 9de9055e51..3555958f2a 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2021 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -645,19 +646,34 @@ FFmpeg, etc.") (define-public python-pyacoustid (package (name "python-pyacoustid") - (version "1.1.7") + (version "1.2.2") (source (origin (method url-fetch) (uri (pypi-uri "pyacoustid" version)) (sha256 (base32 - "1zan6c22ca6sjy0g9ajwjp6mkzw7jv8r3n7jzska09a6x254lf87")))) + "0ha15m41r8ckmanc4k9nrlb9hprvhdjxndzw40a1yj3z1b1xjyf2")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'chromaprint-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "chromaprint.py" + (("libchromaprint.so.1") + (string-append (assoc-ref inputs "chromaprint") + "/lib/libchromaprint.so.1"))) + (substitute* "acoustid.py" + (("'fpcalc'") + (string-append "'" (assoc-ref inputs "chromaprint") + "/bin/fpcalc'"))) + #t))))) + (inputs `(("chromaprint" ,chromaprint))) (propagated-inputs `(("python-audioread" ,python-audioread) ("python-requests" ,python-requests))) - (home-page "https://github.com/sampsyo/pyacoustid") + (home-page "https://github.com/beetbox/pyacoustid") (synopsis "Bindings for Chromaprint acoustic fingerprinting") (description "This package provides bindings for the Chromaprint acoustic -- cgit v1.2.3 From ab12354c0a37fb2a232935f8c5ce388d040241e2 Mon Sep 17 00:00:00 2001 From: Simon Streit Date: Thu, 2 Sep 2021 13:50:53 +0200 Subject: gnu: python-mediafile: Update to 0.7.0. Remove patch. It is now included in upstream release. * gnu/packages/music.scm (python-mediafile): Update to 0.7.0. * gnu/packages/patches/python-mediafile-wavpack.patch: Delete patch. * gnu/local.mk: Deregister it. --- gnu/packages/music.scm | 9 ++-- .../patches/python-mediafile-wavpack.patch | 57 ---------------------- 2 files changed, 4 insertions(+), 62 deletions(-) delete mode 100644 gnu/packages/patches/python-mediafile-wavpack.patch (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6236703f48..82c9242cd3 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2021 Rovanion Luckey ;;; Copyright © 2021 Justin Veilleux ;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -3604,20 +3605,18 @@ streams on an individual packet/page level.") (define-public python-mediafile (package (name "python-mediafile") - (version "0.6.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (pypi-uri "mediafile" version)) - (patches (search-patches "python-mediafile-wavpack.patch")) (sha256 (base32 - "0jmsp3f57xj35ayp8b6didk85nxgl3viw34s5px3l5dwgc055yx3")))) + "0ipb001j19s9wvssmrj8wz0nrkbl0k3zr3dgzyp1bd9cjc6vklnp")))) (build-system python-build-system) (propagated-inputs `(("python-mutagen" ,python-mutagen) - ("python-six" ,python-six) - ("python-tox" ,python-tox))) + ("python-six" ,python-six))) (home-page "https://github.com/beetbox/mediafile") (synopsis "Read and write audio file tags") (description diff --git a/gnu/packages/patches/python-mediafile-wavpack.patch b/gnu/packages/patches/python-mediafile-wavpack.patch deleted file mode 100644 index 9839fe87b5..0000000000 --- a/gnu/packages/patches/python-mediafile-wavpack.patch +++ /dev/null @@ -1,57 +0,0 @@ -This patch has already been applied upstream, but is not included in the -current release 0.6.0. - -From d2fc3b59f77c515b02dfe7ad936f89264375d2b4 Mon Sep 17 00:00:00 2001 -From: Adrian Sampson -Date: Wed, 29 Jul 2020 19:42:57 -0400 -Subject: [PATCH] Fix test for WavPack bitrate - -Fixes #34. ---- - docs/index.rst | 5 +++++ - mediafile.py | 2 +- - test/test_mediafile.py | 2 +- - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/docs/index.rst b/docs/index.rst -index 7b622df..1465405 100644 ---- a/docs/index.rst -+++ b/docs/index.rst -@@ -100,6 +100,11 @@ Internals - Changelog - --------- - -+v0.7.0 -+'''''' -+ -+- Mutagen 1.45.0 or later is now required. -+ - v0.6.0 - '''''' - -diff --git a/mediafile.py b/mediafile.py -index 23fadaf..9e9d063 100644 ---- a/mediafile.py -+++ b/mediafile.py -@@ -56,7 +56,7 @@ - import six - - --__version__ = '0.6.0' -+__version__ = '0.7.0' - __all__ = ['UnreadableFileError', 'FileTypeError', 'MediaFile'] - - log = logging.getLogger(__name__) -diff --git a/test/test_mediafile.py b/test/test_mediafile.py -index e9e1850..7f17f44 100644 ---- a/test/test_mediafile.py -+++ b/test/test_mediafile.py -@@ -907,7 +907,7 @@ class WavpackTest(ReadWriteTestBase, unittest.TestCase): - 'bitrate': 109312, - 'format': u'WavPack', - 'samplerate': 44100, -- 'bitdepth': 0, -+ 'bitdepth': 16, - 'channels': 1, - } - -- cgit v1.2.3 From ef9ad66f35617d384ac79c08cbe7125f79c7bc3f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 2 Sep 2021 13:51:18 +0200 Subject: gnu: python-discogs-client: Update to 2.3.12. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (python-discogs-client)[version]: Update to 2.3.12. [source]: Switch to fork. [home-page]: Ditto. [synopsis]: Remove “official”. [description]: Mention we’re using a fork. [native-inputs]: Remove. [propagated-inputs]: Add python-dateutil. --- gnu/packages/music.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 82c9242cd3..33abab63a9 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4695,26 +4695,26 @@ provide a very simple interface for editing and playing MIDI loops.") (define-public python-discogs-client (package (name "python-discogs-client") - (version "2.2.1") + (version "2.3.12") (source (origin (method url-fetch) - (uri (pypi-uri "discogs-client" version)) + (uri (pypi-uri "python3-discogs-client" version)) (sha256 (base32 - "053ld2psh0yj3z0kg6z5bn4y3cr562m727494n0ayhgzbkjbacly")))) + "1zmib0i9jicv9fyphgkcrk418qmpv3l4p38ibl31sh237ki5xqw9")))) (build-system python-build-system) (propagated-inputs - `(("python-oauthlib" ,python-oauthlib) + `(("python-dateutil" ,python-dateutil) + ("python-oauthlib" ,python-oauthlib) ("python-requests" ,python-requests))) - (native-inputs - `(("python-six" ,python-six))) - (home-page "https://github.com/discogs/discogs_client") - (synopsis "Official Python client for the Discogs API") - (description "This is the official Discogs API client for Python. It enables -you to query the Discogs database for information on artists, releases, labels, -users, Marketplace listings, and more. It also supports OAuth 1.0a -authorization, which allows you to change user data such as profile information, -collections and wantlists, inventory, and orders.") + (home-page "https://github.com/joalla/discogs_client") + (synopsis "Python client for the Discogs API") + (description "This is the continuation of the official Discogs API +client for Python. It enables you to query the Discogs database for +information on artists, releases, labels, users, Marketplace listings, +and more. It also supports OAuth 1.0a authorization, which allows you to +change user data such as profile information, collections and wantlists, +inventory, and orders.") (license license:bsd-2))) (define-public python2-discogs-client -- cgit v1.2.3 From 8540fe57cb079ff5b02da143eaaf315f6d82f07b Mon Sep 17 00:00:00 2001 From: Simon Streit Date: Thu, 2 Sep 2021 13:51:18 +0200 Subject: gnu: beets-bandcamp: Update to 0.1.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (beets-bandcamp)[version]: Update to 0.1.4. [inputs]: Move… [propagated-inputs]: …here. --- gnu/packages/music.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 33abab63a9..e33bf45dcd 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3917,20 +3917,19 @@ websites such as Libre.fm.") (define-public beets-bandcamp (package (name "beets-bandcamp") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (pypi-uri "beets-bandcamp" version)) (sha256 (base32 - "04awg0zdhhg5h510fc1p3qkvr2l1qm6nf85hlr9z8im8a7xlka0i")))) + "0dwbdkrb9c0ppzm5s78h47ndpr88cw1k0z8fgfhkl706wazx2ddg")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; there are no tests (propagated-inputs `(("beets" ,beets) - ("python-isodate" ,python-isodate))) - (inputs - `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-isodate" ,python-isodate) + ("python-beautifulsoup4" ,python-beautifulsoup4) ("python-requests" ,python-requests) ("python-six" ,python-six))) (home-page "https://github.com/unrblt/beets-bandcamp") -- cgit v1.2.3 From 46ba1bb068492192ba69d52c00ca8224956a3849 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 2 Sep 2021 13:57:40 +0200 Subject: gnu: beets: Update to 1.5.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (beets) [version]: Update to 1.5.0. [#:phases]: Keep testcase, switch to pytest and respect tests?. [native-inputs]: Move plugin dependencies… [inputs]: …here. * gnu/packages/music.scm (beets-next): Mark as deprecated. * gnu/packages/patches/beets-werkzeug-compat.patch: Delete patch. * gnu/local.mk: Deregister it. --- gnu/packages/music.scm | 127 +++++++---------------- gnu/packages/patches/beets-werkzeug-compat.patch | 18 ---- 2 files changed, 39 insertions(+), 106 deletions(-) delete mode 100644 gnu/packages/patches/beets-werkzeug-compat.patch (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e33bf45dcd..0a1a311511 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -146,6 +146,7 @@ #:use-module (gnu packages pulseaudio) ;libsndfile #:use-module (gnu packages python) #:use-module (gnu packages python-check) + #:use-module (gnu packages python-compression) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) @@ -3786,34 +3787,27 @@ websites such as Libre.fm.") (define-public beets (package (name "beets") - (version "1.4.9") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "beets" version)) - (patches (search-patches "beets-werkzeug-compat.patch")) (sha256 (base32 - "0m40rjimvfgy1dv04p8f8d5dvi2855v4ix99a9xr900cmcn476yj")))) + "0arl4nc3y8iwa331hf6ggai19y8ns9pl03g5d6ac857wq2x7nzw8")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; Reported upstream: . - ;; Disable the faulty test as the fix is unclear. - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* "test/test_mediafile.py" - (("def test_read_audio_properties") "def _test_read_audio_properties")) - #t)) (add-after 'unpack 'set-HOME (lambda _ (setenv "HOME" (string-append (getcwd) "/tmp")) #t)) (replace 'check - (lambda _ - (invoke "nosetests" "-v"))) - ;; Wrap the executable, so it can find python-gi (aka pygobject) and - ;; gstreamer plugins. + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-v" "test")))) + ;; Wrap the executable, so it can find python-gi (aka + ;; pygobject) and gstreamer plugins. (add-after 'wrap 'wrap-typelib (lambda* (#:key outputs #:allow-other-keys) (let ((prog (string-append (assoc-ref outputs "out") @@ -3825,94 +3819,51 @@ websites such as Libre.fm.") `("GI_TYPELIB_PATH" ":" prefix (,types))) #t)))))) (native-inputs - `(("python-beautifulsoup4" ,python-beautifulsoup4) + `(("gobject-introspection" ,gobject-introspection) ("python-flask" ,python-flask) ("python-mock" ,python-mock) - ("python-mpd2" ,python-mpd2) - ("python-nose" ,python-nose) - ("python-pathlib" ,python-pathlib) - ("python-pyxdg" ,python-pyxdg) - ("python-pylast" ,python-pylast) - ("python-rarfile" ,python-rarfile) + ("python-py7zr" ,python-py7zr) + ("python-pytest" ,python-pytest-6) ("python-responses" ,python-responses))) - ;; TODO: Install optional plugins and dependencies. (inputs - `(("python-discogs-client" ,python-discogs-client) + `(("bash-minimal" ,bash-minimal) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("gstreamer" ,gstreamer) + ("python-confuse" ,python-confuse) ("python-jellyfish" ,python-jellyfish) + ("python-mediafile" ,python-mediafile) ("python-munkres" ,python-munkres) ("python-musicbrainzngs" ,python-musicbrainzngs) - ("python-mutagen" ,python-mutagen) - ("python-pyacoustid" ,python-pyacoustid) ("python-pyyaml" ,python-pyyaml) + ("python-six" ,python-six) ("python-unidecode" ,python-unidecode) - ;; For plugin replaygain. - ("python-pygobject" ,python-pygobject) - ("gobject-introspection" ,gobject-introspection) - ("gst-plugins-base" ,gst-plugins-base) - ("gst-plugins-good" ,gst-plugins-good) - ("gstreamer" ,gstreamer))) + ;; Optional dependencies for plugins. Some of these are also required by tests. + ("python-beautifulsoup4" ,python-beautifulsoup4) ; For lyrics. + ("python-discogs-client" ,python-discogs-client) ; For discogs. + ("python-mpd2" ,python-mpd2) ; For mpdstats. + ("python-mutagen" ,python-mutagen) ; For scrub. + ("python-langdetect" ,python-langdetect) ; For lyrics. + ("python-pillow" ,python-pillow) ; For fetchart, embedart, thumbnails. + ("python-pyacoustid" ,python-pyacoustid) ; For chroma. + ("python-pygobject" ,python-pygobject) ; For bpd, replaygain. + ("python-pylast" ,python-pylast) ; For lastgenre, lastimport. + ("python-pyxdg" ,python-pyxdg) ; For thumbnails. + ("python-rarfile" ,python-rarfile) ; For import. + ("python-reflink" ,python-reflink) ; For reflink. + ("python-requests" ,python-requests) + ("python-requests-oauthlib" ,python-requests-oauthlib))) ; For beatport. (home-page "https://beets.io") (synopsis "Music organizer") - (description "The purpose of beets is to get your music collection right - once and for all. It catalogs your collection, automatically improving its - metadata as it goes using the MusicBrainz database. Then it provides a variety - of tools for manipulating and accessing your music.") + (description "The purpose of beets is to get your music collection +right once and for all. It catalogs your collection, automatically +improving its metadata as it goes using the MusicBrainz database. +Then it provides a variety of tools for manipulating and accessing +your music.") (license license:expat))) (define-public beets-next - (let ((commit "04ea754d00e2873ae9aa2d9e07c5cefd790eaee2") - (revision "1")) - (package - (inherit beets) - (name "beets-next") - (version (git-version (package-version beets) revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/beetbox/beets") - (commit commit))) - (file-name (git-file-name "beets" version)) - (sha256 - (base32 - "092a9sss2shhcjmpgbwvscv8brpm5970i5hddkhi81xcff3bg1h4")))) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; XXX: unclear why this fails - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* "test/test_zero.py" - (("def test_album_art") "def _test_album_art")) - #t)) - (add-after 'unpack 'set-HOME - (lambda _ - (setenv "HOME" (string-append (getcwd) "/tmp")) - #t)) - (replace 'check - (lambda _ - ;; Resources must be writable. - (for-each make-file-writable - (find-files "test/rsrc" ".")) - (invoke "nosetests" "-v"))) - ;; Wrap the executable, so it can find python-gi (aka pygobject) and - ;; gstreamer plugins. - (add-after 'wrap 'wrap-typelib - (lambda* (#:key outputs #:allow-other-keys) - (let ((prog (string-append (assoc-ref outputs "out") - "/bin/beet")) - (plugins (getenv "GST_PLUGIN_SYSTEM_PATH")) - (types (getenv "GI_TYPELIB_PATH"))) - (wrap-program prog - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,plugins)) - `("GI_TYPELIB_PATH" ":" prefix (,types))) - #t)))))) - (inputs - `(("python-confuse" ,python-confuse) - ("python-mediafile" ,python-mediafile) - ("python-reflink" ,python-reflink) - ("python-requests-oauthlib" ,python-requests-oauthlib) - ("opusfile" ,opusfile) - ,@(package-inputs beets)))))) + (deprecated-package "beets-next" beets)) (define-public beets-bandcamp (package diff --git a/gnu/packages/patches/beets-werkzeug-compat.patch b/gnu/packages/patches/beets-werkzeug-compat.patch deleted file mode 100644 index 1a91c3a3f9..0000000000 --- a/gnu/packages/patches/beets-werkzeug-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Be compatible with python-werkzeug 1.0.0. - -Taken from upstream: -https://github.com/beetbox/beets/commit/d43d54e21cde97f57f19486925ab56b419254cc8 - -diff --git a/beetsplug/web/__init__.py b/beetsplug/web/__init__.py -index f53fb3a954..21ff5d94ed 100644 ---- a/beetsplug/web/__init__.py -+++ b/beetsplug/web/__init__.py -@@ -169,7 +169,7 @@ def to_python(self, value): - return ids - - def to_url(self, value): -- return ','.join(value) -+ return ','.join(str(v) for v in value) - - - class QueryConverter(PathConverter): -- cgit v1.2.3 From 8330b0cfbbe676ce32acabb2f852d23a5ba483f5 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 2 Sep 2021 20:11:05 +0200 Subject: gnu: python-pylast: Update to 4.2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (python-pylast) [version]: Update to 4.2.1. [propagated-inputs]: Move… [native-inputs]: …here and remove unneccessary inputs. (python2-pylast): Remove, since Python 2 is not supported by upstream any more. --- gnu/packages/music.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 0a1a311511..944aa74bad 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3711,37 +3711,29 @@ detailed track info including timbre, pitch, rhythm and loudness information. (define-public python-pylast (package (name "python-pylast") - (version "2.0.0") + (version "4.2.1") (source (origin (method url-fetch) (uri (pypi-uri "pylast" version)) (sha256 (base32 - "0r9h7g8i8l2mgqjwkda3v6prfbkb2im5kap1az9ppmhjm9i4jkcf")))) + "0pzzhr4mlwpvfhy9gzq86ppz29fmf5z0w3xkl5if1fm59r1afms7")))) (build-system python-build-system) ;; Tests require network access. See ;; https://github.com/pylast/pylast/issues/105 (arguments '(#:tests? #f)) (native-inputs `(("python-coverage" ,python-coverage) - ("python-pycodestyle" ,python-pycodestyle) - ("python-mock" ,python-mock) - ("python-pep8" ,python-pep8) ("python-pytest" ,python-pytest) ("python-flaky" ,python-flaky) - ("python-pyflakes" ,python-pyflakes) - ("python-pyyaml" ,python-pyyaml))) - (propagated-inputs - `(("python-six" ,python-six))) + ("python-pyyaml" ,python-pyyaml) + ("python-setuptools-scm" ,python-setuptools-scm))) (home-page "https://github.com/pylast/pylast") (synopsis "Python interface to Last.fm and Libre.fm") (description "A Python interface to Last.fm and other API-compatible websites such as Libre.fm.") (license license:asl2.0))) -(define-public python2-pylast - (package-with-python2 python-pylast)) - (define-public instantmusic (let ((commit "300891d09c703525215fa5a116b9294af1c923c8") (revision "1")) -- cgit v1.2.3 From 0af537dcd7c0987f265e26adb492a0abf310742d Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 3 Sep 2021 10:51:26 +0200 Subject: gnu: python-mpd2: Update to 3.0.4. * gnu/packages/mpd.scm (python-mpd2): Update to 3.0.4. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 09d02c5add..200c5db662 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -285,13 +285,13 @@ information about tracks being played to a scrobbler, such as Libre.FM.") (define-public python-mpd2 (package (name "python-mpd2") - (version "3.0.1") + (version "3.0.4") (source (origin (method url-fetch) (uri (pypi-uri "python-mpd2" version)) (sha256 (base32 - "0fxssbmnv44m03shjyvbqslc69b0160702j2s0flgvdxjggrnbjj")))) + "1r8saq1460yfa0sxfrvxqs2r453wz2xchlc9gzbpqznr49786rvs")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 3357e6578ff1b280733ecf16ea211c563ad6ebb5 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 3 Sep 2021 10:52:25 +0200 Subject: gnu: python-mutagen: Update home-page. * gnu/packages/music.scm (python-mutagen) [home-page]: Update. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 944aa74bad..ac721a81e8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3592,7 +3592,7 @@ formats, looking up tracks through metadata and audio fingerprints.") `(("python-pytest" ,python-pytest) ("python-hypothesis" ,python-hypothesis) ("python-flake8" ,python-flake8))) - (home-page "https://bitbucket.org/lazka/mutagen") + (home-page "https://mutagen.readthedocs.io/") (synopsis "Read and write audio tags") (description "Mutagen is a Python module to handle audio metadata. It supports ASF, FLAC, M4A, Monkey’s Audio, MP3, Musepack, Ogg FLAC, Ogg Speex, Ogg -- cgit v1.2.3 From 466ccb9b7a91f8ef547dd6b6f46997be39b9357e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 3 Sep 2021 10:53:15 +0200 Subject: gnu: python-musicbrainzngs: Update to 0.7.1. * gnu/packages/music.scm (python-musicbrainzngs) [version]: Update to 0.7.1. [arguments]: Re-enable tests. --- gnu/packages/music.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ac721a81e8..478dfac190 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3630,18 +3630,14 @@ of tags.") (define-public python-musicbrainzngs (package (name "python-musicbrainzngs") - (version "0.6") + (version "0.7.1") (source (origin (method url-fetch) (uri (pypi-uri "musicbrainzngs" version)) (sha256 (base32 - "1dddarpjawryll2wss65xq3v9q8ln8dan7984l5dxzqx88d2dvr8")))) + "09z6k07pxncfgfc8clfmmxl2xqbd7h8x8bjzwr95hc0bzl00275b")))) (build-system python-build-system) - (arguments - '(;; The tests fail suffer from race conditions: - ;; https://github.com/alastair/python-musicbrainzngs/issues/211 - #:tests? #f)) (home-page "https://python-musicbrainzngs.readthedocs.org/") (synopsis "Python bindings for MusicBrainz NGS webservice") (description "Musicbrainzngs implements Python bindings of the MusicBrainz -- cgit v1.2.3 From ddb8852a9beab231e2bbf4e51f8f62a644ff6ad0 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 3 Sep 2021 10:54:18 +0200 Subject: gnu: python-munkres: Update to 1.1.4. * gnu/packages/python-xyz.scm (python-munkres) [version]: Update to 1.1.4. [arguments]: Re-enable test suite. [native-inputs]: Add pytest. --- gnu/packages/python-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 12adafa892..3bb75bdadc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13670,16 +13670,15 @@ way.") (define-public python-munkres (package (name "python-munkres") - (version "1.0.8") + (version "1.1.4") (source (origin (method url-fetch) (uri (pypi-uri "munkres" version)) (sha256 (base32 - "0mbspx4zv8id4x6pim6ybsa1xh96qwpbqj7skbqz4c9c9nf1lpqq")))) + "00yvj8bxmhhhhd74v7j0x673is7vizmxwgb3dd5xmnkr74ybyi7w")))) (build-system python-build-system) - (arguments - '(#:tests? #f)) ; no test suite + (native-inputs `(("python-pytest" ,python-pytest-6))) (home-page "https://software.clapper.org/munkres/") (synopsis "Implementation of the Munkres algorithm") (description "The Munkres module provides an implementation of the Munkres -- cgit v1.2.3 From 26fe4d77bf4cdbe03bf379f53362ad11394a0cb0 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 3 Sep 2021 10:56:20 +0200 Subject: gnu: python-jellyfish: Update to 0.8.8. * gnu/packages/python-xyz.scm (python-jellyfish)[version]: Update to 0.8.8. [arguments]: Use pytest. [properties]: Remove python2-variant. (python2-jellyfish): Remove, unsupported by upstream. --- gnu/packages/python-xyz.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3bb75bdadc..830c18dd49 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13807,29 +13807,30 @@ ambiguities (forward vs. backward slashes, etc.). (define-public python-jellyfish (package (name "python-jellyfish") - (version "0.5.6") + (version "0.8.8") (source (origin (method url-fetch) (uri (pypi-uri "jellyfish" version)) (sha256 (base32 - "1j9rplb16ba2prjj6mip46z0w9pnhnqpwgiwi0x93vnas14rlyl8")))) + "0p2s6b30sfffx8sya2i8kz0i0riw9fq1fi0k89s8kdgrmjf0h1h5")))) (build-system python-build-system) + (arguments + `(#:tests? #f ; XXX: Tests cannot find C coded version. + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" "jellyfish/test.py"))))))) (native-inputs `(("python-pytest" ,python-pytest))) (home-page "https://github.com/jamesturk/jellyfish") (synopsis "Approximate and phonetic matching of strings") (description "Jellyfish uses a variety of string comparison and phonetic encoding algorithms to do fuzzy string matching.") - (license license:bsd-2) - (properties `((python2-variant . ,(delay python2-jellyfish)))))) - -(define-public python2-jellyfish - (let ((jellyfish (package-with-python2 - (strip-python2-variant python-jellyfish)))) - (package/inherit jellyfish - (native-inputs `(("python2-unicodecsv" ,python2-unicodecsv) - ,@(package-native-inputs jellyfish)))))) + (license license:bsd-2))) (define-public python2-unicodecsv (package -- cgit v1.2.3 From e82b103a776e4816682178432fd278aacc3d4004 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 3 Sep 2021 11:00:24 +0200 Subject: gnu: python-rarfile: Update to 4.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This package is close to useless, because we lack the non-free unrar utility and the libarchive backend does not support most operations. * gnu/packages/python-xyz.scm (python-rarfile)[version]: Update to 4.0. [arguments]: Disable tests. [propagated-inputs]: Move… [inputs]: …here. [native-inputs]: Add pytest. [#:phases]: Use pytest for 'check and Add 'patch phase. (python2-rarfile): Remove, unsupported by upstream. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 830c18dd49..7c70829de9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13910,33 +13910,39 @@ can also be used to get the exact location, font or color of the text.") (define-public python-rarfile (package (name "python-rarfile") - (version "2.8") + (version "4.0") (source (origin (method url-fetch) (uri (pypi-uri "rarfile" version)) (sha256 (base32 - "0qfad483kcbga0bn4qmcz953xjk16r52fahiy46zzn56v80y89ra")))) + "1882wv9szcm29mnyhjmspyflyr2l7z73srn14w4dlnww49lqfm37")))) (build-system python-build-system) (arguments - '(#:phases + `(#:tests? #f ;; The bsdtar utility is very limited and most tests fail. + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "rarfile.py" + ;; Disable unrar and unar, which are unavailable on Guix. + (("(unrar|unar)=True" all tool) (string-append tool "=False")) + ;; Hardcode path to bsdtar + (("\"bsdtar\"") + (string-append "\"" (assoc-ref inputs "libarchive") "/bin/bsdtar\""))) + #t)) (replace 'check - ;; Many tests fail, but the installation proceeds. - (lambda _ (invoke "make" "-C" "test" "test")))))) - (native-inputs - `(("which" ,which))) ; required for tests - (propagated-inputs - `(("libarchive" ,libarchive))) + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) + (native-inputs `(("python-pytest" ,python-pytest))) + (inputs `(("libarchive" ,libarchive))) (home-page "https://github.com/markokr/rarfile") (synopsis "RAR archive reader for Python") (description "This is Python module for RAR archive reading. The interface is made as zipfile like as possible.") (license license:isc))) -(define-public python2-rarfile - (package-with-python2 python-rarfile)) - (define-public python-rich (package (name "python-rich") -- cgit v1.2.3 From e13687e82f2319447a33c55b72c470693c1abddb Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 4 Sep 2021 21:06:38 +0200 Subject: gnu: cmus: Update to 2.9.1. * gnu/packages/music.scm (cmus): Update to 2.9.1. Signed-off-by: Leo Famulari --- gnu/packages/music.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 478dfac190..a8fe84e123 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2021 Justin Veilleux ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Simon Streit +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -553,7 +554,7 @@ It is a fork of Clementine aimed at music collectors and audiophiles.") (define-public cmus (package (name "cmus") - (version "2.8.0") + (version "2.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -562,7 +563,7 @@ It is a fork of Clementine aimed at music collectors and audiophiles.") (file-name (git-file-name name version)) (sha256 (base32 - "1ydnvq13ay8b8mfmmgwi5qsgyf220yi1d01acbnxqn775dghmwar")))) + "0zjkimni2fhv4yskrjrgj6b74f33rfj58zgd7khwrz4z8nf88j0w")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; cmus does not include tests -- cgit v1.2.3 From 6d0ddea44b8e6becfceed02f48dade795f10a368 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 14:29:25 +0200 Subject: gnu: xlockmore: Update to 5.67. * gnu/packages/xdisorg.scm (xlockmore): Update to 5.67. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f630ae95a7..006b1c11ac 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1027,7 +1027,7 @@ shows it again when the mouse cursor moves or a mouse button is pressed.") (define-public xlockmore (package (name "xlockmore") - (version "5.66") + (version "5.67") (source (origin (method url-fetch) (uri (list (string-append "http://sillycycle.com/xlock/" @@ -1038,7 +1038,7 @@ shows it again when the mouse cursor moves or a mouse button is pressed.") "xlockmore-" version ".tar.xz"))) (sha256 (base32 - "0wdb7gpyjw3sigmhiplgg1bqxz6wipr0c3n9492x2a18cv1saxjr")))) + "0k13gxgnk4i041g1fzixfwlf3l5hrvvkhfvxf27szx0d1qbpwq58")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--enable-appdefaultdir=" -- cgit v1.2.3 From 0eea6168c1c220d8ffdff79553488e9b3d2c6eec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 15:17:20 +0200 Subject: gnu: vc: Update to 1.4.2. * gnu/packages/maths.scm (vc): Update to 1.4.2. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 86f6ff34c5..429be09334 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5201,14 +5201,14 @@ supports compressed MAT files, as well as newer (version 7.3) MAT files.") (define-public vc (package (name "vc") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/VcDevel/Vc/releases/" "download/" version "/Vc-" version ".tar.gz")) (sha256 (base32 - "17qili8bf8r78cng65yf4qmgna8kiqjqbgcqbric6v9j6nkhkrk8")))) + "0lirdqzcxys9walz04bllsphydynk7973aimd5k1h1qbwi8z3lsh")))) (build-system cmake-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From f0e6851f0dd685cc60d28e25c65259dc8594d72a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 15:17:27 +0200 Subject: gnu: unbound: Update to 1.13.2. * gnu/packages/dns.scm (unbound): Update to 1.13.2. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index c5e305f1d7..b5e5eb4d29 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -609,14 +609,14 @@ to result in system-wide compromise.") (define-public unbound (package (name "unbound") - (version "1.13.1") + (version "1.13.2") (source (origin (method url-fetch) (uri (string-append "https://www.unbound.net/downloads/unbound-" version ".tar.gz")) (sha256 - (base32 "1f2hky62f4xxnjr0lncrzz4gipg01rp12pf98mrqkgf5ixxxj145")))) + (base32 "10qs1q26lzw18ljggnbz0cc5f7lr9ksj615xbrmh4amryd3va4qa")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs -- cgit v1.2.3 From fb8d658e7c4a5baa9091f7bc90aec154c3d8e574 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 17:52:57 +0200 Subject: gnu: git-annex: Update to 8.20210903. * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20210903. --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 351fea3afc..486f5411b6 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -344,14 +344,14 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "8.20210803") + (version "8.20210903") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "0777q454bgkzr930wacn48xm6ygi4i6rxsizvxjm3a0dlffnv3b2")))) + (base32 "1p6zgk98jmxvqdin5xsdxhgq276bjdr2spi0wabj8x0ziry97rvl")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 63602129947192a2564bbd8aa894a55265a187ad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 17:53:10 +0200 Subject: gnu: nsd: Update to 4.3.7. * gnu/packages/dns.scm (nsd): Update to 4.3.7. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index b5e5eb4d29..45e250138e 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -539,14 +539,14 @@ asynchronous fashion.") (define-public nsd (package (name "nsd") - (version "4.3.6") + (version "4.3.7") (source (origin (method url-fetch) (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" version ".tar.gz")) (sha256 - (base32 "062zwx4k5rgpg2c0b4721ldj36aj8clrxv79mlfw9b15ap7w1rmy")))) + (base32 "1bg87g0i66hw16fm7gbqmzyi2rcn1hadzz0bg9b8s5mx7g2rwfzx")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 039eb73b66e36fee9351fba61baf68692bcb409d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 18:06:10 +0200 Subject: gnu: fbcat: Update to 0.5.2. * gnu/packages/linux.scm (fbcat): Update to 0.5.2. [arguments]: Don't return #t from phases. --- gnu/packages/linux.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fbe6d42336..5c154a9277 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7275,14 +7275,14 @@ relevant @file{/dev/vcs*} file(s).") (define-public fbcat (package (name "fbcat") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/jwilk/fbcat/releases/download/" version "/" name "-" version ".tar.gz")) (sha256 - (base32 "0pj9hxmwhbz6kmd7847yx2jh1scl9l25zgndyi8s9vlzdkq2q8d7")))) + (base32 "07q6f0xj7b4gjvn69qfn0g04yd0ch8ndzyigcz8nnrhli0cvsbh6")))) (build-system gnu-build-system) (inputs ;; The ‘fbgrab’ wrapper can use one of several PPM-to-PNG converters. We @@ -7306,8 +7306,7 @@ relevant @file{/dev/vcs*} file(s).") (("fbcat" all) (string-append out "/bin/" all)) (("pnmtopng" all) - (string-append pnmtopng "/bin/" all))) - #t))) + (string-append pnmtopng "/bin/" all)))))) (add-after 'install 'split-fbgrab-output (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -7318,8 +7317,7 @@ relevant @file{/dev/vcs*} file(s).") (mkdir-p (dirname new)) (rename-file old new))) (list "bin/fbgrab" - "share/man/man1/fbgrab.1")) - #t)))))) + "share/man/man1/fbgrab.1")))))))) (home-page "https://jwilk.net/software/fbcat") (synopsis "Take a screenshot of the contents of the Linux framebuffer") (description -- cgit v1.2.3 From cb9552c2aa30805bd908d9945ff7138b9066f7f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 18:06:42 +0200 Subject: gnu: nvc: Update to 1.5.2. * gnu/packages/fpga.scm (nvc): Update to 1.5.2. [arguments]: Don't return #t from phases. --- gnu/packages/fpga.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 9a29807b83..40cf9cc427 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -432,7 +432,7 @@ a hardware description and verification language. ") (define-public nvc (package (name "nvc") - (version "1.5.1") + (version "1.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -441,7 +441,7 @@ a hardware description and verification language. ") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0m1zhcqhgz5fajz98ky5zdv8g8gvk9caghqfpbv8q3mzdzahcsx5")))) + "1hjshyliaqi4vrw4q760rwmq6hvbpsvr2h4zl34k5j457004dy9l")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -450,8 +450,7 @@ a hardware description and verification language. ") (modify-phases %standard-phases (add-after 'unpack 'clean-up (lambda _ - (delete-file "autogen.sh") - #t))))) + (delete-file "autogen.sh")))))) (native-inputs `(("automake" ,automake) ("autoconf" ,autoconf) -- cgit v1.2.3 From ed04ce98c6bccadd4ef94c0ace3e031cacecc653 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 18:48:16 +0200 Subject: gnu: libfilezilla: Update to 0.31.1. * gnu/packages/ftp.scm (libfilezilla): Update to 0.31.1. --- gnu/packages/ftp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index b3b0068988..872e69d4c8 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -176,14 +176,14 @@ as required.") (define-public libfilezilla (package (name "libfilezilla") - (version "0.30.0") + (version "0.31.1") (source (origin (method url-fetch) (uri (string-append "https://download.filezilla-project.org/" "libfilezilla/libfilezilla-" version ".tar.bz2")) (sha256 - (base32 "0h6wa1dfd14z9ai00a85pahsb4fs3rlb8haiw3vd9pmjrpdgcvf1")))) + (base32 "0vqn6gkwyin9hml39d74vcjcnbwlnk2cpc3msdlkhpq1ns3mhzcr")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 5abaf8936738e56f48f9e79d5b59aa3b09e61f65 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 18:48:23 +0200 Subject: gnu: filezilla: Update to 3.55.1. * gnu/packages/ftp.scm (filezilla): Update to 3.55.1. --- gnu/packages/ftp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 872e69d4c8..17ad139162 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -220,14 +220,14 @@ output. (define-public filezilla (package (name "filezilla") - (version "3.55.0") + (version "3.55.1") (source (origin (method url-fetch) (uri (string-append "https://download.filezilla-project.org/client/" "FileZilla_" version "_src.tar.bz2")) (sha256 - (base32 "10lwmf6cvryw2gja6vj1zh2y55z4i38wsvxdpclvwdnih10ynw5f")))) + (base32 "19bnyx89jg0ll8a8mr4y8gp26gizs11ckgrwglh27zak3zhx1y37")))) (build-system gnu-build-system) (arguments ;; Don't let filezilla phone home to check for updates. -- cgit v1.2.3 From d79107606e428bbce58b8e002e8bd689ff11f874 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 19:25:51 +0200 Subject: gnu: epson-inkjet-printer-escpr: Update to 1.7.17. * gnu/packages/cups.scm (epson-inkjet-printer-escpr): Update to 1.7.17. --- gnu/packages/cups.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index b9077b04f7..a0efb54c4d 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -868,7 +868,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (define-public epson-inkjet-printer-escpr (package (name "epson-inkjet-printer-escpr") - (version "1.7.12") + (version "1.7.17") ;; XXX: This currently works. But it will break as soon as a newer ;; version is available since the URLs for older versions are not ;; preserved. An alternative source will be added as soon as @@ -876,11 +876,11 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (source (origin (method url-fetch) - (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/12/87/" - "86/a97f36f9db998e7d0d25fc963568f207073b85ad/" - "epson-inkjet-printer-escpr-1.7.12-1lsb3.2.tar.gz")) + (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/12/99/" + "78/73605b3f8aac63694fdabee6bd43389731696cd9/" + "epson-inkjet-printer-escpr-1.7.17-1lsb3.2.tar.gz")) (sha256 - (base32 "11di33dhi8s0qf8dc3gai478ji4jszy4jmi5z5gfdkxmpljdlrq2")))) + (base32 "1d7ckrl5kya98h27mx4pgnaz5sbrsd5vhwc8kva9nfah9wsga4wg")))) (build-system gnu-build-system) (arguments `(#:modules -- cgit v1.2.3 From 4c91b5d6acb487cd63abab7cd00e927ccd8e6e7f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 19:33:09 +0200 Subject: gnu: btrfs-progs: Update to 5.13.1. * gnu/packages/linux.scm (btrfs-progs): Update to 5.13.1. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5c154a9277..99134bdb4e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5274,7 +5274,7 @@ and copy/paste text in the console and in xterm.") (define-public btrfs-progs (package (name "btrfs-progs") - (version "5.13") + (version "5.13.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" @@ -5282,7 +5282,7 @@ and copy/paste text in the console and in xterm.") "btrfs-progs-v" version ".tar.xz")) (sha256 (base32 - "0hsqbv7kvw5j2669xmp226cf7mgdfyq6xg8vjhm5w9ix43922aaf")))) + "16gkyhvvpqpq0skpavkvnmglbld7p331bnpiqn2z9flgwq0mlzix")))) (build-system gnu-build-system) (outputs '("out" "static")) ; static versions of the binaries in "out" -- cgit v1.2.3 From c64a78cec17af028b08cc5f60daa68a9e2ea652d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 20:07:48 +0200 Subject: gnu: gparted: Update to 1.3.1. * gnu/packages/disk.scm (gparted): Update to 1.3.1. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 95f712966b..7d6f3811dd 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -555,14 +555,14 @@ and can dramatically shorten the lifespan of the drive if left unchecked.") (define-public gparted (package (name "gparted") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gparted/gparted/gparted-" version "/gparted-" version ".tar.gz")) (sha256 - (base32 "0amx3hb4rc504nl9i73rgyz0hzhq5x8nkg7lwbk4bsnrblj81hcd")))) + (base32 "02g1s6hrhnias7kj241l0f72kllfhq6338mk2dmzjpmifinjxvjy")))) (build-system glib-or-gtk-build-system) (arguments ;; Tests require access to paths outside the build container, such -- cgit v1.2.3 From 5ab51bee586505d6e48fca584c7e084047f920b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 20:57:34 +0200 Subject: gnu: interception-tools: Update to 0.6.7. * gnu/packages/linux.scm (interception-tools): Update to 0.6.7. [arguments]: Remove obsolete 'fix-libevdev-path phase. --- gnu/packages/linux.scm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 99134bdb4e..e2e30f5de5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3741,7 +3741,7 @@ devices that can inject events directly into the input subsystem.") (define-public interception-tools (package (name "interception-tools") - (version "0.6.6") + (version "0.6.7") (home-page "https://gitlab.com/interception/linux/tools") (source (origin (method git-fetch) @@ -3751,25 +3751,17 @@ devices that can inject events directly into the input subsystem.") (file-name (git-file-name name version)) (sha256 (base32 - "0k9h14a9d65nwvv7pj0kigjgzfv453mm3r4svnxfg1h5lccmy8jj")))) + "0wcmppa7092b33wb8vc782day5phf90pc25cn1x7rk0rlw565z36")))) (build-system cmake-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost) ("libevdev" ,libevdev) ("libudev" ,eudev) ("yaml-cpp" ,yaml-cpp))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-libevdev-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((libevdev (assoc-ref inputs "libevdev"))) - (substitute* "CMakeLists.txt" - (("/usr/include/libevdev-1.0") - (string-append libevdev "/include/libevdev-1.0"))) - #t)))) - ;; No tests are included. - #:tests? #f)) + `(#:tests? #f)) ; no test suite (synopsis "Utilities for operating on input events of evdev devices") (description "Interception Tools provides a composable infrastructure on top of -- cgit v1.2.3 From da2bd0c1849b64184bcaf8604f0c177b7b1c2ce3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 4 Sep 2021 21:04:09 +0200 Subject: gnu: libglvnd: Update to 1.3.4. * gnu/packages/gl.scm (libglvnd): Update to 1.3.4. [arguments]: Don't return #t from phases. --- gnu/packages/gl.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 4a1a7001fe..f6b9232e0a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -719,7 +719,7 @@ OpenGL graphics API.") (define-public libglvnd (package (name "libglvnd") - (version "1.3.3") + (version "1.3.4") (home-page "https://gitlab.freedesktop.org/glvnd/libglvnd") (source (origin (method git-fetch) @@ -729,7 +729,7 @@ OpenGL graphics API.") (file-name (git-file-name name version)) (sha256 (base32 - "0gjk6m3gkdm12bmih2jflp0v5s1ibkixk7mrzrk0cj884m3hy1z6")))) + "0phvgg2h3pcz3x39gaymwb37bnw1s26clq9wsj0zx398zmp3dwpk")))) (build-system meson-build-system) (arguments '(#:configure-flags '("-Dx11=enabled") @@ -741,8 +741,7 @@ OpenGL graphics API.") ;; require a running Xorg server. (substitute* "tests/meson.build" (("if with_glx") - "if false")) - #t))))) + "if false"))))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 4339af579e6eec0b18d1f78cc0877ba375ce5841 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Sep 2021 00:31:11 +0200 Subject: gnu: avldrums-lv2: Update to 0.4.2. * gnu/packages/music.scm (avldrums-lv2): Update to 0.4.2. [arguments]: Don't return #t from phases. --- gnu/packages/music.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a8fe84e123..c1f03863b3 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6246,7 +6246,7 @@ Soul Force), MVerb, Nekobi, and ProM.") (define-public avldrums-lv2 (package (name "avldrums-lv2") - (version "0.4.1") + (version "0.4.2") (source (origin (method git-fetch) @@ -6258,7 +6258,7 @@ Soul Force), MVerb, Nekobi, and ProM.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "1vwdp3d8qzd493qa99ddya7iql67bbfxmbcl8hk96lxif2lhmyws")))) + (base32 "14gka5g7va30gm1hn0cas4vvb8s764rfvzcxm67ww86hf54cpnig")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target @@ -6266,10 +6266,10 @@ Soul Force), MVerb, Nekobi, and ProM.") (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases + (delete 'configure) ; no configure script (add-before 'build 'set-CC-variable (lambda _ - (setenv "CC" "gcc") #t)) - (delete 'configure)))) + (setenv "CC" "gcc")))))) (inputs `(("cairo" ,cairo) ("dssi" ,dssi) -- cgit v1.2.3 From 04870195a8fc5546d26761b6bba63eb8eb7965d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Sep 2021 00:53:37 +0200 Subject: gnu: homebank: Update to 5.5.3. * gnu/packages/finance.scm (homebank): Update to 5.5.3. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index befda1a079..4aaab58906 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -268,14 +268,14 @@ Accounting.") (define-public homebank (package (name "homebank") - (version "5.5.2") + (version "5.5.3") (source (origin (method url-fetch) (uri (string-append "http://homebank.free.fr/public/homebank-" version ".tar.gz")) (sha256 (base32 - "1lhyql94zx51vcw9hlc9r26wkm2bn6jdd4xvc95j7y69wiwg77lq")))) + "14qhv79a2waqzmf6l571wklgwq8j1pkmjvzkj5vhh44nia8hfdh7")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 264f84a87caeceede57970935abd732bdac7b757 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Sep 2021 00:54:30 +0200 Subject: gnu: butt: Update to 0.1.31. * gnu/packages/audio.scm (butt): Update to 0.1.31. --- gnu/packages/audio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 80cd521773..3d7d414874 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5277,14 +5277,14 @@ while still staying in time.") (define-public butt (package (name "butt") - (version "0.1.30") + (version "0.1.31") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/butt/butt/butt-" version "/butt-" version ".tar.gz")) (sha256 (base32 - "1dfspdh3f18lpp7asxpj63b9zfpvazi7shgrdacg17gd42ycayq5")) + "19zvdi5vr6vqnrpc60jir7550nz9a5x1c61lh13355cdny2zp28z")) (modules '((guix build utils))) (snippet '(substitute* "src/butt.cpp" @@ -5325,7 +5325,7 @@ while still staying in time.") version "_manual.pdf")) (sha256 (base32 - "1w3krh7f2v5vdz18hqycnpn0qv1x6xl6pa1najgp4jbfisjc1mn8")))))) + "0a0kgd069whfp1v8xgw6qm67w02n8b7b4h5ay5665wgq947hxanp")))))) (home-page "https://danielnoethen.de/butt/") (synopsis "Audio streaming tool") (description "Butt is a tool to stream audio to a ShoutCast or -- cgit v1.2.3 From 321d1babaa7f8692865a559358a17b51d6a0d348 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Sep 2021 00:54:42 +0200 Subject: gnu: bochs: Update to 2.72.7. * gnu/packages/virtualization.scm (bochs): Update to 2.72.7. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e952c009b5..34700211d9 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1810,14 +1810,14 @@ by default and can be made read-only.") (define-public bochs (package (name "bochs") - (version "2.6.11") + (version "2.7") (source (origin (method url-fetch) (uri (string-append "https://sourceforge.net/projects/bochs/files/bochs/" version "/bochs-" version ".tar.gz")) (sha256 - (base32 "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3")))) + (base32 "0ymiwnfqg5npq2dk9ngidbbfn3qw8z6i491finhcaan7zldsn450")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no tests exist -- cgit v1.2.3 From 7022a169bc321170d6c015f0fa89e33c89558eb2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Sep 2021 01:55:37 +0200 Subject: gnu: meld: Update to 3.20.4. * gnu/packages/patchutils.scm (meld): Update to 3.20.4. --- gnu/packages/patchutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index f190fec1a2..cefced86f2 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -246,7 +246,7 @@ GiB).") (define-public meld (package (name "meld") - (version "3.20.3") + (version "3.20.4") (source (origin (method url-fetch) @@ -254,7 +254,7 @@ GiB).") (version-major+minor version) "/meld-" version ".tar.xz")) (sha256 - (base32 "06h52vaghvj5n507mj0hhk9yrca16pyl4l16c00b3bmkplljpqzh")))) + (base32 "04vx2mdbcdin0g3w8x910czfch5vyrl8drv1f2l8gxh6qvp113pl")))) (build-system python-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 45066bc9ff55bfaafaccd8d19afdf2acb5765e96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Sep 2021 03:03:36 +0200 Subject: gnu: ne: Update to 3.3.1. * gnu/packages/text-editors.scm (ne): Update to 3.3.1. [arguments]: Add a 'patch-early-shebang phase. Don't return #t from other phases. --- gnu/packages/text-editors.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 79d2ec4f68..3f427d0931 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1083,7 +1083,7 @@ card. It offers: (define-public ne (package (name "ne") - (version "3.3.0") + (version "3.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -1092,7 +1092,7 @@ card. It offers: (file-name (git-file-name name version)) (sha256 (base32 - "01aglnsfljlvx0wvyvpjfn4y88jf450a06qnj9a8lgdqv1hdkq1a")))) + "0sg2f6lxq6cjkpd3dvlxxns82hvq826rjnams5in97pssmknr77g")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) @@ -1108,11 +1108,14 @@ card. It offers: "/lib")) #:phases (modify-phases %standard-phases + (add-before 'configure 'patch-early-shebang + (lambda _ + (substitute* "version.pl" + (("/usr/bin/env .*perl") (which "perl"))))) (replace 'configure (lambda _ (substitute* "src/makefile" - (("-lcurses") "-lncurses")) - #t))))) + (("-lcurses") "-lncurses"))))))) (home-page "https://ne.di.unimi.it/") (synopsis "Text editor with menu bar") (description "This package provides a modeless text editor with menu bar. -- cgit v1.2.3 From f60a2d13415f9c17a5441646cf9c4c24dcf19be0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Sep 2021 03:27:12 +0200 Subject: gnu: xwd: Update to 1.0.8. * gnu/packages/xorg.scm (xwd): Update to 1.0.8. --- gnu/packages/xorg.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index cae0fb3f73..2484cf6455 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4581,17 +4581,14 @@ extension.") (define-public xwd (package (name "xwd") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) - (uri (string-append - "mirror://xorg/individual/app/xwd-" - version - ".tar.bz2")) + (uri (string-append "mirror://xorg/individual/app/xwd-" + version ".tar.bz2")) (sha256 - (base32 - "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d")))) + (base32 "06q36fh55r62ms0igfxsanrn6gv8lh794q1bw9xzw51p2qs2papv")))) (build-system gnu-build-system) (inputs `(("libxt" ,libxt) -- cgit v1.2.3 From 19c3ca02073ea4d540d98a7bfafbed744f1cb637 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Sep 2021 03:41:51 +0200 Subject: gnu: xrdb: Update to 1.2.1. * gnu/packages/xorg.scm (xrdb): Update to 1.2.1. --- gnu/packages/xorg.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2484cf6455..303b9917ab 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4408,17 +4408,14 @@ and Reflect (RandR) extension.") (define-public xrdb (package (name "xrdb") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) - (uri (string-append - "mirror://xorg/individual/app/xrdb-" - version - ".tar.bz2")) + (uri (string-append "mirror://xorg/individual/app/xrdb-" + version ".tar.bz2")) (sha256 - (base32 - "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj")))) + (base32 "1d78prd8sfszq2rwwlb32ksph4fymf988lp75aj8iysg44f06pag")))) (build-system gnu-build-system) (inputs `(("libxmu" ,libxmu) -- cgit v1.2.3 From ce65f2b73d7bff7a849179f8d3e19886b376f27d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Sep 2021 04:32:21 +0200 Subject: gnu: xfsprogs: Update to 5.13.0. * gnu/packages/linux.scm (xfsprogs): Update to 5.13.0. [arguments]: Don't return #t from phases. --- gnu/packages/linux.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e2e30f5de5..0004cca775 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7559,7 +7559,7 @@ compatible with Python's ConfigParser style of .INI files, including RFC (define-public xfsprogs (package (name "xfsprogs") - (version "5.12.0") + (version "5.13.0") (source (origin (method url-fetch) (uri (string-append @@ -7567,7 +7567,7 @@ compatible with Python's ConfigParser style of .INI files, including RFC "xfsprogs-" version ".tar.gz")) (sha256 (base32 - "0b5vvwq4rqw7kph23ycd518d31dx3wq7w61znixxpdljx0ig71qn")))) + "09s3alwrhs1gaaywkpx2knc5bxb44b77009jw8zgsy9c2wxximns")))) (build-system gnu-build-system) (outputs (list "out" "python")) (arguments @@ -7583,8 +7583,7 @@ compatible with Python's ConfigParser style of .INI files, including RFC (mkdir-p (string-append python (dirname script))) (rename-file (string-append out script) (string-append python script))) - (list "/sbin/xfs_scrub_all")) - #t))) + (list "/sbin/xfs_scrub_all"))))) (add-after 'install 'install-headers (lambda _ (invoke "make" "install-dev")))))) -- cgit v1.2.3 From 795b7f053f3451a678888ed6fdcda3f5bf689da6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 5 Sep 2021 12:01:59 -0400 Subject: gnu: pipe-viewer: Update to 0.1.4. * gnu/packages/video.scm (pipe-viewer)[version]: Update to 0.1.4. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 57a6dc1c19..10aa06700e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1026,7 +1026,7 @@ H.264 (MPEG-4 AVC) video streams.") (define-public pipe-viewer (package (name "pipe-viewer") - (version "0.1.2") + (version "0.1.4") (source (origin (method git-fetch) @@ -1036,7 +1036,7 @@ H.264 (MPEG-4 AVC) video streams.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1d2gfkd3nc0c4ah67250lqskkd85wpljrikw8a378ni398ngaq14")))) + (base32 "0d8b3gcr9dndw8qlwfrm0wgp4vjmn8fwd151kmzz7kkw57f5jfch")))) (build-system perl-build-system) (arguments `(#:imported-modules -- cgit v1.2.3 From 0b3ad325daaec6be693d8a1a984cc0668bfaf51a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 5 Sep 2021 13:54:46 -0400 Subject: gnu: remmina: Update to 1.4.20. * gnu/packages/vnc.scm (remmina)[version]: Update to 1.4.20. --- gnu/packages/vnc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index 3ee4fae91c..4c2b13c93c 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -61,7 +61,7 @@ (define-public remmina (package (name "remmina") - (version "1.4.19") + (version "1.4.20") (source (origin (method git-fetch) @@ -71,7 +71,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1d0yxhrnkmj2wzsj1njw32sqkarmgqkzamwks6dl8pdi20x69br2")))) + (base32 "0apm4lqcmqskdp2fjxl8dbg3686cm4w0b5806fqj7w43hdmd8w4v")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No target -- cgit v1.2.3 From dd7df191b6c8c3bbbece31b6946018dbaef553b4 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 5 Sep 2021 22:45:08 +0200 Subject: gnu: u-boot-nintendo-nes-classic-edition: Make it actually boot again. * gnu/packages/patches/u-boot-nintendo-nes-serial.patch: New file. * gnu/local.mk (dist_patch_DATA): Add u-boot-nintendo-nes-serial.patch. * gnu/packages/bootloaders.scm (u-boot-nintendo-nes-classic-edition): Downgrade to 2018.11. [source]: Add patch. [description]: Modify. [native-inputs]: Add python-2. --- gnu/packages/bootloaders.scm | 29 +++++++++++++++++++++- .../patches/u-boot-nintendo-nes-serial.patch | 14 +++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/u-boot-nintendo-nes-serial.patch (limited to 'gnu/packages') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 2889a90d54..5f7dfa0f8f 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -802,7 +802,34 @@ it fits within common partitioning schemes.") (make-u-boot-package "A20-OLinuXino_MICRO" "arm-linux-gnueabihf")) (define-public u-boot-nintendo-nes-classic-edition - (make-u-boot-package "Nintendo_NES_Classic_Edition" "arm-linux-gnueabihf")) + (let ((base (make-u-boot-package "Nintendo_NES_Classic_Edition" + "arm-linux-gnueabihf"))) + (package + (inherit base) + ;; Starting with 2019.01, FEL doesn't work anymore on A33. + (version "2018.11") + (source (origin + (method url-fetch) + (uri (string-append + "https://ftp.denx.de/pub/u-boot/" + "u-boot-" version ".tar.bz2")) + (sha256 + (base32 + "0znkwljfwwn4y7j20pzz4ilqw8znphrfxns0x1lwdzh3xbr96z3k")) + (patches (search-patches + "u-boot-nintendo-nes-serial.patch")))) + (description "U-Boot is a bootloader used mostly for ARM boards. It +also initializes the boards (RAM etc). + +This version is for the Nintendo NES Classic Edition. It is assumed that +you have added a serial port to pins PB0 and PB1 as described on +@url{https://linux-sunxi.org/Nintendo_NES_Classic_Edition}. + +In order to use FEL mode on the device, hold the Reset button on the +device while it's being turned on (and a while longer).") + (native-inputs + `(("python" ,python-2) + ,@(package-native-inputs base)))))) (define-public u-boot-wandboard (make-u-boot-package "wandboard" "arm-linux-gnueabihf")) diff --git a/gnu/packages/patches/u-boot-nintendo-nes-serial.patch b/gnu/packages/patches/u-boot-nintendo-nes-serial.patch new file mode 100644 index 0000000000..3588236803 --- /dev/null +++ b/gnu/packages/patches/u-boot-nintendo-nes-serial.patch @@ -0,0 +1,14 @@ +Date: Sun, 5 Sep 2021 23:24:00 +0200 +Author: Danny Milosavljevic +Description: Set console UART to use pins PB0 and PB1. +--- u-boot-2018.11/configs/Nintendo_NES_Classic_Edition_defconfig.orig 2021-09-05 23:09:15.905846467 +0200 ++++ u-boot-2018.11/configs/Nintendo_NES_Classic_Edition_defconfig 2021-09-05 23:12:21.562774694 +0200 +@@ -21,7 +21,7 @@ + CONFIG_SYS_NAND_OOBSIZE=0x40 + CONFIG_AXP_DLDO1_VOLT=3300 + CONFIG_AXP_ELDO2_VOLT=1800 +-CONFIG_CONS_INDEX=5 ++CONFIG_CONS_INDEX=1 + CONFIG_USB_MUSB_GADGET=y + CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y + CONFIG_USB_FUNCTION_MASS_STORAGE=y -- cgit v1.2.3 From 53ccbc175570c4fd16b499670d37b36328d30f94 Mon Sep 17 00:00:00 2001 From: iKaSeRo Date: Sun, 5 Sep 2021 14:31:02 +0300 Subject: gnu: Add mlterm. * gnu/packages/terminals.scm (mlterm): New variable. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/terminals.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 1cdf0e1831..478b30eddf 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2020 Leo Famulari ;;; Copyright © 2021 Ekaitz Zarraga ;;; Copyright © 2021 Raphaël Mélotte +;;; Copyright © 2021 ikasero ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,6 +67,7 @@ #:use-module (gnu packages docbook) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages fribidi) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -388,6 +390,47 @@ combining, and so on, with a simple interface.") (home-page "http://www.leonerd.org.uk/code/libtermkey") (license license:expat))) +(define-public mlterm + (package + (name "mlterm") + (version "3.9.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/mlterm/01release/mlterm-" + version "/mlterm-" version ".tar.gz")) + (sha256 + (base32 "03fnynwv7d1aicwk2rp31sgncv5m65agvygqvsgn59v9di40gnnb")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:configure-flags + (list (string-append "--prefix=" (assoc-ref %outputs "out")) + "--disable-static" + "--enable-optimize-redrawing" + "--with-imagelib=gdk-pixbuf"))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("fribidi" ,fribidi) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtk+" ,gtk+) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxft" ,libxft))) + (home-page "http://mlterm.sourceforge.net/") + (synopsis "Multi-Lingual TERMinal emulator") + (description + "mlterm is a multi-lingual terminal emulator. It supports various complex +character sets and encodings from around the world. It can display double-width +(e.g. East Asian) glyphs, combining characters used for, e.g., Thai and +Vietnamese, and bi-directional scripts like Arabic and Hebrew.") + (license license:bsd-3))) + (define-public picocom (package (name "picocom") @@ -1430,8 +1473,8 @@ terminal. Note that you need support for OpenGL 3.2 or higher.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wtarreau/bootterm") - (commit (string-append "v" version)))) + (url "https://github.com/wtarreau/bootterm") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 -- cgit v1.2.3 From e76ed759a0c8756f38173c9fafaab080fd6ce2a5 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 4 Sep 2021 20:42:05 +0200 Subject: gnu: feh: Update to 3.7.1. * gnu/packages/image-viewers.scm (feh): Update to 3.7.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 895a331aee..3b45c25e21 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -249,7 +249,7 @@ YouTube videos without requiring API and opens/downloads them using mpv/ytdl.") (define-public feh (package (name "feh") - (version "3.6.3") + (version "3.7.1") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -257,7 +257,7 @@ YouTube videos without requiring API and opens/downloads them using mpv/ytdl.") name "-" version ".tar.bz2")) (sha256 (base32 - "1d13x8hmvpdc5f5rj4l29ha7iz7wvqxjlvh6il04wq8igzrj0x23")))) + "1djqjagp7k9rris1p8wgz0q8albgsd8gasc0hyanbjap3yk1rasp")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From d5753f1d19d4e7dbfd1ac071edabcb21c4abb0b5 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 5 Sep 2021 15:37:52 +0200 Subject: gnu: emacs-xref: Update to 1.2.1. * gnu/packages/emacs-xyz.scm (emacs-xref): Update to 1.2.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f04a0225b3..68df962ddc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29059,14 +29059,14 @@ work on alists, hash-table and arrays. All functions are prefixed with (define-public emacs-xref (package (name "emacs-xref") - (version "1.1.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/xref-" version ".tar")) (sha256 - (base32 "1s7pwk09bry4nqr4bc78a3mbwyrxagai2gpsd49x47czy2x7m3ax")))) + (base32 "1x7hfqp7y4yr4r7n49lqdf1h2plhgaxdn9x7rjkp05szj3rgflk6")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/xref.html") (synopsis "Cross-referencing commands") -- cgit v1.2.3 From 6940a57abdc4b22afccce0f2ba82e927b154ce60 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 4 Sep 2021 20:35:11 +0200 Subject: gnu: xwallpaper: Update to 0.7.3. * gnu/packages/xdisorg.scm (xwallpaper): Update to 0.7.3. Signed-off-by: Nicolas Goaziou --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 006b1c11ac..24e801b7e9 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2452,7 +2452,7 @@ can optionally use some appearance settings from XSettings, tint2 and GTK.") (define-public xwallpaper (package (name "xwallpaper") - (version "0.6.6") + (version "0.7.3") (source (origin (method git-fetch) @@ -2461,7 +2461,7 @@ can optionally use some appearance settings from XSettings, tint2 and GTK.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10klm81rs3k3l2i7whpvcsg95x51ja11l86fmwbrvg3kq705p2sr")))) + (base32 "1rsv42cl0s149sbpdxz9yqqjip3si95jv3dglwzrcm7pjfg7519v")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 32d80c2238d034e9a5ef2023abccd42e0af67260 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 5 Sep 2021 15:35:20 +0200 Subject: gnu: emacs-ebdb: Update to 0.8.4. * gnu/packages/emacs-xyz.scm (emacs-ebdb): Update to 0.8.4. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 68df962ddc..48d25045b6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25913,14 +25913,14 @@ federated microblogging social network.") (define-public emacs-ebdb (package (name "emacs-ebdb") - (version "0.8.2") + (version "0.8.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "ebdb-" version ".tar")) (sha256 - (base32 "1idwih5v287q9vdhsnr1bsibdv4h61vmy3b82svf2x9aik1a7vir")))) + (base32 "0n811af83fqpzq9513gf240gnz7qkwrjw07qs4sra4069q0pwnjr")))) (build-system emacs-build-system) (home-page "https://github.com/girzel/ebdb") (synopsis "EIEIO port of BBDB, Emacs's contact-management package") -- cgit v1.2.3 From aced5d2608afc3ecdfa4de867333dec2b6002f55 Mon Sep 17 00:00:00 2001 From: Robby Zambito Date: Sun, 29 Aug 2021 21:54:01 -0400 Subject: gnu: Add waypipe. * gnu/packages/freedesktop.scm (waypipe): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/freedesktop.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 693a79c738..086707d51a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 pineapples +;;; Copyright © 2021 Robby Zambito ;;; ;;; This file is part of GNU Guix. ;;; @@ -2434,3 +2435,38 @@ seeks to add support for the screenshot, screencast, and possibly remote-desktop @code{xdg-desktop-portal} interfaces for wlroots based compositors.") (license license:expat))) + +(define-public waypipe + (package + (name "waypipe") + (version "0.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/mstoeckl/waypipe") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qa47ljfvb1vv3h647xwn1j5j8gfmcmdfaz4j8ygnkvj36y87vnz")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-sleep-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((coreutils (assoc-ref inputs "coreutils"))) + (substitute* "./test/startup_failure.py" + (("sleep") (string-append coreutils "/bin/sleep"))))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("scdoc" ,scdoc) + ;; For tests + ("python" ,python) + ("coreutils" ,coreutils))) + (home-page "https://gitlab.freedesktop.org/mstoeckl/waypipe") + (synopsis "Proxy for Wayland protocol applications") + (description + "Waypipe is a proxy for Wayland clients, with the aim of +supporting behavior like @samp{ssh -X}.") + (license license:expat))) -- cgit v1.2.3 From 54ce83b7f2835b80d58459ecb5fcd5c575df421f Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 6 Sep 2021 11:21:30 +0200 Subject: gnu: Add rust-mio-anonymous-pipes-0.2. * gnu/packages/crates-io.scm (rust-mio-anonymous-pipes-0.2): New variable. (rust-mio-anonymous-pipes-0.1): Inherit from above. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 087ffa1d27..8902fda4db 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27046,10 +27046,10 @@ possible over the OS abstractions.") ("rust-env-logger" ,rust-env-logger-0.4) ("rust-tempdir" ,rust-tempdir-0.3)))))) -(define-public rust-mio-anonymous-pipes-0.1 +(define-public rust-mio-anonymous-pipes-0.2 (package (name "rust-mio-anonymous-pipes") - (version "0.1.0") + (version "0.2.0") (source (origin (method url-fetch) @@ -27058,7 +27058,7 @@ possible over the OS abstractions.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1bqs8wncd73q4pnbiwskhgds57hyr8g89vfpqmw1vk9dqp1p9hpq")))) + "0sqsr9ifvacarlmf02l0hh5ianns5kdhzdb1llx5l075bw117ibb")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -27073,6 +27073,28 @@ possible over the OS abstractions.") "This package provides asynchronous wrapper for Windows synchronous pipes.") (license license:expat))) +(define-public rust-mio-anonymous-pipes-0.1 + (package + (inherit rust-mio-anonymous-pipes-0.2) + (name "rust-mio-anonymous-pipes") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "mio-anonymous-pipes" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bqs8wncd73q4pnbiwskhgds57hyr8g89vfpqmw1vk9dqp1p9hpq")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-mio" ,rust-mio-0.6) + ("rust-miow" ,rust-miow-0.3) + ("rust-spsc-buffer" ,rust-spsc-buffer-0.1) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-mio-extras-2 (package (name "rust-mio-extras") -- cgit v1.2.3 From efca5516d14e80b9602335113d74e1ec4498df71 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 29 Aug 2021 17:00:31 +0200 Subject: gnu: rust-alacritty-terminal: Update to 0.15.0. * gnu/packages/crates-io.scm (rust-alacritty-terminal-0.15): Renamed from rust-alacritty-terminal-0.13. Update to 0.15.0. [arguments]: Update rust-base64 to 0.13. Update rust-mio-anonymous-pipes to 0.2. Update rust-nix to 0.22. --- gnu/packages/crates-io.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8902fda4db..8d6a9b1b66 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1609,32 +1609,32 @@ using AES-NI for high performance.") "This package provides a failure resistant deserialization derive.") (license (list license:expat license:asl2.0)))) -(define-public rust-alacritty-terminal-0.13 +(define-public rust-alacritty-terminal-0.15 (package (name "rust-alacritty-terminal") - (version "0.13.0") + (version "0.15.0") (source (origin (method url-fetch) (uri (crate-uri "alacritty_terminal" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "13f0pzy9jci57pmmvdd9qcbiycs2fsjqda4qgafxjm6s27sphdx7")))) + (base32 "1qv8zv20qgn407v8m196p68yddvhalcppc21702698cj99b45ckc")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1) - ("rust-base64" ,rust-base64-0.12) + ("rust-base64" ,rust-base64-0.13) ("rust-bitflags" ,rust-bitflags-1) ("rust-dirs" ,rust-dirs-2) ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-mio" ,rust-mio-0.6) - ("rust-mio-anonymous-pipes" ,rust-mio-anonymous-pipes-0.1) + ("rust-mio-anonymous-pipes" ,rust-mio-anonymous-pipes-0.2) ("rust-mio-extras" ,rust-mio-extras-2) ("rust-miow" ,rust-miow-0.3) - ("rust-nix" ,rust-nix-0.18) + ("rust-nix" ,rust-nix-0.22) ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-regex-automata" ,rust-regex-automata-0.1) ("rust-serde" ,rust-serde-1) -- cgit v1.2.3 From ff1a5d5022d298c90a174f3d07a116cd4c72db98 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 6 Sep 2021 11:23:49 +0200 Subject: gnu: Add rust-crossfont-0.3. * gnu/packages/crates-io.scm (rust-crossfont-0.3): New variable. (rust-crossfont-0.2): Inherit from above. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8d6a9b1b66..aee7a6f756 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10816,17 +10816,17 @@ message passing.") #:cargo-development-inputs (("rust-rand" ,rust-rand-0.6)))))) -(define-public rust-crossfont-0.2 +(define-public rust-crossfont-0.3 (package (name "rust-crossfont") - (version "0.2.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (crate-uri "crossfont" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "04p8k0yn19n2pdbiqzwkknakz9c7kdii0i2nf3s3p298ab7ld28h")))) + (base32 "079431wkjc18zj3038djai83z6fna0x7r1hxpxjhhi50jdz9dh5n")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -10851,6 +10851,35 @@ message passing.") rasterizing glyphs, using native font engines whenever possible.") (license license:asl2.0))) +(define-public rust-crossfont-0.2 + (package + (inherit rust-crossfont-0.3) + (name "rust-crossfont") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "crossfont" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04p8k0yn19n2pdbiqzwkknakz9c7kdii0i2nf3s3p298ab7ld28h")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cocoa" ,rust-cocoa-0.24) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8) + ("rust-core-graphics" ,rust-core-graphics-0.22) + ("rust-core-text" ,rust-core-text-19) + ("rust-dwrote" ,rust-dwrote-0.11) + ("rust-foreign-types" ,rust-foreign-types-0.5) + ("rust-freetype-rs" ,rust-freetype-rs-0.26) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-servo-fontconfig" ,rust-servo-fontconfig-0.5) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-crossterm-0.19 (package (name "rust-crossterm") -- cgit v1.2.3 From 06d34c703b2e3af952055759977a3989ad6d68d2 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 6 Sep 2021 11:25:48 +0200 Subject: gnu: alacritty: Update to 0.9.0. * gnu/packages/terminals.scm (alacritty): Update to 0.9.0. [arguments]: Update rust-alacritty-terminal to 0.15, rust-crossfont to 0.3, rust-dirs to 3. Signed-off-by: Nicolas Goaziou --- gnu/packages/terminals.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 478b30eddf..de9bec9e66 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2021 Ekaitz Zarraga ;;; Copyright © 2021 Raphaël Mélotte ;;; Copyright © 2021 ikasero +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -1308,7 +1309,7 @@ basic input/output.") (define-public alacritty (package (name "alacritty") - (version "0.7.2") + (version "0.9.0") (source (origin ;; XXX: The crate at "crates.io" has limited contents. In particular, @@ -1319,18 +1320,18 @@ basic input/output.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1isa61rivqchzfms8aakr4nks4kflwnfr9f2pik91157hg1plxam")))) + (base32 "068y0b1a0m33r7a3j2xf6k602sc8062gm4d5568ynfx6w5n481lj")))) (build-system cargo-build-system) (arguments `(#:install-source? #f ; virtual manifest #:cargo-test-flags '("--release" "--" "--skip=config_read_eof") #:cargo-inputs (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1) - ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.13) + ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.15) ("rust-clap" ,rust-clap-2) ("rust-cocoa" ,rust-cocoa-0.24) ("rust-copypasta" ,rust-copypasta-0.7) - ("rust-crossfont" ,rust-crossfont-0.2) + ("rust-crossfont" ,rust-crossfont-0.3) ("rust-embed-resource" ,rust-embed-resource-1) ("rust-fnv" ,rust-fnv-1) ("rust-gl-generator" ,rust-gl-generator-0.14) @@ -1443,7 +1444,7 @@ basic input/output.") ("libxxf86vm" ,libxxf86vm) ("mesa" ,mesa) ("rust-bitflags" ,rust-bitflags-1) - ("rust-dirs" ,rust-dirs-2) + ("rust-dirs" ,rust-dirs-3) ("rust-libc" ,rust-libc-0.2) ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-wayland-client" ,rust-wayland-client-0.28) -- cgit v1.2.3 From 9e836ca8fcf97c4ed3aa41db6ed2fd47a142009a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Sep 2021 14:34:35 +0200 Subject: gnu: Add r-cmdfun. * gnu/packages/cran.scm (r-cmdfun): New variable. --- gnu/packages/cran.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4fb5b2d25b..4e05568741 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11711,6 +11711,40 @@ using @dfn{penalized quasi-likelihood} (PQL) estimation (see Jaeger et al. (2016)).") (license license:gpl2))) +(define-public r-cmdfun + (package + (name "r-cmdfun") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "cmdfun" version)) + (sha256 + (base32 + "1pbcq7hi2lcmqnghmy3q2fsk0c9fy5m0637acyzmc096fxbx723j")))) + (properties `((upstream-name . "cmdfun"))) + (build-system r-build-system) + (propagated-inputs + `(("r-magrittr" ,r-magrittr) + ("r-purrr" ,r-purrr) + ("r-r-utils" ,r-r-utils) + ("r-rlang" ,r-rlang) + ("r-testthat" ,r-testthat) + ("r-usethis" ,r-usethis))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://snystrom.github.io/cmdfun/") + (synopsis "Framework for building interfaces to shell commands") + (description + "Writing interfaces to command line software is cumbersome. The cmdfun +package provides a framework for building function calls to seamlessly +interface with shell commands by allowing lazy evaluation of command line +arguments. It also provides methods for handling user-specific paths to tool +installs or secrets like API keys. Its focus is to equally serve package +builders who wish to wrap command line software, and to help analysts stay +inside R when they might usually leave to execute non-R software.") + (license license:expat))) + (define-public r-weights (package (name "r-weights") -- cgit v1.2.3 From f9e5d04fc2023d5e7fdffa0a5349c4f73704f054 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Sep 2021 14:40:12 +0200 Subject: gnu: Add libdeflate. * gnu/packages/compression.scm (libdeflate): New variable. --- gnu/packages/compression.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ecc767a3bf..cfbc959182 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2651,6 +2651,42 @@ with their error correction data losslessly rearranged for better compression, to their original, binary CD format.") (license license:gpl3+))) +(define-public libdeflate + (package + (name "libdeflate") + (version "1.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ebiggers/libdeflate") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nw1zhr2s6ffcc3s0n5wsshvjb6pmybwapagli135zzn2fx1pdiz")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("zlib" ,zlib))) + (home-page "https://github.com/ebiggers/libdeflate") + (synopsis "Library for DEFLATE/zlib/gzip compression and decompression") + (description "Libdeflate is a library for fast, whole-buffer DEFLATE-based +compression and decompression. The supported formats are: + +@enumerate +@item DEFLATE (raw) +@item zlib (a.k.a. DEFLATE with a zlib wrapper) +@item gzip (a.k.a. DEFLATE with a gzip wrapper) +@end enumerate +") + (license license:expat))) + (define-public tarlz (package (name "tarlz") -- cgit v1.2.3 From c82b723bf8f62718f3448869170cf963249e88c5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Sep 2021 14:40:19 +0200 Subject: gnu: Add megadepth. * gnu/packages/bioinformatics.scm (megadepth): New variable. --- gnu/packages/bioinformatics.scm | 65 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b74d8925db..c3ab0ce354 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14999,6 +14999,71 @@ collapsing the single-cell tracks to pseudo-bulk tracks) to capture distinct cross-cluster accessibility profiles.") (license license:gpl3+))) +(define-public megadepth + (package + (name "megadepth") + (version "1.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ChristopherWilks/megadepth") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hj69d2dgmk2zwgazik7xzc04fxxlk93p888kpgc52fmhd95qph7")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #false ; some tests seem to require connection to + ; www.ebi.ac.uk; this may be caused by htslib. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'prepare-CMakeLists.txt + (lambda _ + (rename-file "CMakeLists.txt.ci" "CMakeLists.txt") + (substitute* "CMakeLists.txt" + (("`cat ../VERSION`") ,version) + (("target_link_libraries\\(megadepth_static") "#") + (("target_link_libraries\\(megadepth_statlib") "#") + (("add_executable\\(megadepth_static") "#") + (("add_executable\\(megadepth_statlib") "#")) + + (substitute* "tests/test.sh" + ;; Disable remote test + (("./megadepth http://stingray.cs.jhu.edu/data/temp/test.bam") "#") + ;; Prior to installation the binary's name differs from what + ;; the test script assumes. + (("./megadepth") "../build/megadepth_dynamic")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "../source" + (invoke "bash" "tests/test.sh" "use-local-test-data"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (mkdir-p bin) + (copy-file "megadepth_dynamic" + (string-append bin "/megadepth")))))))) + (native-inputs + `(("diffutils" ,diffutils) + ("perl" ,perl) + ("grep" ,grep))) + (inputs + `(("curl" ,curl) + ("htslib" ,htslib) + ("libdeflate" ,libdeflate) + ("libbigwig" ,libbigwig) + ("zlib" ,zlib))) + (home-page "https://github.com/ChristopherWilks/megadepth") + (synopsis "BigWig and BAM/CRAM related utilities") + (description "Megadepth is an efficient tool for extracting coverage +related information from RNA and DNA-seq BAM and BigWig files. It supports +reading whole-genome coverage from BAM files and writing either indexed TSV or +BigWig files, as well as efficient region coverage summary over intervals from +both types of files.") + (license license:expat))) + (define-public r-ascat (package (name "r-ascat") -- cgit v1.2.3 From 816d52ba93d262548f5e1139ff6051887f13dd0d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Sep 2021 14:48:03 +0200 Subject: gnu: Add r-megadepth. * gnu/packages/bioconductor.scm (r-megadepth): New variable. --- gnu/packages/bioconductor.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 36ab137519..ea8a885c5f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -13700,6 +13700,39 @@ visualization of transcript structures, and matching of assembled transcripts to annotation.") (license license:artistic2.0))) +(define-public r-megadepth + (package + (name "r-megadepth") + (version "1.2.3") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "megadepth" version)) + (sha256 + (base32 + "0grgj7bzyqnxby0sx5ic1h9bzmx19xwl0a5b3v6wbnwqcla2i3kg")))) + (properties `((upstream-name . "megadepth"))) + (build-system r-build-system) + (inputs `(("megadepth" ,megadepth))) + (propagated-inputs + `(("r-cmdfun" ,r-cmdfun) + ("r-dplyr" ,r-dplyr) + ("r-fs" ,r-fs) + ("r-genomicranges" ,r-genomicranges) + ("r-magrittr" ,r-magrittr) + ("r-readr" ,r-readr) + ("r-xfun" ,r-xfun))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/LieberInstitute/megadepth") + (synopsis "BigWig and BAM related utilities") + (description + "This package provides an R interface to Megadepth. It is particularly +useful for computing the coverage of a set of genomic regions across bigWig or +BAM files. With this package, you can build base-pair coverage matrices for +regions or annotations of your choice from BigWig files.") + (license license:artistic2.0))) + (define-public r-tximeta (package (name "r-tximeta") -- cgit v1.2.3 From b0ea618fbec2eb64dc60a8b9f0db3ad587e8cdb3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 6 Sep 2021 18:20:36 +0200 Subject: gnu: emacs-xref: Update to 1.2.2. * gnu/packages/emacs-xyz.scm (emacs-xref): Update to 1.2.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 48d25045b6..b3fb62c8d9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29059,14 +29059,14 @@ work on alists, hash-table and arrays. All functions are prefixed with (define-public emacs-xref (package (name "emacs-xref") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/xref-" version ".tar")) (sha256 - (base32 "1x7hfqp7y4yr4r7n49lqdf1h2plhgaxdn9x7rjkp05szj3rgflk6")))) + (base32 "14kdy8blhs6lwg349l9lmv0bbpybgi9nsg2iic3v87j4jyi41ljm")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/xref.html") (synopsis "Cross-referencing commands") -- cgit v1.2.3 From 5fc9d71bac22c2e41543b6e9c2cc120c3b864642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 6 Sep 2021 23:25:30 +0200 Subject: gnu: ocaml-markup@0.8.0: Use 'ocaml-ounit', not 'ocaml-ounit2'. * gnu/packages/ocaml.scm (ocaml-markup0.8.0)[native-inputs]: New field. --- gnu/packages/ocaml.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ecaf024b40..e8161f0e4e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6503,6 +6503,9 @@ stream, and convert everything to UTF-8.") (sha256 (base32 "0aif4abvfmi9xc1pvw5n5rbm6rzkkpsxyvdn0lanr33rjpvkwdlm")))) + (native-inputs + `(("ocaml-ounit" ,ocaml-ounit) + ("pkg-config" ,pkg-config))) (properties '()))) (define-public ocaml-tyxml -- cgit v1.2.3 From c80e71a5868556f737ba93c70f5050e9ed0a55c2 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Mon, 6 Sep 2021 16:06:45 +0200 Subject: gnu: ocaml-ppx-optcomp: Update to 0.14.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (ocaml-ppx-optcomp): Update to 0.14.3. Signed-off-by: Ludovic Courtès --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e8161f0e4e..2d6743f217 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5786,7 +5786,7 @@ else expression.") (define-public ocaml-ppx-optcomp (package (name "ocaml-ppx-optcomp") - (version "0.14.1") + (version "0.14.3") (home-page "https://github.com/janestreet/ppx_optcomp") (source (origin @@ -5797,7 +5797,7 @@ else expression.") (file-name (git-file-name name version)) (sha256 (base32 - "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4")))) + "1iflgfzs23asw3k6098v84al5zqx59rx2qjw0mhvk56avlx71pkw")))) (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,ocaml-base) -- cgit v1.2.3 From b60a7f049c2aa6d2d6462515e25476cf9a421427 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Mon, 6 Sep 2021 16:06:48 +0200 Subject: gnu: ocamlformat: Update to 0.19.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (ocamlformat): Update to 0.19.0. [propagated-inputs]: Add ocaml-odoc-parser. Signed-off-by: Ludovic Courtès --- gnu/packages/ocaml.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2d6743f217..b6c9559d6e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7145,7 +7145,7 @@ get an precise reference of when the executable was built."))) (define-public ocamlformat (package (name "ocamlformat") - (version "0.18.0") + (version "0.19.0") (source (origin (method git-fetch) @@ -7155,7 +7155,7 @@ get an precise reference of when the executable was built."))) (file-name (git-file-name name version)) (sha256 (base32 - "0n6363km8xr81pvyk453n6h2mb0256c5yxw3p1li4dn83f3lwxr1")))) + "0dp4pkznz9yvqx9gxwbid1z2b8ajkr8i27zay9ghx69624hz3i4z")))) (build-system dune-build-system) (arguments '(#:package "ocamlformat" @@ -7173,6 +7173,7 @@ get an precise reference of when the executable was built."))) ("ocaml-odoc" ,ocaml-odoc) ("ocaml-ppxlib" ,ocaml-ppxlib) ("ocaml-re" ,ocaml-re) + ("ocaml-odoc-parser" ,ocaml-odoc-parser) ("ocaml-stdio" ,ocaml-stdio) ("ocaml-uuseg" ,ocaml-uuseg) ("ocaml-uutf" ,ocaml-uutf))) -- cgit v1.2.3 From 550f4aa682ed8014f3e32ebc65dbab8f0d208e8d Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Mon, 6 Sep 2021 16:06:52 +0200 Subject: gnu: ocaml-ppx-variants-conv: Patch for building with ocaml-ppxlib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch will make it build when building it with ocaml-ppxlib@0.23.0. * gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/ocaml.scm (ocaml-ppx-variants-conv): Apply the patch. Signed-off-by: Ludovic Courtès --- gnu/packages/ocaml.scm | 4 +++ .../ocaml-ppx-variants-ppxlib-api-change.patch | 42 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b6c9559d6e..b4ec016cbe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5340,6 +5340,10 @@ definitions.") (uri (git-reference (url "https://github.com/janestreet/ppx_variants_conv") (commit (string-append "v" version)))) + (patches + (search-patches + ;; Fix build when building with ocaml-ppxlib@0.23.0. + "ocaml-ppx-variants-ppxlib-api-change.patch")) (file-name (git-file-name name version)) (sha256 (base32 diff --git a/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch b/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch new file mode 100644 index 0000000000..b437bfb061 --- /dev/null +++ b/gnu/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch @@ -0,0 +1,42 @@ +From 6103f6fc56f978c847ba7c1f2d9f38ee93a5e337 Mon Sep 17 00:00:00 2001 +From: Sonja Heinze +Date: Tue, 9 Mar 2021 12:57:47 +0100 +Subject: [PATCH] Adapt to Ppxlib's API change + +Ppxlib is removing Lexer.keyword_table from the API in exchange for +the more lightweight Keyword.is_keyword. + +Signed-off-by: Sonja Heinze +--- +Patch from . + + ppx_variants_conv.opam | 2 +- + src/ppx_variants_conv.ml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ppx_variants_conv.opam b/ppx_variants_conv.opam +index 7e7148d..b56040f 100644 +--- a/ppx_variants_conv.opam ++++ b/ppx_variants_conv.opam +@@ -15,7 +15,7 @@ depends: [ + "base" {>= "v0.14" & < "v0.15"} + "variantslib" {>= "v0.14" & < "v0.15"} + "dune" {>= "2.0.0"} +- "ppxlib" {>= "0.14.0"} ++ "ppxlib" {>= "0.23.0"} + ] + synopsis: "Generation of accessor and iteration functions for ocaml variant types" + description: " +diff --git a/src/ppx_variants_conv.ml b/src/ppx_variants_conv.ml +index 8d60086..112fc78 100644 +--- a/src/ppx_variants_conv.ml ++++ b/src/ppx_variants_conv.ml +@@ -66,7 +66,7 @@ end + + let variant_name_to_string v = + let s = String.lowercase v in +- if Caml.Hashtbl.mem Lexer.keyword_table s ++ if Keyword.is_keyword s + then s ^ "_" + else s + -- cgit v1.2.3 From 49922efb11da0f0e9d4f5979d081de5ea8c99d25 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Mon, 6 Sep 2021 16:06:54 +0200 Subject: gnu: ocaml-ppxlib: Update to 0.23.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (ocaml-ppxlib): Update to 0.23.0. Signed-off-by: Ludovic Courtès --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b4ec016cbe..db1d973238 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5049,7 +5049,7 @@ as part of the same ocaml-migrate-parsetree driver.") (define-public ocaml-ppxlib (package (name "ocaml-ppxlib") - (version "0.22.1") + (version "0.23.0") (home-page "https://github.com/ocaml-ppx/ppxlib") (source (origin @@ -5060,7 +5060,7 @@ as part of the same ocaml-migrate-parsetree driver.") (file-name (git-file-name name version)) (sha256 (base32 - "0cpfg634if1py1b2rljk3cagq9gj68dl2gk1kdg76f9rapvl2i4g")))) + "0jg5v4pssbl66hn5davpin1i57a0r3r54l96vpz5y99xk5w70xi1")))) (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,ocaml-base) -- cgit v1.2.3