From 38f2cbda712d67e4b18d074d3f1f9ce70b5b76f0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 29 Sep 2022 10:47:01 +0200 Subject: gnu: emacs-async: Update to 1.9.7. * gnu/packages/emacs-xyz.scm (emacs-async): Update to 1.9.7. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c5d49c2925..63a751541a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3085,7 +3085,7 @@ while paused.") (package (name "emacs-async") (home-page "https://github.com/jwiegley/emacs-async") - (version "1.9.6") + (version "1.9.7") (source (origin (method git-fetch) (uri (git-reference @@ -3094,7 +3094,7 @@ while paused.") (file-name (git-file-name name version)) (sha256 (base32 - "1q480ss2jgijdpy6pa4xrjni9pf5q6dwf8hv052fhdpi55bmfdn2")))) + "18pysi1pf6hbv6w0nq50j5xclvgd006iqqijh44wck9hxhdwyfr1")))) (build-system emacs-build-system) (synopsis "Asynchronous processing in Emacs") (description -- cgit v1.2.3 From 97a2f8e48eb7ad14157c4489ed3a6071963b6083 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 29 Sep 2022 10:49:02 +0200 Subject: gnu: emacs-popup: Update to 0.5.9. * gnu/packages/emacs-xyz.scm (emacs-popup): Update to 0.5.9. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 63a751541a..d9539bfc3d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8238,7 +8238,7 @@ for compilation, debugging, documentation lookup, and so on.") (define-public emacs-popup (package (name "emacs-popup") - (version "0.5.8") + (version "0.5.9") (source (origin (method git-fetch) @@ -8247,7 +8247,7 @@ for compilation, debugging, documentation lookup, and so on.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qrsz4z9q2bfq9xv4n94mvyslm232v2ql9r1fjycx7rnmpqggiwl")))) + (base32 "13ww7hld5pa32myj9krr6prmc99s7hnpsw8mw9krpxffykkblj2f")))) (build-system emacs-build-system) (home-page "https://github.com/auto-complete/popup-el") (synopsis "Visual Popup User Interface for Emacs") -- cgit v1.2.3 From c9f02fb44fc152d243bbac007299ce23f149e727 Mon Sep 17 00:00:00 2001 From: jgart Date: Wed, 28 Sep 2022 23:50:39 -0500 Subject: gnu: Add emacs-elquery. * gnu/packages/emacs-xyz.scm (emacs-elquery): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d9539bfc3d..fbff9b8320 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8455,6 +8455,49 @@ the locations of docstrings, arguments, and functions.") "This package provides a Company backend for Python.") (license license:gpl3+))) +(define-public emacs-elquery + (package + (name "emacs-elquery") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/AdamNiederer/elquery") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "035zjzmd7yfw0rsjpaklc2wwiqw6brkjadch9x8n8n2gjyxg05mn")))) + (build-system emacs-build-system) + (arguments + (list + #:emacs emacs-no-x + #:tests? #t + #:test-command #~(list "ert-runner") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-native-compilation + (lambda _ + (substitute* "elquery.el" + (("\\(1- \\(/ length \\(match-data\\)\\) 2\\)") + "(1- (/ (length (match-data)) 2))")))) + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "test/elquery-test.el" + (("\\(ert-deftest elquery--write-test .*" all) + (string-append all "(skip-unless nil)\n")))))))) + (native-inputs + (list emacs-ert-runner emacs-undercover)) + (propagated-inputs + (list emacs-dash)) + (home-page "https://github.com/AdamNiederer/elquery/") + (synopsis "Read and manipulate HTML in Emacs") + (description + "Elquery is a library that lets you parse, query, set, and format HTML using +Emacs Lisp. It implements most of the @code{querySelector} API, and can get +and set HTML attributes.") + (license license:gpl3+))) + (define-public emacs-puppet-mode (package (name "emacs-puppet-mode") -- cgit v1.2.3 From e6777cfa5eb5e9c36eaf7810b42cac0fbcaa367c Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 29 Sep 2022 11:38:42 +0200 Subject: gnu: Add emacs-cov. * gnu/packages/emacs-xyz.scm (emacs-cov): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fbff9b8320..0671eb4ac6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8498,6 +8498,48 @@ Emacs Lisp. It implements most of the @code{querySelector} API, and can get and set HTML attributes.") (license license:gpl3+))) +(define-public emacs-cov + ;; XXX: Upstream made no release nor any tag so far. + (let ((commit "cd3e1995c596cc227124db9537792d8329ffb696") + (revision "0")) + (package + (name "emacs-cov") + (version (git-version "0.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/AdamNiederer/cov") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gyc0si60czhgrkm7kink1p1zj1h5j5nzif4ivm5bg78l28skmpm")))) + (build-system emacs-build-system) + (arguments + (list + #:emacs emacs-no-x ;for libxml + #:tests? #t + #:test-command #~(list "ert-runner") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "test/cov-test.el" + (("\\(ert-deftest cov--load-coverage-test-mtime-check .*" all) + (string-append all "(skip-unless nil)\n")))))))) + (native-inputs + (list emacs-ert-runner emacs-mocker emacs-undercover)) + (propagated-inputs + (list emacs-elquery emacs-f emacs-s)) + (home-page "https://github.com/AdamNiederer/cov/") + (synopsis "Emacs extension for displaying coverage data") + (description + "Cov shows code coverage data for your program in Emacs. It supports +currently @code{gcov}, @code{lcov}, @code{coverage.py}, and @code{clover} +output, as well as the Coveralls format produced by Undercover.") + (license license:gpl3+)))) + (define-public emacs-puppet-mode (package (name "emacs-puppet-mode") -- cgit v1.2.3 From 168a7933c0e138dc7061a3f0dc96871e16da5c5f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 29 Sep 2022 22:20:18 +0200 Subject: services: shepherd: Leave the finalization thread in peace. This gets rid of that (in)famous at boot time: error in finalization thread: Success This was caused by the file-descriptor closing loop, which would clause the finalization pipe, leading the finalization thread to (erroneously) error out. Thanks to Josselin Poiret for locating the problem! * gnu/services/shepherd.scm (shepherd-boot-gexp): In 'loop', replace 'close-fdes' with a pair of 'fcntl' calls to add FD_CLOEXEC. --- gnu/services/shepherd.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 61f759a19d..7110e5aa89 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -107,14 +107,15 @@ (symlink (canonicalize-path "/run/current-system") "/run/booted-system") - ;; Close any remaining open file descriptors to be on the safe - ;; side. This must be the very last thing we do, because - ;; Guile has internal FDs such as 'sleep_pipe' that need to be - ;; alive. + ;; Ensure open file descriptors are close-on-exec so shepherd doesn't + ;; inherit them. (let loop ((fd 3)) (when (< fd 1024) - (false-if-exception (close-fdes fd)) - (loop (+ 1 fd)))) + (false-if-exception + (let ((flags (fcntl fd F_GETFD))) + (when (zero? (logand flags FD_CLOEXEC)) + (fcntl fd F_SETFD (logior FD_CLOEXEC flags))))) + (loop (+ fd 1)))) ;; Start shepherd. (execl #$(file-append shepherd "/bin/shepherd") -- cgit v1.2.3 From 6943f22ee6956bc6c8e57e191dbdf6d9dcd5995e Mon Sep 17 00:00:00 2001 From: zamfofex Date: Fri, 23 Sep 2022 04:00:59 -0300 Subject: gnu: Add lite-xl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/text-editors.scm (lite-xl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/text-editors.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 0c30a705b9..40d6d28b55 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2021 Calum Irwin ;;; Copyright © 2022 Luis Henrique Gomes Higino ;;; Copyright © 2022 Foo Chuan Wei +;;; Copyright © 2022 zamfofex ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,6 +46,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) @@ -62,6 +64,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) + #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages haskell-xyz) @@ -81,6 +84,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages regex) #:use-module (gnu packages ruby) + #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) @@ -1260,3 +1264,39 @@ scriptable rc file, macros, search and replace (PCRE), window splitting, multiple cursors, and integration with various shell commands.") (license license:asl2.0))) + +(define-public lite-xl + (package + (name "lite-xl") + (version "2.0.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lite-xl/lite-xl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l2i9mvbkc4kqkwk2p17zd1rlm5v41acdyp2xivi53p2hkj4x6pf")) + (modules '((guix build utils))) + (snippet '(substitute* "meson.build" + (("dependency\\('lua5\\.2',") + "dependency('lua-5.2',"))))) + (build-system meson-build-system) + (inputs (list agg + freetype + lua-5.2 + pcre2 + reproc + sdl2)) + (native-inputs (list pkg-config)) + (home-page "https://lite-xl.com") + (synopsis "Lightweight text editor written in Lua") + (description + "Lite XL is derived from lite. It is a lightweight text editor written +mostly in Lua. It aims to provide something practical, pretty, small and fast +easy to modify and extend, or to use without doing either. + +The aim of Lite XL compared to lite is to be more user-friendly, improve the +quality of font rendering, and reduce CPU usage.") + (license license:expat))) -- cgit v1.2.3 From 1bf18818c66fbdd329211e18c85ccd310fa74890 Mon Sep 17 00:00:00 2001 From: Mája Tomášek Date: Fri, 23 Sep 2022 12:27:03 +0200 Subject: services: certbot: Create "live" directory during activation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When trying to run certbot, the mcron command fails, as /etc/letsencrypt/live is missing. This patch adds it into the certbot activation service. * gnu/services/certbot.scm (certbot-activation): Make /etc/letsencrypt/live. Signed-off-by: Ludovic Courtès --- gnu/services/certbot.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/services/certbot.scm b/gnu/services/certbot.scm index 1c819bef48..7dfdad9874 100644 --- a/gnu/services/certbot.scm +++ b/gnu/services/certbot.scm @@ -154,6 +154,7 @@ (define (certbot-activation config) (let* ((certbot-directory "/var/lib/certbot") + (certbot-cert-directory "/etc/letsencrypt/live") (script (in-vicinity certbot-directory "renew-certificates")) (message (format #f (G_ "~a may need to be run~%") script))) (match config @@ -164,6 +165,7 @@ (use-modules (guix build utils)) (mkdir-p #$webroot) (mkdir-p #$certbot-directory) + (mkdir-p #$certbot-cert-directory) (copy-file #$(certbot-command config) #$script) (display #$message))))))) -- cgit v1.2.3 From 1ee2d117d8fa9e2e0d4ec46cc5555497bb5e6337 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Sep 2022 23:17:19 +0200 Subject: gnu: blast+: Build reproducibly. Fixes . * gnu/packages/bioinformatics.scm (blast+)[source]: Do not record kernel version and use fix set of random numbers. --- gnu/packages/bioinformatics.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a034bf134e..ca341a45a7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1656,7 +1656,27 @@ package provides command line tools using the Bio++ library.") ;; Remove useless msbuild directory (delete-file-recursively "c++/src/build-system/project_tree_builder/msbuild") - #t)))) + + ;; Build reproducibly. + ;; Do not record the kernel version + (substitute* "c++/src/build-system/configure" + (("kver=.*") "kver=\"\"")) + ;; Do not generate random numbers. + (substitute* "c++/scripts/common/impl/define_random_macros.sh" + (("#define NCBI_RANDOM_VALUE_MAX 0xffffffffu" m) + (string-append m " +#define NCBI_RANDOM_VALUE_0 2845495105u +#define NCBI_RANDOM_VALUE_1 2158634051u +#define NCBI_RANDOM_VALUE_2 4072202242u +#define NCBI_RANDOM_VALUE_3 902228395u +#define NCBI_RANDOM_VALUE_4 1353323915u +#define NCBI_RANDOM_VALUE_5 574823513u +#define NCBI_RANDOM_VALUE_6 4119501261u +#define NCBI_RANDOM_VALUE_7 2477640938u +#define NCBI_RANDOM_VALUE_8 2776595395u +#define NCBI_RANDOM_VALUE_9 270550684u +")) + (("cksum") "cksum >/dev/null")))))) (build-system gnu-build-system) (arguments `(;; There are two(!) tests for this massive library, and both fail with -- cgit v1.2.3 From 034f68bac3940420d6776f58522d6380023bb407 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Thu, 29 Sep 2022 21:53:35 +0800 Subject: gnu: qtwayland: Rename to qtwayland-5. Automated via: git grep -l qtwayland | xargs sed 's/\qtwayland\b/\0-5/g' -i git checkout NEWS Signed-off-by: Maxim Cournoyer --- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/qt.scm | 4 ++-- gnu/packages/telegram.scm | 2 +- gnu/packages/video.scm | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 61cbf19bc4..059667ee5d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1068,7 +1068,7 @@ protocols used in KDE Plasma.") (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list qtbase-5 qtwayland wayland wayland-protocols)) + (list qtbase-5 qtwayland-5 wayland wayland-protocols)) (arguments `(#:tests? #f ; FIXME tests require weston to run ; weston requires wayland flags in mesa diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 39716187fd..064f5f7278 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -177,7 +177,7 @@ call it if it is not associated to a terminal.") (list libxkbcommon qtbase-5 qtdeclarative-5 - qtwayland + qtwayland-5 wayland wayland-protocols)) (home-page "https://invent.kde.org/plasma/layer-shell-qt") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8c94d613d6..f6e5a37472 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -220,7 +220,7 @@ window managers, that don't provide Qt integration by themselves.") (list cmake-shared extra-cmake-modules pkg-config)) (inputs `(("qtbase" ,qtbase-5) - ("qtwayland" ,qtwayland) + ("qtwayland" ,qtwayland-5) ("wayland" ,wayland) ("xkbcommon" ,libxkbcommon))) (synopsis "Material Decoration for Qt") @@ -1450,7 +1450,7 @@ record media, and manage a collection of media content. It also contains a set of plugins for interacting with pulseaudio and GStreamer.") (license (package-license qtbase)))) -(define-public qtwayland +(define-public qtwayland-5 (package (inherit qtsvg-5) (name "qtwayland") (version "5.15.2") diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 2df68ccca7..82c9227ba8 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -502,7 +502,7 @@ Telegram project, for its use in telegram desktop client.") qtbase-5 qtimageformats qtsvg-5 - qtwayland + qtwayland-5 range-v3 rlottie-for-telegram-desktop rnnoise diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 01c9ae186a..ca6148b078 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3385,7 +3385,7 @@ be used for realtime video capture via Linux-specific APIs.") qtbase-5 qtsvg-5 qtx11extras - qtwayland + qtwayland-5 speexdsp v4l-utils wayland -- cgit v1.2.3 From a70c67cfe75031746d1f73ba76b6d83b95ea1cf7 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Thu, 29 Sep 2022 21:53:55 +0800 Subject: gnu: Add qtwayland, version 6.3.1. * gnu/packages/qt.scm (qtwayland): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/qt.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f6e5a37472..6e30980505 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1500,6 +1500,56 @@ set of plugins for interacting with pulseaudio and GStreamer.") (description "The Qt Wayland module provides the QtWayland client and compositor libraries."))) +(define-public qtwayland + (package + (name "qtwayland") + (version "6.3.1") + (source + (origin + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 "1w60p1did7awdlzq5k8vnq2ncpskb07cpvz31cbv99bjs6igw53g")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; FIXME: tst_seatv4::animatedCursor() fails here. + ;; See also: + (substitute* "tests/auto/client/seatv4/tst_seatv4.cpp" + (((string-append + "QVERIFY\\(!cursorSurface\\(\\)->" + "m_waitingFrameCallbacks\\.empty\\(\\)\\);")) "") + (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);") "")))) + (add-before 'check 'set-test-environment + (lambda _ + ;; Do not fail just because /etc/machine-id is missing. + (setenv "DBUS_FATAL_WARNINGS" "0") + ;; Make Qt render "offscreen", required for tests. + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (native-inputs (list glib perl pkg-config qtdeclarative)) + (inputs + (list fontconfig + freetype + libx11 + libxcomposite + libxext + libxkbcommon + libxrender + mesa + mtdev + qtbase + vulkan-headers + wayland)) + (synopsis "Qt Wayland module") + (description "The Qt Wayland module provides the QtWayland client and +compositor libraries.") + (home-page (package-home-page qtbase)) + (license (package-license qtbase)))) + (define-public qtserialport (package (inherit qtsvg-5) (name "qtserialport") -- cgit v1.2.3 From 575da30495a69e57b44d41e164dc711f26deebc6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 30 Sep 2022 08:28:43 +0200 Subject: gnu: emacs-pg: Update to 0.16. * gnu/packages/emacs-xyz.scm (emacs-pg): Update to 0.16. [source]: Change upstream repository, the older one being unmaintained. [home-page]: Update accordingly. [description]: Expound it. [license]: Set to GPL2+. --- gnu/packages/emacs-xyz.scm | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0671eb4ac6..68e573741a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19056,24 +19056,27 @@ match and total match information in the mode-line in various search modes.") (license license:gpl3+))) (define-public emacs-pg - (let ((commit "4f6516ec3946d95dcef49abb6703cc89ecb5183d")) - (package - (name "emacs-pg") - (version (git-version "0.1" "1" commit)) - (source (origin - (method git-fetch) - (uri (git-reference (url "https://github.com/cbbrowne/pg.el") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0")))) - (build-system emacs-build-system) - (home-page "https://github.com/cbbrowne/pg.el") - (synopsis "Emacs Lisp interface for PostgreSQL") - (description - "This package provides an Emacs Lisp interface for PostgreSQL.") - (license license:gpl3+)))) + (package + (name "emacs-pg") + (version "0.16") + (source (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/emarsden/pg-el") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jdnslpgdm16klaga02p33g7c8bjzg164kxz3jd7gs5v9gqa6ppz")))) + (build-system emacs-build-system) + (home-page "https://github.com/emarsden/pg-el") + (synopsis "Emacs Lisp interface for PostgreSQL") + (description + "This module lets you access the PostgreSQL object-relational DBMS from +Emacs, using its socket-level frontend/backend protocol. The module is +capable of automatic type coercions from a range of SQL types to the +equivalent Emacs Lisp type. This is a low level API, and won't be useful to +end users.") + (license license:gpl2+))) (define-public emacs-finalize (package -- cgit v1.2.3 From a233b9e89f17a6c2fc9972749cb1b0612205f46b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 30 Sep 2022 08:31:06 +0200 Subject: gnu: emacs-helm: Update to 3.8.8. * gnu/packages/emacs-xyz.scm (emacs-helm): Update to 3.8.8. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 68e573741a..c3b26d695b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12528,7 +12528,7 @@ ack, ag, helm and pt.") (define-public emacs-helm (package (name "emacs-helm") - (version "3.8.7") + (version "3.8.8") (source (origin (method git-fetch) @@ -12537,7 +12537,7 @@ ack, ag, helm and pt.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1a8zkp00ahb84ww5072naxwllzbjhi7ccarkk2d7xsykn5lig54c")))) + (base32 "1i8hbdp5sg99h3imqydk4wd7mqsa04113yavk5sx1wgc17jm1l42")))) (build-system emacs-build-system) (propagated-inputs (list emacs-async emacs-popup)) -- cgit v1.2.3 From c3020f3d37d5603a4306a2bbb842f137bc544b21 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 30 Sep 2022 08:33:04 +0200 Subject: gnu: emacs-taxy-magit-section: Update to 0.11. * gnu/packages/emacs-xyz.scm (emacs-taxy-magit-section): Update to 0.11. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c3b26d695b..f99f980fec 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17590,7 +17590,7 @@ groups.") (define-public emacs-taxy-magit-section (package (name "emacs-taxy-magit-section") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) (uri (string-append @@ -17598,7 +17598,7 @@ groups.") ".tar")) (sha256 (base32 - "1g58nvpb04ldhn5qnjw2q5idrv6vhlfa0qmb46cvis6bkz46cxkw")))) + "058z95c0z2hxplr5pfgph1cdq68zcrkmwx1wqyd5fy4a5h43yknq")))) (build-system emacs-build-system) (propagated-inputs (list emacs-magit emacs-taxy)) (home-page "https://github.com/alphapapa/taxy.el") -- cgit v1.2.3 From b5b5f5fff367f67657e910cc9e3080d692e382d3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 30 Sep 2022 08:33:09 +0200 Subject: gnu: emacs-tramp: Update to 2.5.3.3. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.5.3.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f99f980fec..40e0289aa7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27993,14 +27993,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.5.3.2") + (version "2.5.3.3") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "1jcicb9f7c1nmaqg20yy2j4wd0qfch4llc26ga7q3ckhx41pvbiw")))) + (base32 "05w04qwk1lk50fzwl6fxyf6pb1jd2lx4as99zm1dpa858jab6w4a")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 77a075e9aeeabc30af2a03df6ef86838d8090d14 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 30 Sep 2022 08:34:27 +0200 Subject: gnu: emacs-ement: Update to 0.3. * gnu/packages/emacs-xyz.scm (emacs-ement): Update to 0.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 40e0289aa7..f0078b17e5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17103,7 +17103,7 @@ which avoids some of the issues with using Emacs’s built-in Url library.") (define-public emacs-ement (package (name "emacs-ement") - (version "0.2.1") + (version "0.3") (source (origin (method git-fetch) @@ -17112,7 +17112,7 @@ which avoids some of the issues with using Emacs’s built-in Url library.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0kfh0vlsz4qnx4vwkwhkxawk5cpxgnvkar72wha9cxj8s6j51vx0")))) + (base32 "0ing4pdqh4z3jsk9qb8qc5n968c27mxn0yq0h102plrb7fafd8ic")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs)) ;need libxml support -- cgit v1.2.3 From 16df0649bdc6184d9cbe0e3069349f812d90dd7e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 30 Sep 2022 08:35:48 +0200 Subject: gnu: emacs-tuareg: Update to 3.0.1. * gnu/packages/ocaml.scm (emacs-tuareg): Update to 3.0.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b8f8a6f70b..12d7a83836 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1081,7 +1081,7 @@ the OCaml core distribution.") (define-public emacs-tuareg (package (name "emacs-tuareg") - (version "3.0.0") + (version "3.0.1") (source (origin (method git-fetch) @@ -1090,7 +1090,7 @@ the OCaml core distribution.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "115vm0hq4xkwfd3w0j8xqhkdgcirlxpnwzwxv02c27583hj056is")))) + (base32 "1p3xpk78i8ywgdmc59w05wjjy9dg6gm5gicm08szmrlnx08v2ihm")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From bcf7dc6c56c35e8e11e56215b3d32a08c42269d3 Mon Sep 17 00:00:00 2001 From: jgart via Guix-patches via Date: Fri, 30 Sep 2022 00:24:04 -0500 Subject: gnu: Add emacs-new-purescript-mode. * gnu/packages/emacs-xyz.scm (emacs-new-purescript-mode): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f0078b17e5..6d9d0d6a8f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8596,6 +8596,29 @@ linting of manifests and integration with Puppet Debugger.") (description "This package provides an Emacs major mode for writing Purescript.") (license license:gpl3+)))) +(define-public emacs-new-purescript-mode + (let ((commit "9f7bb73e26340fcd2ea1946dbad165f0406eb3e1") + (revision "0")) + (package + (name "emacs-new-purescript-mode") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/justinwoo/new-purescript-mode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0b3499df0gfz8yrdxz9dpgwal21h50sciigwz25ri1hwv1c1i7k0")))) + (build-system emacs-build-system) + (home-page "https://github.com/justinwoo/new-purescript-mode/") + (synopsis "Simple PureScript mode for cheap syntax highlighting") + (description "New PureScript mode is a simple PureScript Emacs mode that +just provides syntax highlighting.") + (license license:expat)))) + (define-public emacs-god-mode (package (name "emacs-god-mode") -- cgit v1.2.3 From df485be2f7d939b5c2b83a3a467cdff4d5a93851 Mon Sep 17 00:00:00 2001 From: Ryan Tolboom Date: Thu, 29 Sep 2022 17:12:20 -0400 Subject: gnu: Add qdmr. * gnu/packages/radio.scm (qdmr): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/radio.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 2968f9d390..fcf69b0e87 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 Sheng Yang ;;; Copyright © 2022 Greg Hogan +;;; Copyright © 2022 Ryan Tolboom ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,6 +90,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) + #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages swig) #:use-module (gnu packages tcl) @@ -2668,3 +2670,40 @@ 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+))) + +(define-public qdmr + (package + (name "qdmr") + (version "0.10.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hmatuschek/qdmr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "037vkwk974zrwacxafslkb3mbw9258v9sdpwdvb23msjzbc3snrn")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f ;no tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "lib/CMakeLists.txt" + (("(DESTINATION \")/etc/udev/" _ directive) + (string-append directive #$output "/lib/udev/")))))))) + (inputs (list libusb qtbase-5 qtlocation qtserialport yaml-cpp)) + (native-inputs (list qttools-5)) + (home-page "https://dm3mat.darc.de/qdmr/") + (synopsis "GUI application and command line tool to program DMR radios") + (description + "qdmr is a graphical user interface (GUI) application that allows one to +program several types of DMR radios. It is comparable to the Customer +Programming Software (CPS) bundled with these radios but aims to be a more +universal tool. + +To install the qdmr udev rules, you must extend @code{udev-service-type} with this +package. E.g.: @code{(udev-rules-service 'qdmr qdmr)}") + (license license:gpl3+))) -- cgit v1.2.3 From 0f66ef9aa99d2043abccbc80d858bdeca57534ac Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 30 Sep 2022 15:19:36 +0200 Subject: tests: install: Fix iso-image-installer test. This is a follow-up of: 45eac6cdf5c8d9d7b0c564b105c790d2d2007799. It fixes the following error: + mkfs.ext4 -L my-root /dev/vda2 sh: line 12: mkfs.ext4: command not found * gnu/tests/install.scm (%test-iso-image-installer): Add e2fsprogs to the appended packages. --- gnu/tests/install.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 4e0e274e66..30a9026d5f 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -471,6 +471,8 @@ reboot\n") (mlet* %store-monad ((images (run-install %minimal-os-on-vda %minimal-os-on-vda-source + #:packages + (list e2fsprogs) #:script %simple-installation-script-for-/dev/vda #:installation-image-type -- cgit v1.2.3 From a47a051e3d8669c51071f224661e0f7a9c5a9aaa Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Sat, 24 Sep 2022 01:39:00 -0400 Subject: gnu: picard: Update to 2.8.3, modernize package. * gnu/packages/music.scm (picard): Update to 2.8.3. [source]: Remove patch. [arguments]: Use G-expressions. Remove trailing #t. [native-inputs]: Remove input labels. [inputs]: Add python-fasteners, python-pyyaml, python-markdown, python-pyjwt. Remove a transitive dependency on QtWebKit. See for more information about this change. * gnu/packages/patches/picard-fix-id3-rename-test.patch: Remove it. * gnu/local.mk (dist_path_DATA): Update accordingly. Signed-off-by: Mathieu Othacehe --- gnu/local.mk | 1 - gnu/packages/music.scm | 47 ++++++++++++---------- .../patches/picard-fix-id3-rename-test.patch | 11 ----- 3 files changed, 26 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/picard-fix-id3-rename-test.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0134fb53d8..26fdfe7ca9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1653,7 +1653,6 @@ dist_patch_DATA = \ %D%/packages/patches/phoronix-test-suite-fsdg.patch \ %D%/packages/patches/php-bug-74093-test.patch \ %D%/packages/patches/php-curl-compat.patch \ - %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ %D%/packages/patches/pinball-system-ltdl.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index bbb58c0241..60dccd9b38 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3524,7 +3524,7 @@ event-based scripts for scrobbling, notifications, etc.") (define-public picard (package (name "picard") - (version "2.4.4") + (version "2.8.3") (source (origin (method url-fetch) (uri (string-append @@ -3532,30 +3532,35 @@ event-based scripts for scrobbling, notifications, etc.") "picard/picard-" version ".tar.gz")) (sha256 (base32 - "1c5l7i43jaj3s4wklc0cba6nn2x9cmpcggk4q4h9m1bci2xilsiy")) - (patches (search-patches "picard-fix-id3-rename-test.patch")))) + "0h4yk1y4k23hkfk7k2in27rd34ani857m0vvn7xa8vxizz951dka")))) (build-system python-build-system) (arguments - '(#:use-setuptools? #f - #:configure-flags - (list "--root=/" - ;; Don't phone home or show ‘Check for Update…’ in the Help menu. - "--disable-autoupdate") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "picard/const/__init__.py" - (("pyfpcalc") - (string-append - "pyfpcalc', '" - (assoc-ref inputs "chromaprint") "/bin/fpcalc"))) - #t))))) + (list + #:use-setuptools? #f + #:configure-flags + #~(list "--root=/" + ;; Don't phone home or show ‘Check for Update…’ in the Help menu. + "--disable-autoupdate") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "picard/const/__init__.py" + (("pyfpcalc") + (string-append + "pyfpcalc', '" + (assoc-ref inputs "chromaprint") "/bin/fpcalc")))))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("python-dateutil" ,python-dateutil))) + (list gettext-minimal python-dateutil)) (inputs - (list chromaprint python-discid python-pyqt python-mutagen)) + (list chromaprint + python-discid + python-pyqt-without-qtwebkit + python-mutagen + python-fasteners + python-pyyaml + python-markdown + python-pyjwt)) (home-page "https://picard.musicbrainz.org/") (synopsis "Graphical music tagging application") (description diff --git a/gnu/packages/patches/picard-fix-id3-rename-test.patch b/gnu/packages/patches/picard-fix-id3-rename-test.patch deleted file mode 100644 index 3c4fa63c84..0000000000 --- a/gnu/packages/patches/picard-fix-id3-rename-test.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: b/test/formats/test_id3.py -=================================================================== ---- a/test/formats/test_id3.py -+++ b/test/formats/test_id3.py -@@ -266,5 +266,5 @@ - def test_rename_txxx_tags(self): - file_path = os.path.join('test', 'data', 'test-id3-rename-tags.mp3') -- filename = self.copy_file_tmp(file_path, 'mp3') -+ filename = self.copy_file_tmp(file_path, '.mp3') - raw_metadata = load_raw(filename) - self.assertIn('TXXX:Artists', raw_metadata) -- cgit v1.2.3 From 51ab8b855361db7f9a13621d4099dfc6e736ff1f Mon Sep 17 00:00:00 2001 From: Remco van 't Veer Date: Sun, 18 Sep 2022 16:21:07 +0200 Subject: gnu: quodlibet: Fix build. Some tests fail because adwaita-icon-theme doesn't ship legacy icons anymore since version 42. Application runs fine without visual defects. * gnu/packages/music.scm (quodlibet): Skip trayicon tests. Signed-off-by: Mathieu Othacehe --- gnu/packages/music.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 60dccd9b38..6b37c79389 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6789,7 +6789,9 @@ streaming audio server.") "--ignore=tests/test_browsers_iradio.py" ;; broken upstream "--disable-warnings" - "--ignore=tests/quality") + "--ignore=tests/quality" + ;; missing legacy icons in adwaita-icon-theme + "--ignore=tests/plugin/test_trayicon.py") (format #t "test suite not run~%")))) (add-after 'install 'glib-or-gtk-wrap ; ensure icons loaded (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) -- cgit v1.2.3 From aab06a959bea39259e169a436872fafd5a7090cc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 29 Sep 2022 14:19:23 -0400 Subject: gnu: linux-libre: Update to 5.19.12. * gnu/packages/linux.scm (linux-libre-5.19-version): Update to 5.19.12. (linux-libre-5.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e309264c7a..533016a6a5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,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.19-version "5.19.11") +(define-public linux-libre-5.19-version "5.19.12") (define-public linux-libre-5.19-gnu-revision "gnu") (define deblob-scripts-5.19 (linux-libre-deblob-scripts @@ -364,7 +364,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "092myqjixvy1k3ylcj0hfc4whfxapjvxsxm4gk30a3jv5dnh7mly"))) (define-public linux-libre-5.19-pristine-source (let ((version linux-libre-5.19-version) - (hash (base32 "0wyrwdqm4dypx2jbb7d8c3b7fl7q5j434d6g9x2v6sw01gwx4m2m"))) + (hash (base32 "1fmhwbgqpr6q3z3ygys153szivlmv3mcnwilbbyfcb1iqx4aadn4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.19))) -- cgit v1.2.3 From 918bd1020a89ab6aa75624bf1bced6e8d762e9ec Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 29 Sep 2022 14:19:41 -0400 Subject: gnu: linux-libre 5.15: Update to 5.15.71. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.71. (linux-libre-5.15-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 533016a6a5..86f68a7a89 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.15-version "5.15.70") +(define-public linux-libre-5.15-version "5.15.71") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "048r4synfax2ajyzlmp672b68yshxwlfccdah2vz1kh88rqfmgsc"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0xhdjz7aqq13pkh1yr7ax3msqdb2xvrcpj464wibn1rl4pq2cz0s"))) + (hash (base32 "0lqy3nmhij6sb4963kb5dhvfdx46mg79hp81kq10wv01iq9hhm2z"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit v1.2.3 From de6276db4ea67cb603dffe901ec16ddd14b5e565 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 29 Sep 2022 14:20:02 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.146. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.146. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 86f68a7a89..d0dab909d1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -388,7 +388,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.145") +(define-public linux-libre-5.10-version "5.10.146") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -398,7 +398,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0qdcqmwvc70hfgj8hb8ccwmnvwl41dvdffqrmyg3cyblwprr0ngw"))) + (hash (base32 "1hbdxvlibp9w0q8bk1zlx77ayq2wcld8rjm134ybgbcf4zrrggbv"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From 7ff6569afe3eb8a9d7dcd23b2c619faccd0a7e2c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 29 Sep 2022 14:20:43 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.215. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.215. (linux-libre-5.4-pristine-source, deblob-scripts-5.4): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d0dab909d1..8f0a0ebccb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -403,17 +403,17 @@ 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.214") +(define-public linux-libre-5.4-version "5.4.215") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version linux-libre-5.4-gnu-revision (base32 "1nlgk8ajb5wl3aa96h9a0pb9j5a5wmrbpk63varn557x1d00r7wj") - (base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6"))) + (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1ny57g5agk8sq6cbp2crjiay5bfkwqy32i4a5yw7x0lch2s7kg4s"))) + (hash (base32 "1gafnf9gbsfzvp9jq6y8qhpvas5cv9y0m9bad2sg55sjlb1zfard"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From e0d699bb17d8d2f6929dec88198c3cec1eeef3ed Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 29 Sep 2022 14:21:19 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.260. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.260. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8f0a0ebccb..a817a10fb1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -418,7 +418,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.259") +(define-public linux-libre-4.19-version "4.19.260") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -428,7 +428,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1ska6v95zjjj44h53gi34rnbsrm4507jwxi3kklnky6d0aykiy1z"))) + (hash (base32 "1vlhaapbkvvk2acw1i5f6v6gd8v0x37n1y3i066cddl90my6yl24"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 2fbd7862d077e079283352d2ecdcb8a58630d8ac Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 29 Sep 2022 14:21:38 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.295. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.295. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a817a10fb1..f8dbda4cc0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -433,7 +433,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.294") +(define-public linux-libre-4.14-version "4.14.295") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -443,7 +443,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "069i11hv4fhwc9dirqbag1g1k3fn21wzpfggah4f1a41whf98apy"))) + (hash (base32 "0svalywqmrhav63vw0ns06c25sgyvzwfngljpham3nm7jjxbkk32"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 9d9b53ed5f79e1d79ab1907faffee1bba0ac422d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 29 Sep 2022 14:22:15 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.330. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.330. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f8dbda4cc0..013f610e32 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -448,7 +448,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.329") +(define-public linux-libre-4.9-version "4.9.330") (define-public linux-libre-4.9-gnu-revision "gnu1") (define deblob-scripts-4.9 (linux-libre-deblob-scripts @@ -458,7 +458,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "168hy7vhgw2sfknflhhf6ykhkp4xs8v0igii6ivjlvs3dmwm21sj"))) + (hash (base32 "0psrl8fcbp1bsanjmllic503dlyhkj8bjzfc20p2ksahlhv1j0mz"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 730f7c096df36f087a7cf9d289cd0f0bece1a5c2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 30 Sep 2022 12:43:44 +0300 Subject: gnu: rav1e: Force building with rust edition 2018. * gnu/packages/video.scm (rav1e)[arguments]: Add phase to force all input crates to be built with rust edition 2018. --- gnu/packages/video.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ca6148b078..6a14a85b74 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5285,6 +5285,12 @@ result in several formats: (substitute* "Cargo.toml" ;; Allow using more recent versions of (("~3.1.2") "~3")))) + (add-after 'configure 'force-rust-edition-2018 + (lambda* (#:key vendor-dir #:allow-other-keys) + ;; Force all the dependencies to not be higher than edition 2018. + (with-fluids ((%default-port-encoding #f)) + (substitute* (find-files vendor-dir "Cargo.toml") + (("edition = \\\"2021\\\"") "edition = \"2018\""))))) (replace 'build (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From ac4be035f20c68854d58ff5addbd38daedb6f681 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 16:37:36 +0300 Subject: gnu: rust-once-cell-1: Update to 1.15.0. * gnu/packages/crates-io.scm (rust-once-cell-1): Update to 1.15.0. [cargo-inputs]: Replace rust-atomic-polyfill-0.1 with 1. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f83d7fff6d..b3ebc8f5a2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40706,7 +40706,7 @@ other crates to create safe wrappers around Oniguruma.") (define-public rust-once-cell-1 (package (name "rust-once-cell") - (version "1.13.0") + (version "1.15.0") (source (origin (method url-fetch) @@ -40714,11 +40714,11 @@ other crates to create safe wrappers around Oniguruma.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1qfqvgnwfzzwxd13ybvplzshaqwnjnna9ghcn0zgijaq0zixp9hq")))) + "1q9r8c0ls1qgjp89p4rd36sjv4671pz6710c106ajwcv2c2asbg8")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-atomic-polyfill" ,rust-atomic-polyfill-0.1) + (("rust-atomic-polyfill" ,rust-atomic-polyfill-1) ("rust-parking-lot-core" ,rust-parking-lot-core-0.9)) #:cargo-development-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) -- cgit v1.2.3 From af45ac752674ab7b7c4b4cde7fce2ab70b4b5c94 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 17:00:38 +0300 Subject: gnu: Add rust-dirs-4. * gnu/packages/crates-io.scm (rust-dirs-4): New variable. (rust-dirs-3): Inherit from rust-dirs-4. --- gnu/packages/crates-io.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b3ebc8f5a2..bebfb72959 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18614,17 +18614,17 @@ other data.") #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1)))))) -(define-public rust-dirs-3 +(define-public rust-dirs-4 (package (name "rust-dirs") - (version "3.0.1") + (version "4.0.0") (source (origin (method url-fetch) (uri (crate-uri "dirs" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1zxrb3anxsh80mnp2il7awccv0s5gvy7djn6gis18nbm0bnraa8l")))) + (base32 "0n8020zl4f0frfnzvgb9agvk4a14i1kjz4daqnxkgslndwmaffna")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -18636,6 +18636,19 @@ other data.") standard locations of directories for config, cache and other data.") (license (list license:expat license:asl2.0)))) +(define-public rust-dirs-3 + (package + (inherit rust-dirs-4) + (name "rust-dirs") + (version "3.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "dirs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zxrb3anxsh80mnp2il7awccv0s5gvy7djn6gis18nbm0bnraa8l")))))) + (define-public rust-dirs-2 (package (inherit rust-dirs-3) -- cgit v1.2.3 From 784f45db065d70a28580c16e7ec4fe10e9e022e9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 17:01:27 +0300 Subject: gnu: rust-dirs-3: Update to 3.0.2. * gnu/packages/crates-io.scm (rust-dirs-3): Update to 3.0.2. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bebfb72959..114a00478d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18640,14 +18640,14 @@ standard locations of directories for config, cache and other data.") (package (inherit rust-dirs-4) (name "rust-dirs") - (version "3.0.1") + (version "3.0.2") (source (origin (method url-fetch) (uri (crate-uri "dirs" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1zxrb3anxsh80mnp2il7awccv0s5gvy7djn6gis18nbm0bnraa8l")))))) + (base32 "028kqy0vrbfgrk1yc1flq2fqh8snyg17qlygawm0r79w211s1fih")))))) (define-public rust-dirs-2 (package -- cgit v1.2.3 From 83dd03f12f1bf4768f7e88ddd324d61d7f93c6ab Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 18:24:38 +0300 Subject: gnu: Add rust-debugger-test-parser-0.1. * gnu/packages/crates-io.scm (rust-debugger-test-parser-0.1): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 114a00478d..dec7aa45db 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17047,6 +17047,31 @@ type.") the Debug trait manually.") (license license:expat))) +(define-public rust-debugger-test-parser-0.1 + (package + (name "rust-debugger-test-parser") + (version "0.1.3") + (source (origin + (method url-fetch) + (uri (crate-uri "debugger-test-parser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0xcyxw0si7j4h701aksdd08j8jmrzc58833g66wm4xvp592kdrgb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-log" ,rust-log-0.4) + ("rust-regex" ,rust-regex-1)))) + (home-page + "https://github.com/microsoft/rust_debugger_test/debugger_test_parser") + (synopsis "Library for parsing debugger output") + (description + "This package provides a library for parsing the output of a debugger and +verifying the contents.") + (license (list license:expat license:asl2.0)))) + (define-public rust-decimal-2 (package (name "rust-decimal") -- cgit v1.2.3 From 8b6d4d3eba9611cd0c51e71f1f0781ef85cfe6e6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 18:25:52 +0300 Subject: gnu: Add rust-debugger-test-0.1. * gnu/packages/crates-io.scm (rust-debugger-test-0.1): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dec7aa45db..9bb243dd1d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17047,6 +17047,34 @@ type.") the Debug trait manually.") (license license:expat))) +(define-public rust-debugger-test-0.1 + (package + (name "rust-debugger-test") + (version "0.1.5") + (source (origin + (method url-fetch) + (uri (crate-uri "debugger-test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "182j5sk71yhbn7f5qkx509bdcjz83n1nshpfgfa8dfrgb5gvanyr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-log" ,rust-log-0.4) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-debugger-test-parser" ,rust-debugger-test-parser-0.1) + ("rust-regex" ,rust-regex-1)))) + (home-page "https://github.com/microsoft/rust_debugger_test") + (synopsis "Proc macro for writing tests with a debugger") + (description + "This package provides a proc macro for writing tests that launch a +debugger and run commands while verifying the output.") + (license (list license:expat license:asl2.0)))) + (define-public rust-debugger-test-parser-0.1 (package (name "rust-debugger-test-parser") -- cgit v1.2.3 From ddc7c84efd3ae55e08b429ba0088afc9952fe2e3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 19:59:20 +0300 Subject: gnu: rust-anyhow-1: Update to 1.0.65. * gnu/packages/crates-io.scm (rust-anyhow-1): Update to 1.0.65. [cargo-inputs]: Add rust-backtrace-0.3. [cargo-development-inputs]: Add rust-syn-1. --- gnu/packages/crates-io.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9bb243dd1d..0e5ed6e07c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2925,7 +2925,7 @@ escape codes.") (define-public rust-anyhow-1 (package (name "rust-anyhow") - (version "1.0.46") + (version "1.0.65") (source (origin (method url-fetch) @@ -2934,12 +2934,15 @@ escape codes.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0w0zm1bqk5kbk834r4xszlzqiln4vw5k1lnlswyjkh24khi2ia1s")))) + "00jnbylbji1wxvgpk6fcpcxyh4firn223w0lpdvxm1117r71l5lq")))) (build-system cargo-build-system) (arguments - `(#:cargo-development-inputs + `(#:cargo-inputs + (("rust-backtrace" ,rust-backtrace-0.3)) + #:cargo-development-inputs (("rust-futures" ,rust-futures-0.3) ("rust-rustversion" ,rust-rustversion-1) + ("rust-syn" ,rust-syn-1) ("rust-thiserror" ,rust-thiserror-1) ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/dtolnay/anyhow") -- cgit v1.2.3 From a830bbf4339344248b753be50bd08e3791cb55cd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 20:00:30 +0300 Subject: gnu: rust-form-urlencoded-1: Update to 1.1.0. * gnu/packages/crates-io.scm (rust-form-urlencoded-1): Update to 1.1.0. [cargo-inputs]: Remove rust-matches-0.1. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0e5ed6e07c..2a3f626a36 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23235,19 +23235,18 @@ implementation that is more efficient for smaller hash keys.") (define-public rust-form-urlencoded-1 (package (name "rust-form-urlencoded") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (crate-uri "form_urlencoded" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "005yi1319k5bz8g5ylbdiakq5jp5jh90yy6k357zm11fr4aqvrpc")))) + (base32 "1y3bwavygjzv7b0yqsjqk33yi6wz25b7q2aaq9h54vqmc7qq9hx9")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-matches" ,rust-matches-0.1) - ("rust-percent-encoding" ,rust-percent-encoding-2)))) + (("rust-percent-encoding" ,rust-percent-encoding-2)))) (home-page "https://github.com/servo/rust-url") (synopsis "Parser and serializer for the urlencoded syntax") (description -- cgit v1.2.3 From a9ac10ba2c054d8e265cdb8b7d075bd9ce708f43 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 20:01:45 +0300 Subject: gnu: rust-rustversion-1: Update to 1.0.9. * gnu/packages/crates-io.scm (rust-rustversion-1): Update to 1.0.9. [cargo-inputs]: Remove rust-proc-macro2-1, rust-quote-1, rust-syn-1. [cargo-development-inputs]: Add rust-trybuild-1. --- gnu/packages/crates-io.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2a3f626a36..c4e5b476b1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -53689,7 +53689,7 @@ font rendering.") (define-public rust-rustversion-1 (package (name "rust-rustversion") - (version "1.0.2") + (version "1.0.9") (source (origin (method url-fetch) @@ -53698,13 +53698,11 @@ font rendering.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1xkr1g792w728py2qpg2zj0vfviv2xzmxkkd9w6035l9d5ss3fxk")))) + "1a6nlrrnfbacn5pzg3m3311anhngcxs8kbvsbynh71ngni47wiwp")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + `(#:cargo-development-inputs + (("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/dtolnay/rustversion") (synopsis "Conditional compilation according to rustc compiler version") (description -- cgit v1.2.3 From f9b8b5ac0e31fa0b43b28cfce53ba66e931ccdcf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 20:03:17 +0300 Subject: gnu: rust-xdg-2: Update to 2.4.1. * gnu/packages/crates-io.scm (rust-xdg-2): Update to 2.4.1. [cargo-inputs]: Replace rust-dirs-3 with 4. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c4e5b476b1..c6ee9d4228 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -73951,16 +73951,16 @@ extended attributes.") (define-public rust-xdg-2 (package (name "rust-xdg") - (version "2.4.0") + (version "2.4.1") (source (origin (method url-fetch) (uri (crate-uri "xdg" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "00sqvl6v0sjdrrmyk2671sshnjlbjdwgb1lw0f3jchbhijazw8rs")))) + (base32 "1xl81zfx5fsc5n06h77s0fvrslzhh2piabfz0c1lqk5xbkdq6i8c")))) (build-system cargo-build-system) - (arguments `(#:cargo-inputs (("rust-dirs" ,rust-dirs-3)))) + (arguments `(#:cargo-inputs (("rust-dirs" ,rust-dirs-4)))) (home-page "https://github.com/whitequark/rust-xdg") (synopsis "Store and retrieve files according to XDG specification") (description -- cgit v1.2.3 From 9ebdd45123f073c694a5a67fc15d6dd572be5a9a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 20:04:43 +0300 Subject: gnu: Add rust-idna-0.3. * gnu/packages/crates-io.scm (rust-idna-0.3): New variable. (rust-idna-0.2): Inherit from rust-idna-0.3. --- gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c6ee9d4228..5280e82b82 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29213,8 +29213,36 @@ with hyper.") "Utility for applying case rules to Rust identifiers.") (license (list license:expat license:asl2.0)))) +(define-public rust-idna-0.3 + (package + (name "rust-idna") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "idna" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rh9f9jls0jy3g8rh2bfpjhvvhh4q80348jc4jr2s844133xykg1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-unicode-bidi" ,rust-unicode-bidi-0.3) + ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)) + #:cargo-development-inputs + (("rust-assert-matches" ,rust-assert-matches-1) + ("rust-bencher" ,rust-bencher-0.1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tester" ,rust-tester-0.9)))) + (home-page "https://github.com/servo/rust-url/") + (synopsis "Internationalizing Domain Names in Applications and Punycode") + (description + "IDNA (Internationalizing Domain Names in Applications) and Punycode.") + (license (list license:expat license:asl2.0)))) + (define-public rust-idna-0.2 (package + (inherit rust-idna-0.3) (name "rust-idna") (version "0.2.3") (source @@ -29224,18 +29252,12 @@ with hyper.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1y7ca2w5qp9msgl57n03zqp78gq1bk2crqzg6kv7a542mdphm2j1")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-matches" ,rust-matches-0.1) ("rust-unicode-bidi" ,rust-unicode-bidi-0.3) - ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))) - (home-page "https://github.com/servo/rust-url/") - (synopsis "Internationalizing Domain Names in Applications and Punycode") - (description - "IDNA (Internationalizing Domain Names in Applications) and Punycode.") - (license (list license:expat license:asl2.0)))) + ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))))) (define-public rust-idna-0.1 (package -- cgit v1.2.3 From 7298371ca2dc980571c23e291f806beb63a8e767 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 20:05:50 +0300 Subject: gnu: Add rust-tester-0.9. * gnu/packages/crates-io.scm (rust-tester-0.9): New variable. (rust-tester-0.5): Inherit from rust-tester-0.9. --- gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5280e82b82..705a3093f3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -64623,10 +64623,10 @@ one body with different resource input parameters. A test is generated for each resource matching the specific resource location pattern.") (license license:asl2.0))) -(define-public rust-tester-0.5 +(define-public rust-tester-0.9 (package (name "rust-tester") - (version "0.5.0") + (version "0.9.0") (source (origin (method url-fetch) @@ -64635,14 +64635,15 @@ each resource matching the specific resource location pattern.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1xkgapz2i4j977f6kh1zp6sa5llbhy5vbnr6kfj8czsrdjr2r0ay")))) + "1svnlmaynfvfqmy7zjvbh2xwzdxxz50cyxbjlliz45a6iw6x2f86")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-getopts" ,rust-getopts-0.2) + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-getopts" ,rust-getopts-0.2) ("rust-libc" ,rust-libc-0.2) - ("rust-term" ,rust-term-0.4)))) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-term" ,rust-term-0.7)))) (home-page "https://github.com/messense/rustc-test") (synopsis @@ -64652,6 +64653,27 @@ each resource matching the specific resource location pattern.") unstable language features.") (license (list license:expat license:asl2.0)))) +(define-public rust-tester-0.5 + (package + (inherit rust-tester-0.9) + (name "rust-tester") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tester" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xkgapz2i4j977f6kh1zp6sa5llbhy5vbnr6kfj8czsrdjr2r0ay")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-getopts" ,rust-getopts-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-term" ,rust-term-0.4)))))) + (define-public rust-text-size-1 (package (name "rust-text-size") -- cgit v1.2.3 From 97666b13d544c6d916095a9365c1ca7de943904a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 20:06:42 +0300 Subject: gnu: rust-url-2: Update to 2.3.1. * gnu/packages/crates-io.scm (rust-url-2): Update to 2.3.1. [arguments]: Don't skip build. [cargo-inputs]: Replace rust-idna-0.2 with 0.3. Remove rust-matches-0.1. [cargo-development-inputs]: Remove rust-rustc-test-0.3. Add rust-debugger-test-0.1, rust-debugger-test-parser-0.1. --- gnu/packages/crates-io.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 705a3093f3..2e8c3c23ea 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -70830,7 +70830,7 @@ type-safe zero-cost dimensional analysis.") (define-public rust-url-2 (package (name "rust-url") - (version "2.2.2") + (version "2.3.1") (source (origin (method url-fetch) @@ -70839,19 +70839,18 @@ type-safe zero-cost dimensional analysis.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "132pzpvfvpw33gjlzqd55n5iag9qddzffq8qbp1myfykna1w61x5")))) + "0hs67jw257y0a7mj2p9wi0n61x8fc2vgwxg37y62nxkmmscwfs0d")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-form-urlencoded" ,rust-form-urlencoded-1) - ("rust-idna" ,rust-idna-0.2) - ("rust-matches" ,rust-matches-0.1) + ("rust-idna" ,rust-idna-0.3) ("rust-percent-encoding" ,rust-percent-encoding-2) ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) - ("rust-rustc-test" ,rust-rustc-test-0.3) + ("rust-debugger-test" ,rust-debugger-test-0.1) + ("rust-debugger-test-parser" ,rust-debugger-test-parser-0.1) ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/servo/rust-url") (synopsis "URL library for Rust, based on the WHATWG URL Standard") -- cgit v1.2.3 From b3c55e94ab745930a0f77a2f407d7249c73ef90d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 20:08:56 +0300 Subject: gnu: rust-fastrand-1: Update to 1.8.0. * gnu/packages/crates-io.scm (rust-fastrand-1): Update to 1.8.0. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2e8c3c23ea..8c6011f486 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21980,14 +21980,14 @@ floats.") (define-public rust-fastrand-1 (package (name "rust-fastrand") - (version "1.6.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (crate-uri "fastrand" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ci4fcwfwkkpwd8b0zgxgvp4qf84cl53ivnp1r6cr40bd8xh97bp")))) + (base32 "16b4z2rig7zmyxw1hsiydv89h9wcshilds13dfpc919kmb7hg957")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 2e6fd5bd588fbf0c76d12f0e3ffe0296cb11ae3d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 20:09:50 +0300 Subject: gnu: rust-lexopt-0.2: Update to 0.2.1. * gnu/packages/crates-io.scm (rust-lexopt-0.2): Update to 0.2.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8c6011f486..f474098d33 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32110,14 +32110,14 @@ nor a system allocator.") (define-public rust-lexopt-0.2 (package (name "rust-lexopt") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (crate-uri "lexopt" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0w1adb1qwp9rkznq37qvwh01ckxpwcywb6ki9mlw03filyp16xfy")))) + (base32 "1s7k6hra9p9xilhl852qi1a7c2gis59qf4yl1ca5pbxf5bkfk3j7")))) (build-system cargo-build-system) (home-page "https://github.com/blyxxyz/lexopt") (synopsis "Minimalist pedantic command line parser") -- cgit v1.2.3 From 91e1dc05dacb7c0c1e92425f51cfe4d01f6eb338 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 20:09:50 +0300 Subject: gnu: rust-percent-encoding-2: Update to 2.2.0. * gnu/packages/crates-io.scm (rust-percent-encoding-2): Update to 2.2.0. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f474098d33..a6ef929388 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43486,7 +43486,7 @@ implementation suitable for use with cryptographic private keys.") (define-public rust-percent-encoding-2 (package (name "rust-percent-encoding") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) @@ -43494,7 +43494,7 @@ implementation suitable for use with cryptographic private keys.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0bp3zrsk3kr47fbpipyczidbbx4g54lzxdm77ni1i3qws10mdzfl")))) + "13nrpp6r1f4k14viksga3094krcrxgv4b42kqbriy63k7ln5g327")))) (build-system cargo-build-system) (home-page "https://github.com/servo/rust-url/") (synopsis "Percent encoding and decoding") -- cgit v1.2.3 From f4715b2f0aeda3fafa424d370c7f1ee45610e3dc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 20:09:51 +0300 Subject: gnu: rust-quote-1: Update to 1.0.21. * gnu/packages/crates-io.scm (rust-quote-1): Update to 1.0.21. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a6ef929388..734ef49616 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48251,7 +48251,7 @@ and Petrick's method, an algorithm to automatically minimize boolean expressions (define-public rust-quote-1 (package (name "rust-quote") - (version "1.0.9") + (version "1.0.21") (source (origin (method url-fetch) @@ -48259,7 +48259,7 @@ and Petrick's method, an algorithm to automatically minimize boolean expressions (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "19rjmfqzk26rxbgxy5j2ckqc2v12sw2xw8l4gi8bzpn2bmsbkl63")))) + "0yai5cyd9h95n7hkwjcx8ig3yv0hindmz5gm60g9dmm7fzrlir5v")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 3a00bcc252df6cd4b84ef5b45f0d9d8e8d71306e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 20:09:52 +0300 Subject: gnu: rust-regex-1: Update to 1.6.0. * gnu/packages/crates-io.scm (rust-regex-1): Update to 1.6.0. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 734ef49616..8356df1a99 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -50031,14 +50031,14 @@ memory to speed up reallocation.") (define-public rust-regex-1 (package (name "rust-regex") - (version "1.5.4") + (version "1.6.0") (source (origin (method url-fetch) (uri (crate-uri "regex" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0qf479kjbmb582h4d1d6gfl75h0j8aq2nrdi5wg6zdcy6llqcynh")))) + (base32 "12wqvyh4i75j7pc8sgvmqh4yy3qaj4inc4alyv1cdf3lf4kb6kjc")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 6a1b3e30c20048a1f840272f1bdf9e035990d58a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 20:09:52 +0300 Subject: gnu: rust-regex-syntax-0.6: Update to 0.6.27. * gnu/packages/crates-io.scm (rust-regex-syntax-0.6): Update to 0.6.27. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8356df1a99..7daf804b46 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -50150,14 +50150,14 @@ uses finite automata and guarantees linear time matching on all inputs.") (define-public rust-regex-syntax-0.6 (package (name "rust-regex-syntax") - (version "0.6.25") + (version "0.6.27") (source (origin (method url-fetch) (uri (crate-uri "regex-syntax" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16y87hz1bxmmz6kk360cxwfm3jnbsxb3x4zw9x1gzz7khic2i5zl")))) + (base32 "0i32nnvyzzkvz1rqp2qyfxrp2170859z8ck37jd63c8irrrppy53")))) (build-system cargo-build-system) (home-page "https://github.com/rust-lang/regex") (synopsis "Regular expression parser") -- cgit v1.2.3 From a3b6b7e91f8814fd397e6629fe388b3806746944 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 20:09:53 +0300 Subject: gnu: rust-unicode-width-0.1: Update to 0.1.10. * gnu/packages/crates-io.scm (rust-unicode-width-0.1): Update to 0.1.10. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7daf804b46..9a64b356b5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -70411,7 +70411,7 @@ boundaries according to Unicode Standard Annex #29 rules.") (define-public rust-unicode-width-0.1 (package (name "rust-unicode-width") - (version "0.1.9") + (version "0.1.10") (source (origin (method url-fetch) @@ -70419,7 +70419,7 @@ boundaries according to Unicode Standard Annex #29 rules.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0wq9wl69wlp6zwlxp660g9p4hm5gk91chwk14dp1gl9bxba45mry")))) + "12vc3wv0qwg8rzcgb9bhaf5119dlmd6lmkhbfy1zfls6n7jx3vf0")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 71247a8e65a9ade490bfede470e2ba9590207a7d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 16:38:27 +0300 Subject: gnu: newsboat: Update to 2.29. * gnu/packages/syndication.scm (newsboat): Update to 2.29. [cargo-development-inputs]: Move rust-cxx-build-1 ... [cargo-inputs]: ... to here. --- gnu/packages/syndication.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 6eb88afb8f..cba8d6ad9d 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -218,14 +218,14 @@ cards.") (define-public newsboat (package (name "newsboat") - (version "2.26") + (version "2.29") (source (origin (method url-fetch) (uri (string-append "https://newsboat.org/releases/" version "/newsboat-" version ".tar.xz")) (sha256 - (base32 "061w86jffyi49m4d9n974a3pd1svbw3azmh0qx8h2v7h0178791l")))) + (base32 "0szx4pivkaja8v399m6v7ycp1xprm4cz7n5z929g4j191hg81f8q")))) (build-system cargo-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -252,6 +252,7 @@ cards.") ("rust-chrono" ,rust-chrono-0.4) ("rust-curl-sys" ,rust-curl-sys-0.4) ("rust-cxx" ,rust-cxx-1) + ("rust-cxx-build" ,rust-cxx-build-1) ("rust-fastrand" ,rust-fastrand-1) ("rust-gettext-rs" ,rust-gettext-rs-0.7) ("rust-lexopt" ,rust-lexopt-0.2) @@ -265,8 +266,7 @@ cards.") ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-xdg" ,rust-xdg-2)) #:cargo-development-inputs - (("rust-cxx-build" ,rust-cxx-build-1) - ("rust-tempfile" ,rust-tempfile-3) + (("rust-tempfile" ,rust-tempfile-3) ("rust-proptest" ,rust-proptest-1) ("rust-section-testing" ,rust-section-testing-0.0)) #:phases -- cgit v1.2.3 From 729ce5fcf8a8ea412a91fa2ff01c0ad07c355424 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 30 Sep 2022 16:56:20 +0200 Subject: gnu: Add centrifuge. * gnu/packages/bioinformatics.scm (centrifuge): New variable. --- gnu/packages/bioinformatics.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ca341a45a7..c5b47eedf5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8464,6 +8464,46 @@ BLAST, KEGG, GenBank, MEDLINE and GO.") ;; (LGPLv2.1+) and scripts in samples (which have GPL2 and GPL2+) (license (list license:ruby license:lgpl2.1+ license:gpl2+ )))) +(define-public centrifuge + (package + (name "centrifuge") + (version "1.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DaehwanKimLab/centrifuge.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "167610gbz1rrh6ir3j7jcmhzg3x5msn7x7a3dpv7wmwdndnnqvg0")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #false ; no check target + #:make-flags + #~(list (string-append "prefix=" #$output)) + #:phases + '(modify-phases %standard-phases + (delete 'configure)))) + (inputs (list python-wrapper)) + (native-inputs + (list pandoc perl ;for documentation + which)) + (home-page "https://github.com/DaehwanKimLab/centrifuge/") + (synopsis "Classifier for metagenomic sequences") + (description "Centrifuge is a microbial classification engine that enables +rapid, accurate and sensitive labeling of reads and quantification of species +on desktop computers. The system uses an indexing scheme based on the +@dfn{Burrows-Wheeler transform} (BWT) and the @dfn{Ferragina-Manzini} (FM) +index, optimized specifically for the metagenomic classification problem. +Centrifuge requires a relatively small index (4.7 GB for all complete +bacterial and viral genomes plus the human genome) and classifies sequences at +very high speed, allowing it to process the millions of reads from a typical +high-throughput DNA sequencing run within a few minutes.") + (license license:gpl3+))) + (define-public bio-vcf (package (name "bio-vcf") -- cgit v1.2.3 From 1266b9ed111bff7b860cba6921e4540bc1f61c9e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 30 Sep 2022 22:43:21 +0200 Subject: gnu: salmon: Update to 1.9.0. * gnu/packages/bioinformatics.scm (salmon): Update to 1.9.0. [arguments]: Remove -DTBB_LIBRARIES from configure flags; copy pufferfish itlib headers. [inputs]: Use new label-less list; move pufferfish origin from here... [native-inputs]: ...to here. --- gnu/packages/bioinformatics.scm | 198 ++++++++++++++++++++-------------------- 1 file changed, 100 insertions(+), 98 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c5b47eedf5..249b956c88 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10296,7 +10296,7 @@ The following file formats are supported: (define-public salmon (package (name "salmon") - (version "1.6.0") + (version "1.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -10305,104 +10305,112 @@ The following file formats are supported: (file-name (git-file-name name version)) (sha256 (base32 - "1wb5wl0rc77svbwq6zvak5h7pf9acw3di0vz5i3gqyhg5l6qd736")) + "1370ry3jpj05gplzyny44mqg77a29a6gp8ijmjz135d2igf956r8")) (modules '((guix build utils))) (snippet ;; Delete bundled headers for eigen3. '(delete-file-recursively "include/eigen3/")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - ,#~(list (string-append "-Dlibgff_DIR=" - #$(this-package-input "libgff") "/lib") - "-DCMAKE_CXX_FLAGS=\"-DHAVE_NUMERIC_LIMITS128=1\"" - "-Dlibgff_FOUND=TRUE" - "-DTBB_FOUND=TRUE" - #$(string-append "-DTBB_VERSION=" (package-version tbb-2020)) - "-DTBB_LIBRARIES=tbb -ltbbmalloc" - "-DFETCHED_PUFFERFISH=TRUE" - "-DUSE_SHARED_LIBS=TRUE") + (list + #:configure-flags + #~(list (string-append "-Dlibgff_DIR=" + #$(this-package-input "libgff") "/lib") + "-DCMAKE_CXX_FLAGS=\"-DHAVE_NUMERIC_LIMITS128=1\"" + "-Dlibgff_FOUND=TRUE" + "-DTBB_FOUND=TRUE" + #$(string-append "-DTBB_VERSION=" (package-version tbb)) + "-DFETCHED_PUFFERFISH=TRUE" + "-DUSE_SHARED_LIBS=TRUE") #:phases - (modify-phases %standard-phases - (add-after 'unpack 'prepare-pufferfish - (lambda* (#:key inputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "pufferfish") - "external/pufferfish") - ;; This test isn't working correctly, so compilation aborts. - (substitute* "external/pufferfish/include/string_view.hpp" - (("#if __has_include\\(\\)") - "#if 0")) - (let ((headers "external/install/pufferfish/include/pufferfish") - (source "external/install/src/pufferfish")) - (mkdir-p headers) - (mkdir-p source) - (for-each (lambda (file) - (install-file (string-append "external/pufferfish/include/" file) - headers)) - (list "ProgOpts.hpp" "BooPHF.hpp" "SpinLock.hpp" - "Kmer.hpp" "CanonicalKmer.hpp" "string_view.hpp" - "CanonicalKmerIterator.hpp" - "PufferfishBaseIndex.hpp" - "PufferfishIndex.hpp" - "PufferfishSparseIndex.hpp" - "PufferfishLossyIndex.hpp" - "PufferfishTypes.hpp" - "rank9b.hpp" "rank9sel.hpp" "macros.hpp" - "select.hpp" "Util.hpp" - "PairedAlignmentFormatter.hpp" - "SelectiveAlignmentUtils.hpp" - "PuffAligner.hpp" "MemCollector.hpp" - "MemChainer.hpp" "CommonTypes.hpp" - "SAMWriter.hpp" "PufferfishConfig.hpp" - "BulkChunk.hpp" "BinWriter.hpp")) - (for-each (lambda (dir) - (copy-recursively - (string-append "external/pufferfish/include/" dir) - (string-append headers "/" dir))) - (list "libdivide" - "ksw2pp" - "compact_vector" - "metro" - "chobo" - "sparsepp" - "simde" - "tsl")) - (copy-recursively - (string-append "external/pufferfish/src/metro/") - (string-append source "/metro")) - (install-file - (string-append "external/pufferfish/src/rank9b.cpp") - source) - - ;; Do not complain about not having built libtbb - (substitute* "external/pufferfish/external/twopaco/CMakeLists.txt" - (("add_dependencies.*") ""))))) - (add-after 'unpack 'do-not-phone-home - (lambda _ - (substitute* "src/Salmon.cpp" - (("getVersionMessage\\(\\)") "\"\"")))) - (add-after 'unpack 'use-system-libraries - (lambda* (#:key inputs #:allow-other-keys) - ;; Ensure that all headers can be found - (setenv "CPLUS_INCLUDE_PATH" - (string-append (or (getenv "CPLUS_INCLUDE_PATH") "") - ":" - (getcwd) "/external/install/pufferfish/include:" - (assoc-ref inputs "eigen") - "/include/eigen3")))) - (add-after 'unpack 'fix-error-message-in-tests - (lambda _ - (substitute* "cmake/TestSalmonQuasi.cmake" - (("SALMON_QUASI_INDEX_COMMAND") - "SALMON_QUASI_INDEX_CMD"))))))) + '(modify-phases %standard-phases + (add-after 'unpack 'prepare-pufferfish + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "pufferfish") + "external/pufferfish") + ;; This test isn't working correctly, so compilation aborts. + (substitute* "external/pufferfish/include/string_view.hpp" + (("#if __has_include\\(\\)") + "#if 0")) + (let ((headers "external/install/pufferfish/include/pufferfish") + (source "external/install/src/pufferfish")) + (mkdir-p headers) + (mkdir-p source) + (for-each (lambda (file) + (install-file (string-append "external/pufferfish/include/" file) + headers)) + (list "ProgOpts.hpp" "BooPHF.hpp" "SpinLock.hpp" + "Kmer.hpp" "CanonicalKmer.hpp" "string_view.hpp" + "CanonicalKmerIterator.hpp" + "PufferfishBaseIndex.hpp" + "PufferfishIndex.hpp" + "PufferfishSparseIndex.hpp" + "PufferfishLossyIndex.hpp" + "PufferfishTypes.hpp" + "rank9b.hpp" "rank9sel.hpp" "macros.hpp" + "select.hpp" "Util.hpp" + "PairedAlignmentFormatter.hpp" + "SelectiveAlignmentUtils.hpp" + "PuffAligner.hpp" "MemCollector.hpp" + "MemChainer.hpp" "CommonTypes.hpp" + "SAMWriter.hpp" "PufferfishConfig.hpp" + "BulkChunk.hpp" "BinWriter.hpp")) + + (for-each (lambda (dir) + (copy-recursively + (string-append "external/pufferfish/include/" dir) + (string-append headers "/" dir))) + (list "libdivide" + "ksw2pp" + "compact_vector" + "itlib" + "metro" + "chobo" + "sparsepp" + "simde" + "tsl")) + (copy-recursively + (string-append "external/pufferfish/src/metro/") + (string-append source "/metro")) + (install-file + (string-append "external/pufferfish/src/rank9b.cpp") + source) + + ;; Do not complain about not having built libtbb + (substitute* "external/pufferfish/external/twopaco/CMakeLists.txt" + (("add_dependencies.*") ""))))) + (add-after 'unpack 'do-not-phone-home + (lambda _ + (substitute* "src/Salmon.cpp" + (("getVersionMessage\\(\\)") "\"\"")))) + (add-after 'unpack 'use-system-libraries + (lambda* (#:key inputs #:allow-other-keys) + ;; Ensure that all headers can be found + (setenv "CPLUS_INCLUDE_PATH" + (string-append (or (getenv "CPLUS_INCLUDE_PATH") "") + ":" + (getcwd) "/external/install/pufferfish/include:" + (assoc-ref inputs "eigen") + "/include/eigen3")))) + (add-after 'unpack 'fix-error-message-in-tests + (lambda _ + (substitute* "cmake/TestSalmonQuasi.cmake" + (("SALMON_QUASI_INDEX_COMMAND") + "SALMON_QUASI_INDEX_CMD"))))))) (inputs - `(("boost" ,boost) - ("bzip2" ,bzip2) - ("cereal" ,cereal-1.3.0) - ("curl" ,curl) - ("eigen" ,eigen) - ("jemalloc" ,jemalloc) - ("libgff" ,libgff) + (list boost + bzip2 + cereal-1.3.0 + curl + eigen + jemalloc + libgff + tbb + libstadenio-for-salmon + xz + zlib)) + (native-inputs + `(("pkg-config" ,pkg-config) ("pufferfish" ,(origin (method git-fetch) (uri (git-reference @@ -10411,13 +10419,7 @@ The following file formats are supported: (file-name (git-file-name "pufferfish" version)) (sha256 (base32 - "0jakgpbanl6cs23x3g26iab54p7zylcf9v8vc32ps57smp8wql52")))) - ("tbb" ,tbb-2020) - ("libstadenio-for-salmon" ,libstadenio-for-salmon) - ("xz" ,xz) - ("zlib" ,zlib))) - (native-inputs - (list pkg-config)) + "048a006mc2d0h78ym58mv67hl1pj480ilc5ifq0rlzfdyyfs1b8i")))))) (home-page "https://github.com/COMBINE-lab/salmon") (synopsis "Quantification from RNA-seq reads using lightweight alignments") (description "Salmon is a program to produce highly-accurate, -- cgit v1.2.3 From 68d3ec6ad7784f1ff54a11d0466578c8722df21e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 1 Oct 2022 09:32:10 +0200 Subject: gnu: monero: Update to 0.18.1.2. * gnu/packages/finance.scm (monero): Update to 0.18.1.2. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 9739c5acd5..132d6d3cc8 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -707,7 +707,7 @@ blockchain.") ;; the system's dynamically linked library. (package (name "monero") - (version "0.18.1.1") + (version "0.18.1.2") (source (origin (method git-fetch) @@ -725,7 +725,7 @@ blockchain.") delete-file-recursively '("external/miniupnp" "external/rapidjson")))) (sha256 - (base32 "050rf4c1i42d0vhcb3hqrrndr2l45w1qg4h62cagk0nmq5va6xj7")))) + (base32 "033hfc98gv28x05gc1ln6dmyc45cki4qdylmz35wh4dchyr74pf9")))) (build-system cmake-build-system) (native-inputs (list doxygen -- cgit v1.2.3 From 225e00bd1925487fb045d9184fd249d93accad08 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 1 Oct 2022 10:03:30 +0200 Subject: gnu: monero-gui: Update to 0.18.1.2. * gnu/packages/finance.scm (monero-gui): Update to 0.18.1.2. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 132d6d3cc8..ac19851a85 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -812,7 +812,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.18.1.1") + (version "0.18.1.2") (source (origin (method git-fetch) @@ -828,7 +828,7 @@ the Monero command line client and daemon.") ;; See the 'extract-monero-sources' phase. (delete-file-recursively "monero"))) (sha256 - (base32 "0zh0sf7acr1a4s5kmp9fpjd2wr78qv74z1xhkwrkkn9ainp4qfaz")))) + (base32 "1lwlkqj8liflk0jfzmlclm1xca0x3z8v3kcbzd671rgismm8v332")))) (build-system qt-build-system) (native-inputs `(,@(package-native-inputs monero) -- cgit v1.2.3 From 85e7d3e83a04225fd15981f70621f9bbf0125ee6 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Tue, 27 Sep 2022 21:35:59 +0200 Subject: gnu: gtk: Update to 4.8.1. * gnu/packages/gtk.scm (gtk): Update to 4.8.1. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4cdc8d090a..879cf44d67 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1181,7 +1181,7 @@ application suites.") (define-public gtk (package (name "gtk") - (version "4.8.0") + (version "4.8.1") (source (origin (method url-fetch) @@ -1189,7 +1189,7 @@ application suites.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0zxxvjnbmaahvm9lwm007dzgc0yl8qamkp1467c5kqyi6ws21mn8")) + (base32 "1za2nyqqs2lrbss61gfw17qba2f0w6a119m1xk4d0fx2k3gdis2w")) (patches (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch")))) (build-system meson-build-system) -- cgit v1.2.3 From b3d3012f11f023d2da6b413cb88936e8ab7428f5 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Tue, 27 Sep 2022 21:38:23 +0200 Subject: gnu: webkitgtk: Update to 2.38.0. * gnu/packages/webkit.scm (webkitgtk): Update to 2.38.0. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index d13a8b38ca..6cdae9a928 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -281,14 +281,14 @@ propagated by default) such as @code{gst-plugins-good} and (package (inherit webkitgtk) (name "webkitgtk") - (version "2.37.91") ;webkit2gtk5 + (version "2.38.0") ;webkit2gtk5 (source (origin (inherit (package-source webkitgtk)) (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "0r2d1dbx6s8bad011dkmx7j34gcxlz9bs14pip1qn7n1rhgxb3qi")))) + (base32 "1g8gpi1scbmbcywkfjr2srxdq9r63s94d7v01fdk5qdnldsn7kpr")))) (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments webkitgtk) -- cgit v1.2.3 From 95a216c4f03d2d71e1bba5776bc5bb719c6969a2 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Tue, 27 Sep 2022 21:45:29 +0200 Subject: gnu: libadwaita: Update to 1.2.0. * gnu/packages/gnome.scm (libadwaita): Update to 1.2.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 54355ac9e6..992f148ccb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13222,7 +13222,7 @@ Document Analysis and Recognition program.") (define-public libadwaita (package (name "libadwaita") - (version "1.2.rc") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libadwaita/" @@ -13230,7 +13230,7 @@ Document Analysis and Recognition program.") "libadwaita-" version ".tar.xz")) (sha256 (base32 - "1syg7fkpcsw0q6fy3g79myb9m9bvrnh3rjrm6g4bfg1pnlqf1w22")))) + "0326qs0zhfi6zv52p90axnicmv0qb2l2hwpyv60pk9lvwcdkwbrj")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From a70372b4aa3108d08841c713d150c5a8029f7c62 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 17 Sep 2022 18:32:41 +0200 Subject: gnu: blueprint-compiler: Wrap GUIX_PYTHONPATH and GI_TYPELIB_PATH. * gnu/packages/gnome.scm (blueprint-compiler)[arguments]: Add python-build-system's wrap phase, as well as a phase for GI_TYPELIB_PATH. --- gnu/packages/gnome.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 992f148ccb..d8b3692b80 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3276,6 +3276,25 @@ the GNOME desktop environment.") (base32 "0hj7f4xhwjc4x32r3lswwclbw37fw3spy806g4plkmym25hz4ydy")))) (build-system meson-build-system) + (arguments + (list + #:imported-modules + `(,@%meson-build-system-modules + (guix build python-build-system)) + #:modules + `((guix build meson-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'wrap 'wrap-python + (assoc-ref python:%standard-phases 'wrap)) + (add-after 'wrap-python 'wrap-gi + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append out "/bin/blueprint-compiler") + `("GI_TYPELIB_PATH" ":" suffix (,gi-typelib-path))))))))) (native-inputs (list gtk python-pygobject python)) (inputs (list python)) (synopsis "Template markup language") -- cgit v1.2.3 From 16be8d4e7be7aff7d68b2845599842dd7ab30fa4 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 17 Sep 2022 21:29:56 +0200 Subject: gnu: pugixml: Update to 1.12.1. * gnu/packages/xml.scm (pugixml): Update to 1.12.1. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 42d76bef53..53c3f496d5 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1067,14 +1067,14 @@ the form of functions.") (define-public pugixml (package (name "pugixml") - (version "1.11") + (version "1.12.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/zeux/pugixml/releases/download/v" version "/pugixml-" version ".tar.gz")) (sha256 - (base32 "0b5apqiisq8yk51x0cwks4h2m0zd2zgjdy0w80qp9h5rccz3v496")))) + (base32 "1ixg6fpr7vhkg9bn2g2qmmwpy974z7nx7zq81whm2h6c36lp3xnw")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") -- cgit v1.2.3 From b6b09a93fd0d2177e702f43c566bb2b4c2d300c8 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 17 Sep 2022 21:50:41 +0200 Subject: gnu: Add python-timeout-decorator. * gnu/packages/python-xyz.scm (python-timeout-decorator): New variable. --- gnu/packages/python-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 57942331b2..34d6aa5ea0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11217,6 +11217,23 @@ checksums. It implement more than a hundred checksum routines.") blocks or callables with two context managers and two decorators.") (license license:expat))) +(define-public python-timeout-decorator + (package + (name "python-timeout-decorator") + (version "0.5.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "timeout-decorator" version)) + (sha256 + (base32 + "1mxk2qyydhzncm93z08kvj5ssxq3fr2n7pkrrji28nqwvdc2ybva")))) + (build-system python-build-system) + (home-page "https://github.com/pnpnpn/timeout-decorator") + (synopsis "Timeout decorator") + (description "This package provides a decorator that raises an error +when an operation takes longer than expected.") + (license license:expat))) + (define-public python-straight-plugin (package (name "python-straight-plugin") -- cgit v1.2.3 From 7b7562d930648380d03c2ffa06cbd0f145791ce9 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 17 Sep 2022 21:50:48 +0200 Subject: gnu: Add python-readability-lxml. * gnu/packages/python-xyz.scm (python-readability-lxml): New variable. --- gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 34d6aa5ea0..74fa826889 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27967,6 +27967,38 @@ characteristics. These measures are basically linear regressions based on the number of words, syllables, and sentences.") (license license:asl2.0))) +(define-public python-readability-lxml + (package + (name "python-readability-lxml") + (version "0.8.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/buriy/python-readability") + (commit (string-append "v" version)))) + (sha256 + (base32 + "13nfy2v0pbbf62jn9qwgi489gg97hbb22q6w3f78mnvjxd2m19rh")) + (snippet + #~(begin (delete-file "readability/compat/two.py"))))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest" "-v" "tests/"))))))) + (propagated-inputs (list python-chardet python-cssselect python-lxml)) + (native-inputs (list python-timeout-decorator python-pytest)) + (home-page "http://github.com/buriy/python-readability") + (synopsis "HTML to text parser") + (description + "This package provides classes and function that strip gratuitous markup +from web pages to make them easier to read.") + (license license:asl2.0))) + (define-public python-listparser (package (name "python-listparser") -- cgit v1.2.3 From 99af12e826b0a176a6527c10f5b14039084a1cbd Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 17 Sep 2022 22:03:33 +0200 Subject: gnu: Add syndication-domination. * gnu/packages/syndication.scm (syndication-domination): New variable. --- gnu/packages/syndication.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index cba8d6ad9d..732f5f4ea9 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -35,7 +35,9 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages build-tools) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages crates-io) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) @@ -48,6 +50,7 @@ #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) #:use-module (gnu packages python-check) #:use-module (gnu packages python-xyz) @@ -491,6 +494,31 @@ a simple interface that makes it easy to organize and browse feeds.") (license (list license:expat license:gpl3+)))) ; tuir/packages/praw +(define-public syndication-domination + (let ((revision "1") + (commit "f64caabd6f46be14fdb92085971a7f2d6fa5e61e")) + (package + (name "syndication-domination") + (version (git-version "0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/gabmus/syndication-domination") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1i0llzzm3lc2kw7rjhb46c7wlknsb6r9bdrf61chi2pk6hpjyscv")))) + (build-system meson-build-system) + (arguments + (list #:meson meson-0.63)) + (inputs (list fmt tidy-html pybind11 python pugixml)) + (native-inputs (list cmake pkg-config)) ; need cmake to find pybind11 + (home-page "https://gitlab.com/gabmus/syndication-domination") + (synopsis "RSS/Atom feed parser") + (description "This package provides an experimental RSS/Atom feed +parser. It is \"not fit for use at this point\", but gfeeds uses it anyway.") + (license license:agpl3)))) + (define-public gfeeds (package (name "gfeeds") -- cgit v1.2.3 From e90509b627c8ac21e904bea2d94dbc044e9daa6b Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 15 Sep 2022 22:15:15 +0200 Subject: gnu: gfeeds: Use git origin. * gnu/packages/syndication.scm (gfeeds)[origin]: Use git-fetch and git-reference. --- gnu/packages/syndication.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 732f5f4ea9..05e4c20d97 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -524,14 +524,13 @@ parser. It is \"not fit for use at this point\", but gfeeds uses it anyway.") (name "gfeeds") (version "0.16.2") (source (origin - (method url-fetch) - (uri - (string-append - "https://gitlab.gnome.org/World/gfeeds/-/archive/" version - "/gfeeds-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/World/gfeeds") + (commit version))) (sha256 (base32 - "05gwwzqfz29m477imd5vh84jfla1wnklwpc2sdxnqli72wg08fli")))) + "045889417506w2l25j7jxx7jfdpfljbirhm1s4whvhk83xap19zb")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From 9619a31dc33c37014f501e8a9eca7de16e5cb468 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 15 Sep 2022 22:16:55 +0200 Subject: gnu: gfeeds: Modernize package description. * gnu/packages/syndication.scm (gfeeds)[arguments]: Convert to list of G-Expressions. Drop trailing #t. [native-inputs]: Drop labels. [inputs]: Add bash-minimal. --- gnu/packages/syndication.scm | 52 +++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 05e4c20d97..7c2031cabf 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -26,6 +26,7 @@ #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix build-system cargo) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) @@ -35,6 +36,7 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages build-tools) #:use-module (gnu packages check) #:use-module (gnu packages cmake) @@ -533,33 +535,33 @@ parser. It is \"not fit for use at this point\", but gfeeds uses it anyway.") "045889417506w2l25j7jxx7jfdpfljbirhm1s4whvhk83xap19zb")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-mpv-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gfeeds/confManager.py" - (("mpv") (search-input-file inputs "/bin/mpv"))) - #t)) - (add-after 'unpack 'patch-webkit2-version - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "bin/gfeeds.in" - (("gi\\.require_version\\('WebKit2', '4\\.0'\\)") - "gi.require_version('WebKit2', '4.1')")))) - (add-after 'install 'wrap-gfeeds - (lambda* (#:key outputs #:allow-other-keys) - (wrap-program (string-append - (assoc-ref outputs "out") "/bin/gfeeds") - `("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) - `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) - `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS")))) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-mpv-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gfeeds/confManager.py" + (("mpv") (search-input-file inputs "/bin/mpv"))))) + (add-after 'unpack 'patch-webkit2-version + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "bin/gfeeds.in" + (("gi\\.require_version\\('WebKit2', '4\\.0'\\)") + "gi.require_version('WebKit2', '4.1')")))) + (add-after 'install 'wrap-gfeeds + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (string-append + (assoc-ref outputs "out") "/bin/gfeeds") + `("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) + `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS"))))))))) (native-inputs - `(("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config))) + (list `(,glib "bin") + `(,gtk+ "bin") + gobject-introspection + pkg-config)) (inputs - (list glib + (list bash-minimal + glib gsettings-desktop-schemas gtk+ hicolor-icon-theme -- cgit v1.2.3 From 7f0ff905386be612307a198ca98efda50d1362ff Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 17 Sep 2022 18:35:47 +0200 Subject: gnu: gfeeds: Update to 1.0.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/syndication.scm (gfeeds): Update to 1.0.3. [arguments]<#:phases>: Add ‘skip-icon-cache’. [native-inputs]: Remove gtk+:bin. Add blueprint-compiler. [inputs]: Replace gtk+ with gtk. Replace libhandy with libadwaita. Replace python-readability with python-readability-lxml. Replace webkitgtk with webkitgtk-next. Add python-humanize, python-magic, python-pygobject, and syndication-domination. --- gnu/packages/syndication.scm | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 7c2031cabf..c30d16c870 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2022 Luis Felipe López Acevedo +;;; Copyright © 2022 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; @@ -524,7 +525,7 @@ parser. It is \"not fit for use at this point\", but gfeeds uses it anyway.") (define-public gfeeds (package (name "gfeeds") - (version "0.16.2") + (version "1.0.3") (source (origin (method git-fetch) (uri (git-reference @@ -532,7 +533,7 @@ parser. It is \"not fit for use at this point\", but gfeeds uses it anyway.") (commit version))) (sha256 (base32 - "045889417506w2l25j7jxx7jfdpfljbirhm1s4whvhk83xap19zb")))) + "1lkvhff7pl1y4brqsix6sar5yl8flyhfp3w96fx0klhk3586bvhg")))) (build-system meson-build-system) (arguments (list @@ -542,11 +543,10 @@ parser. It is \"not fit for use at this point\", but gfeeds uses it anyway.") (lambda* (#:key inputs #:allow-other-keys) (substitute* "gfeeds/confManager.py" (("mpv") (search-input-file inputs "/bin/mpv"))))) - (add-after 'unpack 'patch-webkit2-version - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "bin/gfeeds.in" - (("gi\\.require_version\\('WebKit2', '4\\.0'\\)") - "gi.require_version('WebKit2', '4.1')")))) + (add-after 'unpack 'skip-icon-cache + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") "true")))) (add-after 'install 'wrap-gfeeds (lambda* (#:key outputs #:allow-other-keys) (wrap-program (string-append @@ -556,31 +556,34 @@ parser. It is \"not fit for use at this point\", but gfeeds uses it anyway.") `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS"))))))))) (native-inputs (list `(,glib "bin") - `(,gtk+ "bin") + blueprint-compiler gobject-introspection pkg-config)) (inputs (list bash-minimal glib gsettings-desktop-schemas - gtk+ + gtk hicolor-icon-theme - libhandy + libadwaita mpv python python-beautifulsoup4 python-dateutil python-feedparser python-html5lib + python-humanize python-listparser python-lxml + python-magic python-pillow python-pygments + python-pygobject python-pytz - python-readability + python-readability-lxml python-requests - webkitgtk - python-pygobject)) + syndication-domination + webkitgtk-next)) (home-page "https://gfeeds.gabmus.org/") (synopsis "Easy-to-use GTK+ RSS/Atom feed reader") (description "Feeds is an RSS/Atom feed reader made with GTK+ -- cgit v1.2.3 From 46e1eb48c97a51d4d92b92f8606d8106427fb55c Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 1 Oct 2022 17:53:25 +0200 Subject: gnu: komikku: Use G-Expressions. * gnu/packages/gnome.scm (komikku)[arguments]: Convert to list of G-Expressions. --- gnu/packages/gnome.scm | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d8b3692b80..81b8c241ee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13023,25 +13023,26 @@ profiler via Sysprof, debugging support, and more.") "17r059srxrx26w40swy47pdpyigyjdczp8550g4rfh86qs3ld4il")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-sources - (lambda _ - (substitute* "komikku/utils.py" - (("from komikku\\.servers import get_servers_list") - ;; code following that line should migrate old databases - ;; but the line itself results in an import error - "return data_dir_path")))) - (add-after 'unpack 'skip-gtk-update-icon-cache - (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") (which "true"))))) - (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap - (lambda* (#:key outputs #:allow-other-keys) - (wrap-program (search-input-file outputs "bin/komikku") - `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda _ + (substitute* "komikku/utils.py" + (("from komikku\\.servers import get_servers_list") + ;; code following that line should migrate old databases + ;; but the line itself results in an import error + "return data_dir_path")))) + (add-after 'unpack 'skip-gtk-update-icon-cache + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") (which "true"))))) + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/komikku") + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) (inputs (list bash-minimal gtk+ -- cgit v1.2.3 From 4b3493ed0156709a924f31ef4c9a5efa0815dfe8 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 18 Sep 2022 00:20:46 +0200 Subject: gnu: komikku: Update to 1.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (komikku): Update to 1.0.0. [arguments]<#:meson>: Use meson-0.63. <#:phases>: Adjust ‘skip-gtk-update-icon-cache’ [inputs]: Replace gtk+ with gtk. Replace libhandy with libadwaita. Replace webkitgtk-with-libsoup2 with webkitgtk-next. --- gnu/packages/gnome.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 81b8c241ee..fbaef9eb6e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2019 David Wilson ;;; Copyright © 2019, 2020 Raghav Gururajan ;;; Copyright © 2019, 2020 Jonathan Brielmaier -;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler +;;; Copyright © 2019-2022 Liliana Marie Prikler ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 raingloom @@ -13010,7 +13010,7 @@ profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "0.41.0") + (version "1.0.0") (source (origin (method git-fetch) @@ -13020,11 +13020,12 @@ profiler via Sysprof, debugging support, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "17r059srxrx26w40swy47pdpyigyjdczp8550g4rfh86qs3ld4il")))) + "0k0s644ylbyq3a4vhdn9ymmk7kb0jgcpxxrhpr1g2nrcq7fqn116")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t + #:meson meson-0.63 #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-sources @@ -13036,8 +13037,12 @@ profiler via Sysprof, debugging support, and more.") "return data_dir_path")))) (add-after 'unpack 'skip-gtk-update-icon-cache (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") (which "true"))))) + (substitute* "meson.build" + (("([a-z_]*): true" all option) + (cond ; cond rather than match saves an import + ((string=? option "gtk_update_icon_cache") + (string-append option ": false")) + (else all)))))) (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap (lambda* (#:key outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/komikku") @@ -13045,8 +13050,8 @@ profiler via Sysprof, debugging support, and more.") `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) (inputs (list bash-minimal - gtk+ - libhandy + gtk + libadwaita libnotify libsecret python @@ -13064,7 +13069,7 @@ profiler via Sysprof, debugging support, and more.") python-pygobject python-requests python-unidecode - webkitgtk-with-libsoup2)) + webkitgtk-next)) (native-inputs (list desktop-file-utils gettext-minimal -- cgit v1.2.3 From 461b1e490935e720999e78dc29656ae3c9ea2ea3 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 1 Oct 2022 18:22:53 +0200 Subject: gnu: nanovna-saver: Update to 0.5.3. * gnu/packages/radio.scm (nanovna-saver): Update to 0.5.3. --- gnu/packages/radio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index fcf69b0e87..f466678289 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1644,7 +1644,7 @@ modes: (define-public nanovna-saver (package (name "nanovna-saver") - (version "0.3.9") + (version "0.5.3") (source (origin (method git-fetch) @@ -1653,7 +1653,7 @@ modes: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1h5k402wjlj7xjniggwf0x7a5srlgglc2x4hy6lz6c30zwa7z8fm")))) + (base32 "1h0wzva8j7fqnpf0qy42bw9rdclgq3jdq902ajvd9v5iqcqs78n0")))) (build-system python-build-system) (native-inputs (list python-cython)) -- cgit v1.2.3 From 4b5ac6b226bdf34387ded002647c44a0c63587f8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 1 Oct 2022 23:46:12 +0300 Subject: gnu: exercism: Install shell completions. * gnu/packages/education.scm (exercism)[arguments]: Add a phase to build and install shell completions. --- gnu/packages/education.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index a2607087e5..f16324a2c6 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -1065,7 +1065,28 @@ machine, and more.") (arguments `(#:import-path "github.com/exercism/cli/exercism" #:unpack-path "github.com/exercism/cli" - #:install-source? #f)) + #:install-source? #f + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-completions + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bash (string-append out "/etc/bash_completion.d/exercism")) + (fish (string-append + out "/share/fish/vendor_completions.d/exercism.fish")) + (zsh (string-append out "/share/zsh/site-functions/_exercism"))) + (mkdir-p (dirname bash)) + (with-output-to-file bash + (lambda () + (invoke (string-append out "/bin/exercism") "completion" "bash"))) + (mkdir-p (dirname fish)) + (with-output-to-file fish + (lambda () + (invoke (string-append out "/bin/exercism") "completion" "fish"))) + (mkdir-p (dirname zsh)) + (with-output-to-file zsh + (lambda () + (invoke (string-append out "/bin/exercism") "completion" "zsh"))))))))) (inputs `(("github.com/blang/semver" ,go-github-com-blang-semver) ("github.com/spf13/cobra" ,go-github-com-spf13-cobra) -- cgit v1.2.3 From 04516a7adffd23ecbe23a718625b3adcefe1f63e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 1 Oct 2022 23:47:06 +0300 Subject: gnu: exercism: Update home-page. * gnu/packages/education.scm (exercism)[home-page]: Follow redirect. --- gnu/packages/education.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index f16324a2c6..9e082b00c0 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -1094,7 +1094,7 @@ machine, and more.") ("github.com/spf13/viper" ,go-github-com-spf13-viper) ("golang.org/x/net" ,go-golang-org-x-net) ("golang.org/x/text" ,go-golang-org-x-text))) - (home-page "https://exercism.io") + (home-page "https://exercism.org/") (synopsis "Mentored learning for programming languages") (description "Commandline client for exercism.io, a free service providing mentored learning for programming languages.") -- cgit v1.2.3 From 821cd5651a29c668a070625e8ce45fe164fe9527 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 1 Oct 2022 23:48:02 +0300 Subject: gnu: exercism: Remove input labels. * gnu/packages/education.scm (exercism)[inputs]: Remove input labels. --- gnu/packages/education.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 9e082b00c0..0d4719f3ce 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -1088,12 +1088,12 @@ machine, and more.") (lambda () (invoke (string-append out "/bin/exercism") "completion" "zsh"))))))))) (inputs - `(("github.com/blang/semver" ,go-github-com-blang-semver) - ("github.com/spf13/cobra" ,go-github-com-spf13-cobra) - ("github.com/spf13/pflag" ,go-github-com-spf13-pflag) - ("github.com/spf13/viper" ,go-github-com-spf13-viper) - ("golang.org/x/net" ,go-golang-org-x-net) - ("golang.org/x/text" ,go-golang-org-x-text))) + (list go-github-com-blang-semver + go-github-com-spf13-cobra + go-github-com-spf13-pflag + go-github-com-spf13-viper + go-golang-org-x-net + go-golang-org-x-text)) (home-page "https://exercism.org/") (synopsis "Mentored learning for programming languages") (description "Commandline client for exercism.io, a free service providing -- cgit v1.2.3 From 78176e3a8196fc8e3841b67a5d60915af9b97bc3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Oct 2022 17:46:34 +0200 Subject: gnu: ungoogled-chromium: Update to 106.0.5249.91-1. * gnu/packages/chromium.scm (%chromium-version): Set to 106.0.5249.91. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index f730d69da5..0559f60c5f 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -319,7 +319,7 @@ ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "106.0.5249.61") +(define %chromium-version "106.0.5249.91") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") (define %arch-revision "6afedb08139b97089ce8ef720ece5cd14c83948c") @@ -332,7 +332,7 @@ (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "0mz3f4f2q72zl6m9vxxx084z0a1kfmsqf7fcir5bka85ap2klpjl")))) + "1cih72ay2gr9xjwwa8iw0wmpmfs4xm4200c4z04v7vi9sxadxnrd")))) (define %debian-origin (origin @@ -516,7 +516,7 @@ %chromium-version ".tar.xz")) (sha256 (base32 - "15qljfg8w124yp65srp1rz3ywrlqhzqzkhimn1h9xz0jkf9cnypj")) + "16jlwzlfqdhhyajsxxrdfcqmh76ds8g1w4xd5mz3bdbd81mljh2p")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From 09e5f9e38eaa4b34324c0279edcc521655baa10c Mon Sep 17 00:00:00 2001 From: ギャラ Date: Sat, 1 Oct 2022 09:30:31 +0900 Subject: gnu: libvterm: Update to 0.3.0. * gnu/packages/terminals.scm (libvterm): Update to 0.3.0. Signed-off-by: Efraim Flashner --- gnu/packages/terminals.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 9ece3043e0..f29d7e3773 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -640,7 +640,7 @@ should be thread-safe.") (define-public libvterm (package (name "libvterm") - (version "0.1.4") + (version "0.3") (source (origin (method url-fetch) @@ -648,7 +648,7 @@ should be thread-safe.") "libvterm-" version ".tar.gz")) (sha256 (base32 - "1pfkhbbihd2kvaza707vl2nvk7bxaawmb37wf9v6d72mjng38w5w")))) + "0n1k923ii618ffkbifi8a89ag8c6m9l49z8dj01dyay551k0vsv1")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 1df3af9bdffad08c14e784c0f3911ae95d5d6769 Mon Sep 17 00:00:00 2001 From: ギャラ Date: Sat, 1 Oct 2022 09:30:33 +0900 Subject: gnu: neovim: Update to 0.8.0. * gnu/packages/vim.scm (neovim): Update to 0.8.0. Signed-off-by: Efraim Flashner --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index c6bfbb5c6b..901527e159 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -685,7 +685,7 @@ are detected, the user is notified."))) (define-public neovim (package (name "neovim") - (version "0.7.2") + (version "0.8.0") (source (origin (method git-fetch) (uri (git-reference @@ -694,7 +694,7 @@ are detected, the user is notified."))) (file-name (git-file-name name version)) (sha256 (base32 - "1jn4i4ral79ys06i50bimylm515sfh41z503gj50a74h1ylg0z4w")))) + "0hkd49wkxfi6k1xa92hdd4b9z356r32hbpr78z1cigcln1wr0z7j")))) (build-system cmake-build-system) (arguments (list #:modules -- cgit v1.2.3 From 77bcdb7439ed0d86af3cd9ed2a05efefe88245c9 Mon Sep 17 00:00:00 2001 From: Mike Swanson Date: Thu, 29 Sep 2022 20:26:35 -0700 Subject: gnu: units: Update to 2.22. * gnu/packages/maths.scm (units): Update to 2.22. Signed-off-by: Efraim Flashner --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d3373359b8..ffd2a89d2f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -368,13 +368,13 @@ programming language.") (define-public units (package (name "units") - (version "2.21") + (version "2.22") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/units/units-" version ".tar.gz")) (sha256 (base32 - "1bybhqs4yrly9myb5maz3kdmf8k4fhk2m1d5cbcryn40z6lq0gkc")))) + "0j2q2a9sgldqwcifsnb7qagsmp8fvj91vfh6v4k7gzi1fwhf24sx")))) (build-system gnu-build-system) (inputs `(("readline" ,readline) -- cgit v1.2.3 From ae221813745783ef1b7eee47561a2208cd5ad512 Mon Sep 17 00:00:00 2001 From: Fulbert Date: Thu, 29 Sep 2022 19:19:45 +0200 Subject: gnu: csound: Update to 6.16.2. * gnu/packages/audio.scm (csound): Update to 6.16.2. Signed-off-by: Efraim Flashner --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index fd27c1cc71..b1a91418da 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1400,7 +1400,7 @@ object library.") (define-public csound (package (name "csound") - (version "6.14.0") + (version "6.16.2") (source (origin (method git-fetch) @@ -1409,7 +1409,7 @@ object library.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1sr9knfhbm2m0wpkjq2l5n471vnl51wy4p6j4m95zqybimzb4s2j")))) + (base32 "1lgasyk8j4cl9178vci1dph63nks3cgwhf8y1d04z9dc8gg15dyn")))) (build-system cmake-build-system) (native-inputs (list bison flex gettext-minimal zlib)) -- cgit v1.2.3 From 2ac5da4b5a82efad02e9a1b6db0440c3289a84f0 Mon Sep 17 00:00:00 2001 From: itd Date: Thu, 22 Sep 2022 08:21:58 +0200 Subject: gnu: Add ghc-9.0. * gnu/packages/haskell.scm (ghc-9.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/haskell.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index effc6eeb1b..3746b6bd57 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1011,6 +1011,42 @@ interactive environment for the functional language Haskell.") (define-public ghc-8 ghc-8.10) +(define-public ghc-9.0 + (package + (inherit ghc-8.10) + (name "ghc-next") + (version "9.0.2") + (source (origin + (method url-fetch) + (uri (string-append "https://www.haskell.org/ghc/dist/" version + "/ghc-" version "-src.tar.xz")) + (sha256 + (base32 + "15wii8can2r3dcl6jjmd50h2jvn7rlmn05zb74d2scj6cfwl43hl")))) + (native-inputs + `(;; GHC 9.0.2 must be built with GHC >= 8.8 + ("ghc-bootstrap" ,ghc-8.10) + ("ghc-testsuite" + ,(origin + (method url-fetch) + (uri (string-append + "https://www.haskell.org/ghc/dist/" + version "/ghc-" version "-testsuite.tar.xz")) + (sha256 + (base32 + "1m5fzhr4gjn9ni8gxx7ag3fkbw1rspjzgv39mnfb0nkm5mw70v3s")))) + ,@(filter (match-lambda + (("ghc-bootstrap" . _) #f) + (("ghc-testsuite" . _) #f) + (_ #t)) + (package-native-inputs ghc-8.10)))) + (native-search-paths + (list (search-path-specification + (variable "GHC_PACKAGE_PATH") + (files (list (string-append "lib/ghc-" version))) + (file-pattern ".*\\.conf\\.d$") + (file-type 'directory)))))) + (define-public ghc ghc-8) ;;; haskell.scm ends here -- cgit v1.2.3 From f44ba4a1ad9a1c16cb6a90faf690c6c9b0b919d6 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sun, 25 Sep 2022 08:02:37 +0800 Subject: gnu: Add go-1.18. * gnu/packages/golang (go-1.18,go-std-1.18): New variables. Signed-off-by: Efraim Flashner --- gnu/packages/golang.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 29a11a4ec1..698b4600ae 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -841,6 +841,22 @@ in the style of communicating sequential processes (@dfn{CSP}).") (alist-replace "go" (list go-1.16) (package-native-inputs go-1.16)) (package-native-inputs go-1.16))))) +(define-public go-1.18 + (package + (inherit go-1.17) + (name "go") + (version "1.18.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/go") + (commit (string-append "go" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1s2xwgd3mfbjdf7ls9gyj7n1lbqc4276qkr3znyq9694isj1ak20")))))) + (define-public go go-1.17) (define make-go-std @@ -880,6 +896,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (define-public go-std-1.14 (make-go-std go-1.14)) (define-public go-std-1.16 (make-go-std go-1.16)) (define-public go-std-1.17 (make-go-std go-1.17)) +(define-public go-std-1.18 (make-go-std go-1.18)) (define-public go-0xacab-org-leap-shapeshifter (let ((commit "0aa6226582efb8e563540ec1d3c5cfcd19200474") -- cgit v1.2.3 From 5bd048debf2aca40e353956c9e54d3a267ec7eb2 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sun, 25 Sep 2022 08:03:02 +0800 Subject: gnu: Add go-1.19. * gnu/packages/golang (go-1.19,go-std-1.19): New variables. Signed-off-by: Efraim Flashner --- gnu/packages/golang.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 698b4600ae..4a4c706509 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -857,6 +857,33 @@ in the style of communicating sequential processes (@dfn{CSP}).") (base32 "1s2xwgd3mfbjdf7ls9gyj7n1lbqc4276qkr3znyq9694isj1ak20")))))) +(define-public go-1.19 + (package + (inherit go-1.18) + (name "go") + (version "1.19.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/go") + (commit (string-append "go" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gah4zhbkgbwrrryfmzdv2qwi1rgxk10q2r3hnlcb1dybf9c1i1w")))) + (arguments + (substitute-keyword-arguments (package-arguments go-1.18) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'install-doc-files + (lambda _ + (for-each (lambda (file) + (install-file file (string-append + #$output "/share/doc/go"))) + '("CONTRIBUTING.md" "PATENTS" "README.md" + "SECURITY.md")))))))))) + (define-public go go-1.17) (define make-go-std @@ -897,6 +924,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (define-public go-std-1.16 (make-go-std go-1.16)) (define-public go-std-1.17 (make-go-std go-1.17)) (define-public go-std-1.18 (make-go-std go-1.18)) +(define-public go-std-1.19 (make-go-std go-1.19)) (define-public go-0xacab-org-leap-shapeshifter (let ((commit "0aa6226582efb8e563540ec1d3c5cfcd19200474") -- cgit v1.2.3 From 6448abe39aea8644ebd2be141ab60bcbc5de085e Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 1 Oct 2022 06:27:23 +0200 Subject: gnu: python-socks: Update to 2.0.3. * gnu/packages/python-web.scm (python-socks): Update to 2.0.3. [arguments]<#:phases>: Remove trailing #t. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 94544e1e74..f1eb4fb7b5 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -6555,14 +6555,14 @@ your code non-blocking and speedy.") (define-public python-socks (package (name "python-socks") - (version "1.2.4") + (version "2.0.3") (source (origin (method url-fetch) (uri (pypi-uri "python-socks" version)) (sha256 (base32 - "1n6xb18jy41ybgkmamakg6psp3qididd45qknxiggngaiibz43kx")))) + "12msk06c0glljcrx1byd78xgv05lxw81vknqwhn8ccs7an7cmag3")))) (build-system python-build-system) (arguments `(#:tests? #f ; tests not included @@ -6571,8 +6571,7 @@ your code non-blocking and speedy.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "pytest" "tests/" "-s")) - #t))))) + (invoke "pytest" "tests/" "-s"))))))) (propagated-inputs (list python-async-timeout python-curio python-trio)) (native-inputs -- cgit v1.2.3 From 357bd133d8a6ecb1003ff7edb746ba589b9fe9eb Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 1 Oct 2022 06:27:24 +0200 Subject: gnu: python-aiohttp-socks: Update to 0.7.1. * gnu/packages/python-web.scm (python-aiohttp-socks): Update to 0.7.1. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f1eb4fb7b5..2983381cc2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -56,6 +56,7 @@ ;;; Copyright © 2022 Nicolas Graves ;;; Copyright © 2022 Tomasz Jeneralczyk ;;; Copyright © 2022 msimonin +;;; Copyright © 2022 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -432,14 +433,14 @@ Callback Hell. (define-public python-aiohttp-socks (package (name "python-aiohttp-socks") - (version "0.6.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (pypi-uri "aiohttp_socks" version)) (sha256 (base32 - "04w010bvi719ifpc3sshav95k10hf9nq8czn9yglkj206yxcypdr")))) + "06il43dv6qm858af841vq9qadw6h7qsfs06nnwagmwqyi72cl592")))) (build-system python-build-system) (propagated-inputs (list python-aiohttp python-attrs python-socks)) -- cgit v1.2.3 From d37f4f4ac7d85569274d88855dac681d193deb8d Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 1 Oct 2022 06:27:25 +0200 Subject: gnu: python-matrix-nio: Update to 0.20.0. * gnu/packages/matrix.scm (python-matrix-nio): Update to 0.20.0. [native-inputs]: Add python-pytest-asyncio. [propagated-inputs]: Changed python-jsonschema to python-jsonschema-next. Signed-off-by: Efraim Flashner --- gnu/packages/matrix.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 2ba6d8ba1f..8e543f0a91 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Tobias Geerinckx-Rice -;;; Copyright © 2020, 2021 Michael Rohleder +;;; Copyright © 2020, 2021, 2022 Michael Rohleder ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2022 Aleksandr Vityazev ;;; Copyright © 2022 Morgan Smith @@ -158,13 +158,13 @@ homeserver and generally help bootstrap the ecosystem.") (define-public python-matrix-nio (package (name "python-matrix-nio") - (version "0.18.7") + (version "0.20.0") (source (origin (method url-fetch) (uri (pypi-uri "matrix-nio" version)) (sha256 - (base32 "0cw4y6dx8n8hynxqlzzkj8p34nfbc2xryvmkr5yhmja31y4rks4k")))) + (base32 "1ycrp48b15nm2d3w3qpzps21czl3gbikadl10sncbzr9wdwn44g4")))) (build-system python-build-system) (arguments `(#:phases @@ -191,6 +191,7 @@ homeserver and generally help bootstrap the ecosystem.") ("python-hpack" ,python-hpack) ("python-faker" ,python-faker) ("python-pytest-aiohttp" ,python-pytest-aiohttp) + ("python-pytest-asyncio" ,python-pytest-asyncio) ("python-aioresponses" ,python-aioresponses) ("python-pytest-benchmark" ,python-pytest-benchmark) ("python-toml" ,python-toml) @@ -206,7 +207,7 @@ homeserver and generally help bootstrap the ecosystem.") (file-name (git-file-name name version)) (sha256 (base32 - "152prkndk53pfxm4in4xak4hwzyaxlbp6wv2zbk2xpzgyy9bvn3s")))))) + "10j8g3ns3v1ghdn262dxg50ayaczdp1hj97pj4ydw02bncqhddpd")))))) (propagated-inputs (list python-aiofiles python-aiohttp @@ -216,7 +217,7 @@ homeserver and generally help bootstrap the ecosystem.") python-future python-h11 python-h2 - python-jsonschema + python-jsonschema-next python-logbook python-olm python-peewee -- cgit v1.2.3 From 6fc185bc79d1693a034bfca7100516bb19c60524 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 1 Oct 2022 06:27:26 +0200 Subject: gnu: pantalaimon: Update to 0.10.5. * gnu/packages/matrix.scm (pantalaimon): Update to 0.10.5. Signed-off-by: Efraim Flashner --- gnu/packages/matrix.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 8e543f0a91..d5e0060c04 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -235,7 +235,7 @@ fledged batteries-included asyncio layer using aiohttp.") (define-public pantalaimon (package (name "pantalaimon") - (version "0.10.3") + (version "0.10.5") (source (origin (method git-fetch) @@ -245,7 +245,7 @@ fledged batteries-included asyncio layer using aiohttp.") (file-name (git-file-name name version)) (sha256 (base32 - "153d8083lj3qqirbv5q1d3igzd61a5kyzfk7xmv29sd3jbs8ysm9")))) + "16ask8v00654q307c55q5gnm8hrj40gibpab5zl52v4i0bgl9j68")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From bb3b810167d9ff784770a848a6f86b0cfa9cdfd8 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 1 Oct 2022 06:40:31 +0200 Subject: gnu: emacs-scratch-el: Update source and homepage. * gnu/packages/emacs-xyz.scm (emacs-scratch-el)[source, homepage]: Update URL. Signed-off-by: Efraim Flashner --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6d9d0d6a8f..93ad1a6fbf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18465,7 +18465,7 @@ from @code{groovy-mode} for editing Jenkins declarative pipeline files.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ieure/scratch-el") + (url "https://codeberg.org/emacs-weirdware/scratch") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -18484,7 +18484,7 @@ from @code{groovy-mode} for editing Jenkins declarative pipeline files.") (string-append (assoc-ref outputs "out") "/share/info")) #t))))) - (home-page "https://github.com/ieure/scratch-el/") + (home-page "https://codeberg.org/emacs-weirdware/scratch") (synopsis "Create scratch buffers with the same mode as current buffer") (description "Scratch is an extension to Emacs that enables one to create scratch buffers that are in the same mode as the current buffer. This is -- cgit v1.2.3 From 782c7455e1ea3785e8c7e9b300d55c9ebb441a35 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 2 Oct 2022 23:15:55 +0200 Subject: gnu: ffmpeg@4: Build against SDL2 2.0 so 'ffplay' gets built. Fixes . Reported by Zhu Zihao . * gnu/packages/sdl.scm (sdl2-2.0): New variable. * gnu/packages/video.scm (ffmpeg-4)[inputs]: New field. --- gnu/packages/sdl.scm | 14 ++++++++++++++ gnu/packages/video.scm | 2 ++ 2 files changed, 16 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 2523889a8d..2a10ff3962 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -155,6 +155,20 @@ joystick, and graphics hardware.") wayland-protocols))) (license license:bsd-3))) +(define-public sdl2-2.0 + (package + (inherit sdl2) + (name "sdl2") + (version "2.0.14") + (source (origin + (method url-fetch) + (uri + (string-append "https://libsdl.org/release/SDL2-" + version ".tar.gz")) + (sha256 + (base32 + "1g1jahknv5r4yhh1xq5sf0md20ybdw1zh1i15lry26sq39bmn8fq")))))) + (define-public libmikmod (package (name "libmikmod") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6a14a85b74..5568c5be8b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1772,6 +1772,8 @@ audio/video codec library.") (sha256 (base32 "14xadxm1yaamp216nq09xwasxg5g133v86dbb33mdg5di1zrlhdg")))) + (inputs (modify-inputs (package-inputs ffmpeg-5) + (replace "sdl2" sdl2-2.0))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg-5) ((#:configure-flags flags ''()) -- cgit v1.2.3 From abc232c42d0a80143aba5875213e6d5a843e3d25 Mon Sep 17 00:00:00 2001 From: Giovanni Biscuolo Date: Thu, 22 Sep 2022 14:39:13 +0200 Subject: gnu: Add tdlib-1.8.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is needed for emacs-telega 0.8.3 * gnu/packages/messaging.scm (tdlib-1.8.0): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c19ec45a35..dcd602c7c0 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 Jack Hill ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022 Giovanni Biscuolo ;;; ;;; This file is part of GNU Guix. ;;; @@ -2685,6 +2686,20 @@ support for high performance Telegram Bot creation.") (home-page "https://core.telegram.org/tdlib") (license license:boost1.0))) +(define-public tdlib-1.8.0 + (package + (inherit tdlib) + (name "tdlib-1.8.0") + (version "1.8.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tdlib/td") + (commit (string-append "v" version)))) + (sha256 + (base32 + "19psqpyh9a2kzfdhgqkirpif4x8pzy89phvi59dq155y30a3661q")))))) + (define-public purple-mm-sms (package (name "purple-mm-sms") -- cgit v1.2.3 From 69aa41e405ebc1ace2bc7d57127e320e42ba0dc0 Mon Sep 17 00:00:00 2001 From: Giovanni Biscuolo Date: Thu, 22 Sep 2022 14:39:39 +0200 Subject: gnu: emacs-telega: Use tdlib-1.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit emacs-telega is compatible with the latest TDLib major release 1.8.0 * gnu/packages/emacs-xyz.scm: (emacs-telega) Use tdlib-1.8.0 instead of latest tdlib Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 93ad1a6fbf..bdef3ed8e5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29796,7 +29796,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (lambda _ (chdir "..")))) #:test-target "test")) (inputs - (list tdlib libappindicator)) + (list tdlib-1.8.0 libappindicator)) (native-inputs (list python pkg-config)) (home-page "https://zevlg.github.io/telega.el/") -- cgit v1.2.3 From b479089fdc64271c40f83084970d92bb64280edc Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Thu, 22 Sep 2022 16:59:10 +0200 Subject: gnu: Add texlive-generic-xstring. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tex.scm (texlive-generic-xstring): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/tex.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index e5e7921ad7..1266d46861 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11877,6 +11877,27 @@ syllable. The package itself does not support UTF-8 input in ordinary (PDF)LaTeX; some UTF-8 support is offered by package @code{soulutf8}.") (license license:lppl)))) +(define-public texlive-generic-xstring + (let ((template (simple-texlive-package + "texlive-generic-xstring" + (list "/doc/generic/xstring/" + "/tex/generic/xstring/") + (base32 + "1azpq855kq1l4686bjp8haxim5c8wycz1b6lcg5q7x8kb4g9sppn") + #:trivial? #t))) + (package + (inherit template) + (home-page "http://www.ctan.org/pkg/xstring") + (synopsis "String manipulation for (La)TeX") + (description + "@code{xstring} package provides macros for manipulating strings -- +testing a string's contents, extracting substrings, substitution of substrings +and providing numbers such as string length, position of, or number of +recurrences of, a substring. The package works equally in Plain TeX and LaTeX +(though e-TeX is always required). The strings to be processed may contain +(expandable) macros.") + (license license:lppl1.3c)))) + (define-public texlive-latex-totcount (package (inherit (simple-texlive-package -- cgit v1.2.3 From 5440d6be786d70831ae7474cc8da5270252fa923 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 22 Sep 2022 19:44:04 +0000 Subject: gnu: python-networkx: Update to 2.8.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-networkx): Update to 2.8.6. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 74fa826889..754eff6c44 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9498,13 +9498,13 @@ interfaces in an easy and portable manner.") (define-public python-networkx (package (name "python-networkx") - (version "2.6.2") + (version "2.8.6") (source (origin (method url-fetch) (uri (pypi-uri "networkx" version)) (sha256 - (base32 "1fqrq7gc0nn4rd4zqibw96cap75vb5nlixapkajwawp71jaz21i3")))) + (base32 "19h18f5j79l7kmwm5cvm75fadjgmkzw5m3pyvb9cnq0860q7faxx")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 2070ce84ec3a3c683ff63b984af5cd7a0e813c1c Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 22 Sep 2022 19:44:05 +0000 Subject: gnu: python-aws-sam-translator: Update to 1.51.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-aws-sam-translator): Update to 1.51.0. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2983381cc2..09dbebf44c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -564,13 +564,13 @@ WSGI. This package includes libraries for implementing ASGI servers.") (define-public python-aws-sam-translator (package (name "python-aws-sam-translator") - (version "1.40.0") + (version "1.51.0") (source (origin (method url-fetch) (uri (pypi-uri "aws-sam-translator" version)) (sha256 (base32 - "1hq5ggbzcq4k3ks439hki493w4sasgaxns6j5x57xsj822acalmf")))) + "1ywzchc3nk13xh593j7b14qp3y0fdx7cfbdhnm34p39av66xffac")))) (build-system python-build-system) (arguments `(;; XXX: Tests are not distributed with the PyPI archive, and would -- cgit v1.2.3 From dec74d456365ae2d57213cbf0d0a9fd726600cbe Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 22 Sep 2022 19:44:06 +0000 Subject: gnu: Add python-jschema-to-python. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-jschema-to-python): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 09dbebf44c..2517201722 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -758,6 +758,25 @@ the CloudFormation spec and additional checks. Includes checking valid values for resource properties and best practices.") (license license:expat))) +(define-public python-jschema-to-python + (package + (name "python-jschema-to-python") + (version "1.2.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "jschema_to_python" version)) + (sha256 + (base32 + "14cvaiwm56g0v6p7zviikaa5i9ln3yqy910jmp60hirhbpz19zvn")))) + (build-system python-build-system) + (propagated-inputs (list python-attrs python-jsonpickle python-pbr)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/microsoft/jschema-to-python") + (synopsis "Generate Python classes from a JSON schema.") + (description "This package generates source code for Python classes from a +@url{http://jschema.org,JSchema} JSON schema.") + (license license:expat))) + (define-public python-falcon (package (name "python-falcon") -- cgit v1.2.3 From 56d8907c5ffbe9422f1b159759653715ded9d45a Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 22 Sep 2022 19:44:07 +0000 Subject: gnu: Add python-sarif-om. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-sarif-om): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2517201722..c088f3a8dc 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -777,6 +777,26 @@ for resource properties and best practices.") @url{http://jschema.org,JSchema} JSON schema.") (license license:expat))) +(define-public python-sarif-om + (package + (name "python-sarif-om") + (version "1.0.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "sarif_om" version)) + (sha256 + (base32 + "167gb8xjm0310km3w1s12bqldbv7zyklkr4j5900vq4361ml2pyd")))) + (build-system python-build-system) + (propagated-inputs (list python-attrs)) + (native-inputs (list python-pbr)) + (home-page "https://github.com/microsoft/sarif-python-om") + (synopsis "Python implementation of the SARIF 2.1.0 object model.") + (description "This module contains classes for the object model defined +by the @url{https://sarifweb.azurewebsites.net,Static Analysis Results +Interchange Format (SARIF)} file format.") + (license license:expat))) + (define-public python-falcon (package (name "python-falcon") -- cgit v1.2.3 From 35c92a63245ff214dbd7fe8910b6ef8a01280e18 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 22 Sep 2022 19:44:08 +0000 Subject: gnu: python-cfn-lint: Update to 0.65.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-cfn-lint): Update to 0.65.0. [arguments]<#:phases>: Add 'skip-network-test. [propagated-inputs]: Add python-importlib-resources, python-jschema-to-python, python-sarif-om. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index c088f3a8dc..1f0b43d1ad 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -711,7 +711,7 @@ decode and default on encode. (define-public python-cfn-lint (package (name "python-cfn-lint") - (version "0.54.3") + (version "0.65.0") (home-page "https://github.com/aws-cloudformation/cfn-lint") (source (origin (method git-fetch) @@ -721,11 +721,16 @@ decode and default on encode. (file-name (git-file-name name version)) (sha256 (base32 - "106qf19n2k6sdjkb4006aidibd24qqiw901c1613xgjpnyw4dyl6")))) + "1rfacp39jssrbchrzb49vwrqyzhx5v7jfcgngqnb9r7qfs4bwi3w")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'skip-network-test + (lambda _ + ;; This test requires networking. + (substitute* "test/unit/module/formatters/test_formatters.py" + (("def test_sarif_formatter") "def _test_sarif_formatter")))) (replace 'check (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? @@ -745,11 +750,14 @@ decode and default on encode. (list python-pydot python-mock)) (propagated-inputs (list python-aws-sam-translator + python-importlib-resources + python-jschema-to-python python-jsonpatch python-jsonschema python-junit-xml python-networkx python-pyyaml + python-sarif-om python-six)) (synopsis "Validate CloudFormation templates") (description -- cgit v1.2.3 From d1c3de6583e24135cdd1a72cf2f5ee758182d402 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 22 Sep 2022 19:44:09 +0000 Subject: gnu: python-setools: Update to 4.4.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/selinux.scm (python-setools): Update to 4.4.0. [source, home-page]: Update url. [inputs]: Add python-pyqt. [native-inputs]: Add python-cython. Signed-off-by: Ludovic Courtès --- gnu/packages/selinux.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index b4f074b695..d898b55129 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages swig) #:use-module (gnu packages xml)) @@ -305,16 +306,16 @@ based on required access.") (define-public python-setools (package (name "python-setools") - (version "4.1.1") + (version "4.4.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/TresysTechnology/setools") + (url "https://github.com/SELinuxProject/setools") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0459xxly6zzqc5azcwk3rbbcxvj60dq08f8z6xr05y7dsbb16cg6")))) + "1qvd5j6zwq4fmlahg45swjplhif2z89x7s6pnp07gvcp2fbqdsh5")))) (build-system python-build-system) (arguments `(#:tests? #f ; the test target causes a rebuild @@ -339,10 +340,10 @@ based on required access.") (propagated-inputs (list python-networkx)) (inputs - (list libsepol libselinux)) + (list libsepol libselinux python-pyqt)) (native-inputs - (list bison flex swig)) - (home-page "https://github.com/TresysTechnology/setools") + (list bison flex python-cython swig)) + (home-page "https://github.com/SELinuxProject/setools") (synopsis "Tools for SELinux policy analysis") (description "SETools is a collection of graphical tools, command-line tools, and libraries designed to facilitate SELinux policy analysis.") -- cgit v1.2.3 From 582b1f626f351d0c519c973ba3c49d1c270200bf Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 22 Sep 2022 19:44:10 +0000 Subject: gnu: python-louvain: Fix test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/graph.scm (python-louvain)[source]: Add patch. * gnu/packages/patches/python-louvain-fix-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patch. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/graph.scm | 1 + gnu/packages/patches/python-louvain-fix-test.patch | 15 +++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 gnu/packages/patches/python-louvain-fix-test.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 26fdfe7ca9..789aacb77b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1619,6 +1619,7 @@ dist_patch_DATA = \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-chai-drop-python2.patch \ + %D%/packages/patches/python-louvain-fix-test.patch \ %D%/packages/patches/python-random2-getrandbits-test.patch \ %D%/packages/patches/python-poppler-qt5-fix-build.patch \ %D%/packages/patches/python-w3lib-fix-test-failure.patch \ diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 109ba68675..02c80f0682 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -290,6 +290,7 @@ subplots, multiple-axes, polar charts, and bubble charts.") (origin (method url-fetch) (uri (pypi-uri "python-louvain" version)) + (patches (search-patches "python-louvain-fix-test.patch")) (sha256 (base32 "0sx53l555rwq0z7if8agirjgw4ddp8r9b949wwz8vlig03sjvfmp")))) (build-system python-build-system) diff --git a/gnu/packages/patches/python-louvain-fix-test.patch b/gnu/packages/patches/python-louvain-fix-test.patch new file mode 100644 index 0000000000..2127df681c --- /dev/null +++ b/gnu/packages/patches/python-louvain-fix-test.patch @@ -0,0 +1,15 @@ +https://github.com/taynaud/python-louvain/commit/638804ae636dc65306900ef6518ca0a1c9202566.diff + +diff --git a/test_community.py b/test_community.py +index 1ee1976..566a4b1 100644 +--- a/test_community.py ++++ b/test_community.py +@@ -203,7 +203,7 @@ def test_karate(self): + self.assertAlmostEqual(co.modularity(part, graph), + co.modularity(part_weight, + graph, +- "test_weight"), places=2) ++ "test_weight"), places=1) + + part_res_low = co.best_partition(graph, resolution=0.1) + self.assertTrue( -- cgit v1.2.3 From 3fbe68d9fc700657c57989b7f505bb4fced299de Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 2 Oct 2022 22:01:17 +0200 Subject: gnu: emacs-ag: Use gexps. * gnu/packages/emacs-xyz.scm (emacs-ag)[phases]: Use gexps. {install-info}: Adjust for gexps. Signed-off-by: Efraim Flashner --- gnu/packages/emacs-xyz.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bdef3ed8e5..f93c5abf9a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3026,17 +3026,17 @@ links.") (base32 "1p918y24vcn2pdliaymd210xp9fvhd4a1srqbv2lfiqrh59yjidx")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'make-info - (lambda _ - (with-directory-excursion "docs" - (invoke "make" "info")))) - (add-after 'install 'install-info - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (info (string-append out "/share/info"))) - (install-file "docs/_build/texinfo/agel.info" info))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'make-info + (lambda _ + (with-directory-excursion "docs" + (invoke "make" "info")))) + (add-after 'install 'install-info + (lambda _ + (install-file "docs/_build/texinfo/agel.info" + (string-append #$output "/share/info"))))))) (native-inputs (list python-sphinx texinfo)) (propagated-inputs -- cgit v1.2.3 From f64c80a53843006aa96bbdb3d5286f67c7dc8d8f Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 2 Oct 2022 22:25:56 +0200 Subject: gnu: emacs-ag: Do not propagate the-silver-searcher. * gnu/packages/emacs-xyz.scm (emacs-ag)[phases]: Add phase substitute-ag-path to avoid propagating ag. [inputs]: Add the-silver-searcher. [propagated-inputs]: Remove the-silver-searcher. Signed-off-by: Efraim Flashner --- gnu/packages/emacs-xyz.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f93c5abf9a..0cd9fa1959 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3029,6 +3029,11 @@ links.") (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'substitute-ag-path + (lambda* (#:key inputs #:allow-other-keys) + (make-file-writable "ag.el") + (emacs-substitute-variables "ag.el" + ("ag-executable" (search-input-file inputs "/bin/ag"))))) (add-before 'install 'make-info (lambda _ (with-directory-excursion "docs" @@ -3037,12 +3042,11 @@ links.") (lambda _ (install-file "docs/_build/texinfo/agel.info" (string-append #$output "/share/info"))))))) + (inputs (list the-silver-searcher)) ; 'ag' executable (native-inputs (list python-sphinx texinfo)) (propagated-inputs - (list emacs-dash - emacs-s - the-silver-searcher)) ;'ag' executable + (list emacs-dash emacs-s)) (home-page "https://github.com/Wilfred/ag.el") (synopsis "Front-end for ag (the-silver-searcher) for Emacs") (description "This package provides the ability to use the silver -- cgit v1.2.3 From 2b08945cbb0b9557a798af4be6438e1e97444a0e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Oct 2022 19:31:28 -0400 Subject: gnu: gf2x: Migrate from gforge.inria.fr to gitlab.inria.fr. * gnu/packages/algebra.scm (gf2x) [source]: Fetch from git, adjust URL. [native-inputs]: Add autoconf, automake and libtool. [home-site]: Update URL. --- gnu/packages/algebra.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 183d84c549..4d49e07cc5 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -106,24 +106,26 @@ multiplication routines such as Toom–Cook and the FFT.") (define-public gf2x (package - (name "gf2x") - (version "1.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://gforge.inria.fr/frs/download.php/file/36934/gf2x-" - version ".tar.gz")) - (sha256 - (base32 - "0d6vh1mxskvv3bxl6byp7gxxw3zzpkldrxnyajhnl05m0gx7yhk1")))) - (build-system gnu-build-system) - (synopsis "Arithmetic of polynomials over binary finite fields") - (description - "The gf2x library provides arithmetic of polynomials over finite fields + (name "gf2x") + (version "1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/gf2x/gf2x") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0521pkhwj7x6www4phraqzm9f7rdpi37vvmd33badkba17cdb40d")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake libtool)) + (synopsis "Arithmetic of polynomials over binary finite fields") + (description + "The gf2x library provides arithmetic of polynomials over finite fields of characteristic 2. It implements the multiplication, squaring and greatest common divisor operations.") - (license license:gpl3+) - (home-page "https://gforge.inria.fr/projects/gf2x/"))) + (home-page "https://gitlab.inria.fr/gf2x/gf2x") + (license license:gpl3+))) (define-public cm (package -- cgit v1.2.3 From 795f90ea4e16068f7e5876a0c1e829b23c1827fe Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Oct 2022 20:18:45 -0400 Subject: gnu: gf2x: Update to 1.3.0. * gnu/packages/algebra.scm (gf2x): Update to 1.3.0. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 4d49e07cc5..9648809a4e 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -107,7 +107,7 @@ multiplication routines such as Toom–Cook and the FFT.") (define-public gf2x (package (name "gf2x") - (version "1.2") + (version "1.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -116,7 +116,7 @@ multiplication routines such as Toom–Cook and the FFT.") (file-name (git-file-name name version)) (sha256 (base32 - "0521pkhwj7x6www4phraqzm9f7rdpi37vvmd33badkba17cdb40d")))) + "04g5jg0i4vz46b4w2dvbmahwzi3k6b8g515mfw7im1inc78s14id")))) (build-system gnu-build-system) (native-inputs (list autoconf automake libtool)) (synopsis "Arithmetic of polynomials over binary finite fields") -- cgit v1.2.3 From bcc61c08be8a7a278dcdf72c9cf04a879098761a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Oct 2022 20:15:09 -0400 Subject: gnu: gmp-ecm: Update to 7.0.5. * gnu/packages/algebra.scm (gmp-ecm): Update to 7.0.5. [source]: Fetch from git from gitlab.inria.fr. [arguments]: Use gexps. [phases] {patch-paths}: New phase [native-inputs]: New field. [home-page]: Update URL. --- gnu/packages/algebra.scm | 61 +++++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 9648809a4e..c98b882d09 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -631,35 +631,42 @@ geometry and singularity theory.") (define-public gmp-ecm (package - (name "gmp-ecm") - (version "7.0.4") - (source (origin - (method url-fetch) - (uri - (let ((hash "00c4c691a1ef8605b65bdf794a71539d")) - (string-append "https://gitlab.inria.fr/zimmerma/ecm/" - "uploads/" hash "/ecm-" version - ".tar.gz"))) - (sha256 (base32 - "0hxs24c2m3mh0nq1zz63z3sb7dhy1rilg2s1igwwcb26x3pb7xqc")))) - (build-system gnu-build-system) - (inputs - (list gmp)) - (arguments - `(#:configure-flags '("--enable-shared" - ;; Disable specific assembly routines, which depend - ;; on the subarchitecture of the build machine, - ;; and use gmp instead. - "--disable-asm-redc"))) - (synopsis "Integer factorization library using the elliptic curve method") - (description - "GMP-ECM factors integers using the elliptic curve method (ECM) as well + (name "gmp-ecm") + (version "7.0.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/zimmerma/ecm") + (commit (string-append "git-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "013sfsd5kyh7phhf4namcdndpcp2jnibzxf10f4g89qabr8av63m")))) + (build-system gnu-build-system) + (inputs + (list gmp)) + (arguments + (list + #:configure-flags #~(list "--enable-shared" + ;; Disable specific assembly routines, which + ;; depend on the subarchitecture of the build + ;; machine, and use gmp instead. + "--disable-asm-redc") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "test.ecm" + (("/bin/rm") (which "rm")))))))) + (native-inputs (list autoconf automake libtool)) + (synopsis "Integer factorization library using the elliptic curve method") + (description + "GMP-ECM factors integers using the elliptic curve method (ECM) as well as the P-1 and P+1 algorithms. It provides a library and a stand-alone binary.") - ;; Most files are under lgpl3+, but some are under gpl3+ or gpl2+, - ;; so the combined work is under gpl3+. - (license license:gpl3+) - (home-page "http://ecm.gforge.inria.fr/"))) + (home-page "https://gitlab.inria.fr/zimmerma/ecm") + ;; Most files are under lgpl3+, but some are under gpl3+ or gpl2+, so the + ;; combined work is under gpl3+. + (license license:gpl3+))) (define-public bc (package -- cgit v1.2.3 From 0f4655933121af9cf46df35677702d953c270907 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Oct 2022 20:54:45 -0400 Subject: gnu: gappa: Update to 1.4.1. * gnu/packages/algebra.scm (gappa): Update to 1.4.1. [source]: Fetch from git. [arguments]: Use gexps. [phases]: Delete trailing #t. [native-inputs]: New field. --- gnu/packages/algebra.scm | 62 +++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 30 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index c98b882d09..71a4b3dc9b 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2021 Lars-Dominik Braun +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -1402,42 +1403,43 @@ objects.") (define-public gappa (package - (name "gappa") - (version "1.4.0") - (source (origin - (method url-fetch) - (uri (string-append "https://gappa.gitlabpages.inria.fr/releases/" - "gappa-" version ".tar.gz")) - (sha256 - (base32 - "12x42z901pr05ldmparqdi8sq9s7fxbavhzk2dbq3l6hy247dwbb")))) - (build-system gnu-build-system) - (inputs - (list boost gmp mpfr)) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-remake-shell - (lambda _ - (substitute* "remake.cpp" - (("/bin/sh") (which "sh"))) - #t)) - (replace 'build - (lambda _ (invoke "./remake" "-s" "-d"))) - (replace 'install - (lambda _ (invoke "./remake" "-s" "-d" "install"))) - (replace 'check - (lambda _ (invoke "./remake" "check")))))) - (home-page "http://gappa.gforge.inria.fr/") - (synopsis "Proof generator for arithmetic properties") - (description "Gappa is a tool intended to help verifying and formally + (name "gappa") + (version "1.4.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/gappa/gappa") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vfggzilc0gicrhqypmlx30ccrdkmyg22zzn46988c28xi9rcicj")))) + (build-system gnu-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-remake-shell + (lambda _ + (substitute* "remake.cpp" + (("/bin/sh") (which "sh"))))) + (replace 'build + (lambda _ (invoke "./remake" "-s" "-d"))) + (replace 'install + (lambda _ (invoke "./remake" "-s" "-d" "install"))) + (replace 'check + (lambda _ (invoke "./remake" "check")))))) + (native-inputs (list autoconf automake bison flex libtool)) + (inputs (list boost gmp mpfr)) + (home-page "https://gitlab.inria.fr/gappa/gappa") + (synopsis "Proof generator for arithmetic properties") + (description "Gappa is a tool intended to help verifying and formally proving properties on numerical programs dealing with floating-point or fixed-point arithmetic. It has been used to write robust floating-point filters for CGAL and it is used to certify elementary functions in CRlibm. While Gappa is intended to be used directly, it can also act as a backend prover for the Why3 software verification platform or as an automatic tactic for the Coq proof assistant.") - (license (list license:gpl3+ license:cecill)))) ; either/or + (license (list license:gpl3+ license:cecill)))) ; either/or (define-public givaro (package -- cgit v1.2.3 From 384b98028cb4be0e321320f10a1f3893e66598e0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 3 Oct 2022 09:49:27 -0400 Subject: gnu: gappa: Honor TESTS?. * gnu/packages/algebra.scm (gappa) [phases] {check}: Honor TESTS?. --- gnu/packages/algebra.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 71a4b3dc9b..f94aba1ebf 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1427,7 +1427,9 @@ objects.") (replace 'install (lambda _ (invoke "./remake" "-s" "-d" "install"))) (replace 'check - (lambda _ (invoke "./remake" "check")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./remake" "check"))))))) (native-inputs (list autoconf automake bison flex libtool)) (inputs (list boost gmp mpfr)) (home-page "https://gitlab.inria.fr/gappa/gappa") -- cgit v1.2.3 From efb974a6faedd5af4e450733602357219e7b8cd9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Oct 2022 20:57:31 -0400 Subject: gnu: isl: Remove outdated comment. * gnu/packages/gcc.scm (isl) [source]: Remove outdated comment. --- gnu/packages/gcc.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index bb8a922d53..30b2be1f5a 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1242,7 +1242,6 @@ provides the GNU compiler for the Go programming language.")) (version "0.23") (source (origin (method url-fetch) - ;; Used to be at isl.gforge.inria.fr. (uri (list (string-append "mirror://sourceforge/libisl/isl-" version ".tar.bz2") (string-append %gcc-infrastructure -- cgit v1.2.3 From a001be9664e91ec2d12750c95b10a77316263186 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Oct 2022 21:01:59 -0400 Subject: gnu: mpfi: Use gexps and remove input labels. * gnu/packages/multiprecision.scm (mpfi) [source]: Re-indentation. [configure-flags]: Use gexps. [native-inputs]: Remove labels. --- gnu/packages/multiprecision.scm | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 6c0d163a10..956d45bc1d 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018, 2019, 2021 Efraim Flashner ;;; Copyright © 2021 Vinicius Monego +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,8 +32,9 @@ #:use-module (gnu packages m4) #:use-module (gnu packages gcc) #:use-module (gnu packages texinfo) - #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -159,25 +161,20 @@ precision and correctly rounds the results.") (package (name "mpfi") (version "1.5.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://gforge.inria.fr/frs/download.php" - "/latestfile/181/mpfi-" version ".tgz")) - (sha256 - (base32 "0mismr1ll3wp788dq2n22s5irm0dziy75byyfdwz22kjbmckhf9v")))) + (source (origin + (method url-fetch) + (uri (string-append "https://gforge.inria.fr/frs/download.php" + "/latestfile/181/mpfi-" version ".tgz")) + (sha256 + (base32 + "0mismr1ll3wp788dq2n22s5irm0dziy75byyfdwz22kjbmckhf9v")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;tests are broken in this release - #:configure-flags '("--enable-static=no"))) - (native-inputs - `(("automake" ,automake) - ("autoreconf" ,autoconf) - ("libtool" ,libtool) - ("texinfo" ,texinfo))) + (list #:tests? #f ;tests are broken in this release + #:configure-flags #~(list "--enable-static=no"))) + (native-inputs (list automake autoconf libtool texinfo)) (propagated-inputs - (list gmp ; refers to both - mpfr)) + (list gmp mpfr)) ; refers to both (home-page "https://gforge.inria.fr/projects/mpfi/") (synopsis "C library for arbitrary-precision interval arithmetic") (description -- cgit v1.2.3 From 8ad1978695dfcaf74e06250ebb057851dcd7a217 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Oct 2022 22:07:39 -0400 Subject: gnu: mpfi: Update to 1.5.4-1.b982534. * gnu/packages/multiprecision.scm (mpfi): Update to 1.5.4-1.b982534. [source]: Fetch from git and use latest commit available. [tests?]: Delete argument, enabling test suite. [phases]: New argument. [native-inputs]: New field. --- gnu/packages/multiprecision.scm | 64 +++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 956d45bc1d..b96efed843 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -29,11 +29,14 @@ #:use-module (guix licenses) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) #:use-module (gnu packages m4) #:use-module (gnu packages gcc) #:use-module (gnu packages texinfo) #:use-module (guix download) #:use-module (guix gexp) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -158,27 +161,44 @@ precision and correctly rounds the results.") (home-page "http://www.multiprecision.org/mpc/"))) (define-public mpfi - (package - (name "mpfi") - (version "1.5.4") - (source (origin - (method url-fetch) - (uri (string-append "https://gforge.inria.fr/frs/download.php" - "/latestfile/181/mpfi-" version ".tgz")) - (sha256 - (base32 - "0mismr1ll3wp788dq2n22s5irm0dziy75byyfdwz22kjbmckhf9v")))) - (build-system gnu-build-system) - (arguments - (list #:tests? #f ;tests are broken in this release - #:configure-flags #~(list "--enable-static=no"))) - (native-inputs (list automake autoconf libtool texinfo)) - (propagated-inputs - (list gmp mpfr)) ; refers to both - (home-page "https://gforge.inria.fr/projects/mpfi/") - (synopsis "C library for arbitrary-precision interval arithmetic") - (description - "@acronym{MPFI, Multiple Precision Floating-point Interval} is a portable C + ;; The last release, 1.5.4, lacks source files such as div_ext.c and others + ;; (see: https://gitlab.inria.fr/mpfi/mpfi/-/issues/21721). Use the latest + ;; commit until a new release is made. + (let ((commit "b9825348f1e723ab0988105599b34f1f9cd5ff3e") + (revision "1")) + (package + (name "mpfi") + (version (git-version "1.5.4" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/mpfi/mpfi") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "141pa2ym1azka25bwkx2w1mf6wdcn155ncc45dr5bj5dycw2hj0m")))) + (build-system gnu-build-system) + (arguments + (list #:configure-flags #~(list "--enable-static=no") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "mpfi"))) + (add-after 'unpack 'disable-problematic-tests + (lambda _ + ;; XXX: The tdiv_ext and trec_sqrt tests + ;; segfaults (not reported upstream; accounts on + ;; their gitlab apparently require to be + ;; manually created). + (setenv "XFAIL_TESTS" "tdiv_ext trec_sqrt")))))) + (native-inputs (list automake autoconf libtool texinfo)) + (propagated-inputs + (list gmp mpfr)) ; refers to both + (home-page "https://gitlab.inria.fr/mpfi/mpfi") + (synopsis "C library for arbitrary-precision interval arithmetic") + (description + "@acronym{MPFI, Multiple Precision Floating-point Interval} is a portable C library for arbitrary-precision interval arithmetic, with intervals represented using MPFR reliable floating-point numbers. It's based on the @acronym{GMP, GNU Multiple Precision Arithmetic} and GNU@tie{}@acronym{MPFR, Multiple Precision @@ -187,7 +207,7 @@ Floating-Point Reliably} libraries. The purpose of arbitrary-precision interval arithmetic is to get results that are both guaranteed, thanks to interval computation, and accurate, thanks to multiple-precision arithmetic.") - (license lgpl2.1+))) + (license lgpl2.1+)))) (define-public irram (package -- cgit v1.2.3 From a93781b83cfc83cdd74c11bf4931cca4002c2048 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Oct 2022 22:23:09 -0400 Subject: gnu: Remove unused scotch patches. * gnu/packages/patches/scotch-build-parallelism.patch: Delete file. * gnu/packages/patches/scotch-integer-declarations.patch: Likewise. * gnu/local.mk (dist_patch_DATA): De-register them. --- gnu/local.mk | 2 -- .../patches/scotch-build-parallelism.patch | 39 ---------------------- .../patches/scotch-integer-declarations.patch | 37 -------------------- 3 files changed, 78 deletions(-) delete mode 100644 gnu/packages/patches/scotch-build-parallelism.patch delete mode 100644 gnu/packages/patches/scotch-integer-declarations.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 789aacb77b..e9178923af 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1823,8 +1823,6 @@ dist_patch_DATA = \ %D%/packages/patches/scalapack-gcc-10-compilation.patch \ %D%/packages/patches/scheme48-tests.patch \ %D%/packages/patches/scons-test-environment.patch \ - %D%/packages/patches/scotch-build-parallelism.patch \ - %D%/packages/patches/scotch-integer-declarations.patch \ %D%/packages/patches/screen-hurd-path-max.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seed-webkit.patch \ diff --git a/gnu/packages/patches/scotch-build-parallelism.patch b/gnu/packages/patches/scotch-build-parallelism.patch deleted file mode 100644 index a669f1dbeb..0000000000 --- a/gnu/packages/patches/scotch-build-parallelism.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fixes make with -j, otherwise scotch.h may not be generated by the time make -tries to compile library_graph_diam.o et al. - -Reported upstream at -https://gforge.inria.fr/tracker/index.php?func=detail&aid=21651&group_id=248&atid=1081 - -diff --git a/src/libscotch/Makefile b/src/libscotch/Makefile -index 9898894..b0ee14c 100644 ---- a/src/libscotch/Makefile -+++ b/src/libscotch/Makefile -@@ -2229,6 +2229,28 @@ library_graph_color_f$(OBJ) : library_graph_color_f.c \ - common.h \ - scotch.h - -+library_graph_diam$(OBJ) : library_graph_diam.c \ -+ module.h \ -+ common.h \ -+ graph.h \ -+ scotch.h -+ -+library_graph_diam_f$(OBJ) : library_graph_diam.c \ -+ module.h \ -+ common.h \ -+ scotch.h -+ -+library_graph_induce$(OBJ) : library_graph_diam.c \ -+ module.h \ -+ common.h \ -+ graph.h \ -+ scotch.h -+ -+library_graph_induce_f$(OBJ) : library_graph_diam.c \ -+ module.h \ -+ common.h \ -+ scotch.h -+ - library_graph_io_chac$(OBJ) : library_graph_io_chac.c \ - module.h \ - common.h \ diff --git a/gnu/packages/patches/scotch-integer-declarations.patch b/gnu/packages/patches/scotch-integer-declarations.patch deleted file mode 100644 index 978625c1c0..0000000000 --- a/gnu/packages/patches/scotch-integer-declarations.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/libscotch/library.h b/src/libscotch/library.h -index 1891c19..ecc0533 100644 ---- a/src/libscotch/library.h -+++ b/src/libscotch/library.h -@@ -67,6 +67,8 @@ - - /*+ Integer type. +*/ - -+#include -+ - typedef DUMMYIDX SCOTCH_Idx; - - typedef DUMMYINT SCOTCH_Num; -diff --git a/src/libscotchmetis/library_metis.h b/src/libscotchmetis/library_metis.h -index e6767e1..04e71c3 100644 ---- a/src/libscotchmetis/library_metis.h -+++ b/src/libscotchmetis/library_metis.h -@@ -99,6 +99,7 @@ typedef enum { - */ - - #ifndef SCOTCH_H /* In case "scotch.h" not included before */ -+#include - typedef DUMMYINT SCOTCH_Num; - #endif /* SCOTCH_H */ - -diff --git a/src/libscotchmetis/library_parmetis.h b/src/libscotchmetis/library_parmetis.h -index 6d2f0b0..3c803fc 100644 ---- a/src/libscotchmetis/library_parmetis.h -+++ b/src/libscotchmetis/library_parmetis.h -@@ -106,6 +106,7 @@ typedef enum { - */ - - #ifndef SCOTCH_H /* In case "scotch.h" not included before */ -+#include - typedef DUMMYINT SCOTCH_Num; - #endif /* SCOTCH_H */ - -- cgit v1.2.3 From 1390e38264568380a37ff57187b49da4e34ad19a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Oct 2022 22:25:06 -0400 Subject: gnu: ocaml-dose3: Migrate from gforce.inria.fr. * gnu/packages/ocaml.scm (ocaml-dose3) [source]: Fetch from git from inill's gitlab instance. --- gnu/packages/ocaml.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 12d7a83836..01bbbe1831 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -648,11 +648,14 @@ underlying solvers like Cplex, Gurobi, Lpsolver, Glpk, CbC, SCIP or WBO.") (name "ocaml-dose3") (version "5.0.1") (source (origin - (method url-fetch) - (uri "https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz") + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/irill/dose3") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm")) + "0dxkw37gj8z45kd0dnrlfgpj8yycq0dphs8kjm9kvq9xc8rikxp3")) (patches (search-patches "ocaml-dose3-add-unix-dependency.patch" -- cgit v1.2.3 From 67e9513e40715083ad23089ff093cf47565f1eb7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 3 Oct 2022 09:33:56 -0400 Subject: gnu: r-spams: Update to 2.6.1. * gnu/packages/statistics.scm (r-spams): Update to 2.6.1. [source]: Migrate from gforge.inria.fr to gitlab.inria.fr, fetching from git. [phases]: Use gexps. {patch-paths, mkdist}: New phases. {no-mtune}: Delete trailing #t. [native-inputs]: New field. [home-page]: Update URL. --- gnu/packages/statistics.scm | 72 ++++++++++++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 6e57eb2f4f..7a9c4414b1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017 Alex Kost ;;; Copyright © 2018 Alex Branham ;;; Copyright © 2020 Tim Howes -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Lars-Dominik Braun ;;; Copyright © 2021 Frank Pursel @@ -73,6 +73,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) + #:use-module (gnu packages ocaml) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -83,6 +84,7 @@ #:use-module (gnu packages shells) #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) + #:use-module (gnu packages swig) #:use-module (gnu packages tcl) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) @@ -4407,31 +4409,55 @@ from within R.") (define-public r-spams (package (name "r-spams") - (version "2.6-2017-03-22") - (source - (origin - (method url-fetch) - ;; Use the ‘Latest version’ link for a stable URI across releases. - (uri (string-append "https://gforge.inria.fr/frs/download.php/" - "latestfile/4531/spams-R-v" version ".tar.gz")) - (sha256 - (base32 - "13z2293jixf1r9g8dyy856xrhvpjr2ln2n9smn6644126r9hmhkx")))) + (version "2.6.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/thoth/spams-devel") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qvj87fw4sm54c7dvhxjgmgvnyyrrz9fk6dqp3ak0gwgb42gqh60")))) (build-system r-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "spams") #t)) - ;; Don't tune for the building machine. - (add-after 'chdir 'no-mtune - (lambda _ - (substitute* "src/Makevars" - (("-mtune=native") "")) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'patch-generated-file-shebangs 'patch-paths + (lambda _ + (substitute* (cons* "swig/setRelease" + "swig/R/docmatlab2R" + "swig/R/mkdist" + (find-files "." "(^mk|\\.sh$)")) + (("/bin/pwd") "pwd") + (("/bin/rm") "rm")))) + (add-after 'patch-paths 'mkdist + (lambda _ + (chdir "swig/R") + (setenv "TEXINPUTS" (string-append (getcwd) "/../../doc:")) + (substitute* "mkdist" + (("^SWIG=.*") + (string-append "SWIG=" (which "swig"))) + (("^../mkdoc") "")) ;requires texlive-aeguill + (invoke "./mkdist") + (chdir "dist/spams-R/spams"))) + ;; Don't tune for the building machine. + (add-after 'mkdist 'no-mtune + (lambda _ + (substitute* "src/Makevars" + (("-mtune=native") ""))))))) + (native-inputs + (list hevea + perl + swig + ;;texlive-aeguill ;;FIXME: package me! + texlive-base + texlive-jknappen)) (propagated-inputs - (list r-lattice r-matrix)) - (home-page "https://spams-devel.gforge.inria.fr") + (list r-lattice + r-matrix)) + (home-page "https://gitlab.inria.fr/thoth/spams-devel/") (synopsis "Toolbox for solving sparse estimation problems") (description "SPAMS (SPArse Modeling Software) is an optimization toolbox for solving various sparse estimation problems. It includes tools for the -- cgit v1.2.3 From 06201b76e5ef811245d627706c90117a0e9813d4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 3 Oct 2022 11:12:55 -0400 Subject: gnu: Remove ocaml-craml. The package doesn't build from source and is unmaintained according to its maintainer: https://github.com/realworldocaml/craml/pull/8#issuecomment-529235628. * gnu/packages/ocaml.scm (ocaml-craml): Delete variable. --- gnu/packages/ocaml.scm | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 01bbbe1831..4bc159481e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5049,39 +5049,6 @@ yojson package. The program @code{atdgen} can be used to derive OCaml-JSON serializers and deserializers from type definitions.") (license license:bsd-3))) -(define-public ocaml-craml - (package - (name "ocaml-craml") - (version "1.0.0") - (home-page "https://github.com/realworldocaml/craml") - (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append home-page ".git")) - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "197xjp4vmzdymf2ndinw271ihpf45h04mx8gqj8ypspxdr5fj1a5")))) - (build-system dune-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'upgrade - (lambda _ - (invoke "dune" "upgrade") - #t))))) - (inputs - (list ocaml-fmt ocaml-astring ocaml-logs ocaml-cmdliner)) - (synopsis - "CRAM-testing framework for testing command line applications") - (description "CRAM is a is functional testing framework for command line -applications. @code{craml} is freely inspired by the -Mercurial's @code{https://www.selenic.com/blog/?p=663, unified test -format}. @code{craml} is released as a single binary (called @code{craml}).") - (license license:isc))) - (define-public ocaml-merlin-lib (package (name "ocaml-merlin-lib") -- cgit v1.2.3 From 96b560ac8b95ad3547534c97eb037027988e29c7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:46 +0200 Subject: gnu: r-dearseq: Update to 1.8.4. * gnu/packages/bioconductor.scm (r-dearseq): Update to 1.8.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 10b70bab06..81a272142d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2370,14 +2370,14 @@ used visualizations.") (define-public r-dearseq (package (name "r-dearseq") - (version "1.8.1") + (version "1.8.4") (source (origin (method url-fetch) (uri (bioconductor-uri "dearseq" version)) (sha256 (base32 - "1f144k5gsclcmsnlsbisr2mivk91dbkci83wx1kznw6i15p4cpj1")))) + "1zsqsgf243gq1k57mw11d6apzccnq531mwg2wzw9mjrs1m0jsfzl")))) (build-system r-build-system) (propagated-inputs (list r-compquadform -- cgit v1.2.3 From 29a947216c2bab9471504add000531811de9252a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:51 +0200 Subject: gnu: r-annotationforge: Update to 1.38.1. * gnu/packages/bioconductor.scm (r-annotationforge): Update to 1.38.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 81a272142d..55d358c748 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3279,14 +3279,14 @@ used by @code{ensembldb}, @code{Organism.dplyr}, and other packages.") (define-public r-annotationforge (package (name "r-annotationforge") - (version "1.38.0") + (version "1.38.1") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationForge" version)) (sha256 (base32 - "18rcfadxdaggyjj3rj17nbvgddlqs6zlr5jmq9a02kin59czvzz8")))) + "0lcr79a3570h7zg4z691gxg2vlyqnars5811q0clzinbmq7b4x3v")))) (properties `((upstream-name . "AnnotationForge"))) (build-system r-build-system) -- cgit v1.2.3 From 15243c2f8458da002a2fb621b4e6c305ffc0dee3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:52 +0200 Subject: gnu: r-biostrings: Update to 2.64.1. * gnu/packages/bioconductor.scm (r-biostrings): Update to 2.64.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 55d358c748..bce4c030b0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3566,13 +3566,13 @@ objects.") (define-public r-biostrings (package (name "r-biostrings") - (version "2.64.0") + (version "2.64.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Biostrings" version)) (sha256 (base32 - "1sz52hz89l9w2y2bvyis7kczslk1xnskls9l2bn1s3dhnjzdzhg8")))) + "1wk8nlmp6f6fsjrcb4fb48s3ay38yywwad748i6lfkkcw2pdfw33")))) (properties `((upstream-name . "Biostrings"))) (build-system r-build-system) -- cgit v1.2.3 From 038eeeaf2a521f943fa291610bf6a1740eb56b57 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:52 +0200 Subject: gnu: r-chipseeker: Update to 1.32.1. * gnu/packages/bioconductor.scm (r-chipseeker): Update to 1.32.1. [propagated-inputs]: Add r-ggvenndiagram. --- gnu/packages/bioconductor.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bce4c030b0..c70c08936a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3698,13 +3698,13 @@ analysis.") (define-public r-chipseeker (package (name "r-chipseeker") - (version "1.32.0") + (version "1.32.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPseeker" version)) (sha256 (base32 - "001f85nk4myk9vgs05inlj2dfby4802p1iyzkfqg332yk52gsbl7")))) + "0l2514wvlc8q7n1zjzfrghdg372sp73z39204bkif3g6pdkcvbcf")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -3718,6 +3718,7 @@ analysis.") r-genomicranges r-genomicfeatures r-ggplot2 + r-ggvenndiagram r-gplots r-gtools r-dplyr -- cgit v1.2.3 From c82320aa21a78fd5494ea9d8aa24b1f8ee6963ea Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:52 +0200 Subject: gnu: r-complexheatmap: Update to 2.12.1. * gnu/packages/bioconductor.scm (r-complexheatmap): Update to 2.12.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c70c08936a..02e417d98d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3771,14 +3771,14 @@ experiments.") (define-public r-complexheatmap (package (name "r-complexheatmap") - (version "2.12.0") + (version "2.12.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ComplexHeatmap" version)) (sha256 (base32 - "15b49vlkl89prcw70mlw066z0gxhs26x8dpfn6qr3gz7hihygs65")))) + "0b4p3ijhdcydfp0j58xlb5dn7d3m2x420n91rl9diqpg4r2gl0s8")))) (properties `((upstream-name . "ComplexHeatmap"))) (build-system r-build-system) -- cgit v1.2.3 From ba6a3e7d39b2fe0dba38c16ee151f6115aa4a22f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:52 +0200 Subject: gnu: r-gage: Update to 2.46.1. * gnu/packages/bioconductor.scm (r-gage): Update to 2.46.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 02e417d98d..1b89d751fe 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4211,14 +4211,14 @@ microarrays or GRanges for sequencing data.") (define-public r-gage (package (name "r-gage") - (version "2.46.0") + (version "2.46.1") (source (origin (method url-fetch) (uri (bioconductor-uri "gage" version)) (sha256 (base32 - "03hx188h98qrbpjlf8v9sg2vqyfv49rp4c18ir11pg6hwqqrxh7b")))) + "01y04jcy7a9fksyhj0nq37n1inkrpqf4qv117lflvipbx0dsw4gl")))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi r-go-db r-graph r-keggrest)) -- cgit v1.2.3 From a15ad5ebe3ecbf9fb45b827086d5270db8bca4b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:52 +0200 Subject: gnu: r-genomeinfodb: Update to 1.32.4. * gnu/packages/bioconductor.scm (r-genomeinfodb): Update to 1.32.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1b89d751fe..cb330e90a9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4329,13 +4329,13 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.32.3") + (version "1.32.4") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "17nwcq2ivj3bdibdywfyjq4n6z0djispbh9ahqa55sp31ksq41xh")))) + "0z2bqr0zrl3r2kcqs72ny8p1psf8w1sgbr7qjjknxdv1qp8m2j7v")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) -- cgit v1.2.3 From a16c87fae16334740cab2a17fad22ace64a7698f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:53 +0200 Subject: gnu: r-genomicfeatures: Update to 1.48.4. * gnu/packages/bioconductor.scm (r-genomicfeatures): Update to 1.48.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cb330e90a9..523e7a6c33 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4389,13 +4389,13 @@ alignments.") (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.48.3") + (version "1.48.4") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "0f14p1ma2y8l60p9sxmh5j0axws9by1cznczb2jxipphpb4slpl1")))) + "15kn5lmdqp7rsh2zlixj7ashsqnv50bs36hapw36qbaz9vgvim4v")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) -- cgit v1.2.3 From 039d894b9d7e05e624a57eeae9e213fc717e8eb7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:53 +0200 Subject: gnu: r-limma: Update to 3.52.4. * gnu/packages/bioconductor.scm (r-limma): Update to 3.52.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 523e7a6c33..a450e06bd5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4693,13 +4693,13 @@ Binomial data via estimation of latent structure in the natural parameter.") (define-public r-limma (package (name "r-limma") - (version "3.52.2") + (version "3.52.4") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "0m8p8pqmf48f2zdf3qs66hmychbc58g2hfg1wyxzsv180m6xkk65")))) + "14xy3qyra2crz31sxgz768mhnhhvcpfhfcigf4xsii643lqcz75h")))) (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 309cfcedca91e56e613f92c68b345686226fcc73 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:53 +0200 Subject: gnu: r-zellkonverter: Update to 1.6.5. * gnu/packages/bioconductor.scm (r-zellkonverter): Update to 1.6.5. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a450e06bd5..a3128b77e7 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6569,13 +6569,13 @@ libraries for systems that do not have these available via other means.") (define-public r-zellkonverter (package (name "r-zellkonverter") - (version "1.6.3") + (version "1.6.5") (source (origin (method url-fetch) (uri (bioconductor-uri "zellkonverter" version)) (sha256 - (base32 "0l6v7a2zyxpq2w3vm85z439ldi3ld3pkc3wx95a1vxzbr31cpdzz")))) + (base32 "0rxpjkisjj1xjchjjm72k8za5hn48wbdahmbllljvxm5ii6k36k6")))) (properties `((upstream-name . "zellkonverter"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e581479be804490ad0f221cdd4532ade2206a71b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:53 +0200 Subject: gnu: r-diffbind: Update to 3.6.4. * gnu/packages/bioconductor.scm (r-diffbind): Update to 3.6.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a3128b77e7..54aa7ca5ff 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6806,14 +6806,14 @@ signal in the input, that lead to spurious peaks during peak calling.") (define-public r-diffbind (package (name "r-diffbind") - (version "3.6.1") + (version "3.6.4") (source (origin (method url-fetch) (uri (bioconductor-uri "DiffBind" version)) (sha256 (base32 - "0izlk8vmmal4dj0bjxhgzr25arfa9zgdv06rm70w7ylr0gl84pzr")))) + "035xczcir4q7yj6x9m3yq3dpvbfas9la925avni8147cwhybagqr")))) (properties `((upstream-name . "DiffBind"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 41f029c12a043b656d53bc68fdbe447977656509 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:53 +0200 Subject: gnu: r-scaledmatrix: Update to 1.4.1. * gnu/packages/bioconductor.scm (r-scaledmatrix): Update to 1.4.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 54aa7ca5ff..de2cdc593a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7668,14 +7668,14 @@ achieved for all methods using the BiocParallel framework.") (define-public r-scaledmatrix (package (name "r-scaledmatrix") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ScaledMatrix" version)) (sha256 (base32 - "0p6065mbn77hphpjfchz3r3raspl127f11n39mwh9bih4zg375cl")))) + "05gxr41nb1jqhv357rfha4062kszvrmkr36mhkjsf7kgnzf0p8hz")))) (properties `((upstream-name . "ScaledMatrix"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From a047448aaddd5e6550b1aa3c0d2637609f1625da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:54 +0200 Subject: gnu: r-treeio: Update to 1.20.2. * gnu/packages/bioconductor.scm (r-treeio): Update to 1.20.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index de2cdc593a..9f56f30163 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7694,14 +7694,14 @@ multiplication.") (define-public r-treeio (package (name "r-treeio") - (version "1.20.0") + (version "1.20.2") (source (origin (method url-fetch) (uri (bioconductor-uri "treeio" version)) (sha256 (base32 - "1hc5m0b2qqxrh3z0inny2jizrpn9d4yn9pn3k1h18xb4ggyijyla")))) + "1jymbyl82n88ckw0nkbj72rvlxbk5m7xmcmq3fyi885z7aasc0x1")))) (properties `((upstream-name . "treeio"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 1cb30ba7146e2e16e8cf869f1c723ff9534c0d1a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:54 +0200 Subject: gnu: r-ggtree: Update to 3.4.4. * gnu/packages/bioconductor.scm (r-ggtree): Update to 3.4.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9f56f30163..76fe9b1c6b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7726,14 +7726,14 @@ platform for merging tree with associated data and converting file formats.") (define-public r-ggtree (package (name "r-ggtree") - (version "3.4.0") + (version "3.4.4") (source (origin (method url-fetch) (uri (bioconductor-uri "ggtree" version)) (sha256 (base32 - "033r748npv0l72yb9sk6lqnj0l7cd36ykf788145qv8ck5i2gyk4")))) + "0h1qlhn4rj7jgd9vrja7lykaglyfvnzwkghvsqj1mvp4niwli7y5")))) (properties `((upstream-name . "ggtree"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2b4a7fa22ec57bb6023ae0fb7a28f4b1c0e47e1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:54 +0200 Subject: gnu: r-residualmatrix: Update to 1.6.1. * gnu/packages/bioconductor.scm (r-residualmatrix): Update to 1.6.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 76fe9b1c6b..0ebae95f15 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8216,14 +8216,14 @@ interactive exploration of results.") (define-public r-residualmatrix (package (name "r-residualmatrix") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ResidualMatrix" version)) (sha256 (base32 - "1pjr3gva0jwj2pgqr4k4nl1ir1153hhrk1d400r30w0di472hns4")))) + "1530706c7b53h9m8smgnaj63rgdbm3hd09n7jwy6zc0y6qcffckd")))) (properties `((upstream-name . "ResidualMatrix"))) (build-system r-build-system) -- cgit v1.2.3 From 842431a036e8d9bff6519c0ad2c7986122e50bac Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:54 +0200 Subject: gnu: r-dose: Update to 3.22.1. * gnu/packages/bioconductor.scm (r-dose): Update to 3.22.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0ebae95f15..f606439884 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -9350,14 +9350,14 @@ to multiple hypothesis correction.") (define-public r-dose (package (name "r-dose") - (version "3.22.0") + (version "3.22.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DOSE" version)) (sha256 (base32 - "11lg4ql0bi54p2wg3z1dw9rwqai37khgcqbs4cb7zf67ml8jadwp")))) + "1mch26kddrhhzgi4bssnyy7bvdhprrncmvxl6zn1cq7g07p5765i")))) (properties `((upstream-name . "DOSE"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 83f0c1a39d60048e00691205ad42b4a0ab5efc70 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:55 +0200 Subject: gnu: r-enrichplot: Update to 1.16.2. * gnu/packages/bioconductor.scm (r-enrichplot): Update to 1.16.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f606439884..61aa7eac49 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -9385,14 +9385,14 @@ data.") (define-public r-enrichplot (package (name "r-enrichplot") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (bioconductor-uri "enrichplot" version)) (sha256 (base32 - "17ln1wbkq8sp7jw0dpkccj5qcsl382sgd7zic04dk99z9ag3mh02")))) + "0qh7bci3rn6y2fl45izrdb62jcm6j0zxxg4pyp4mvvgjvka5lnss")))) (build-system r-build-system) (propagated-inputs (list r-aplot -- cgit v1.2.3 From 597106f23444b799e30e6a1d183ec4e541ad97e1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:55 +0200 Subject: gnu: r-rgadem: Update to 2.44.1. * gnu/packages/bioconductor.scm (r-rgadem): Update to 2.44.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 61aa7eac49..950796458b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -9807,14 +9807,14 @@ fitting a three-component normal mixture on z-scores.") (define-public r-rgadem (package (name "r-rgadem") - (version "2.44.0") + (version "2.44.1") (source (origin (method url-fetch) (uri (bioconductor-uri "rGADEM" version)) (sha256 (base32 - "013xdwz0c3n0n9hxf8kkx570qry961pgdjsp023531pl5ww2ing4")))) + "052z9iavnmkaz9jzz7ycpb8z7qqq3s5k6a04icrwl00wff7zqa2q")))) (properties `((upstream-name . "rGADEM"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 23e42e77d43d245044d34b809e11fa275e8f71e8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:55 +0200 Subject: gnu: r-rsubread: Update to 2.10.5. * gnu/packages/bioconductor.scm (r-rsubread): Update to 2.10.5. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 950796458b..2c1d2e5883 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -11502,14 +11502,14 @@ annotations.") (define-public r-rsubread (package (name "r-rsubread") - (version "2.10.4") + (version "2.10.5") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsubread" version)) (sha256 (base32 - "155h25gbagqns7wpriil17li0jkdd1z1pcz0dlnikdqj4saf97rl")))) + "0n9qqbkj2lgxkia6kfpfz06wbc1lvw24qyvn88f48zw5nh0rsrs2")))) (properties `((upstream-name . "Rsubread"))) (build-system r-build-system) (inputs (list zlib)) -- cgit v1.2.3 From 1c3750c9eacc8b2ca3872551150579549d895a5b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:55 +0200 Subject: gnu: r-ncdfflow: Update to 2.42.1. * gnu/packages/bioconductor.scm (r-ncdfflow): Update to 2.42.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2c1d2e5883..2926e4cbb8 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -11704,14 +11704,14 @@ change point detection.") (define-public r-ncdfflow (package (name "r-ncdfflow") - (version "2.42.0") + (version "2.42.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ncdfFlow" version)) (sha256 (base32 - "18ba8rygcd1ys150pk38r4w5lxwm6sl76zkd294yg847dygsqa4m")))) + "0759xvkp22dnbhq5wpgvpk8p61w0d50r5jrbh9n7sj8sga4lvvv7")))) (properties `((upstream-name . "ncdfFlow"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From f82d20caaee86d8c8fd91e07181264fce398b70a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:56 +0200 Subject: gnu: r-ggcyto: Update to 1.24.1. * gnu/packages/bioconductor.scm (r-ggcyto): Update to 1.24.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2926e4cbb8..bbbe7e9fa4 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -11735,14 +11735,14 @@ manipulation of flow cytometry data.") (define-public r-ggcyto (package (name "r-ggcyto") - (version "1.24.0") + (version "1.24.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ggcyto" version)) (sha256 (base32 - "0sycyvdpa77mykzr709a7padh6478zmnzapibbq90qkc7bxnj359")))) + "1cw60x78vqzjmgb5xd3sxyz6zwdaffp3byk34z8d4b3wkh530325")))) (properties `((upstream-name . "ggcyto"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From eed76ad91a4ccdd183c856263f079ca625c46551 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:56 +0200 Subject: gnu: r-flowviz: Update to 1.60.2. * gnu/packages/bioconductor.scm (r-flowviz): Update to 1.60.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bbbe7e9fa4..6a589f46eb 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -11772,14 +11772,14 @@ statistics to the plot.") (define-public r-flowviz (package (name "r-flowviz") - (version "1.60.0") + (version "1.60.2") (source (origin (method url-fetch) (uri (bioconductor-uri "flowViz" version)) (sha256 (base32 - "175ygncrv6q6mb8pahixs89m9wm6hdpzx489gc9s8lgad2vrvz8f")))) + "08rwzc26jns0wwjsqqmf60bpxsckr5x8skdn9iwl8grp81npcc95")))) (properties `((upstream-name . "flowViz"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From bceed10243ef9c11010d6d1fffaa79afe4954542 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:56 +0200 Subject: gnu: r-flowstats: Update to 4.8.2. * gnu/packages/bioconductor.scm (r-flowstats): Update to 4.8.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6a589f46eb..150d816933 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -11920,14 +11920,14 @@ matches the flowJo analysis.") (define-public r-flowstats (package (name "r-flowstats") - (version "4.8.0") + (version "4.8.2") (source (origin (method url-fetch) (uri (bioconductor-uri "flowStats" version)) (sha256 (base32 - "1jbc92ah2mlpnd7v3k0207v4qz3rg9g9yy6r6y0s0cc5nifdyhwj")))) + "1x01gg5ifxh3wp0cp5a23lr9v6l9q5qg8145q2pgn904jkx5wldc")))) (properties `((upstream-name . "flowStats"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 10c006c21d42d78b6b0dbe4e1ef602a31fc829e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:56 +0200 Subject: gnu: r-opencyto: Update to 2.8.4. * gnu/packages/bioconductor.scm (r-opencyto): Update to 2.8.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 150d816933..59f4c35a9e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -11958,14 +11958,14 @@ package.") (define-public r-opencyto (package (name "r-opencyto") - (version "2.8.0") + (version "2.8.4") (source (origin (method url-fetch) (uri (bioconductor-uri "openCyto" version)) (sha256 (base32 - "1nz5fra0jf70jwyfbcz5ksnz5xb62vfnfwfasr0zwwvjvmmvrs1y")))) + "0fa3hbbrjw458dhmxdjypcjgyxmphp9kdr3r62qqf803i4wsxfk0")))) (properties `((upstream-name . "openCyto"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e30b2aeaa213601e7743e7b4d8fb88b8ed98e883 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:56 +0200 Subject: gnu: r-cytoml: Update to 2.8.1. * gnu/packages/bioconductor.scm (r-cytoml): Update to 2.8.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 59f4c35a9e..09c3b9b3bb 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -12002,14 +12002,14 @@ sequential way to mimic the manual gating strategy.") (define-public r-cytoml (package (name "r-cytoml") - (version "2.8.0") + (version "2.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "CytoML" version)) (sha256 (base32 - "0vp7advfh1d8596hjpzayasjhga4mx0l104sgz2asscbrjm4v7rr")))) + "01yzdljpyq92bv318b5qs29f190226zwbqjnckvxmbb0k8m7s5hw")))) (properties `((upstream-name . "CytoML"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 8441c1f9ea19aab1a69290e2a9b7b0a13808e999 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:57 +0200 Subject: gnu: r-bioccheck: Update to 1.32.1. * gnu/packages/bioconductor.scm (r-bioccheck): Update to 1.32.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 09c3b9b3bb..cb0bcbd893 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -13761,13 +13761,13 @@ monograph.") (define-public r-bioccheck (package (name "r-bioccheck") - (version "1.32.0") + (version "1.32.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocCheck" version)) (sha256 (base32 - "1k1gxzmxx26hmwdxgagv93mv4jwyygkk8703ds6nvryzhqffzkbc")))) + "0bq4xrz1spp0bmbccxydkw6yw03by5dysz85mn152ab6xixm52lw")))) (properties `((upstream-name . "BiocCheck"))) (build-system r-build-system) -- cgit v1.2.3 From 9af834ad37af4acfa451177f3b4d5e4a5063756a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:57 +0200 Subject: gnu: r-biocviews: Update to 1.64.1. * gnu/packages/bioconductor.scm (r-biocviews): Update to 1.64.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cb0bcbd893..fbc4a679fd 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -13836,13 +13836,13 @@ functionality.") (define-public r-biocviews (package (name "r-biocviews") - (version "1.64.0") + (version "1.64.1") (source (origin (method url-fetch) (uri (bioconductor-uri "biocViews" version)) (sha256 (base32 - "1lahla53awdqiglfiygbxg5pkzfabym7n5abgyp1nvqsvsj0g126")))) + "0ixcx9qqpmwmnhml3klk5z075km8g2l4q0iqc1dbniga87qgyl38")))) (properties `((upstream-name . "biocViews"))) (build-system r-build-system) -- cgit v1.2.3 From 78ff15ae42266465bdf3cff2a0ec052563d07095 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:57 +0200 Subject: gnu: r-biocpkgtools: Update to 1.14.1. * gnu/packages/bioconductor.scm (r-biocpkgtools): Update to 1.14.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index fbc4a679fd..3311154b72 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -14032,14 +14032,14 @@ gene selection, testing relationships, and so on.") (define-public r-biocpkgtools (package (name "r-biocpkgtools") - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocPkgTools" version)) (sha256 (base32 - "1v0824vmg49q9lh0igdyniryyknw6vmh462rn25kmg9hdna0w99h")))) + "0akryshjdn227a8ir8r0lb59v060h58rhy5vjmdxax8p81ajzxkd")))) (properties `((upstream-name . "BiocPkgTools"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d66a4669091e592af7670e0521517131e6f82f10 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:58 +0200 Subject: gnu: r-hdf5array: Update to 1.24.2. * gnu/packages/bioconductor.scm (r-hdf5array): Update to 1.24.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3311154b72..a3cfe16d17 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -14578,14 +14578,14 @@ provided.") (define-public r-hdf5array (package (name "r-hdf5array") - (version "1.24.1") + (version "1.24.2") (source (origin (method url-fetch) (uri (bioconductor-uri "HDF5Array" version)) (sha256 (base32 - "1r1lg7k60qgb489xkypd4gvm1fmdlihvylb5va6xj58ipndbfday")))) + "1dzx5463ig3ag72a47slc4jbq5id11w77cj0zgzr85h0dbxklrr9")))) (properties `((upstream-name . "HDF5Array"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 1527d2e9df7ddd83df5d2f40deaf549878cf22ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:58 +0200 Subject: gnu: r-scuttle: Update to 1.6.3. * gnu/packages/bioconductor.scm (r-scuttle): Update to 1.6.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a3cfe16d17..5ccf327c21 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -14979,14 +14979,14 @@ cell types to infer the cell of origin of each single cell independently.") (define-public r-scuttle (package (name "r-scuttle") - (version "1.6.2") + (version "1.6.3") (source (origin (method url-fetch) (uri (bioconductor-uri "scuttle" version)) (sha256 (base32 - "0nnmq3wf436xaw4arc4y3ldvn6ilsg52xzbccmid0icb8z3y2kzn")))) + "1w1jy5fqkp2d03lp84d49fsksnl0pcg0wgqyd49d5k1mipdw4671")))) (properties `((upstream-name . "scuttle"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From cc719399c98f133a951977867974e2bce9b854be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:58 +0200 Subject: gnu: r-scran: Update to 1.24.1. * gnu/packages/bioconductor.scm (r-scran): Update to 1.24.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5ccf327c21..56640caed1 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -15056,14 +15056,14 @@ quality control.") (define-public r-scran (package (name "r-scran") - (version "1.24.0") + (version "1.24.1") (source (origin (method url-fetch) (uri (bioconductor-uri "scran" version)) (sha256 (base32 - "0xg7dl35915a65pmzkxdacsm4iqf97ayljdjljcvqx1ycmn7x68w")))) + "1a6vlq8i5gh7zxm6igmy75187pkx42z28qjag50m49xy5valw3ni")))) (build-system r-build-system) (propagated-inputs (list r-beachmat -- cgit v1.2.3 From 547d4670e73fefb92c2728f07d02ce76e9491690 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:58 +0200 Subject: gnu: r-delayedmatrixstats: Update to 1.18.1. * gnu/packages/bioconductor.scm (r-delayedmatrixstats): Update to 1.18.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 56640caed1..c5e94a60ba 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -15124,14 +15124,14 @@ data in the column sparse format.") (define-public r-delayedmatrixstats (package (name "r-delayedmatrixstats") - (version "1.18.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedMatrixStats" version)) (sha256 (base32 - "1qlwv69c0r2w3zkmsr8r7w6sr3hf1ha0sfcrsjx4ks8f0ww7aqsv")))) + "1kq643fmfzq1qjvpj3kc092ahc3qamqgx53layqsyvz5mil55jjv")))) (properties `((upstream-name . "DelayedMatrixStats"))) (build-system r-build-system) -- cgit v1.2.3 From 869b1f9f5c4ce4390b0d560809a8939ee6b87500 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:58 +0200 Subject: gnu: r-pathview: Update to 1.36.1. * gnu/packages/bioconductor.scm (r-pathview): Update to 1.36.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c5e94a60ba..cb6d39cac0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -15806,13 +15806,13 @@ other functional sequencing data.") (define-public r-pathview (package (name "r-pathview") - (version "1.36.0") + (version "1.36.1") (source (origin (method url-fetch) (uri (bioconductor-uri "pathview" version)) (sha256 - (base32 "1472k107f21cflbx2fip92g8gl9wlwxgwfvgvl73ma0y0jzs0qdq")))) + (base32 "11g4zhy4qfq0gmy588334f7s2w1acs2dz9kimax5ya2b8jjibk71")))) (properties `((upstream-name . "pathview"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2e7872f6c928d94ac9b35556d6c43171c0b32fba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:58 +0200 Subject: gnu: r-bgeecall: Update to 1.12.2. * gnu/packages/bioconductor.scm (r-bgeecall): Update to 1.12.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cb6d39cac0..74dd1ecd6c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -16055,14 +16055,14 @@ real numbers.") (define-public r-bgeecall (package (name "r-bgeecall") - (version "1.12.1") + (version "1.12.2") (source (origin (method url-fetch) (uri (bioconductor-uri "BgeeCall" version)) (sha256 (base32 - "1g12cms66zb45p347h3b358vjhnq76galvwqwq86xby4hnwpdzkh")))) + "0l6smwy55mm4clb71l4bpch3bayyyf87nq1asbrv6s6fd22mmwil")))) (properties `((upstream-name . "BgeeCall"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6bf59194a64f89ed8acb292ddcb501bcf0f140e5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:59 +0200 Subject: gnu: r-basilisk: Update to 1.8.1. * gnu/packages/bioconductor.scm (r-basilisk): Update to 1.8.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 74dd1ecd6c..e4cf665f05 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -16244,14 +16244,14 @@ package, primarily for creation of the underlying Conda instance.") (define-public r-basilisk (package (name "r-basilisk") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "basilisk" version)) (sha256 (base32 - "1p90wq8a9wrpqpgmcy4zgh5skdw65gg2gsb3lnx78zk9khq0yyzh")))) + "134xix2iq5l7783dng2jjklxd3m5lh4snb7bjhslrs2r1j3p8jpk")))) (properties `((upstream-name . "basilisk"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 87c097631fa6ae6dcc6019d1aefd585c52358d69 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:59 +0200 Subject: gnu: r-biocdockermanager: Update to 1.8.1. * gnu/packages/bioconductor.scm (r-biocdockermanager): Update to 1.8.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e4cf665f05..c25cf53d31 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -16304,14 +16304,14 @@ Bioconductor-friendly.") (define-public r-biocdockermanager (package (name "r-biocdockermanager") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocDockerManager" version)) (sha256 (base32 - "0kl6r8ad728a8dvqx0safj7v5gj1rxxcdiw44jkr1pd5ddv0xbi6")))) + "0a4dcga18bw5mvzmsml28bf4zclz32pp9iflnbvps7pdxvhmmg9d")))) (properties `((upstream-name . "BiocDockerManager"))) (build-system r-build-system) -- cgit v1.2.3 From 202fd44ca08054f9aa9527c9ba1fb8777a5ddcad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:59 +0200 Subject: gnu: r-biodb: Update to 1.4.2. * gnu/packages/bioconductor.scm (r-biodb): Update to 1.4.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c25cf53d31..cc4b34a2ca 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -16334,14 +16334,14 @@ the Bioconductor project.") (define-public r-biodb (package (name "r-biodb") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "biodb" version)) (sha256 (base32 - "02i0n29bp9d9p1ibslxca5m37qsgny2hlgg7d364lf7kc6y2bqni")))) + "0f3clqmrpaawhjjyb4x5mnbhsam56r0av05b5cl5p4waylp8qbs1")))) (properties `((upstream-name . "biodb"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 94693d1980f9b8f65a61c601d130f1265d362124 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:59 +0200 Subject: gnu: r-bionero: Update to 1.4.2. * gnu/packages/bioconductor.scm (r-bionero): Update to 1.4.2. [propagated-inputs]: Remove r-deseq2 and r-ggpubr; add r-ggrepel and r-patchwork. --- gnu/packages/bioconductor.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cc4b34a2ca..4e732347fe 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -16475,32 +16475,32 @@ using aCGH or sequencing.") (define-public r-bionero (package (name "r-bionero") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "BioNERO" version)) (sha256 (base32 - "1nyzjbl0gcwvbj2nxfwykirikf8j3rsx5ny45bqjbcb4r23k65kj")))) + "0dsznfnhidbmf52rv8l26f1ms2k9yy4q4c6cf3x8ylc79c1sjrcp")))) (properties `((upstream-name . "BioNERO"))) (build-system r-build-system) (propagated-inputs (list r-biocparallel r-complexheatmap - r-deseq2 r-dynamictreecut r-genie3 r-ggnetwork r-ggnewscale r-ggplot2 - r-ggpubr + r-ggrepel r-igraph r-intergraph r-matrixstats r-minet r-netrep r-networkd3 + r-patchwork r-rcolorbrewer r-reshape2 r-summarizedexperiment -- cgit v1.2.3 From 17134b9ec1aad94d41d75217a919dd1b224549d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Oct 2022 18:20:59 +0200 Subject: gnu: r-tximeta: Update to 1.14.1. * gnu/packages/bioconductor.scm (r-tximeta): Update to 1.14.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4e732347fe..0a491f3d00 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -17010,14 +17010,14 @@ embeddings and functions to build new reference.") (define-public r-tximeta (package (name "r-tximeta") - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "tximeta" version)) (sha256 (base32 - "1vq7x1sf5h8iwdalalbrybxzbq47s2ymb75himj5wkv77mgcivfl")))) + "0hxq5lkrdiz0a3xpl88adrv4m55jr6g46a5m9pamc0w4bxddirr8")))) (properties `((upstream-name . "tximeta"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From fd7c34f2bf68e14e5e77895fe861828444625c3a Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Mon, 3 Oct 2022 02:37:56 -0400 Subject: gnu: Add emacs-circadian. * gnu/packages/emacs-xyz.scm (emacs-circadian): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0cd9fa1959..acb50aa2f4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19641,6 +19641,35 @@ tables of contents.") timestamps by providing a @code{ts} struct.") (license license:gpl3+))) +(define-public emacs-circadian + (package + (name "emacs-circadian") + (version "0.3.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/guidoschmidt/circadian.el") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wpsykmai3idz0bgfl07hwl9nr4x9sgprvqgw8jln4dz2wf5gdic")))) + (arguments + (list + #:tests? #t + #:test-command #~(list "ert-runner"))) + (build-system emacs-build-system) + (native-inputs + (list emacs-el-mock emacs-ert-runner)) + (home-page "https://github.com/guidoschmidt/circadian.el") + (synopsis "Theme-switching for Emacs based on daytime") + (description "Circadian may reduce eye strain by automatically switching +between light and dark themes based on daytime. It is inspired by color +temperature shifting tools and brightness adaption software.") + ;; The LICENSE file is expat, but the sole ".el" file is explicitly GPL3+. + (license (list license:gpl3+ + license:expat)))) + (define-public emacs-peg (package (name "emacs-peg") -- cgit v1.2.3 From 5e8221822e2841f1bd325f4a783c9131910af17d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 4 Oct 2022 13:28:27 +0200 Subject: gnu: emacs-org-mime: Update to 0.3.2. * gnu/packages/emacs-xyz.scm (emacs-org-mime): Update to 0.3.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index acb50aa2f4..db2323efb3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8866,7 +8866,7 @@ cards created in Org mode.") (define-public emacs-org-mime (package (name "emacs-org-mime") - (version "0.3.1") + (version "0.3.2") (source (origin (method git-fetch) @@ -8875,7 +8875,7 @@ cards created in Org mode.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "17380kpf08j5ai30nn5iks0k3x8sm3kmz8lkyr1v0qvpr5a8s70b")))) + (base32 "1w5z9irzk918mj75z5m0j2h8mms8v27x50kp7r3b01wblf0jd2zc")))) (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 df5a021f66a2f39bd0be2b488fb797773b5275d9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 4 Oct 2022 13:31:40 +0200 Subject: gnu: emacs-modus-themes: Update to 2.7.1. * gnu/packages/emacs-xyz.scm (emacs-modus-themes): Update to 2.7.1. --- gnu/packages/emacs-xyz.scm | 67 ++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 32 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index db2323efb3..48d4e05bfc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29398,36 +29398,39 @@ Emacs that integrate with major modes like Org-mode.") (license license:expat))) (define-public emacs-modus-themes - (package - (name "emacs-modus-themes") - (version "2.6.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~protesilaos/modus-themes") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1zl1gd3jlkanjmlsxmwhqaiwyblp6kzznfjnw9cq8ah2390y9n1c")))) - (native-inputs (list texinfo)) - (build-system emacs-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'makeinfo - (lambda _ - (invoke "emacs" - "--batch" - "--eval=(require 'ox-texinfo)" - "--eval=(find-file \"doc/modus-themes.org\")" - "--eval=(org-texinfo-export-to-info)") - (install-file "doc/modus-themes.info" (string-append #$output "/share/info"))))))) - (home-page "https://protesilaos.com/modus-themes/") - (synopsis "Accessible themes (WCAG AAA)") - (description - "The Modus themes are designed for accessible readability. They conform + ;; XXX: Upstream did not tag latest version bump, so we use the commit + ;; matching that bump. + (let ((commit "0b42e595fb8c1753039277ab0b068d0f4f107edf")) + (package + (name "emacs-modus-themes") + (version "2.7.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~protesilaos/modus-themes") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0iy1psfkhqf9a47pabl1w108niw2d4xnfvlcql2j58qlv5k9h1z7")))) + (native-inputs (list texinfo)) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'makeinfo + (lambda _ + (invoke "emacs" + "--batch" + "--eval=(require 'ox-texinfo)" + "--eval=(find-file \"doc/modus-themes.org\")" + "--eval=(org-texinfo-export-to-info)") + (install-file "doc/modus-themes.info" (string-append #$output "/share/info"))))))) + (home-page "https://protesilaos.com/modus-themes/") + (synopsis "Accessible themes (WCAG AAA)") + (description + "The Modus themes are designed for accessible readability. They conform with the highest standard for color contrast between any given combination of background and foreground values. This corresponds to the WCAG AAA standard, which specifies a minimum rate of distance in relative luminance of 7:1. @@ -29436,8 +29439,8 @@ Modus Operandi (modus-operandi) is a light theme, while Modus Vivendi (modus-vivendi) is dark. Each theme’s color palette is designed to meet the needs of the numerous interfaces that are possible in the Emacs computing environment.") - (license (list license:gpl3+ - license:fdl1.3+)))) ; GFDLv1.3+ for the manual + (license (list license:gpl3+ + license:fdl1.3+))))) ; GFDLv1.3+ for the manual (define-public emacs-punpun-theme (let ((commit "7026684cd568cb691af3ced5de14c375fe6f5a1a") -- cgit v1.2.3 From 7e9534150bb92b40f2f5315894eff23f4d82510a Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 1 Oct 2022 08:13:41 +0200 Subject: gnu: emacs-nov-el: Update to 0.4.0 and use gexps. * gnu/packages/emacs-xyz.scm (emacs-nov-el): Update to 0.4.0. [arguments]: Use gexps. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 48d4e05bfc..a134ac594a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18558,7 +18558,7 @@ the format.") (define-public emacs-nov-el (package (name "emacs-nov-el") - (version "0.3.4") + (version "0.4.0") (source (origin (method git-fetch) @@ -18568,18 +18568,18 @@ the format.") (file-name (git-file-name name version)) (sha256 (base32 - "0va9xjrq30cv5kb59a4rq5mcm83ggnv774r8spmskff3hj8012wf")))) + "10507fdfx02wb3j7g34w4ii8rgnjbmriq63ir6x1agf38s3i9p52")))) (build-system emacs-build-system) (arguments - `(#:emacs ,emacs ;need libxml - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'embed-path-to-unzip - (lambda _ - (substitute* "nov.el" - (("\\(executable-find \"unzip\"\\)") - (string-append "\"" (which "unzip") "\""))) - #t))))) + (list + #:emacs emacs ;need libxml + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'embed-path-to-unzip + (lambda _ + (substitute* "nov.el" + (("\\(executable-find \"unzip\"\\)") + (string-append "\"" (which "unzip") "\"")))))))) (propagated-inputs (list emacs-dash emacs-esxml)) (inputs -- cgit v1.2.3 From 31e19fd874cb1e3ccccd9d2d0bb5e4fcc5dd4e23 Mon Sep 17 00:00:00 2001 From: jgart Date: Sun, 2 Oct 2022 20:20:07 -0500 Subject: gnu: emacs-lsp-mode: Update to 26c4d3e. * gnu/packages/emacs-xyz.scm (emacs-lsp-mode): Update to 26c4d3e. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a134ac594a..235505b08c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26209,8 +26209,8 @@ the standard @code{Dockerfile} file format.") (license license:asl2.0))) (define-public emacs-lsp-mode - (let ((commit "4aafe25e03ab7470b8d3c1cb326affa3c5e9930e") - (revision "0")) + (let ((commit "26c4d3e54ad2956623e64132312fe864274d346f") + (revision "1")) (package (name "emacs-lsp-mode") (version (git-version "8.0.1" revision commit)) @@ -26222,7 +26222,7 @@ the standard @code{Dockerfile} file format.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "01csz4vr3fg1q2py45mxj5j8bkvckn3daam1jafb2gg9gjc9bp7z")))) + (base32 "0klnik69b5y6s2q00vyshxymlg7k4x9x6m7wpsf7z9w12qn27alx")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs ;need libxml support -- cgit v1.2.3 From ba84c8c4489e0b22fc692724416829c377b4ee91 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Fri, 30 Sep 2022 20:38:30 +0200 Subject: gnu: augustus: Update to 3.2.0. * gnu/packages/games.scm (augustus): Update to 3.2.0. [inputs]: Add expat. [snippet]: Unbundle it. Drop trailing #t. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8d569b013f..65375c9acc 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1589,7 +1589,7 @@ does not include game data.") (package (inherit julius) (name "augustus") - (version "2.0.1") + (version "3.2.0") (source (origin (method git-fetch) @@ -1598,17 +1598,19 @@ does not include game data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0czazw8mc3fbvdazs2nzvgxd1dpzjc8z5fwiv89vv4nd7laz3jkj")) + (base32 "0d1k5279imc17mk3lxn8amc4ljgcj4v6x6lj2w3bph1z0a7a4bim")) ;; Remove unused bundled libraries. (modules '((guix build utils))) (snippet '(begin (with-directory-excursion "ext" - (for-each delete-file-recursively '("dirent" "png" "SDL2" "zlib"))) - #t)))) + (for-each delete-file-recursively + '("dirent" "expat" "png" "SDL2" "zlib"))))))) (arguments ;; No tests. See https://github.com/Keriew/augustus/issues/82. `(#:tests? #f)) + (inputs (modify-inputs (package-inputs julius) + (prepend expat))) (home-page "https://github.com/Keriew/augustus") (synopsis "Re-implementation of Caesar III game engine with gameplay changes") (description -- cgit v1.2.3 From 7030f592c643360105514f9f1f923b0b6342d5e3 Mon Sep 17 00:00:00 2001 From: "( via Guix-patches via" Date: Thu, 29 Sep 2022 17:40:20 +0100 Subject: home: Add home-batsignal-service-type. * gnu/home/services/pm.scm (home-batsignal-service-type): New variable. (home-batsignal-configuration): New record type. * doc/guix.texi: Document them. * gnu/local.mk: Add gnu/home/services/pm.scm. --- doc/guix.texi | 90 +++++++++++++++++++++++++++-- gnu/home/services/pm.scm | 145 +++++++++++++++++++++++++++++++++++++++++++++++ gnu/local.mk | 2 + 3 files changed, 231 insertions(+), 6 deletions(-) create mode 100644 gnu/home/services/pm.scm (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index fb9efe6b4f..eeec4dec2c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -107,6 +107,7 @@ Copyright @copyright{} 2022 Karl Hallsby@* Copyright @copyright{} 2022 Justin Veilleux@* Copyright @copyright{} 2022 Reily Siegel@* Copyright @copyright{} 2022 Simon Streit@* +Copyright @copyright{} 2022 (@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -40154,12 +40155,13 @@ services)}. @menu * Essential Home Services:: Environment variables, packages, on-* scripts. -* Shells: Shells Home Services. POSIX shells, Bash, Zsh. -* Mcron: Mcron Home Service. Scheduled User's Job Execution. -* Shepherd: Shepherd Home Service. Managing User's Daemons. -* SSH: Secure Shell. Setting up the secure shell client. -* Desktop: Desktop Home Services. Services for graphical environments. -* Guix: Guix Home Services. Services for Guix. +* Shells: Shells Home Services. POSIX shells, Bash, Zsh. +* Mcron: Mcron Home Service. Scheduled User's Job Execution. +* Power Management: Power Management Home Services. Services for battery power. +* Shepherd: Shepherd Home Service. Managing User's Daemons. +* SSH: Secure Shell. Setting up the secure shell client. +* Desktop: Desktop Home Services. Services for graphical environments. +* Guix: Guix Home Services. Services for Guix. @end menu @c In addition to that Home Services can provide @@ -40607,6 +40609,82 @@ specifications,, mcron, GNU@tie{}mcron}). @end table @end deftp +@node Power Management Home Services +@subsection Power Management Home Services + +@cindex power management +The @code{(gnu home services pm)} module provides home services +pertaining to battery power. + +@defvr {Scheme Variable} home-batsignal-service-type +Service for @code{batsignal}, a program that monitors battery levels +and warns the user through desktop notifications when their battery +is getting low. You can also configure a command to be run when the +battery level passes a point deemed ``dangerous''. This service is +configured with the @code{home-batsignal-configuration} record. +@end defvr + +@deftp {Data Type} home-batsignal-configuration +Data type representing the configuration for batsignal. + +@table @asis +@item @code{warning-level} (default: @code{15}) +The battery level to send a warning message at. + +@item @code{warning-message} (default: @code{#f}) +The message to send as a notification when the battery level reaches +the @code{warning-level}. Setting to @code{#f} uses the default +message. + +@item @code{critical-level} (default: @code{5}) +The battery level to send a critical message at. + +@item @code{critical-message} (default: @code{#f}) +The message to send as a notification when the battery level reaches +the @code{critical-level}. Setting to @code{#f} uses the default +message. + +@item @code{danger-level} (default: @code{2}) +The battery level to run the @code{danger-command} at. + +@item @code{danger-command} (default: @code{#f}) +The command to run when the battery level reaches the @code{danger-level}. +Setting to @code{#f} disables running the command entirely. + +@item @code{full-level} (default: @code{#f}) +The battery level to send a full message at. Setting to @code{#f} +disables sending the full message entirely. + +@item @code{full-message} (default: @code{#f}) +The message to send as a notification when the battery level reaches +the @code{full-level}. Setting to @code{#f} uses the default message. + +@item @code{batteries} (default: @code{'()}) +The batteries to monitor. Setting to @code{'()} tries to find batteries +automatically. + +@item @code{poll-delay} (default: @code{60}) +The time in seconds to wait before checking the batteries again. + +@item @code{icon} (default: @code{#f}) +A file-like object to use as the icon for battery notifications. Setting +to @code{#f} disables notification icons entirely. + +@item @code{notifications?} (default: @code{#t}) +Whether to send any notifications. + +@item @code{notifications-expire?} (default: @code{#f}) +Whether notifications sent expire after a time. + +@item @code{notification-command} (default: @code{#f}) +Command to use to send messages. Setting to @code{#f} sends a notification +through @code{libnotify}. + +@item @code{ignore-missing?} (default: @code{#f}) +Whether to ignore missing battery errors. +@end table +@end deftp + @node Shepherd Home Service @subsection Managing User Daemons diff --git a/gnu/home/services/pm.scm b/gnu/home/services/pm.scm new file mode 100644 index 0000000000..5f09941827 --- /dev/null +++ b/gnu/home/services/pm.scm @@ -0,0 +1,145 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 ( +;;; +;;; 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 home services pm) + #:use-module (guix gexp) + #:use-module (guix packages) + #:use-module (guix records) + #:use-module (gnu home services) + #:use-module (gnu home services shepherd) + #:use-module (gnu packages monitoring) + #:use-module (gnu services shepherd) + + #:export (home-batsignal-configuration + home-batsignal-service-type)) + +;;; +;;; batsignal +;;; +;;; Daemon for running commands and displaying notifications on +;;; battery events. +;;; + +(define-record-type* + home-batsignal-configuration make-home-batsignal-configuration + home-batsignal-configuration? + (warning-level batsignal-warning-level ;integer + (default 15)) + (warning-message batsignal-warning-message ;string | #f + (default #f)) + (critical-level batsignal-critical-level ;integer + (default 5)) + (critical-message batsignal-critical-message ;string | #f + (default #f)) + (danger-level batsignal-danger-level ;integer + (default 2)) + (danger-command batsignal-danger-command ;file-like | string | #f + (default #f)) + (full-level batsignal-full-level ;integer | #f + (default #f)) + (full-message batsignal-full-message ;string | #f + (default #f)) + (batteries batsignal-batteries ;list of string + (default '())) + (poll-delay batsignal-poll-delay ;integer + (default 60)) + (icon batsignal-icon ;file-like | #f + (default #f)) + (notifications? batsignal-notifications? ;boolean + (default #t)) + (notifications-expire? batsignal-notifications-expire? ;boolean + (default #f)) + (notification-command batsignal-notification-command ;string | #f + (default #f)) + (ignore-missing? batsignal-ignore-missing? ;boolean + (default #f))) + +(define (home-batsignal-shepherd-services config) + (let ((warning-level (batsignal-warning-level config)) + (warning-message (batsignal-warning-message config)) + (critical-level (batsignal-critical-level config)) + (critical-message (batsignal-critical-message config)) + (danger-level (batsignal-danger-level config)) + (danger-command (batsignal-danger-command config)) + (full-level (batsignal-full-level config)) + (full-message (batsignal-full-message config)) + (batteries (batsignal-batteries config)) + (poll-delay (batsignal-poll-delay config)) + (icon (batsignal-icon config)) + (notifications? (batsignal-notifications? config)) + (notifications-expire? (batsignal-notifications-expire? config)) + (notification-command (batsignal-notification-command config)) + (ignore-missing? (batsignal-ignore-missing? config))) + (list (shepherd-service + (provision '(batsignal)) + (documentation "Run the batsignal battery-watching daemon.") + (start #~(make-forkexec-constructor + (append (list #$(file-append batsignal "/bin/batsignal") + "-w" (number->string #$warning-level) + "-c" (number->string #$critical-level) + "-d" (number->string #$danger-level) + "-m" (number->string #$poll-delay)) + (if #$warning-message + (list "-W" #$warning-message) + (list)) + (if #$critical-message + (list "-C" #$critical-message) + (list)) + (if #$danger-command + (list "-D" #$danger-command) + (list)) + (if #$full-level + (list "-f" (number->string #$full-level)) + (list)) + (if #$full-message + (list "-F" #$full-message) + (list)) + (if (null? (list #$@batteries)) + (list) + (list "-n" (string-join (list #$@batteries) ","))) + (if #$icon + (list "-I" #$icon) + (list)) + (if #$notifications? + (list) + (list "-N")) + (if #$notifications-expire? + (list "-e") + (list)) + (if #$notification-command + (list "-M" #$notification-command) + (list)) + (if #$ignore-missing? + (list "-i") + (list))) + #:log-file (string-append + (or (getenv "XDG_LOG_HOME") + (format #f "~a/.local/var/log" + (getenv "HOME"))) + "/batsignal.log"))) + (stop #~(make-kill-destructor)))))) + +(define home-batsignal-service-type + (service-type + (name 'home-batsignal) + (extensions + (list (service-extension home-shepherd-service-type + home-batsignal-shepherd-services))) + (default-value (home-batsignal-configuration)) + (description + "Run batsignal, a battery watching and notification daemon."))) diff --git a/gnu/local.mk b/gnu/local.mk index e9178923af..5976cbe90c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -54,6 +54,7 @@ # Copyright © 2022 muradm # Copyright © 2022 Hilton Chain # Copyright © 2022 Alex Griffin +# Copyright © 2022 ( # # This file is part of GNU Guix. # @@ -89,6 +90,7 @@ GNU_SYSTEM_MODULES = \ %D%/home/services/symlink-manager.scm \ %D%/home/services/fontutils.scm \ %D%/home/services/guix.scm \ + %D%/home/services/pm.scm \ %D%/home/services/shells.scm \ %D%/home/services/shepherd.scm \ %D%/home/services/ssh.scm \ -- cgit v1.2.3 From ae1af5d7875c9c5f6f50a5f63650e575c10ee231 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 Oct 2022 09:14:04 +0200 Subject: gnu: guix: Update to 17134b9. * gnu/packages/package-management.scm (guix): Update to 17134b9. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2d1fe914e3..d856b56fe3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -165,8 +165,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.3.0") - (commit "9e4632081ff31bf0d1715edd66f514614c6dc4bb") - (revision 29)) + (commit "17134b9ec1aad94d41d75217a919dd1b224549d2") + (revision 30)) (package (name "guix") @@ -182,7 +182,7 @@ (commit commit))) (sha256 (base32 - "1x32l8szclv8zlwdjr8yfidxxm4n7dgm6j7xypmx5mg5pkakyan5")) + "16z9jwnw8y39y5cpalcyrhfrv13z2ijwmil7lxccsfzqzks6wp9m")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From f83622f17d21d684e431fe14731349b952411368 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 Oct 2022 09:44:18 +0200 Subject: services: anonip: Bail out when the input is not a FIFO. * gnu/services/web.scm (anonip-shepherd-service)[start]: Accept zero arguments. Define 'spawn'. Print a message and return #f when #$INPUT does not denote a FIFO. --- gnu/services/web.scm | 60 +++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index e347f5dbcc..e5ab1a1180 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -1438,32 +1438,40 @@ files.") (documentation "Anonimyze the given log file location with anonip.") (start - #~(lambda _ - (unless (file-exists? #$input) - (mknod #$input 'fifo #o600 0)) - (let ((pid - (fork+exec-command - (append - (list #$(file-append (anonip-configuration-anonip config) - "/bin/anonip") - (string-append "--input=" #$input) - (string-append "--output=" #$output)) - (if #$(anonip-configuration-skip-private? config) - '("--skip-private") (list)) - '#$(optional anonip-configuration-column "--column") - '#$(optional anonip-configuration-ipv4mask "--ipv4mask") - '#$(optional anonip-configuration-ipv6mask "--ipv6mask") - '#$(optional anonip-configuration-increment "--increment") - '#$(optional anonip-configuration-replacement - "--replacement") - '#$(optional anonip-configuration-delimiter "--delimiter") - '#$(optional anonip-configuration-regex "--regex")) - ;; Run in a UTF-8 locale - #:environment-variables - (list (string-append "GUIX_LOCPATH=" #$glibc-utf8-locales - "/lib/locale") - "LC_ALL=en_US.utf8")))) - pid))) + #~(lambda () + (define (spawn) + (fork+exec-command + (append + (list #$(file-append (anonip-configuration-anonip config) + "/bin/anonip") + (string-append "--input=" #$input) + (string-append "--output=" #$output)) + (if #$(anonip-configuration-skip-private? config) + '("--skip-private") (list)) + '#$(optional anonip-configuration-column "--column") + '#$(optional anonip-configuration-ipv4mask "--ipv4mask") + '#$(optional anonip-configuration-ipv6mask "--ipv6mask") + '#$(optional anonip-configuration-increment "--increment") + '#$(optional anonip-configuration-replacement + "--replacement") + '#$(optional anonip-configuration-delimiter "--delimiter") + '#$(optional anonip-configuration-regex "--regex")) + ;; Run in a UTF-8 locale + #:environment-variables + (list (string-append "GUIX_LOCPATH=" #$glibc-utf8-locales + "/lib/locale") + "LC_ALL=en_US.utf8"))) + + (let ((stat (stat #$input #f))) + (cond ((not stat) + (mknod #$input 'fifo #o600 0) + (spawn)) + ((eq? 'fifo (stat:type stat)) + (spawn)) + (else + (format #t "'~a' is not a FIFO; bailing out~%" + #$input) + #f))))) (stop #~(make-kill-destructor)))))) (define anonip-service-type -- cgit v1.2.3 From 0669bf64f788a6fe8567f4ae16c022583df1a5f8 Mon Sep 17 00:00:00 2001 From: Zzull Date: Sat, 24 Sep 2022 17:27:25 +0200 Subject: gnu: Add python-property-manager. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-property-manager): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 754eff6c44..9f0275cb68 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -130,6 +130,7 @@ ;;; Copyright © 2022 Tomasz Jeneralczyk ;;; Copyright © 2022 Mathieu Laparie ;;; Copyright © 2022 Garek Dyszel +;;; Copyright © 2022 Baptiste Strazzulla ;;; ;;; This file is part of GNU Guix. ;;; @@ -7297,6 +7298,30 @@ buffer transformation, compression, and decompression functions for use in the tifffile, czifile, and other scientific image input/output modules.") (license license:bsd-3))) +(define-public python-property-manager + (package + (name "python-property-manager") + (version "3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "property-manager" version)) + (sha256 + (base32 "0m3w4spr8f39xnm65naw29ncal4r453kn7ndqb63rwbsmslnvrwk")))) + (build-system python-build-system) + (native-inputs + (list python-pytest-cov)) + (propagated-inputs + (list python-verboselogs + python-humanfriendly + python-coloredlogs)) + (home-page "https://github.com/xolox/python-property-manager") + (synopsis "Useful property variants for Python programming") + (description "The @code{property-manager} package defines several custom +property variants for Python programming including required properties, +writable properties, cached properties, etc.") + (license license:expat))) ; MIT license + (define-public python-executing (package (name "python-executing") -- cgit v1.2.3 From d7932b731f0a3b396c6b2503a461a21a474098c3 Mon Sep 17 00:00:00 2001 From: Zzull Date: Sat, 24 Sep 2022 17:42:28 +0200 Subject: gnu: Add python-executor. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-executor): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9f0275cb68..8575d4a67e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7343,6 +7343,32 @@ writable properties, cached properties, etc.") currently doing, particularly the AST node being executed.") (license license:expat))) +(define-public python-executor + (package + (name "python-executor") + (version "23.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "executor" version)) + (sha256 + (base32 "0g83yr54j0vcwhy6h7n0jsd7q0q630kwa6v9kqzlzrm9xj6c3ip1")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; TODO: tests require root/sudo + (propagated-inputs + (list python-six + python-property-manager + python-fasteners + python-virtualenv)) + (home-page "https://github.com/xolox/python-executor") + (synopsis "Programmer friendly subprocess wrapper") + (description "The @code{executor} package is a simple wrapper for Python’s +subprocess module that makes it very easy to handle subprocesses on UNIX +systems with proper escaping of arguments and error checking currently doing, +particularly the AST node being executed.") + (license license:expat))) ; MIT license + (define-public python-roifile (package (name "python-roifile") -- cgit v1.2.3 From 58f6b246a6c3f3cf1cfdcce6bd2cdb3a26c23c9b Mon Sep 17 00:00:00 2001 From: Zzull Date: Sat, 24 Sep 2022 18:09:53 +0200 Subject: gnu: Add awscli-2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (awscli-2): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1f0b43d1ad..6a9d6ee61d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -57,6 +57,7 @@ ;;; Copyright © 2022 Tomasz Jeneralczyk ;;; Copyright © 2022 msimonin ;;; Copyright © 2022 Michael Rohleder +;;; Copyright © 2022 Baptiste Strazzulla ;;; ;;; This file is part of GNU Guix. ;;; @@ -3262,6 +3263,26 @@ supports url redirection and retries, and also gzip and deflate decoding.") Amazon Web Services (AWS) API.") (license license:asl2.0))) +(define-public awscli-2 + (package + (inherit awscli) + (name "awscli") + (version "2.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri (string-append name "v2") version)) + (sha256 + (base32 + "0g1icsy2l4n540gnhliypy830dfp08hpfc3rk12dlxgc9v3ra4wl")))) + (arguments + ;; FIXME: The 'pypi' release does not contain tests. + '(#:tests? #f)) + (inputs + (list python-importlib-resources + python-executor)))) + + (define-public python-wsgiproxy2 (package (name "python-wsgiproxy2") -- cgit v1.2.3 From ecee392ef1b9335afb2268c889d891a9ba1a4681 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 Oct 2022 12:28:30 +0200 Subject: gnu: eog-plugins: Fix source URL. The incorrect URL was introduced in d6d861c6151fb2cb9296b993425d9a64a7653d95. * gnu/packages/gnome.scm (eog-plugins)[source]: Change directory in URL. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fbaef9eb6e..8fb1213122 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6904,7 +6904,7 @@ supports image conversion, rotation, and slideshows.") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/eog-plugins/" - (version-major+minor version) "/" + (version-major version) "/" "eog-plugins-" version ".tar.xz")) (sha256 (base32 -- cgit v1.2.3 From 1c821a3a6347c8e0476225adaf077f69e19dc449 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 4 Oct 2022 20:36:24 +0200 Subject: gnu: icedove: Update to 102.3.1 [security fixes]. Fixes CVE-2022-39236, CVE-2022-39249, CVE-2022-39250 and CVE-2022-39251. * gnu/packages/gnuzilla.scm (icedove): Update to 102.3.1. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index bb285eab70..304b98832e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1240,11 +1240,11 @@ standards of the IceCat project.") (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20220920000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20220928000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "102.3.0") + (version "102.3.1") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1531,7 +1531,7 @@ standards of the IceCat project.") ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "04f60827c1b53ab86121c7d122d3a8216219ff9f")) + ,(let ((changeset "07a17b101f904a686bbdf798ba2e820079a8323f")) (origin (method hg-fetch) (uri (hg-reference @@ -1540,7 +1540,7 @@ standards of the IceCat project.") (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "078jrxpzqj45l84i39a9fq023j71ngca5gs2ngpjsbily51bzx09"))))) + "16wlpcv1n64crcgk4gcl92r37dlpw26izvam82pbp5f8c25amlnk"))))) ("cargo" ,(force rust-1.59-promise) "cargo") ("clang" ,clang) ("llvm" ,llvm) -- cgit v1.2.3 From ef53c075a110d960ff4b29229d30d8ed764cffd2 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 18 Sep 2022 17:16:21 +0200 Subject: gnu: Add ibus-minimal. * gnu/packages/ibus.scm (ibus-minimal): New variable. (ibus): Inherit from ibus-minimal. --- gnu/packages/ibus.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 4be80ecbe0..e4662901f3 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -67,9 +67,10 @@ #:use-module (gnu packages textutils) #:use-module (gnu packages unicode) #:use-module (gnu packages xorg) - #:use-module (gnu packages xdisorg)) + #:use-module (gnu packages xdisorg) + #:use-module (srfi srfi-1)) -(define-public ibus +(define-public ibus-minimal (package (name "ibus") (version "1.5.27") @@ -233,7 +234,12 @@ input method user interface. It comes with multilingual input support. It may also simplify input method development.") (home-page "https://github.com/ibus/ibus/wiki") - (license lgpl2.1+))) + (license lgpl2.1+) + (properties '((hidden? . #t))))) + +(define-public ibus + (package/inherit ibus-minimal + (properties (alist-delete 'hidden? (package-properties ibus-minimal))))) (define-public ibus-libpinyin (package -- cgit v1.2.3 From c264265abd7f0aa8d62c301dc22bc72cc2055b0e Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 18 Sep 2022 17:18:09 +0200 Subject: gnu: sdl2: Use ibus-minimal instead of ibus. This prevents an input cycle between GTK -> ffmpeg -> sdl2 -> ibus -> GTK. * gnu/packages/sdl.scm (sdl2)[inputs]: Replace ibus with ibus-minimal. --- gnu/packages/sdl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 2a10ff3962..674eee8f6c 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -148,7 +148,7 @@ joystick, and graphics hardware.") eudev ;for discovering input devices fcitx ;helps with CJK input glib - ibus + ibus-minimal libxkbcommon libxcursor ;enables X11 cursor support wayland -- cgit v1.2.3 From a96ebe47b0686b5dd7ebe5fc133073abce559f4d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 18 Sep 2022 17:27:30 +0200 Subject: gnu: ibus: Build with GTK4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ibus.scm (ibus)[arguments]: Add “--enable-gtk4”. [inputs]: Add gtk and pango-next. --- gnu/packages/ibus.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index e4662901f3..29bfc44e4a 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -239,6 +239,11 @@ may also simplify input method development.") (define-public ibus (package/inherit ibus-minimal + (arguments (substitute-keyword-arguments (package-arguments ibus-minimal) + ((#:configure-flags flags) + #~(cons* "--enable-gtk4" #$flags)))) + (inputs (modify-inputs (package-inputs ibus-minimal) + (prepend gtk pango-next))) (properties (alist-delete 'hidden? (package-properties ibus-minimal))))) (define-public ibus-libpinyin -- cgit v1.2.3 From 9ed65e6af77893b658a7159b091b5002892c2f95 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Oct 2022 23:07:19 +0200 Subject: gnu: kaiju: Update to 1.9.0. * gnu/packages/bioinformatics.scm (kaiju): Update to 1.9.0. [arguments]: Use gexps; wrap scripts in install phase. [inputs]: Add bzip2, coreutils, curl, gawk, guile-3.0, gzip, python-wrapper, tar, and wget. --- gnu/packages/bioinformatics.scm | 53 ++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 249b956c88..0404253193 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4845,7 +4845,7 @@ data.") (define-public kaiju (package (name "kaiju") - (version "1.6.3") + (version "1.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -4854,24 +4854,45 @@ data.") (file-name (git-file-name name version)) (sha256 (base32 - "119pzi0ddzv9mjg4wwa6han0cwr3k3ssn7kirvsjfcq05mi5ka0x")))) + "1hfmadkfs6jjd7l3byly5xxb0ifm3dm1wis11sjbqfcv6l89snmg")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; There are no tests. - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'move-to-src-dir - (lambda _ (chdir "src") #t)) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (mkdir-p bin) - (chdir "..") - (copy-recursively "bin" bin)) - #t))))) + (list + #:tests? #f ; There are no tests. + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'move-to-src-dir + (lambda _ (chdir "src"))) + (replace 'install + (lambda _ + (let ((bin (string-append #$output "/bin"))) + (mkdir-p bin) + (copy-recursively "../bin" bin) + (let ((path (search-path-as-list '("bin") + '#$(match (package-inputs this-package) + (((_ pkg) ...) pkg))))) + (for-each (lambda (script) + (let ((exe (string-append bin "/" script))) + (chmod exe #o555) + (wrap-script exe + #:guile #$(file-append guile-3.0 "/bin/guile") + `("PATH" ":" prefix ,path)))) + (list "kaiju-convertMAR.py" + "kaiju-gbk2faa.pl" + "kaiju-makedb"))))))))) (inputs - (list perl zlib)) + (list bzip2 + coreutils + curl + gawk + guile-3.0 ;for wrap-script + gzip + perl + python-wrapper + tar + wget + zlib)) (home-page "http://kaiju.binf.ku.dk/") (synopsis "Fast and sensitive taxonomic classification for metagenomics") (description "Kaiju is a program for sensitive taxonomic classification -- cgit v1.2.3 From 3f627bf56bfc6c1904cfea4c73d0a5afc72b25ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Oct 2022 13:47:57 +0200 Subject: gnu: cd-hit: Update to 4.8.1. * gnu/packages/bioinformatics.scm (cd-hit): Update to 4.8.1. [arguments]: Do not use quasiquote; remove trailing #T from build phases. [inputs]: Add zlib. --- gnu/packages/bioinformatics.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0404253193..bb1aeac3a3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2429,26 +2429,27 @@ are not included due to their size.") (define-public cd-hit (package (name "cd-hit") - (version "4.6.8") + (version "4.8.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/weizhongli/cdhit" "/releases/download/V" version "/cd-hit-v" version - "-2017-0621-source.tar.gz")) + "-2019-0228.tar.gz")) (sha256 (base32 - "1b4mwm2520ixjbw57sil20f9iixzw4bkdqqwgg1fc3pzm6rz4zmn")))) + "1phmfhgcpyfd6kj7jwzw976613lcpv1wc2pzfdfaxla062x2s5r6")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; there are no tests - #:make-flags - ;; Executables are copied directly to the PREFIX. - ,#~(list (string-append "PREFIX=" #$output "/bin") - ;; Support longer sequences (e.g. Pacbio sequences) - "MAX_SEQ=60000000") - #:phases - (modify-phases %standard-phases + (list + #:tests? #f ; there are no tests + #:make-flags + ;; Executables are copied directly to the PREFIX. + #~(list (string-append "PREFIX=" #$output "/bin") + ;; Support longer sequences (e.g. Pacbio sequences) + "MAX_SEQ=60000000") + #:phases + '(modify-phases %standard-phases ;; No "configure" script (delete 'configure) ;; Remove sources of non-determinism @@ -2458,15 +2459,13 @@ are not included due to their size.") ((" \\(built on \" __DATE__ \"\\)") "")) (substitute* "cdhit-common.c++" (("__DATE__") "\"0\"") - (("\", %s, \" __TIME__ \"\\\\n\", date") "")) - #t)) + (("\", %s, \" __TIME__ \"\\\\n\", date") "")))) ;; The "install" target does not create the target directory. (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 - (list perl)) + (list perl zlib)) (home-page "http://weizhongli-lab.org/cd-hit/") (synopsis "Cluster and compare protein or nucleotide sequences") (description -- cgit v1.2.3 From be1d561f1a74d158d67623bf037727918781bd96 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Oct 2022 14:28:24 +0200 Subject: gnu: Add cd-hit-auxtools. * gnu/packages/bioinformatics.scm (cd-hit-auxtools): New variable. --- gnu/packages/bioinformatics.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bb1aeac3a3..b467a8b828 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2476,6 +2476,26 @@ databases.") ;; version 2 (GPLv2)." (license license:gpl2))) +(define-public cd-hit-auxtools + (package + (inherit cd-hit) + (name "cd-hit-auxtools") + (arguments + (list + #:tests? #f ; there are no tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir (lambda _ (chdir "cd-hit-auxtools"))) + ;; No "configure" script + (delete 'configure) + ;; There is no install target. + (replace 'install + (lambda _ + (for-each (lambda (file) + (install-file file (string-append #$output "/bin"))) + '("cd-hit-dup" "cd-hit-lap" "read-linker"))))))) + (inputs '()))) + (define-public clipper (package (name "clipper") -- cgit v1.2.3 From fd6cd9de8682c7ddf96bf8deb637b1ca6cdbd205 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Oct 2022 17:59:04 +0200 Subject: gnu: Add megahit. * gnu/packages/bioinformatics.scm (megahit): New variable. --- gnu/packages/bioinformatics.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b467a8b828..becf171880 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16331,6 +16331,38 @@ BigWig files, as well as efficient region coverage summary over intervals from both types of files.") (license license:expat))) +(define-public megahit + (package + (name "megahit") + (version "1.2.9") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/voutcn/megahit.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1r5d9nkdmgjsbrpj43q9hy3s8jwsabaz3ji561v18hy47v58923c")))) + (build-system cmake-build-system) + (arguments + (list + #:test-target "simple_test" + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "src/megahit" + (("os.path.join\\(script_path, '..'\\)") + "os.path.join(script_path, '../source')"))))))) + (inputs (list python-wrapper zlib)) + (home-page "https://www.ncbi.nlm.nih.gov/pubmed/25609793") + (synopsis "Meta-genome assembler") + (description "Megahit is a fast and memory-efficient NGS assembler. It is +optimized for metagenomes, but also works well on generic single genome +assembly (small or mammalian size) and single-cell assembly.") + (license license:gpl3))) + (define-public mudskipper (package (name "mudskipper") -- cgit v1.2.3 From 7ddba7bf66c3d2d30e3720a2923c6918a68cb082 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Wed, 5 Oct 2022 21:44:00 +0200 Subject: gnu: gnome-maps: Update to 43.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/geo.scm (gnome-maps): Update to 43.0. [arguments]<#:meson>: Use meson-0.63. <#:phases>: Replace ‘skip-gtk-update-icon-cache’ with ‘skip-cache-and-database-updates’. Update accordingly. --- gnu/packages/geo.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 43b37c8d7e..353336ca7a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -255,7 +255,7 @@ topology functions.") (define-public gnome-maps (package (name "gnome-maps") - (version "43.rc") ;for libsoup 3 support + (version "43.0") ;for libsoup 3 support (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -263,18 +263,23 @@ topology functions.") name "-" version ".tar.xz")) (sha256 (base32 - "16a3j896fwxgnvrmx27jnrvhxzh3v22paaq87ad57yp8wkq946il")))) + "1r1l6ajs6zz316m8zac5r0l3qgdv616xh376bfn2fflcnz7wys08")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t + #:meson meson-0.63 #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. + (add-after 'unpack 'skip-cache-and-database-updates (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true")))) + (substitute* "meson.build" + (("([a-z_]*): true" all option) + (cond ; cond rather than match saves an import + ((member option '("gtk_update_icon_cache" + "update_desktop_database")) + (string-append option ": false")) + (else all)))))) (add-after 'unpack 'patch-dbus-service (lambda _ (substitute* "data/org.gnome.Maps.service.in" -- cgit v1.2.3 From ccbeb3fde6c0d58f3fd509f3c2d3414dfe03943c Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Wed, 5 Oct 2022 21:45:18 +0200 Subject: gnu: gnome-maps: Delete trailing space. * gnu/packages/geo.scm (gnome-maps)[inputs]: Delete trailing spaces. --- gnu/packages/geo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 353336ca7a..6b82087d6e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -312,7 +312,7 @@ topology functions.") libhandy librsvg libsecret - libshumate + libshumate libsoup libxml2 pango-next ;TODO: remove when it's the default -- cgit v1.2.3 From 9be5f88e18c50df26e5482f80eb8fcbff9c588bd Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Wed, 5 Oct 2022 21:59:36 +0200 Subject: gnu: gnome-maps: Properly wrap GI_TYPELIB_PATH. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a bug reported by pkill9 and tschilptschilp23 in IRC. See and . It does so by using a snippet that's also applied in gnome-shell. * gnu/packages/geo.scm (gnome-maps)[#:phases]: Remove ‘patch-dbus-service’. Update ‘wrap’ so that it uses GJS-specific wrapping code rather than wrap-program. --- gnu/packages/geo.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 6b82087d6e..5e484c6e1c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -280,15 +280,16 @@ topology functions.") "update_desktop_database")) (string-append option ": false")) (else all)))))) - (add-after 'unpack 'patch-dbus-service - (lambda _ - (substitute* "data/org.gnome.Maps.service.in" - (("@pkgdatadir@/org.gnome.Maps") - (string-append #$output "/bin/gnome-maps"))))) (add-after 'install 'wrap (lambda _ - (wrap-program (string-append #$output "/bin/gnome-maps") - `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))))))) + (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (substitute* (string-append #$output "/share/gnome-maps/" + "org.gnome.Maps") + (("imports\\.package\\.init" all) + (string-append "'" gi-typelib-path "'.split(':').forEach(" + "path => imports.gi.GIRepository.Repository." + "prepend_search_path(path));\n" + all))))))))) (native-inputs (list gettext-minimal `(,glib "bin") -- cgit v1.2.3 From 40ad967322ac270bb1273c5cdd2ae7db8051ef36 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Sat, 1 Oct 2022 15:12:57 +0200 Subject: services: dhcp-client: Implement and use a configuration record. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/networking.scm (dhcp-client-configuration): New record configuration. (dhcp-client-shepherd-service): Implement a shepher service. Provide a deprication message for legacy configurations. (dhcp-client-service-type): Use dhcp-client-shepherd-service. * doc/guix.texi (Networking Setup): Update. * po/guix/POTFILES.in: Add 'gnu/services/networking.scm'. Co-authored-by: Ludovic Courtès --- doc/guix.texi | 20 ++++++- gnu/services/networking.scm | 123 ++++++++++++++++++++++++++++---------------- po/guix/POTFILES.in | 1 + 3 files changed, 97 insertions(+), 47 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index eeec4dec2c..6691ae5844 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19230,10 +19230,26 @@ the user mode network stack,,, QEMU, QEMU Documentation}). @cindex DHCP, networking service @defvr {Scheme Variable} dhcp-client-service-type This is the type of services that run @var{dhcp}, a Dynamic Host Configuration -Protocol (DHCP) client, on all the non-loopback network interfaces. Its value -is the DHCP client package to use, @code{isc-dhcp} by default. +Protocol (DHCP) client. @end defvr +@deftp {Data Type} dhcp-client-configuration +Data type representing the configuration of the DHCP client service. + +@table @asis +@item @code{package} (default: @code{isc-dhcp}) +DHCP client package to use. + +@item @code{interfaces} (default: @code{'all}) +Either @code{'all} or the list of interface names that the DHCP client +should listen on---e.g., @code{'("eno1")}. + +When set to @code{'all}, the DHCP client listens on all the available +non-loopback interfaces that can be activated. Otherwise the DHCP +client listens only on the specified interfaces. +@end table +@end deftp + @cindex NetworkManager @defvr {Scheme Variable} network-manager-service-type diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 9d85728371..19aba8c266 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -66,6 +66,9 @@ #:use-module (guix modules) #:use-module (guix packages) #:use-module (guix deprecation) + #:use-module (guix diagnostics) + #:autoload (guix ui) (display-hint) + #:use-module (guix i18n) #:use-module (rnrs enums) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) @@ -77,6 +80,10 @@ static-networking-service-type) #:export (%facebook-host-aliases dhcp-client-service-type + dhcp-client-configuration + dhcp-client-configuration? + dhcp-client-configuration-package + dhcp-client-configuration-interfaces dhcpd-service-type dhcpd-configuration @@ -259,52 +266,78 @@ fe80::1%lo0 connect.facebook.net fe80::1%lo0 www.connect.facebook.net fe80::1%lo0 apps.facebook.com\n") + +(define-record-type* + dhcp-client-configuration make-dhcp-client-configuration + dhcp-client-configuration? + (package dhcp-client-configuration-package ;file-like + (default isc-dhcp)) + (interfaces dhcp-client-configuration-interfaces + (default 'all))) ;'all | list of strings + +(define dhcp-client-shepherd-service + (match-lambda + (($ package interfaces) + (let ((pid-file "/var/run/dhclient.pid")) + (list (shepherd-service + (documentation "Set up networking via DHCP.") + (requirement '(user-processes udev)) + + ;; XXX: Running with '-nw' ("no wait") avoids blocking for a minute when + ;; networking is unavailable, but also means that the interface is not up + ;; yet when 'start' completes. To wait for the interface to be ready, one + ;; should instead monitor udev events. + (provision '(networking)) + + (start #~(lambda _ + (define dhclient + (string-append #$package "/sbin/dhclient")) + + ;; When invoked without any arguments, 'dhclient' discovers all + ;; non-loopback interfaces *that are up*. However, the relevant + ;; interfaces are typically down at this point. Thus we perform + ;; our own interface discovery here. + (define valid? + (lambda (interface) + (and (arp-network-interface? interface) + (not (loopback-network-interface? interface)) + ;; XXX: Make sure the interfaces are up so that + ;; 'dhclient' can actually send/receive over them. + ;; Ignore those that cannot be activated. + (false-if-exception + (set-network-interface-up interface))))) + (define ifaces + (filter valid? + #$(match interfaces + ('all + #~(all-network-interface-names)) + (_ + #~'#$interfaces)))) + + (false-if-exception (delete-file #$pid-file)) + (let ((pid (fork+exec-command + (cons* dhclient "-nw" + "-pf" #$pid-file ifaces)))) + (and (zero? (cdr (waitpid pid))) + (read-pid-file #$pid-file))))) + (stop #~(make-kill-destructor)))))) + (package + (warning (G_ "'dhcp-client' service now expects a \ +'dhcp-client-configuration' record~%")) + (display-hint (G_ "The value associated with instances of +@code{dhcp-client-service-type} must now be a @code{dhcp-client-configuration} +record instead of a package. Please adjust your configuration accordingly.")) + (dhcp-client-shepherd-service + (dhcp-client-configuration + (package package)))))) + (define dhcp-client-service-type - (shepherd-service-type - 'dhcp-client - (lambda (dhcp) - (define dhclient - (file-append dhcp "/sbin/dhclient")) - - (define pid-file - "/var/run/dhclient.pid") - - (shepherd-service - (documentation "Set up networking via DHCP.") - (requirement '(user-processes udev)) - - ;; XXX: Running with '-nw' ("no wait") avoids blocking for a minute when - ;; networking is unavailable, but also means that the interface is not up - ;; yet when 'start' completes. To wait for the interface to be ready, one - ;; should instead monitor udev events. - (provision '(networking)) - - (start #~(lambda _ - ;; When invoked without any arguments, 'dhclient' discovers all - ;; non-loopback interfaces *that are up*. However, the relevant - ;; interfaces are typically down at this point. Thus we perform - ;; our own interface discovery here. - (define valid? - (lambda (interface) - (and (arp-network-interface? interface) - (not (loopback-network-interface? interface)) - ;; XXX: Make sure the interfaces are up so that - ;; 'dhclient' can actually send/receive over them. - ;; Ignore those that cannot be activated. - (false-if-exception - (set-network-interface-up interface))))) - (define ifaces - (filter valid? (all-network-interface-names))) - - (false-if-exception (delete-file #$pid-file)) - (let ((pid (fork+exec-command - (cons* #$dhclient "-nw" - "-pf" #$pid-file ifaces)))) - (and (zero? (cdr (waitpid pid))) - (read-pid-file #$pid-file))))) - (stop #~(make-kill-destructor)))) - isc-dhcp - (description "Run @command{dhcp}, a Dynamic Host Configuration + (service-type (name 'dhcp-client) + (extensions + (list (service-extension shepherd-root-service-type + dhcp-client-shepherd-service))) + (default-value (dhcp-client-configuration)) + (description "Run @command{dhcp}, a Dynamic Host Configuration Protocol (DHCP) client, on all the non-loopback network interfaces."))) (define-record-type* diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index 4050a4c7ae..ed3fdb6be0 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -5,6 +5,7 @@ gnu/packages.scm gnu/services.scm gnu/system.scm gnu/services/configuration.scm +gnu/services/networking.scm gnu/services/shepherd.scm gnu/services/samba.scm gnu/home/services.scm -- cgit v1.2.3 From 43b8df4bece2a207018dc0fedc44d3d188d2d0f0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 1 Oct 2022 16:42:12 +0100 Subject: gnu: Add splash. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/astronomy.scm (splash): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/astronomy.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 13ffdd74d3..aaa9207e0e 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -591,6 +591,50 @@ large scale galaxy-survey data, it can perform reasonably well on moderately crowded star fields.") (license license:gpl3+))) +(define-public splash + (package + (name "splash") + (version "3.5.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/danieljprice/splash") + (commit (string-append "v" version)))) + (sha256 + (base32 + "12s3w96wzd4zpxw4adzhalkr57fgdk7cjp6bj596jnd87pz3rhyd")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + ;; FIXME: Tests failed + ;; Issue submited upstream https://github.com/danieljprice/splash/issues/67 + ;; + ;; make: *** No rule to make target 'test_interpolate3D.o', needed by 'test1'. Stop. + ;; + (list #:tests? #f + #:parallel-build? #f ;parallel build fails + #:make-flags #~(list "SYSTEM=gfortran" "PREFIX=" + (string-append "GIZA_DIR=" + #$(this-package-input "giza")) + (string-append "DESTDIR=" + #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'install 'create-install-dirrectories + (lambda _ + (mkdir-p (string-append #$output "/bin"))))))) + (native-inputs (list gfortran pkg-config perl python-wrapper)) + (inputs (list cairo cfitsio giza)) + (home-page "https://users.monash.edu.au/~dprice/splash/") + (synopsis + "Astrophysical visualisation tool for smoothed particle hydrodynamics") + (description + "SPLASH is visualisation tool for Smoothed Particle Hydrodynamics (SPH) +simulations in one, two and three dimensions, developed mainly for +astrophysics. It uses a command-line menu but data can be manipulated +interactively in the plotting window.") + (license license:gpl2+))) + (define-public skymaker (package (name "skymaker") -- cgit v1.2.3 From d912c363309d6c809d14dce5c55b81e255d9ebcc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 5 Oct 2022 15:05:29 -0400 Subject: gnu: linux-libre 5.19: Update to 5.19.14. * gnu/packages/linux.scm (linux-libre-5.19-version): Update to 5.19.14. (linux-libre-5.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 013f610e32..e33c904313 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,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.19-version "5.19.12") +(define-public linux-libre-5.19-version "5.19.14") (define-public linux-libre-5.19-gnu-revision "gnu") (define deblob-scripts-5.19 (linux-libre-deblob-scripts @@ -364,7 +364,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "092myqjixvy1k3ylcj0hfc4whfxapjvxsxm4gk30a3jv5dnh7mly"))) (define-public linux-libre-5.19-pristine-source (let ((version linux-libre-5.19-version) - (hash (base32 "1fmhwbgqpr6q3z3ygys153szivlmv3mcnwilbbyfcb1iqx4aadn4"))) + (hash (base32 "1h8srn3fw4vw61qi0xxlk9fq0fqq4wl7fbrzz7sivdd8qkhjgv8x"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.19))) -- cgit v1.2.3 From a175ef12b6cbb7914791893edbce2c4a2d96d2ba Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 5 Oct 2022 15:05:43 -0400 Subject: gnu: linux-libre 5.15: Update to 5.15.72. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.72. (linux-libre-5.15-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e33c904313..90dd8d3292 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.15-version "5.15.71") +(define-public linux-libre-5.15-version "5.15.72") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "048r4synfax2ajyzlmp672b68yshxwlfccdah2vz1kh88rqfmgsc"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0lqy3nmhij6sb4963kb5dhvfdx46mg79hp81kq10wv01iq9hhm2z"))) + (hash (base32 "1aq75z2spa1jvxv9m89gsaxza29n25k8j1f0pg9yj6j7bcxk5430"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit v1.2.3 From 93852b83ec4bc88257422eaf5c687fa26d590109 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 5 Oct 2022 15:05:59 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.147. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.147. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 90dd8d3292..c83f7830b0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -388,7 +388,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.146") +(define-public linux-libre-5.10-version "5.10.147") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -398,7 +398,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1hbdxvlibp9w0q8bk1zlx77ayq2wcld8rjm134ybgbcf4zrrggbv"))) + (hash (base32 "16pdpjmvrdml7am7s2kydrif1l7f4aq0wh4ak0xh3dby16zkl9c5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From 1b7cb8a9772466fee542d0927771d89311e4e4ad Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 5 Oct 2022 15:06:26 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.216. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.216. (linux-libre-5.4-pristine-source, deblob-scripts-5.4): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c83f7830b0..a4a92ee557 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -403,17 +403,17 @@ 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.215") +(define-public linux-libre-5.4-version "5.4.216") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version linux-libre-5.4-gnu-revision (base32 "1nlgk8ajb5wl3aa96h9a0pb9j5a5wmrbpk63varn557x1d00r7wj") - (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) + (base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1gafnf9gbsfzvp9jq6y8qhpvas5cv9y0m9bad2sg55sjlb1zfard"))) + (hash (base32 "19vyxa0yzdf4w48jamjfz6kpiaaa7mjjz5gs2awckzilfc0n4pyf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From e543bd8321cf0bcfbab1f8189786defe2a13722a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 5 Oct 2022 15:06:47 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.261. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.261. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a4a92ee557..0e03a52185 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -418,7 +418,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.260") +(define-public linux-libre-4.19-version "4.19.261") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -428,7 +428,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1vlhaapbkvvk2acw1i5f6v6gd8v0x37n1y3i066cddl90my6yl24"))) + (hash (base32 "1cicb3zydpka9yjx875hbh305bsdvni2kp674pkvaw04pnc35hxy"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 40a42c4348635f186553938015f7e6a06be1e10c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 23 Sep 2022 09:05:47 +0300 Subject: gnu: linux-libre: Support zram on all kernels. * gnu/packages/linux.scm (%default-extra-linux-options): Add config options to add zram support. --- gnu/packages/linux.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0e03a52185..2a2b1614f9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -696,6 +696,10 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ("CONFIG_PROC_PID_CPUSET" . #t) ;; Allow disk encryption by default ("CONFIG_DM_CRYPT" . m) + ;; Support zram on all kernel configs + ("CONFIG_ZSWAP" . #t) + ("CONFIG_ZSMALLOC" . #t) + ("CONFIG_ZRAM" . m) ;; Modules required for initrd: ("CONFIG_NET_9P" . m) ("CONFIG_NET_9P_VIRTIO" . m) -- cgit v1.2.3 From e069c6df5e2685bceba6dc27f4f8eab35894ce6c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Oct 2022 12:38:34 +0200 Subject: gnu: Add r-dada2. * gnu/packages/bioconductor.scm (r-dada2): New variable. --- gnu/packages/bioconductor.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0a491f3d00..ecb60f2e24 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -16743,6 +16743,43 @@ ensemble machine learning for the estimation of nuisance functions.") visualizing bisulfite sequencing data.") (license license:artistic2.0))) +(define-public r-dada2 + (package + (name "r-dada2") + (version "1.24.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "dada2" version)) + (sha256 + (base32 + "0nvjnmcjh0i660y8s3rh9b3zl163wxdx7qm2n36m6vf0iy987l4x")))) + (properties `((upstream-name . "dada2"))) + (build-system r-build-system) + (propagated-inputs + (list r-biocgenerics + r-biostrings + r-ggplot2 + r-iranges + r-rcpp + r-rcppparallel + r-reshape2 + r-shortread + r-xvector)) + (native-inputs (list r-knitr)) + (home-page "https://benjjneb.github.io/dada2/") + (synopsis + "Accurate, high-resolution sample inference from amplicon sequencing data") + (description + "The dada2 package infers exact @dfn{amplicon sequence variants} (ASVs) +from high-throughput amplicon sequencing data, replacing the coarser and less +accurate OTU clustering approach. The dada2 pipeline takes as input +demultiplexed fastq files, and outputs the sequence variants and their +sample-wise abundances after removing substitution and chimera errors. +Taxonomic classification is available via a native implementation of the RDP +naive Bayesian classifier, and species-level assignment to 16S rRNA gene +fragments by exact matching.") + (license license:lgpl2.0))) + (define-public r-dmrseq (package (name "r-dmrseq") -- cgit v1.2.3 From a503d0ba8cde954c1aa5c67494176a5f5632797e Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 9 Sep 2022 12:03:37 -0400 Subject: gnu: gitolite: Switch to G-expressions. * gnu/packages/version-control.scm (gitolite)[arguments]: Use G-expressions. [inputs]: Add grep and sed. --- gnu/packages/version-control.scm | 162 +++++++++++++++++++-------------------- 1 file changed, 79 insertions(+), 83 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ad3029e814..bd0ad70ce8 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1497,89 +1497,85 @@ also walk each side of a merge and test those changes individually.") (base32 "05xw1pmagvkrbzga5pgl3xk9qyc6b5x73f842454f3w9ijspa8zy")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests - #:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (add-before 'install 'patch-scripts - (lambda* (#:key inputs #:allow-other-keys) - (let ((perl (search-input-file inputs "/bin/perl"))) - ;; This seems to take care of every shell script that - ;; invokes Perl. - (substitute* (find-files ".") - ((" perl -") - (string-append " " perl " -"))) - - (substitute* (find-files "src/triggers" ".*") - ((" sed ") - (string-append " " (which "sed") " "))) - - (substitute* - '("src/triggers/post-compile/update-gitweb-access-list" - "src/triggers/post-compile/ssh-authkeys-split" - "src/triggers/upstream") - ((" grep ") - (string-append " " (which "grep") " "))) - - ;; Avoid references to the store in authorized_keys. - ;; This works because gitolite-shell is in the PATH. - (substitute* "src/triggers/post-compile/ssh-authkeys" - (("\\$glshell \\$user") - "gitolite-shell $user"))))) - (add-before 'install 'patch-source - (lambda* (#:key inputs #:allow-other-keys) - ;; Gitolite uses cat to test the readability of the - ;; pubkey - (substitute* "src/lib/Gitolite/Setup.pm" - (("\"cat ") - (string-append "\"" (which "cat") " ")) - (("\"ssh-keygen") - (string-append "\"" (which "ssh-keygen")))) - - (substitute* '("src/lib/Gitolite/Hooks/PostUpdate.pm" - "src/lib/Gitolite/Hooks/Update.pm") - (("/usr/bin/perl") - (search-input-file inputs "/bin/perl"))) - - (substitute* "src/lib/Gitolite/Common.pm" - (("\"ssh-keygen") - (string-append "\"" (which "ssh-keygen"))) - (("\"logger\"") - (string-append "\"" - (assoc-ref inputs "inetutils") - "/bin/logger\""))) - - (substitute* "src/lib/Gitolite/Cache.pm" - (("/usr/sbin/redis-server") "redis-server")) - - (substitute* "src/commands/svnserve" - (("/usr/bin/svnserve") "svnserve")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((output (assoc-ref outputs "out")) - (sharedir (string-append output "/share/gitolite")) - (bindir (string-append output "/bin"))) - (mkdir-p sharedir) - (mkdir-p bindir) - (invoke "./install" "-to" sharedir) - ;; Create symlinks for executable scripts in /bin. - (for-each (lambda (script) - (symlink (string-append sharedir "/" script) - (string-append bindir "/" script))) - '("gitolite" "gitolite-shell"))))) - (add-after 'install 'wrap-scripts - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (coreutils (assoc-ref inputs "coreutils")) - (findutils (assoc-ref inputs "findutils")) - (git (assoc-ref inputs "git"))) - (for-each (lambda (file-name) - (wrap-program (string-append out file-name) - `("PATH" ":" prefix - ,(map (lambda (dir) - (string-append dir "/bin")) - (list out coreutils findutils git))))) - '("/bin/gitolite" "/bin/gitolite-shell")))))))) + (list #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (add-before 'install 'patch-scripts + (lambda* _ + ;; This seems to take care of every shell script that + ;; invokes Perl. + (substitute* (find-files ".") + ((" perl -") + (string-append " " #$perl "/bin/perl" " -"))) + + (substitute* (find-files "src/triggers" ".*") + ((" sed ") + (string-append " " #$sed "/bin/sed" " "))) + + (substitute* + '("src/triggers/post-compile/update-gitweb-access-list" + "src/triggers/post-compile/ssh-authkeys-split" + "src/triggers/upstream") + ((" grep ") + (string-append " " #$grep "/bin/grep" " "))) + + ;; Avoid references to the store in authorized_keys. + ;; This works because gitolite-shell is in the PATH. + (substitute* "src/triggers/post-compile/ssh-authkeys" + (("\\$glshell \\$user") + "gitolite-shell $user")))) + (add-before 'install 'patch-source + (lambda* _ + ;; Gitolite uses cat to test the readability of the + ;; pubkey + (substitute* "src/lib/Gitolite/Setup.pm" + (("\"cat ") + (string-append "\"" #$coreutils "/bin/cat" " ")) + (("\"ssh-keygen") + (string-append "\"" #$openssh "/bin/ssh-keygen"))) + + (substitute* '("src/lib/Gitolite/Hooks/PostUpdate.pm" + "src/lib/Gitolite/Hooks/Update.pm") + (("/usr/bin/perl") + (string-append #$perl "/bin/perl"))) + + (substitute* "src/lib/Gitolite/Common.pm" + (("\"ssh-keygen") + (string-append "\"" #$openssh "/bin/ssh-keygen")) + (("\"logger\"") + (string-append "\"" #$inetutils "/bin/logger\""))) + + (substitute* "src/lib/Gitolite/Cache.pm" + (("/usr/sbin/redis-server") "redis-server")) + + (substitute* "src/commands/svnserve" + (("/usr/bin/svnserve") "svnserve")))) + (replace 'install + (lambda* _ + (let* ((sharedir (string-append #$output "/share/gitolite")) + (bindir (string-append #$output "/bin"))) + (mkdir-p sharedir) + (mkdir-p bindir) + (invoke "./install" "-to" sharedir) + ;; Create symlinks for executable scripts in /bin. + (for-each (lambda (script) + (symlink (string-append sharedir "/" script) + (string-append bindir "/" script))) + '("gitolite" "gitolite-shell"))))) + (add-after 'install 'wrap-scripts + (lambda* _ + (for-each (lambda (file-name) + (wrap-program (string-append #$output file-name) + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin")) + (list #$output + #$coreutils + #$findutils + #$git))))) + '("/bin/gitolite" "/bin/gitolite-shell"))))))) (inputs (list bash-minimal coreutils findutils git inetutils openssh perl)) (home-page "https://gitolite.com") -- cgit v1.2.3 From dd7c8537d214b10614c5442ab0e6b563e5b823ce Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 2 Oct 2022 05:07:49 +0200 Subject: gnu: libqmatrixclient: Update to 0.6.11. * gnu/packages/messaging.scm (libqmatrixclient): Update to 0.6.11. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index dcd602c7c0..334f9d1517 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2312,7 +2312,7 @@ notifications, and Python scripting support.") (define-public libqmatrixclient (package (name "libqmatrixclient") - (version "0.5.3.2") + (version "0.6.11") (source (origin (method git-fetch) @@ -2321,7 +2321,7 @@ notifications, and Python scripting support.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs")))) + (base32 "072d3irpdd0p4w77s5pp0baqf74hk7vqggw7ic7i42lzjdwp3yql")))) (build-system cmake-build-system) (inputs (list qtbase-5 qtmultimedia-5)) -- cgit v1.2.3 From 2408a10325e7ad2c28ba84b5c8d5bf1c2979863c Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 2 Oct 2022 05:07:50 +0200 Subject: gnu: quaternion: Update to 0.0.95.1. * gnu/packages/messaging.scm (quaternion): Update to 0.0.95.1. [inputs]: Add qtgraphicaleffects. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 334f9d1517..709e57b2a5 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2483,7 +2483,7 @@ notification, emojis, E2E encryption, and voip calls.") (define-public quaternion (package (name "quaternion") - (version "0.0.9.4f") + (version "0.0.95.1") (outputs '("out" "debug")) (source (origin @@ -2493,12 +2493,13 @@ notification, emojis, E2E encryption, and voip calls.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1q9ddz4rs02a0w3lwrsjnh59khv38cq9f0kv09vnwvazvayn87ck")))) + (base32 "10mzcr4rpyq5bl3h8wzxxlk8rdz7slhiq863xs77bmsq2pzf6lp8")))) (build-system qt-build-system) (inputs (list libqmatrixclient qtbase-5 qtdeclarative-5 + qtgraphicaleffects qtmultimedia-5 qtquickcontrols-5 qtquickcontrols2-5 -- cgit v1.2.3 From b86867417fa76384eae76fcef099cf4d133bb20d Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 2 Oct 2022 00:56:44 +0200 Subject: gnu: celluloid: Do not install icon cache. Fixes . * gnu/packages/video.scm (celluloid)[arguments]: Add phase disable-postinstall-script so postinstall-script does nothing. Build with glib-or-gtk meson option. [native-inputs]: Remove desktop-file-utils, gtk:bin. Signed-off-by: Efraim Flashner --- gnu/packages/video.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5568c5be8b..e6da6ce04f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -785,12 +785,18 @@ old-fashioned output methods with powerful ascii-art renderer.") (sha256 (base32 "0ns9xh582c8kajw4v2x5ap5jfiba3gxywqc2klc0v6fc3id1gqii")))) (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-postinstall-script + (lambda _ + (setenv "DESTDIR" "/")))))) (native-inputs (list - desktop-file-utils ; for update-desktop-database intltool `(,glib "bin") ; for glib-compile-resources - `(,gtk "bin") ; for gtk-update-icon-cache pkg-config python-wrapper)) ; for generate-authors.py (inputs -- cgit v1.2.3 From 020dc0a1f1928503d1e2d5b401f87373c62c402c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 20 Sep 2022 13:28:26 +0100 Subject: gnu: plink: Change origin URL. pngu.mgh.harvard.edu seems to time out. * gnu/packages/bioinformatics.scm (plink)[origin]. Change URL. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index becf171880..c6d63a7492 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6296,7 +6296,7 @@ accessed/downloaded on demand across HTTP.") (origin (method url-fetch) (uri (string-append - "http://pngu.mgh.harvard.edu/~purcell/plink/dist/plink-" + "https://zzz.bwh.harvard.edu/plink/dist/plink-" version "-src.zip")) (sha256 (base32 "0as8gxm4pjyc8dxmm1sl873rrd7wn5qs0l29nqfnl31x8i467xaa")) -- cgit v1.2.3 From b370ac2103e0732d0e1181d892e1c62f9b9991a6 Mon Sep 17 00:00:00 2001 From: "(" Date: Sun, 11 Sep 2022 09:02:03 +0100 Subject: gnu: Add rust-greetd-ipc-0.8. * gnu/packages/crates-io.scm (rust-greetd-ipc-0.8): New variable. Signed-off-by: Christopher Baines --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9a64b356b5..92e424a88a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2022 Marius Bakke ;;; Copyright © 2022 Evgenii Lepikhin ;;; Copyright © 2022 Gabriel Arazas +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -26388,6 +26389,32 @@ and loading crate.") loading crate.") (license license:expat))) +(define-public rust-greetd-ipc-0.8 + (package + (name "rust-greetd-ipc") + (version "0.8.0") + (source (origin + (method url-fetch) + (uri (crate-uri "greetd-ipc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dscriv3adjyaxfaax3cmqrzx6q2vwwchbh86dhll783wjc4ivw0")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-async-trait" ,rust-async-trait-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://kl.wtf/projects/greetd") + (synopsis "@command{greetd} IPC protocol library for Rust") + (description + "This package provides library that helps you use the +@command{greetd} JSON-based IPC protocol from Rust.") + (license license:gpl3))) + (define-public rust-grep-0.2 (package (name "rust-grep") -- cgit v1.2.3 From 829c2eaa7f7236989f407aed294c4be712810a66 Mon Sep 17 00:00:00 2001 From: "(" Date: Sun, 11 Sep 2022 09:02:04 +0100 Subject: gnu: Add rust-os-pipe-0.8. * gnu/packages/crates-io.scm (rust-os-pipe-0.8): New variable. Signed-off-by: Christopher Baines --- gnu/packages/crates-io.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 92e424a88a..f671a2daf3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41432,10 +41432,27 @@ under its new name.") "04yjs1hf88jjm17g8a2lr7ibxyyg460rzbgcw9f1yzihq833y8zv")))) (native-inputs (list)))) -(define-public rust-os-pipe-0.5 +(define-public rust-os-pipe-0.8 (package (inherit rust-os-pipe-0.9) (name "rust-os-pipe") + (version "0.8.2") + (source (origin + (method url-fetch) + (uri (crate-uri "os-pipe" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "049ax8shxik7mm68r2nf7xnrcq3z3p7hz54sbrcxwywxqsjdzs41")))) + (arguments + (list #:cargo-inputs + `(("rust-nix" ,rust-nix-0.15) + ("rust-winapi" ,rust-winapi-0.3)))))) + +(define-public rust-os-pipe-0.5 + (package + (inherit rust-os-pipe-0.8) + (name "rust-os-pipe") (version "0.5.1") (source (origin -- cgit v1.2.3 From 44f8aa26bc6a5881fa1106077ecc136713a198a9 Mon Sep 17 00:00:00 2001 From: "(" Date: Sun, 11 Sep 2022 09:02:05 +0100 Subject: gnu: Add wlgreet. * gnu/packages/admin.scm (wlgreet): New variable. Signed-off-by: Christopher Baines --- gnu/packages/admin.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1a213adfdd..13d582403b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2022 Roman Riabenko ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 Andreas Rammhold +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,6 +100,7 @@ #:use-module (gnu packages c) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages crates-graphics) #:use-module (gnu packages crates-io) #:use-module (gnu packages cross-base) #:use-module (gnu packages crypto) @@ -109,6 +111,7 @@ #:use-module (gnu packages elf) #:use-module (gnu packages file) #:use-module (gnu packages flex) + #:use-module (gnu packages fonts) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) @@ -5224,6 +5227,74 @@ greetd-pam-mount is used in configuration of greetd to provide auto-(mounting/unmounting) of XDG_RUNTIME_DIR in the way that it will not interfere with default pam-mount configuration."))) +(define-public wlgreet + (package + (name "wlgreet") + (version "0.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~kennylevinsen/wlgreet") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00grp63n9nrgqls3knxfv9wjbc7p0jwr7i2vzxy750dz85gi2kzn")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-chrono" ,rust-chrono-0.4) + ("rust-getopts" ,rust-getopts-0.2) + ("rust-greetd-ipc" ,rust-greetd-ipc-0.8) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-memmap2" ,rust-memmap2-0.3) + ("rust-nix" ,rust-nix-0.15) + ("rust-os-pipe" ,rust-os-pipe-0.8) + ("rust-rusttype" ,rust-rusttype-0.7) + ("rust-serde" ,rust-serde-1) + ("rust-smithay-client-toolkit" + ,rust-smithay-client-toolkit-0.15) + ("rust-toml" ,rust-toml-0.5) + ("rust-wayland-client" ,rust-wayland-client-0.29) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.29) + ("rust-xml-rs" ,rust-xml-rs-0.8)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-bundled-fonts + (lambda _ + (delete-file-recursively "fonts"))) + (add-after 'remove-bundled-fonts 'fix-font-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/draw.rs" + (("\\.\\./fonts/dejavu/DejaVuSansMono\\.ttf" _) + (search-input-file + inputs + "share/fonts/truetype/DejaVuSansMono.ttf")) + (("\\.\\./fonts/Roboto-Regular\\.ttf" _) + (search-input-file + inputs + "share/fonts/truetype/Roboto-Regular.ttf"))))) + (add-after 'configure 'fix-library-references + (lambda* (#:key inputs vendor-dir #:allow-other-keys) + (substitute* (find-files vendor-dir "\\.rs$") + (("lib(wayland-.*|xkbcommon)\\.so" so-file) + (search-input-file + inputs + (string-append "lib/" so-file))))))))) + (inputs + (list font-dejavu + font-google-roboto + libxkbcommon + wayland)) + (home-page "https://git.sr.ht/~kennylevinsen/wlgreet") + (synopsis "Bare-bones Wayland-based greeter for @command{greetd}") + (description + "@command{wlgreet} provides a @command{greetd} greeter +that runs on a Wayland compositor such as @command{sway}. It +is implemented with pure Wayland APIs, so it does not depend +on a GUI toolkit.") + (license license:gpl3))) + (define-public libseat (package (name "libseat") -- cgit v1.2.3 From 7a271e688612ae77e69834cc8d4aa82bd2cfdbd9 Mon Sep 17 00:00:00 2001 From: "(" Date: Wed, 14 Sep 2022 07:48:32 +0100 Subject: gnu: Add cpass. * gnu/packages/password-utils.scm (cpass): New variable. Signed-off-by: Christopher Baines --- gnu/packages/password-utils.scm | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 003e346305..09752a43d0 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2021 David Dashyan ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Maxime Devos +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,6 +59,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system go) + #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix gexp) @@ -109,8 +111,7 @@ #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) - #:use-module (gnu packages xml) - #:use-module (guix build-system python)) + #:use-module (gnu packages xml)) (define-public pwgen (package @@ -863,6 +864,39 @@ also install the browser extension for GNU IceCat or ungoogled-chromium separately.") (license license:isc))) +(define-public cpass + (package + (name "cpass") + (version "0.9.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "cpass" version)) + (sha256 + (base32 + "1zp3a8mgqxn916fzj1v2yhgnl7v6s0vnd0qcghqs3qq648qmlwr5")))) + (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-pass-refs + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cpass.py" + (("'pass'") + (string-append "'" + (search-input-file inputs + "bin/pass") + "'")) + (("\\.password_store") + ".password-store"))))))) + (inputs (list password-store)) + (propagated-inputs (list python-urwid)) + (home-page "https://github.com/OliverLew/cpass") + (synopsis "Textual interface for @command{pass}") + (description + "@command{cpass} is a terminal user interface for @command{pass}. +It supports both vim-like keybindings and the mouse.") + (license license:expat))) + (define-public argon2 (package (name "argon2") -- cgit v1.2.3 From 53eea4d6570037e6168cbb0fbd8e295874f0759a Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Thu, 15 Sep 2022 10:41:07 +0200 Subject: gnu: Add r-spacefillr. * gnu/packages/cran.scm (r-spacefillr): New variable. Signed-off-by: Christopher Baines --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6a561473fc..709259ea5e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -34733,6 +34733,30 @@ analyses.") for rendering equations in the HTML help files.") (license (list license:asl2.0 license:gpl3)))) +(define-public r-spacefillr + (package + (name "r-spacefillr") + (version "0.3.0") + (source (origin + (method url-fetch) + (uri (cran-uri "spacefillr" version)) + (sha256 + (base32 + "0c4yasc1zizjmhd2ciyz86lg76fsrxvl19yjkb2fmkda9rmnc0bf")))) + (properties `((upstream-name . "spacefillr"))) + (build-system r-build-system) + (propagated-inputs (list r-rcpp)) + (home-page "https://github.com/tylermorganwall/spacefillr") + (synopsis "Space-Filling Random and Quasi-Random Sequences") + (description + "@code{spacefillr} enables generation of random and quasi-random +space-filling sequences. It supports the following sequences: Halton, Sobol, +Owen-scrambled Sobol, Owen-scrambled Sobol with errors distributed as blue +noise, progressive jittered, progressive multi-jittered (PMJ), PMJ with blue +noise, PMJ02, and PMJ02 with blue noise. The package also includes a C++ +API.") + (license license:expat))) + (define-public r-spacetime (package (name "r-spacetime") -- cgit v1.2.3 From e4593e21145769ff721b70148edb25fd35838834 Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Thu, 15 Sep 2022 10:45:05 +0200 Subject: gnu: Add r-gldex. * gnu/packages/cran.scm (r-gldex): New variable. Signed-off-by: Christopher Baines --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 709259ea5e..c48ef78f4c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21328,6 +21328,33 @@ using a lasso (L1) penalty. Facilities are provided for estimates along a path of values for the regularization parameter.") (license license:gpl2))) +(define-public r-gldex + (package + (name "r-gldex") + (version "2.0.0.9") + (source (origin + (method url-fetch) + (uri (cran-uri "GLDEX" version)) + (sha256 + (base32 + "1g0wg6z4ba1n6p2nw3kr734wlgmq0aw1a4spr6xw6djj7idsfi61")))) + (properties `((upstream-name . "GLDEX"))) + (build-system r-build-system) + (propagated-inputs (list r-cluster r-spacefillr)) + (home-page "https://cran.r-project.org/package=GLDEX") + (synopsis "Fitting single and mixture of generalised lambda distributions") + (description + "@code{GLDEX} offers fitting algorithms corresponding to two major +objectives. One is to provide a smoothing device to fit distributions to data +using the weighted and unweighted discretised approach based on the bin width +of the histogram. The other is to provide a definitive fit to the data set +using the maximum likelihood and quantile matching estimation. Other methods +such as moment matching, starship method, and L moment matching are also +provided. Diagnostics on goodness of fit can be done via qqplots, KS-resample +tests and comparing mean, variance, skewness and kurtosis of the data with the +fitted distribution.") + (license license:gpl3+))) + (define-public r-rhpcblasctl (package (name "r-rhpcblasctl") -- cgit v1.2.3 From 52b9f0ef1e1d80275ea39ba146f286f6a91c9585 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Thu, 15 Sep 2022 13:16:25 +0000 Subject: gnu: Add discregrid. * gnu/packages/graphics.scm (discregrid): New variable. Signed-off-by: Christopher Baines --- gnu/packages/graphics.scm | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index fe38e7d03f..93cbb23620 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2202,6 +2202,75 @@ Features include: ") (license license:gpl3+))) +(define-public discregrid + (let ((commit "4c27e1cc88be828c6ac5b8a05759ac7e01cf79e9") + (revision "0")) + (package + (name "discregrid") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/InteractiveComputerGraphics/Discregrid") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01cwfpw19rc9k5glx9dhnqpihd0is28a9b53qvzp5kgjmdq2v1p0")) + (modules '((guix build utils))) + (snippet + #~(begin + (delete-file-recursively "extern/cxxopts") + (substitute* '("cmd/discrete_field_to_bitmap/main.cpp" + "cmd/generate_density_map/main.cpp" + "cmd/generate_sdf/main.cpp") + (("^#include ") + "#include ")))))) + (build-system cmake-build-system) + (outputs '("out" "bin")) + (arguments + (list #:tests? #f ; No tests + #:configure-flags + #~(list (string-append "-DCMAKE_INSTALL_BINDIR=" + #$output:bin "/bin") + ;; Bespoke version of BUILD_SHARED_LIBS. + "-DBUILD_AS_SHARED_LIBS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake + (lambda _ + (let ((port (open-file "cmd/CMakeLists.txt" "a"))) + (display "install(TARGETS + DiscreteFieldToBitmap + GenerateDensityMap + GenerateSDF) +" + port) + (close-port port))))))) + (inputs + (list cxxopts eigen)) + (home-page "https://github.com/InteractiveComputerGraphics/Discregrid") + (synopsis "Discretize functions on regular grids") + (description "Discregrid is a C++ library for the parallel discretization +of (preferably smooth) functions on regular grids. It generates a (cubic) +polynomial discretization given a box-shaped domain, a grid resolution, and a +3D scalar field. The library can also serialize and deserialize the generated +discrete grid, and compute and discretize the signed distance field +corresponding to a triangle mesh. The following programs are included with +Discregrid: + +@itemize +@item @code{GenerateSDF}: Computes a discrete (cubic) signed distance field +from a triangle mesh in OBJ format. + +@item @code{DiscreteFieldToBitmap}: Generates an image in bitmap format of a +two-dimensional slice of a previously computed discretization. + +@item @code{GenerateDensityMap}: Generates a density map from a previously +generated discrete signed distance field using the cubic spline kernel. +@end itemize") + (license license:expat)))) + (define-public mmg (package (name "mmg") -- cgit v1.2.3 From eb5b104ca8a3d37cebb8ac6c93bdd0a0447db2b2 Mon Sep 17 00:00:00 2001 From: Lu Hui Date: Fri, 16 Sep 2022 20:46:06 +0800 Subject: gnu: libdaemon: Fix targeting riscv64. * gnu/packages/libdaemon.scm (libdaemon)[native-inputs,arguments]: Treat targeting riscv64 like aarch64 is handled. Signed-off-by: Christopher Baines --- gnu/packages/libdaemon.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libdaemon.scm b/gnu/packages/libdaemon.scm index 9dc851e823..12e4e2dc9c 100644 --- a/gnu/packages/libdaemon.scm +++ b/gnu/packages/libdaemon.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2020 Ludovic Courtès ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2022 LuHui ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,7 +50,8 @@ (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (native-inputs - (if (and=> (%current-target-system) target-aarch64?) + (if (or (and=> (%current-target-system) target-aarch64?) + (and=> (%current-target-system) target-riscv64?)) `(("config" ,config)) ; for config.sub '())) (arguments @@ -66,7 +68,8 @@ ;; Hurd's console client. "--localstatedir=/var")) '()) - ,@(if (and=> (%current-target-system) target-aarch64?) + ,@(if (or (and=> (%current-target-system) target-aarch64?) + (and=> (%current-target-system) target-riscv64?)) `(#:phases (modify-phases %standard-phases (add-before 'configure 'update-config.sub -- cgit v1.2.3 From 53e086c5c6ec9988f08bf7072c26030237dbd890 Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Sun, 18 Sep 2022 00:04:17 +0000 Subject: gnu: Add waybar-cpu-histogram. * gnu/packages/wm.scm (waybar-cpu-histogram): New variable. Signed-off-by: Christopher Baines --- gnu/packages/wm.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 5699e42540..af406ed2ed 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -57,6 +57,7 @@ ;;; Copyright © 2022 muradm ;;; Copyright © 2022 Elais Player ;;; Copyright © 2022 Trevor Richards +;;; Copyright © 2022 Fredrik Salomonsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -1753,6 +1754,34 @@ display a clock or apply image manipulation techniques to the background image." Wlroots based compositors.") (license license:expat))) ; MIT license +(define-public waybar-cpu-histogram + (package + (name "waybar-cpu-histogram") + (version "0.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~plattfot/waybar-cpu-histogram") + (commit (string-append version)))) + (sha256 + (base32 + "001pyf1jdmf2478plnggd7dkfi688qwi89db2jwfp4zza3640na6")) + (file-name (git-file-name name version)))) + (build-system meson-build-system) + (native-inputs + (list pkg-config)) + (inputs + (list jsoncpp + fmt)) + (synopsis "CPU histogram for waybar") + (description + "Custom module for waybar to show CPU usage as a histogram. A compact way +to see how many cores are active, compared to having a bar for each +core/thread.") + (home-page "https://github.com/plattfot/cpu-histogram/") + (license license:expat))) + (define-public wlr-randr (package (name "wlr-randr") -- cgit v1.2.3 From 2f88f5c06fb2a47ac50c84efbe264f1751fe3417 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 6 Oct 2022 17:25:13 +0200 Subject: gnu: komikku: Update to 1.1.0. * gnu/packages/gnome.scm (komikku): Update to 1.1.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8fb1213122..7182822a4f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13010,7 +13010,7 @@ profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) @@ -13020,7 +13020,7 @@ profiler via Sysprof, debugging support, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "0k0s644ylbyq3a4vhdn9ymmk7kb0jgcpxxrhpr1g2nrcq7fqn116")))) + "0ik3dwyq3r44d0h7r7x8j2sah9fhzilyvds1d6bbgbccqxzw4lnh")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From ac3582f990ec32bce6f113a57718b3dc0c246e07 Mon Sep 17 00:00:00 2001 From: Brian Cully Date: Tue, 4 Oct 2022 13:59:23 -0400 Subject: gnu: zfs: Update to 2.1.6. * gnu/packages/file-systems.scm (zfs): Update to 2.1.6. Signed-off-by: Efraim Flashner --- gnu/packages/file-systems.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index d326b9cc3d..d22ac5aab8 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1192,7 +1192,7 @@ with the included @command{xfstests-check} helper.") (define-public zfs (package (name "zfs") - (version "2.1.5") + (version "2.1.6") (outputs '("out" "module" "src")) (source (origin @@ -1201,7 +1201,7 @@ with the included @command{xfstests-check} helper.") "/download/zfs-" version "/zfs-" version ".tar.gz")) (sha256 - (base32 "0371j5k28cymqngfl76dfxzggvdf8n0ssij37350gzs4bhg084qr")))) + (base32 "0ymxkms1gwf731x61sj54rnnp029724zhywkxd4164yjz0a90cqm")))) (build-system linux-module-build-system) (arguments (list -- cgit v1.2.3 From 0179b21641f62fbc22de19e5f84158b295ef442b Mon Sep 17 00:00:00 2001 From: itd Date: Mon, 3 Oct 2022 22:46:01 +0200 Subject: gnu: weechat-wee-slack: Update to 2.9.0. * gnu/packages/messaging.scm (weechat-wee-slack): Update to 2.9.0. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 709e57b2a5..2ce0ce2689 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -3398,7 +3398,7 @@ Weechat communicate over the Matrix protocol.") (define-public weechat-wee-slack (package (name "weechat-wee-slack") - (version "2.8.0") + (version "2.9.0") (source (origin (method git-fetch) @@ -3408,7 +3408,7 @@ Weechat communicate over the Matrix protocol.") (file-name (git-file-name name version)) (sha256 (base32 - "0xfklr0gsc9jgxfyrrb2j756lclz9g8imcb0pk0xgyj8mhsw23zk")))) + "01h9n6a39sgpczvjywvxb5z5vz3jb3h2xx2vspjkkz06gzwniijq")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 3657b4daeafab8d3935191d57653b8331e395897 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 5 Oct 2022 14:39:57 +0200 Subject: gnu: tessen: Update to 2.1.2. * gnu/packages/password-utils.scm (tessen): Update to 2.1.2. [arguments]: Substitute notify-send, wl-copy and xdg-open. [inputs] Add libnotify, wl-clipboard and xdg-utils. Signed-off-by: Efraim Flashner --- gnu/packages/password-utils.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 09752a43d0..8e29bef484 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -82,6 +82,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages gtk) @@ -758,7 +759,7 @@ using password-store through rofi interface: (define-public tessen (package (name "tessen") - (version "2.1.0") + (version "2.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -767,7 +768,7 @@ using password-store through rofi interface: (file-name (git-file-name name version)) (sha256 (base32 - "1ddsjhzp1qy3jfhxlrzcxgp0gza234yc0sdlngwa3xdj0wr40zs0")))) + "01jaxakq847k3v2wid8fzhcmq8mraxz0q1j87s1jv75l1gy4qiij")))) (build-system gnu-build-system) (arguments (list #:tests? @@ -777,13 +778,17 @@ using password-store through rofi interface: (add-after 'unpack 'patch-wtype-path (lambda* (#:key inputs #:allow-other-keys) (substitute* "tessen" - (("wtype") (search-input-file inputs "/bin/wtype"))))) + (("notify-send") (search-input-file inputs + "/bin/notify-send")) + (("wl-copy") (search-input-file inputs "/bin/wl-copy")) + (("wtype") (search-input-file inputs "/bin/wtype")) + (("xdg-open") (search-input-file inputs "/bin/xdg-open"))))) (delete 'configure)) ;no configure script #:make-flags #~(list (string-append "PREFIX=" #$output)))) (native-inputs (list scdoc)) - (inputs (list wtype)) + (inputs (list libnotify wl-clipboard wtype xdg-utils)) (home-page "https://github.com/ayushnix/tessen") (synopsis "Frontend for password-store and gopass") (description "Tessen is a bash script that can autotype and copy data -- cgit v1.2.3 From b60b756226bafb4e1e40da06876207ef209927ea Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 6 Oct 2022 18:28:07 +0200 Subject: gnu: python-pygame-sdl2: Update to 2.1.0-for-renpy-8.0.3. * gnu/packages/game-development.scm (python-pygame-sdl2): Update to 2.1.0-for-renpy-8.0.3. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 889b435cfb..7b283e4f1e 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1210,7 +1210,7 @@ to create fully featured games and multimedia programs in the python language.") (define-public python-pygame-sdl2 (let ((real-version "2.1.0") - (renpy-version "8.0.0")) + (renpy-version "8.0.3")) (package (inherit python-pygame) (name "python-pygame-sdl2") @@ -1220,7 +1220,7 @@ to create fully featured games and multimedia programs in the python language.") (method url-fetch) (uri (string-append "https://www.renpy.org/dl/" renpy-version "/pygame_sdl2-" version ".tar.gz")) - (sha256 (base32 "0majf64pdfba5byjlv41pgsdmwvy09hw3m7143jz3kc1wjd2gaw8")) + (sha256 (base32 "1nq78mybkvshshdjy5bly6nfq6dnwll648ng62fwmksxpni17486")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From e4951f7c71b2e94de40a194b4e1d2034266d4c3a Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 6 Oct 2022 18:30:07 +0200 Subject: gnu: python-renpy: Update to 8.0.3. * gnu/packages/game-development.scm (python-renpy): Update to 8.0.3. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7b283e4f1e..513ed31bc0 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1261,13 +1261,13 @@ developed mainly for Ren'py.") (define-public python-renpy (package (name "python-renpy") - (version "8.0.0") + (version "8.0.3") (source (origin (method url-fetch) (uri (string-append "https://www.renpy.org/dl/" version "/renpy-" version "-source.tar.bz2")) - (sha256 (base32 "09z3r16j4cxddkb50ghmi4xp0s05s15q4pzdmfajy85ignwqhjdi")) + (sha256 (base32 "1b49y60pi6304fg06lw5gajzrgg9w80swpfkn6pw0lxbr6djgjgn")) (modules '((guix build utils))) (patches (search-patches -- cgit v1.2.3 From 96cbfc620263550002a897682e89b8dc0620d933 Mon Sep 17 00:00:00 2001 From: Brian Kubisiak Date: Sun, 25 Sep 2022 05:59:24 -0700 Subject: gnu: Add python-textual. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-textual): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8575d4a67e..823e5952e4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16041,6 +16041,50 @@ is made as zipfile like as possible.") syntax highlighting, markdown and more to the terminal.") (license license:expat))) +(define-public python-textual + (package + (name "python-textual") + (version "0.1.18") + (source (origin + (method url-fetch) + (uri (pypi-uri "textual" version)) + (sha256 + (base32 + "08yg5a51hz1axfj5hx28hx31gq5apcj6vpkkmawmiplisa73z25j")))) + (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (copy-recursively (string-append + (assoc-ref inputs "tests") "/tests") + "tests") + (invoke "python" "-m" "pytest" "-vv"))))))) + (propagated-inputs + (list python-rich python-typing-extensions)) + (native-inputs + `(("python-pytest" ,python-pytest) + ("tests" + ;; The release on pypi comes without tests. We can't build from this + ;; checkout, though, because installation requires an invocation of + ;; poetry. + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Textualize/textual") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b3ycwqhp21mg9fvmadgxhgbvkwq6fd784l2xcmvy77rravrnnax")))))) + (home-page "https://github.com/Textualize/textual") + (synopsis "Build text user interfaces in Python") + (description "Textual is a @acronym{TUI, Text User Interface} framework +for Python inspired by modern web development.") + (license license:expat))) + (define-public python-magic (package (name "python-magic") -- cgit v1.2.3 From a0c83aa04bd45ee17ee72df529866ee4ac6041e3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Oct 2022 22:41:15 +0200 Subject: gnu: python-textual: Remove input labels. * gnu/packages/python-xyz.scm (python-textual)[arguments]: Define the 'tests' origin here. [native-inputs]: Remove "tests" input and remove input labels. --- gnu/packages/python-xyz.scm | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 823e5952e4..60870f5447 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16053,32 +16053,31 @@ syntax highlighting, markdown and more to the terminal.") "08yg5a51hz1axfj5hx28hx31gq5apcj6vpkkmawmiplisa73z25j")))) (build-system python-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs tests? #:allow-other-keys) - (when tests? - (copy-recursively (string-append - (assoc-ref inputs "tests") "/tests") - "tests") - (invoke "python" "-m" "pytest" "-vv"))))))) + (let ((tests + ;; The release on pypi comes without tests. We can't build + ;; from this checkout, though, because installation requires + ;; an invocation of poetry. + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Textualize/textual") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b3ycwqhp21mg9fvmadgxhgbvkwq6fd784l2xcmvy77rravrnnax"))))) + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (copy-recursively #$(file-append tests "/tests") + "tests") + (invoke "python" "-m" "pytest" "-vv")))))))) (propagated-inputs (list python-rich python-typing-extensions)) (native-inputs - `(("python-pytest" ,python-pytest) - ("tests" - ;; The release on pypi comes without tests. We can't build from this - ;; checkout, though, because installation requires an invocation of - ;; poetry. - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Textualize/textual") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0b3ycwqhp21mg9fvmadgxhgbvkwq6fd784l2xcmvy77rravrnnax")))))) + (list python-pytest)) (home-page "https://github.com/Textualize/textual") (synopsis "Build text user interfaces in Python") (description "Textual is a @acronym{TUI, Text User Interface} framework -- cgit v1.2.3 From 3a5ae8c0702d79a0353805d6e3ed71717189510e Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 25 Sep 2022 18:57:22 +0200 Subject: gnu: sssd: Update to 2.7.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/sssd.scm (sssd): Update to 2.7.4. * gnu/packages/patches/sssd-optional-systemd.patch: Update patch. Signed-off-by: Ludovic Courtès --- gnu/packages/patches/sssd-optional-systemd.patch | 24 ++++++++++++------------ gnu/packages/sssd.scm | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/patches/sssd-optional-systemd.patch b/gnu/packages/patches/sssd-optional-systemd.patch index 0784fdc7aa..e6d74e79fa 100644 --- a/gnu/packages/patches/sssd-optional-systemd.patch +++ b/gnu/packages/patches/sssd-optional-systemd.patch @@ -2,7 +2,7 @@ Allow running sss_analyze without Python modules for systemd. Upstream PR: https://github.com/SSSD/sssd/pull/6125 diff --git a/src/tools/analyzer/modules/request.py b/src/tools/analyzer/modules/request.py -index b96a23c05..28ac2f194 100644 +index b9fe3caf8..51ec3a151 100644 --- a/src/tools/analyzer/modules/request.py +++ b/src/tools/analyzer/modules/request.py @@ -1,8 +1,6 @@ @@ -14,7 +14,7 @@ index b96a23c05..28ac2f194 100644 from sssd.parser import SubparsersAction from sssd.parser import Option -@@ -77,8 +75,10 @@ class RequestAnalyzer: +@@ -76,8 +74,10 @@ class RequestAnalyzer: Instantiated source object """ if args.source == "journald": @@ -25,7 +25,7 @@ index b96a23c05..28ac2f194 100644 source = Files(args.logdir) return source -@@ -143,7 +143,7 @@ class RequestAnalyzer: +@@ -142,7 +142,7 @@ class RequestAnalyzer: self.consumed_logs.append(line.rstrip(line[-1])) else: # files source includes newline @@ -34,12 +34,12 @@ index b96a23c05..28ac2f194 100644 print(line, end='') else: print(line) -@@ -225,7 +225,7 @@ class RequestAnalyzer: - source.set_component(component, False) - self.done = "" - for line in self.matched_line(source, patterns): -- if isinstance(source, Journald): -+ if type(source).__name__ == 'Journald': - print(line) - else: - self.print_formatted(line, args.verbose) +@@ -240,7 +240,7 @@ class RequestAnalyzer: + self.print_formatted_verbose(source, patterns) + else: + for line in self.matched_line(source, patterns): +- if isinstance(source, Journald): ++ if type(source).__name__ == 'Journald': + print(line) + else: + self.print_formatted(line) diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm index 98b819070f..dbeb0ee143 100644 --- a/gnu/packages/sssd.scm +++ b/gnu/packages/sssd.scm @@ -154,7 +154,7 @@ fundamental object types for C.") (define-public sssd (package (name "sssd") - (version "2.7.3") + (version "2.7.4") (source (origin (method git-fetch) @@ -163,7 +163,7 @@ fundamental object types for C.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "18kcg82gcf5wgmaq5w9fszv9sg3d93yqm39p1npr8kw8b9203n4r")) + (base32 "1946pfwyv1ci0m4flrhwkksq42p14n7kcng6fbq6sy4lcn5g3yml")) (patches (search-patches "sssd-optional-systemd.patch" "sssd-system-directories.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 2a51fb1d29679343dcae508f2d59e90636a5cd7b Mon Sep 17 00:00:00 2001 From: Felix Lechner Date: Sun, 25 Sep 2022 16:30:26 -0700 Subject: gnu: nyacc: Update to 1.07.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mes.scm (nyacc): Update to 1.07.4. Signed-off-by: Ludovic Courtès --- gnu/packages/mes.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 2823297e3f..72cdb503d7 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -98,14 +98,14 @@ extensive examples, including parsers for the Javascript and C99 languages.") (define-public nyacc (package (inherit nyacc-0.99) - (version "1.07.0") + (version "1.07.4") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/nyacc/nyacc-" version ".tar.gz")) (sha256 (base32 - "01qb6h6bk684z8xda5d71q5f5l2z3q9jjz36if3jbpjc7b8dxjap")) + "1kr3b88sx0g9zy52algxqpvnkjm76qdyld7pasbbajkph2zhcj92")) (modules '((guix build utils))) (snippet '(substitute* "configure" -- cgit v1.2.3 From 37ed844711c1e8c802ea9f7e0f378e6440e4c526 Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Fri, 30 Sep 2022 09:34:39 +0200 Subject: gnu: squid: Enable TLS features. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Despite openssl being listed as an input, it was not actually enabled by default. Fixing that using a configure flag. * gnu/packages/networking.scm (squid)[arguments]: Add "--with-openssl" to #:configure-flags. Signed-off-by: Ludovic Courtès --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3d9ba4fc8d..3489c3b96a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2010,7 +2010,7 @@ TCP connection, TLS handshake and so on) in the terminal.") '(#:configure-flags ;; disable -march=native in build for reproducibility; see ;; https://wiki.squid-cache.org/KnowledgeBase/IllegalInstructionError - (list "--disable-arch-native") + (list "--disable-arch-native" "--with-openssl") #:phases (modify-phases %standard-phases (add-before 'build 'fix-true-path -- cgit v1.2.3 From cb731c80fffcbc483c950f73477ac99ba15e856f Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Fri, 30 Sep 2022 19:08:32 +0200 Subject: gnu: julius: Update to 1.7.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (julius): Update to 1.7.0. Signed-off-by: Ludovic Courtès --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 65375c9acc..246472c699 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1555,7 +1555,7 @@ Joy-Con controllers.") (define-public julius (package (name "julius") - (version "1.6.0") + (version "1.7.0") (source (origin (method git-fetch) @@ -1564,7 +1564,7 @@ Joy-Con controllers.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nfdn8n6ywhm69ckz9a1chl5xxiqyaj3l337wadsbppnpscjihrc")) + (base32 "0w7kmgz9ya0ck9cxhsyralarg7y6ydx4plmh33r4mkxkamlr7493")) ;; Remove unused bundled libraries. (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 9cd3c2dc18fda4c2b726195f239dc8443760b1fb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 7 Oct 2022 00:41:01 +0200 Subject: gnu: emacs-debbugs: Update to 0.34. * gnu/packages/emacs-xyz.scm (emacs-debbugs): Update to 0.34. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 235505b08c..35f1bf3d19 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7106,14 +7106,14 @@ by a query, so both a link can refer to several mails.") (define-public emacs-debbugs (package (name "emacs-debbugs") - (version "0.33") + (version "0.34") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/debbugs-" version ".tar")) (sha256 - (base32 "1s4p3jf9yrm8pn5pljpkrw05n2p9v6fpl141rh1df7f7l0w80qbk")))) + (base32 "06nxia4myhysiw12vsflgllrp9nyhmjnybrrcl1vyf4pw0fc6yrx")))) (build-system emacs-build-system) (arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$"))) (propagated-inputs -- cgit v1.2.3 From 22498be0a152dd32df4a8edbd88d63557e0711b4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 7 Oct 2022 00:43:01 +0200 Subject: gnu: emacs-emms: Update to 12. * gnu/packages/emacs-xyz.scm (emacs-emms): Update to 12. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 35f1bf3d19..bae5f94a7f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2481,14 +2481,14 @@ incrementally confined in Isearch manner.") (define emacs-emms-print-metadata (package (name "emacs-emms-print-metadata") - (version "11") + (version "12") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "emms-" version ".tar")) (sha256 - (base32 "000lqhsafyh1n293ksnlyavxv1pzl5pazds4sgxjcqd45lyn55ii")))) + (base32 "048ijrpw6s4k7zr78fzc3ksjjri6mnyp6c47h5lp5nw5gvm4np7a")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From 23c97e2e887d7bca3787b6d06bbe3e5cd659ab67 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 7 Oct 2022 00:44:07 +0200 Subject: gnu: emacs-ement: Update to 0.3.1. * gnu/packages/emacs-xyz.scm (emacs-ement): Update to 0.3.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bae5f94a7f..0f6a7f0b04 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17130,7 +17130,7 @@ which avoids some of the issues with using Emacs’s built-in Url library.") (define-public emacs-ement (package (name "emacs-ement") - (version "0.3") + (version "0.3.1") (source (origin (method git-fetch) @@ -17139,7 +17139,7 @@ which avoids some of the issues with using Emacs’s built-in Url library.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ing4pdqh4z3jsk9qb8qc5n968c27mxn0yq0h102plrb7fafd8ic")))) + (base32 "1ap4zxn2ba8bvmzm77aa4bnxgb1hnz5cymcim9jzy7b67bgapmy7")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs)) ;need libxml support -- cgit v1.2.3 From c558fed4dbd836f9017724eb47063c31088a730a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 7 Oct 2022 00:46:32 +0200 Subject: gnu: emacs-org-re-reveal: Update to 3.16.0. * gnu/packages/emacs-xyz.scm (emacs-org-re-reveal): Update to 3.16.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0f6a7f0b04..bb6a3990ea 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21380,7 +21380,7 @@ powerful Org contents.") (define-public emacs-org-re-reveal (package (name "emacs-org-re-reveal") - (version "3.15.0") + (version "3.16.0") (source (origin (method git-fetch) @@ -21389,7 +21389,7 @@ powerful Org contents.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0mn7qn80289gizvnxyjjs00b7qmlf0692kai7qgzgfj6i87pjc38")))) + (base32 "0w6v7x4y0wn8af48vfn8m5h46w09wncwgcc9q8pl3zf92s50drg7")))) (build-system emacs-build-system) (propagated-inputs (list emacs-htmlize emacs-org)) -- cgit v1.2.3 From 63cece578755f9d4c00d468e28df69cbd8b5ab4c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 7 Oct 2022 00:47:42 +0200 Subject: gnu: emacs-lcr: Update to 1.2. * gnu/packages/emacs-xyz.scm (emacs-lcr): Update to 1.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bb6a3990ea..a319f503b2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17199,7 +17199,7 @@ editing RPM spec files.") (define-public emacs-lcr (package (name "emacs-lcr") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) @@ -17208,7 +17208,7 @@ editing RPM spec files.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0mc55icihxqpf8b05990q1lc2nj2792wcgyr73xsiqx0963sjaj8")))) + (base32 "1856i3xll0pjrnh9r1xvi8lywpnixps2znvkvvd5505wcp20bcxf")))) (build-system emacs-build-system) (propagated-inputs (list emacs-dash)) -- cgit v1.2.3 From eea2d5b6f74a14088e69480d36cd5dcc0a526263 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 7 Oct 2022 00:49:36 +0200 Subject: gnu: extractpdfmark: Update to 1.1.1. * gnu/packages/pdf.scm (extractpdfmark): Update to 1.1.1. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index d698450656..6a04c4b0f8 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -112,7 +112,7 @@ (define-public extractpdfmark (package (name "extractpdfmark") - (version "1.1.0") + (version "1.1.1") (source (origin (method git-fetch) @@ -121,7 +121,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "14aa6zly53j8gx5d32caiabk2j4b102xha0v9149yahz6kbn5b80")))) + (base32 "0yzc3ajgdfb4ssxp49g2vrki45kl144j39bg0wdn6h9dc14kzmx4")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8319be779f0d780aa801c9fa1be853781c680dda Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 7 Oct 2022 00:51:13 +0200 Subject: gnu: extractpdfmark: Improve package style. * gnu/packages/pdf.scm (extractpdfmark)[arguments]: Use G-expressions. Fix phase name. [native-inputs]: Remove labels. --- gnu/packages/pdf.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 6a04c4b0f8..915f96bb3f 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -124,18 +124,18 @@ (base32 "0yzc3ajgdfb4ssxp49g2vrki45kl144j39bg0wdn6h9dc14kzmx4")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'start-xorg-server - ;; The test suite wants to write to /homeless-shelter - (lambda _ (setenv "HOME" (getcwd))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-home + ;; The test suite wants to write to /homeless-shelter + (lambda _ (setenv "HOME" (getcwd))))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("gettext" ,gettext-minimal) - ("ghostscript" ,ghostscript) - ("pkg-config" ,pkg-config) - ("texlive" ,texlive-tiny))) + (list autoconf + automake + gettext-minimal + ghostscript + pkg-config + texlive-tiny)) (inputs (list poppler)) (home-page "https://github.com/trueroad/extractpdfmark") -- cgit v1.2.3 From a52f39ad0c0ffe78e4d2eef5fefdb4204799fdcb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Oct 2022 15:16:24 +0200 Subject: gnu: rest@0.9.1: Remove dependency on gtksourceview and libadwaita. Partly fixes . This also reduces the closure size of rest@0.9.1 from 2.1GiB to 498MiB (on x86_64-linux). * gnu/packages/gnome.scm (rest-next)[arguments]: Pass the "-Dexamples=false" config flag. * gnu/packages/gnome.scm (rest-next)[inputs]: Remove GTKSOURCEVIEW and LIBADWAITA. --- gnu/packages/gnome.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7182822a4f..8043eec30d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4995,7 +4995,10 @@ libxml to ease remote use of the RESTful API.") (arguments (substitute-keyword-arguments (package-arguments rest) ((#:tests? _ #f) #t) ((#:configure-flags _) - #~(list)) + ;; Do not build the optional 'librest-demo' program as it + ;; depends on gtksourceview and libadwaita and thus, + ;; indirectly, on Rust. + #~(list "-Dexamples=false")) ((#:phases phases '%standard-phases) #~(modify-phases #$phases (add-after 'unpack 'disable-problematic-tests @@ -5012,7 +5015,7 @@ libxml to ease remote use of the RESTful API.") (append gettext-minimal gi-docgen gsettings-desktop-schemas))) - (inputs (list gtksourceview json-glib libadwaita)) + (inputs (list json-glib)) (propagated-inputs (modify-inputs (package-propagated-inputs rest) (replace "libsoup" libsoup) -- cgit v1.2.3 From 06deab3321d387fff3f07efe9c53c7db3ab2aa85 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Oct 2022 15:51:29 +0200 Subject: gnu: libnma: Depend on GTK 4.x only on supported platforms. Partly fixes . * gnu/packages/gnome.scm (libnma)[arguments]: Set "-Dlibnma_gtk4=false" when (supported-package? gtk) returns #f. [inputs]: Adjust accordingly. --- gnu/packages/gnome.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8043eec30d..12cb4550b3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1763,7 +1763,11 @@ client devices can handle.") "0h095a26w3sgbspsf7wzz8ddg62j3jb9ckrrv41k7cdp0k2dkhsg")))) (build-system meson-build-system) (arguments - `(#:configure-flags (list "-Dlibnma_gtk4=true") + ;; GTK 4.x depends on Rust (indirectly) so pull it only on platforms + ;; where it is supported. + `(#:configure-flags ,(if (supported-package? gtk) + `(list "-Dlibnma_gtk4=true") + `(list "-Dlibnma_gtk4=false")) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook-xml @@ -1782,7 +1786,7 @@ client devices can handle.") vala)) (inputs (list gcr - gtk + (if (supported-package? gtk) gtk gtk+) iso-codes mobile-broadband-provider-info network-manager)) -- cgit v1.2.3 From c93b249dc010c5f2121fc2248966452196d64da9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 28 Jul 2022 10:42:52 -0400 Subject: gnu: tigervnc-server: Use new style inputs, gexps. * gnu/packages/vnc.scm (%tigervnc-client-source): New variable. (tigervnc-server): Move input fields after arguments. [native-inputs]: Use new style and 'modify-inputs'. Do not add tigervnc-client regular inputs. [configure-flags]: Use gexps, cons* instead of append. [phases]: Use gexps. {check}: Replace smiley with an explanatory comment. {copy-tvnc-xserver}: Adjust default Makefile variables, which simplifies needed bindings in other phases. {build-tigervnc, build, install-tigervnc-aux, install}: Remove let*-bound variables. {build-tigervnc, build}: Honor PARALLEL-BUILD?. --- gnu/packages/vnc.scm | 162 ++++++++++++++++++++++++--------------------------- 1 file changed, 76 insertions(+), 86 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index 84c84aec76..18244b3334 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -25,6 +25,7 @@ (define-module (gnu packages vnc) #:use-module (guix build-system cmake) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix gexp) @@ -207,6 +208,8 @@ and TLS encryption. This package installs only the VNC client, the application which is needed to connect to VNC servers.") (license license:gpl2)))) +(define %tigervnc-client-source (package-source tigervnc-client)) + ;; A VNC server is, in fact, an X server so it seems like a good idea ;; to build on the work already done for xorg-server package. This is ;; not entirely compatible with the recommendation in BUILDING.txt @@ -221,47 +224,27 @@ application which is needed to connect to VNC servers.") (inherit xorg-server) (name "tigervnc-server") (version (package-version tigervnc-client)) - (native-inputs - `(("tigervnc-src" ,(package-source tigervnc-client)) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("gettext-minimal" ,gettext-minimal) - ("font-util" ,font-util) - ("cmake" ,cmake) - ("perl" ,perl) - ,@(package-native-inputs tigervnc-client) - ,@(package-inputs tigervnc-client) - ,@(package-native-inputs xorg-server))) - (inputs - (modify-inputs (package-inputs xorg-server) - (prepend perl coreutils xauth))) - (propagated-inputs - (modify-inputs (package-propagated-inputs xorg-server) - (prepend xauth))) (arguments (substitute-keyword-arguments (package-arguments xorg-server) ((#:configure-flags flags) - `(append '("--with-pic" ; Taken from BUILDING.txt - "--without-dtrace" - "--disable-static" - "--disable-dri2" - "--disable-xinerama" - "--disable-xvfb" - "--disable-xnest" - "--disable-xorg" - "--disable-dmx" - "--disable-xwin" - "--disable-xephyr" - "--disable-kdrive" - ;; "--disable-config-dbus" ; This was a warning. - "--disable-config-hal" - "--disable-config-udev" - "--disable-dri2" - ;; "--enable-install-libxf86config" ; This, too, was a warning. - "--enable-glx") - (delete "--enable-xephyr" ,flags))) + #~(cons* "--with-pic" ; Taken from BUILDING.txt + "--without-dtrace" + "--disable-static" + "--disable-dri2" + "--disable-xinerama" + "--disable-xvfb" + "--disable-xnest" + "--disable-xorg" + "--disable-dmx" + "--disable-xwin" + "--disable-xephyr" + "--disable-kdrive" + "--disable-config-hal" + "--disable-config-udev" + "--disable-dri2" + "--enable-glx" + (delete "--enable-xephyr" #$flags))) ((#:modules modules) `(append '((ice-9 ftw) (ice-9 match) @@ -269,55 +252,62 @@ application which is needed to connect to VNC servers.") (guix build gnu-build-system)) modules)) ((#:phases phases) - `(modify-phases ,phases - (delete 'check) ;) - (add-after 'unpack 'copy-tvnc-xserver - (lambda _ - (let* - ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) - (tvnc-xserver (string-append tvnc-src "/unix/xserver"))) - (copy-recursively tvnc-xserver ".")))) - (add-after 'copy-tvnc-xserver 'patch-xserver - (lambda _ - (invoke "patch" "-p1" "-i" - (string-append (assoc-ref %build-inputs "tigervnc-src") - "/unix/xserver21.1.1.patch")) - (invoke "autoreconf" "-fiv"))) - (add-before 'build 'build-tigervnc - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (tvnc-src (assoc-ref %build-inputs "tigervnc-src")) - (tvnc-build (string-append (getcwd) "/tigervnc-build"))) - (mkdir-p tvnc-build) - (with-directory-excursion tvnc-build - (invoke "cmake" "-G" "Unix Makefiles" - (string-append "-DCMAKE_INSTALL_PREFIX=" out) - tvnc-src) - (invoke "make" "-j" (number->string (parallel-job-count))))))) - (replace 'build - (lambda _ - (let* ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) - (tvnc-build (string-append (getcwd) "/tigervnc-build")) - (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src)) - (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build))) - (invoke "make" srcarg buildarg "-j" - (number->string (parallel-job-count)))))) - (add-before 'install 'install-tigervnc-aux - (lambda _ - (let* ((out (assoc-ref %outputs 'out)) - (tvnc-src (assoc-ref %build-inputs "tigervnc-src")) - (tvnc-build (string-append (getcwd) "/tigervnc-build")) - (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src)) - (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build))) - (with-directory-excursion (string-append tvnc-build "/unix") - (invoke "make" srcarg buildarg "install"))))) - (replace 'install - (lambda* _ - (let* ((tvnc-src (assoc-ref %build-inputs "tigervnc-src")) - (tvnc-build (string-append (getcwd) "/tigervnc-build")) - (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src)) - (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build))) - (invoke "make" "install" srcarg buildarg)))))))) + #~(modify-phases #$phases + (delete 'check) ;no test suite + (add-after 'unpack 'copy-tvnc-xserver + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (search-input-directory inputs "unix/xserver") + ".") + ;; Adjust Makefile variables default values to simplify usage. + (substitute* "hw/vnc/Makefile.am" + (("(TIGERVNC_SRCDIR=).*" _ head) + (string-append head #$%tigervnc-client-source "\n")) + (("(TIGERVNC_BUILDDIR=).*" _ head) + (string-append head (getcwd) "/tigervnc-build\n"))))) + (add-after 'copy-tvnc-xserver 'patch-xserver + (lambda* (#:key inputs #:allow-other-keys) + (invoke "patch" "-p1" "-i" + (search-input-file inputs "unix/xserver21.1.1.patch")) + (invoke "autoreconf" "-fiv"))) + (add-before 'build 'build-tigervnc + (lambda* (#:key parallel-build? #:allow-other-keys) + (mkdir-p "tigervnc-build") + (with-directory-excursion "tigervnc-build" + (invoke "cmake" "-G" "Unix Makefiles" + (string-append "-DCMAKE_INSTALL_PREFIX=" #$output) + #$%tigervnc-client-source) + (invoke "make" "-j" (number->string (if parallel-build? + (parallel-job-count) + 1)))))) + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (invoke "make" "-j" (number->string (if parallel-build? + (parallel-job-count) + 1))))) + (add-before 'install 'install-tigervnc-aux + (lambda _ + (invoke "make" "-C" "tigervnc-build/unix" "install"))) + (replace 'install + (lambda _ + (invoke "make" "install"))))))) + (native-inputs + (modify-inputs (append (package-native-inputs xorg-server) + (package-native-inputs tigervnc-client)) + (append %tigervnc-client-source + autoconf + automake + libtool + gettext-minimal + font-util + cmake + perl))) + (inputs + (modify-inputs (append (package-inputs xorg-server) + (package-inputs tigervnc-client)) + (prepend perl coreutils xauth))) + (propagated-inputs + (modify-inputs (package-propagated-inputs xorg-server) + (prepend xauth))) (description "TigerVNC is a client/server implementation of VNC (Virtual Network Computing). It provides enough performance to run even 3D and video applications. It also provides extensions for advanced authentication methods -- cgit v1.2.3 From 0debec9f2d0bd9855ecfa42aa59168d7122b18b9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 28 Jul 2022 15:44:49 -0400 Subject: gnu: tigervnc-server: Move source production into origin snippet. This will make it possible to patch command references in source files, and also makes it more transparent as to what sources get used. * gnu/packages/vnc.scm (tigervnc-server): Re-flow comment. [source]: Inherit from xorg-server. Add a snippet. Use a patch to apply the xserver patch. Fix file name. [phases]{copy-tvnc-xserver, patch-xserver}: Delete phases. {build-tigervnc, install-tigervnc-aux}: Adjust accordingly. --- gnu/packages/vnc.scm | 70 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index 18244b3334..e06dbcceb9 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -210,20 +210,49 @@ application which is needed to connect to VNC servers.") (define %tigervnc-client-source (package-source tigervnc-client)) -;; A VNC server is, in fact, an X server so it seems like a good idea -;; to build on the work already done for xorg-server package. This is -;; not entirely compatible with the recommendation in BUILDING.txt -;; where the client is built first, then the source code of the X -;; server is copied into a subdir of the build directory, patched with -;; VNC additions and then build and installed as Xvnc. The procedure -;; was turned around, where TigerVNC code is downloaded and built -;; inside the Guix X server build dir. Also, the VNC patching process -;; for the X server is automated in a straightforward manner. +;; A VNC server is, in fact, an X server so it seems like a good idea to build +;; on the work already done for xorg-server package. This is not entirely +;; compatible with the recommendation in BUILDING.txt where the client is +;; built first, then the source code of the X server is copied into a subdir +;; of the build directory, patched with VNC additions and then build and +;; installed as Xvnc. The procedure was turned around, where TigerVNC code is +;; downloaded and built inside the Guix X server build dir. Also, the VNC +;; patching process for the X server is automated in a straightforward manner. (define-public tigervnc-server (package (inherit xorg-server) (name "tigervnc-server") (version (package-version tigervnc-client)) + (source + (origin + (inherit (package-source xorg-server)) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Copy the VNC extension into the xorg-server sources. + (copy-recursively #$(file-append %tigervnc-client-source + "/unix/xserver") + ".") + ;; Include a full copy of tigervnc-client sources, so that the + ;; complete sources involved are available and can be edited during + ;; the build. + (copy-recursively #$%tigervnc-client-source "tigervnc-client") + ;; Adjust the VNC extension build system files so that it refers + ;; to it. + (substitute* "hw/vnc/Makefile.am" + (("(TIGERVNC_SRCDIR=).*" _ head) + (string-append head "$(CURDIR)/../../tigervnc-client\n")) + (("(TIGERVNC_BUILDDIR=).*" _ head) + (string-append head + "$(CURDIR)/../../tigervnc-client/build\n"))) + ;; Ensure the Autotools build system gets re-bootstrapped. + (delete-file "configure"))) + ;; Patch the xorg-server build system so that it builds the VNC + ;; extension. + (patches (cons (file-append %tigervnc-client-source + "/unix/xserver21.1.1.patch") + (origin-patches (package-source xorg-server)))) + (file-name (string-append name "-" version ".tar.xz")))) (arguments (substitute-keyword-arguments (package-arguments xorg-server) @@ -254,28 +283,13 @@ application which is needed to connect to VNC servers.") ((#:phases phases) #~(modify-phases #$phases (delete 'check) ;no test suite - (add-after 'unpack 'copy-tvnc-xserver - (lambda* (#:key inputs #:allow-other-keys) - (copy-recursively (search-input-directory inputs "unix/xserver") - ".") - ;; Adjust Makefile variables default values to simplify usage. - (substitute* "hw/vnc/Makefile.am" - (("(TIGERVNC_SRCDIR=).*" _ head) - (string-append head #$%tigervnc-client-source "\n")) - (("(TIGERVNC_BUILDDIR=).*" _ head) - (string-append head (getcwd) "/tigervnc-build\n"))))) - (add-after 'copy-tvnc-xserver 'patch-xserver - (lambda* (#:key inputs #:allow-other-keys) - (invoke "patch" "-p1" "-i" - (search-input-file inputs "unix/xserver21.1.1.patch")) - (invoke "autoreconf" "-fiv"))) (add-before 'build 'build-tigervnc (lambda* (#:key parallel-build? #:allow-other-keys) - (mkdir-p "tigervnc-build") - (with-directory-excursion "tigervnc-build" + (mkdir-p "tigervnc-client/build") + (with-directory-excursion "tigervnc-client/build" (invoke "cmake" "-G" "Unix Makefiles" (string-append "-DCMAKE_INSTALL_PREFIX=" #$output) - #$%tigervnc-client-source) + "..") (invoke "make" "-j" (number->string (if parallel-build? (parallel-job-count) 1)))))) @@ -286,7 +300,7 @@ application which is needed to connect to VNC servers.") 1))))) (add-before 'install 'install-tigervnc-aux (lambda _ - (invoke "make" "-C" "tigervnc-build/unix" "install"))) + (invoke "make" "-C" "tigervnc-client/build/unix" "install"))) (replace 'install (lambda _ (invoke "make" "install"))))))) -- cgit v1.2.3 From a7bfc9d68f0dc5775df53fb6e5c81c6a1b3b5dcd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 28 Jul 2022 14:02:25 -0400 Subject: gnu: tigervnc-server: Adjust PAM config. * gnu/packages/vnc.scm (tigervnc-server) [phases]{adjust-pam-config}: New phase. --- gnu/packages/vnc.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index e06dbcceb9..4795ccc72a 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -283,6 +283,11 @@ application which is needed to connect to VNC servers.") ((#:phases phases) #~(modify-phases #$phases (delete 'check) ;no test suite + (add-after 'unpack 'adjust-pam-config + (lambda _ + (substitute* "tigervnc-client/unix/vncserver/tigervnc.pam" + (("pam_systemd.so") + "pam_elogind.so")))) (add-before 'build 'build-tigervnc (lambda* (#:key parallel-build? #:allow-other-keys) (mkdir-p "tigervnc-client/build") -- cgit v1.2.3 From ff33b8698a17af3f8b079b03b83243fba4bd5d88 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 28 Jul 2022 16:40:16 -0400 Subject: gnu: tigervnc-server: Disable tests via #:tests?. * gnu/packages/vnc.scm (tigervnc-server) [tests?]: Set to #f. [phases]: Restore check phase. --- gnu/packages/vnc.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index 4795ccc72a..3731f63846 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -256,6 +256,8 @@ application which is needed to connect to VNC servers.") (arguments (substitute-keyword-arguments (package-arguments xorg-server) + ((#:tests? #f #f) + #f) ((#:configure-flags flags) #~(cons* "--with-pic" ; Taken from BUILDING.txt "--without-dtrace" @@ -282,7 +284,6 @@ application which is needed to connect to VNC servers.") modules)) ((#:phases phases) #~(modify-phases #$phases - (delete 'check) ;no test suite (add-after 'unpack 'adjust-pam-config (lambda _ (substitute* "tigervnc-client/unix/vncserver/tigervnc.pam" -- cgit v1.2.3 From 447c20db7ead3052f2719157f7e70d8614743988 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 28 Jul 2022 23:07:26 -0400 Subject: gnu: tigervnc-server: Patch and wrap vncserver script. * gnu/packages/vnc.scm (tigervnc-server): [phases]{patch-paths, wrap-vncserver}: New phases. [inputs]: Add font-alias, guile-3.0, util-linux and xinit. --- gnu/packages/vnc.scm | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index 3731f63846..8bbccfb498 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -289,6 +289,31 @@ application which is needed to connect to VNC servers.") (substitute* "tigervnc-client/unix/vncserver/tigervnc.pam" (("pam_systemd.so") "pam_elogind.so")))) + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tigervnc-client/unix/vncserver/vncserver.in" + (("`mcookie`") + (format #f "`~a`" (search-input-file inputs "bin/mcookie"))) + ;; Adjust the places where the vncserver script looks for + ;; X11 fonts. + (("'/usr/share/X11/fonts'" all) + (format #f "'~a', '~a', ~a" + "/run/current-system/profile/share/fonts/X11" + (string-append #$(this-package-input "font-alias") + "share/fonts/X11") + all)) + ;; Adjust the location used to locate of the .desktop files. + (("/usr/share/xsessions") + "/run/current-system/profile/share/xsessions") + ;; Do not require a system-provided Xsession shell script, + ;; as Guix System has none. This causes the foreach loop to + ;; iterate an empty list (disabled). + (("\"/etc/X11/xinit/Xsession\", \"/etc/X11/Xsession\"") + "()") + (("if \\(not defined \\$Xsession)") + "if (0)") + (("@cmd, \\$Xsession,") + "@cmd,")))) (add-before 'build 'build-tigervnc (lambda* (#:key parallel-build? #:allow-other-keys) (mkdir-p "tigervnc-client/build") @@ -309,7 +334,16 @@ application which is needed to connect to VNC servers.") (invoke "make" "-C" "tigervnc-client/build/unix" "install"))) (replace 'install (lambda _ - (invoke "make" "install"))))))) + (invoke "make" "install"))) + (add-after 'install 'wrap-vncserver + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-script (search-input-file outputs "libexec/vncserver") + (list "PATH" 'prefix + (map (lambda (p) + (dirname (search-input-file inputs p))) + '("bin/uname" + "bin/xauth" + "bin/xinit")))))))))) (native-inputs (modify-inputs (append (package-native-inputs xorg-server) (package-native-inputs tigervnc-client)) @@ -324,7 +358,13 @@ application which is needed to connect to VNC servers.") (inputs (modify-inputs (append (package-inputs xorg-server) (package-inputs tigervnc-client)) - (prepend perl coreutils xauth))) + (prepend coreutils + font-alias + guile-3.0 + perl + util-linux + xauth + xinit))) (propagated-inputs (modify-inputs (package-propagated-inputs xorg-server) (prepend xauth))) -- cgit v1.2.3 From f3e9b069b1af5f03f0feef11aa9f5c52050a3dcf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 19 Sep 2022 15:14:35 -0400 Subject: gnu: gdm: Patch an extra reference to the Xsession script. Without this change, attempting to start a remote session over VNC would fail with: Sep 19 19:54:04 localhost gdm-session-worker: Gdm: GdmSessionWorker: child '/gnu/store/yy9wq647l37658vgi291a287ll9iw6dc-gdm-42.0/etc/gdm/Xsession' could not be started: No such file or directory * gnu/packages/gnome.scm (gdm)[phases]{patch-paths} : Patch a reference in so the Xsession script is correctly found via the GDM_X_SESSION environment variable. --- gnu/packages/gnome.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 12cb4550b3..840cdabeb9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8862,7 +8862,10 @@ library.") "gdm_session_set_environment_variable " "(self, \"" name "\"," "g_getenv (\"" name "\"));\n")) - propagate))))) + propagate))) + ;; This is used by remote sessions, such as when using VNC. + (("\\(GDMCONFDIR \"/Xsession \\\\\"%s\\\\\"\", command)") + "(\"%s \\\"%s\\\"\", g_getenv (\"GDM_X_SESSION\"), command)"))) ;; Find the configuration file using an environment variable. (substitute* '("common/gdm-settings.c") (("GDM_CUSTOM_CONF") -- cgit v1.2.3 From 1936668f5b7837104de4a091c8f6adf907ff9273 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 2 Aug 2022 17:50:20 -0400 Subject: services: gdm: Add a configuration field to enable XDMCP. * gnu/services/xorg.scm ()[xdmcp?]: New field. * gnu/services/xorg.scm (gdm-configuration-file): Use it. Use (ice-9 format) to serialize boolean. (gdm-polkit-rules): New variable. (gdm-service-type): Use it to extend polkit. * doc/guix.texi (X Window): Document it. --- doc/guix.texi | 6 ++++++ gnu/services/xorg.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 55 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index f8badfb5a9..4e75a5c00e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21119,6 +21119,12 @@ Configuration of the Xorg graphical server. @item @code{x-session} (default: @code{(xinitrc)}) Script to run before starting a X session. +@item @code{xdmcp?} (default: @code{#f}) +When true, enable the X Display Manager Control Protocol (XDMCP). This +should only be enabled in trusted environments, as the protocol is not +secure. When enabled, GDM listens for XDMCP queries on the UDP port +177. + @item @code{dbus-daemon} (default: @code{dbus-daemon-wrapper}) File name of the @code{dbus-daemon} executable. diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 3ff290c197..eb77822741 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -63,6 +63,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:export (xorg-configuration xorg-configuration? @@ -885,6 +886,8 @@ the GNOME desktop environment.") (default (xorg-configuration))) (x-session gdm-configuration-x-session (default (xinitrc))) + (xdmcp? gdm-configuration-xdmcp? + (default #f)) (wayland? gdm-configuration-wayland? (default #f)) (wayland-session gdm-configuration-wayland-session (default gdm-wayland-session-wrapper))) @@ -913,18 +916,20 @@ the GNOME desktop environment.") ;; See also ;; . "InitialSetupEnable=false\n" - "WaylandEnable=" (if (gdm-configuration-wayland? config) - "true" - "false") "\n" + (format #f "WaylandEnable=~:[false~;true~]~%" + (gdm-configuration-wayland? config)) "\n" "[debug]\n" - "Enable=" (if (gdm-configuration-debug? config) - "true" - "false") "\n" + (format #f "Enable=~:[false~;true~]~%" + (gdm-configuration-debug? config)) "\n" "[security]\n" "#DisallowTCP=true\n" - "#AllowRemoteAutoLogin=false\n")) + "#AllowRemoteAutoLogin=false\n" + "\n" + "[xdmcp]\n" + (format #f "Enable=~:[false~;true~]~%" + (gdm-configuration-xdmcp? config)))) (define (gdm-pam-service config) "Return a PAM service for @command{gdm}." @@ -995,6 +1000,41 @@ the GNOME desktop environment.") (stop #~(make-kill-destructor)) (respawn? #t)))) +(define gdm-polkit-rules + (lambda (config) + (if (gdm-configuration-xdmcp? config) + ;; Allow remote (XDMCP) users to use colord; otherwise an + ;; authentication dialog would appear on the GDM screen (see the + ;; upstream bug: + ;; https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/issues/273). + (list (computed-file + "02-allow-colord.rules" + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + + (let* ((rules.d + (string-append #$output + "/share/polkit-1" + "/rules.d")) + (allow-colord.rules (string-append + rules.d + "/02-allow-colord.rules"))) + (mkdir-p rules.d) + (call-with-output-file allow-colord.rules + (lambda (port) + ;; This workaround enables any local or remote in + ;; the "users" group to use colord (see: + ;; https://c-nergy.be/blog/?p=12073). + (format port "\ +polkit.addRule(function(action, subject) { + if (action.id.match(\"org.freedesktop.color-manager\")) { + polkit.log(\"POLKIT DEBUG returning YES for action: \" + action); + return polkit.Result.YES; + } +});~%")))))))) + '()))) + (define gdm-service-type (handle-xorg-configuration gdm-configuration (service-type (name 'gdm) @@ -1005,6 +1045,8 @@ the GNOME desktop environment.") (const %gdm-accounts)) (service-extension pam-root-service-type gdm-pam-service) + (service-extension polkit-service-type + gdm-polkit-rules) (service-extension profile-service-type gdm-configuration-gnome-shell-assets) (service-extension dbus-root-service-type -- cgit v1.2.3 From 21f641e9faf55b13263d5f0b3314860af5d697a5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 19 Sep 2022 22:05:04 -0400 Subject: marionette: Make marionette-screen-text private. It has only one user, which is better suited for wait-for-screen-text anyway. * gnu/tests/base.scm (run-basic-test): Refactor to use wait-for-screen-text instead of marionette-screen-text. --- gnu/build/marionette.scm | 1 - gnu/tests/base.scm | 25 +++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index 5ebf783892..aba6fb8146 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -33,7 +33,6 @@ wait-for-tcp-port wait-for-unix-socket marionette-control - marionette-screen-text wait-for-screen-text %qwerty-us-keystrokes marionette-type diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 636b127fb8..64cd6a911a 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2022 Ludovic Courtès ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -509,18 +510,18 @@ info --version") (file-exists? capture)))) (test-assert "screen text" - (let ((text (marionette-screen-text marionette - #:ocr - #$(file-append ocrad - "/bin/ocrad")))) - ;; Check whether the welcome message and shell prompt are - ;; displayed. Note: OCR confuses "y" and "V" for instance, so - ;; we cannot reliably match the whole text. - (and (string-contains text "This is the GNU") - (string-contains text - (string-append - "root@" - #$(operating-system-host-name os)))))) + (wait-for-screen-text + marionette + (lambda (text) + ;; Check whether the welcome message and shell prompt are + ;; displayed. Note: OCR confuses "y" and "V" for instance, so + ;; we cannot reliably match the whole text. + (and (string-contains text "This is the GNU") + (string-contains text + (string-append + "root@" + #$(operating-system-host-name os))))) + #:ocr #$(file-append ocrad "/bin/ocrad"))) (test-end)))) -- cgit v1.2.3 From 4cce84b247b3a7fa2bfd52e49d4ff8e73b78481f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 19 Sep 2022 22:06:54 -0400 Subject: marionette: Preserve screen dumps on failures. This is to make it easier to debug test failures involving 'wait-for-screen-text': the screendump image used for the OCR is now preserved for inspection when 'wait-for-screen-text' fails. * gnu/build/marionette.scm (marionette-screen-text): Return the screendump image file as the second value. Adjust doc. (wait-for-screen-text): Add the preserved screendump image file name to the error message. Adjust doc. --- gnu/build/marionette.scm | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index aba6fb8146..5f8a74717a 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -22,6 +22,7 @@ #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) #:use-module (srfi srfi-64) + #:use-module (srfi srfi-71) #:use-module (rnrs io ports) #:use-module (ice-9 match) #:use-module (ice-9 popen) @@ -311,18 +312,20 @@ Monitor\")." (define* (marionette-screen-text marionette #:key (ocr "ocrad")) "Take a screenshot of MARIONETTE, perform optical character -recognition (OCR), and return the text read from the screen as a string. Do -this by invoking OCR, which should be the file name of GNU Ocrad's -@command{ocrad} or Tesseract OCR's @command{tesseract} command." +recognition (OCR), and return the text read from the screen as a string, along +the screen dump image used. Do this by invoking OCR, which should be the file +name of GNU Ocrad's@command{ocrad} or Tesseract OCR's @command{tesseract} +command. The screen dump image returned as the second value should be deleted +if it is not needed." (define image (string-append (tmpnam) ".ppm")) ;; Use the QEMU Monitor to save an image of the screen to the host. (marionette-control (string-append "screendump " image) marionette) ;; Process it via the OCR. (cond ((string-contains ocr "ocrad") - (invoke-ocrad-ocr image #:ocrad ocr)) + (values (invoke-ocrad-ocr image #:ocrad ocr) image)) ((string-contains ocr "tesseract") - (invoke-tesseract-ocr image #:tesseract ocr)) + (values (invoke-tesseract-ocr image #:tesseract ocr) image)) (else (error "unsupported ocr command")))) (define* (wait-for-screen-text marionette predicate @@ -330,21 +333,34 @@ this by invoking OCR, which should be the file name of GNU Ocrad's (ocr "ocrad") (timeout 30)) "Wait for TIMEOUT seconds or until the screen text on MARIONETTE matches -PREDICATE, whichever comes first. Raise an error when TIMEOUT is exceeded." +PREDICATE, whichever comes first. Raise an error when TIMEOUT is exceeded. +The error contains the recognized text along the preserved file name of the +screen dump, which is relative to the current working directory." (define start (car (gettimeofday))) (define end (+ start timeout)) - (let loop ((last-text #f)) + (let loop ((last-text #f) + (last-screendump #f)) (if (> (car (gettimeofday)) end) - (error "'wait-for-screen-text' timeout" 'ocr-text: last-text) - (let ((text (marionette-screen-text marionette #:ocr ocr))) - (or (predicate text) - (begin - (sleep 1) - (loop text))))))) + (let ((screendump-backup (string-drop last-screendump 5))) + ;; Move the file from /tmp/fileXXXXXX.pmm to the current working + ;; directory, so that it is preserved in the test derivation output. + (copy-file last-screendump screendump-backup) + (delete-file last-screendump) + (error "'wait-for-screen-text' timeout" + 'ocr-text: last-text + 'screendump: screendump-backup)) + (let* ((text screendump (marionette-screen-text marionette #:ocr ocr)) + (result (predicate text))) + (cond (result + (delete-file screendump) + result) + (else + (sleep 1) + (loop text screendump))))))) (define %qwerty-us-keystrokes ;; Maps "special" characters to their keystrokes. -- cgit v1.2.3 From f24e0fc233950f9ac5ab6b4ac5653a278cae0383 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 20 Sep 2022 11:00:59 -0400 Subject: marionette: Define keystrokes for typing colons and exclamation marks. * gnu/build/marionette.scm (%qwerty-us-keystrokes): Register keystrokes for the ':' and '!' characters. --- gnu/build/marionette.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index 5f8a74717a..6f373f87b6 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -382,8 +382,10 @@ screen dump, which is relative to the current working directory." (#\> . "shift-dot") (#\. . "dot") (#\, . "comma") + (#\: . "shift-semicolon") (#\; . "semicolon") (#\' . "apostrophe") + (#\! . "shift-1") (#\" . "shift-apostrophe") (#\` . "grave_accent") (#\bs . "backspace") -- cgit v1.2.3 From 133901a396cf81aa1dcb35586e77a5a78475c4c7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 23 Sep 2022 00:23:47 -0400 Subject: marionette: Add a callback arguments to wait-for-screen-text. * gnu/build/marionette.scm (wait-for-screen-text): New 'pre-action' and 'post-action' arguments. Update doc. Call the procedures before and after the OCR occurs, respectively. --- gnu/build/marionette.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index 6f373f87b6..f4b219e842 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -331,11 +331,15 @@ if it is not needed." (define* (wait-for-screen-text marionette predicate #:key (ocr "ocrad") - (timeout 30)) + (timeout 30) + pre-action + post-action) "Wait for TIMEOUT seconds or until the screen text on MARIONETTE matches PREDICATE, whichever comes first. Raise an error when TIMEOUT is exceeded. The error contains the recognized text along the preserved file name of the -screen dump, which is relative to the current working directory." +screen dump, which is relative to the current working directory. If +PRE-ACTION is provided, it should be a thunk to call before each OCR attempt. +Likewise for POST-ACTION, except it runs at the end of a successful OCR." (define start (car (gettimeofday))) @@ -353,7 +357,9 @@ screen dump, which is relative to the current working directory." (error "'wait-for-screen-text' timeout" 'ocr-text: last-text 'screendump: screendump-backup)) - (let* ((text screendump (marionette-screen-text marionette #:ocr ocr)) + (let* ((_ (and (procedure? pre-action) (pre-action))) + (text screendump (marionette-screen-text marionette #:ocr ocr)) + (_ (and (procedure? post-action) (post-action))) (result (predicate text))) (cond (result (delete-file screendump) -- cgit v1.2.3 From 0503b104d6b99055b7a149fb0aa91179c69f2935 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 21 Sep 2022 21:45:26 -0400 Subject: gnu: dconf: Set sysconfdir to /etc. * gnu/packages/gnome.scm (dconf) [arguments]: Use gexps. [configure-flags]: Add --sysconfdir=/etc. [native-inputs]: Remove labels. --- gnu/packages/gnome.scm | 54 ++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 840cdabeb9..23ede13958 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4742,33 +4742,39 @@ and RDP protocols.") (base32 "0cs5nayg080y8pb9b7qccm1ni8wkicdmqp1jsgc22110r6j24zyg")))) (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + ;; Configure sysconfdir to /etc so that gconf profiles can be written + ;; there and loaded without having to set GCONF_PROFILE, which cannot be + ;; safely set globally (as a gconf profile is a per-user thing). + #:configure-flags #~(list "--sysconfdir=/etc" + "-Dgtk_doc=true") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'increase-test-timeout + (lambda _ + ;; On big-memory systems, the engine test may take + ;; much longer than the default of 30 seconds. + (substitute* "tests/meson.build" + (("test\\(unit_test\\[0\\], exe" all) + (string-append all ", timeout: 300")))))))) + (native-inputs + (list bash-completion + libxslt ;for xsltproc + libxml2 ;for XML_CATALOG_FILES + docbook-xml-4.2 + docbook-xsl + `(,glib "bin") + gtk-doc/stable + pkg-config + python + vala)) + (inputs + (list gtk+ + dbus)) (propagated-inputs ;; In Requires of dconf.pc. (list glib)) - (inputs - (list gtk+ dbus)) - (native-inputs - `(("bash-completion" ,bash-completion) - ("libxslt" ,libxslt) ;for xsltproc - ("libxml2" ,libxml2) ;for XML_CATALOG_FILES - ("docbook-xml" ,docbook-xml-4.2) - ("docbook-xsl" ,docbook-xsl) - ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc/stable) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("vala" ,vala))) - (arguments - `(#:glib-or-gtk? #t - #:configure-flags '("-Dgtk_doc=true") - #:phases (modify-phases %standard-phases - (add-after 'unpack 'increase-test-timeout - (lambda _ - ;; On big-memory systems, the engine test may take - ;; much longer than the default of 30 seconds. - (substitute* "tests/meson.build" - (("test\\(unit_test\\[0\\], exe" all) - (string-append all ", timeout: 300")))))))) (home-page "https://developer.gnome.org/dconf/") (synopsis "Low-level GNOME configuration system") (description "Dconf is a low-level configuration system. Its main purpose -- cgit v1.2.3 From 7b896a26b8a911231d606b4fe664b03b95b27b39 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 21 Sep 2022 16:54:48 -0400 Subject: services: Add dconf-service-type. This allows the dconf profile directive "system-db:" to look up profiles by name from under /etc/dconf/db/. * gnu/services/xorg.scm (dconf-keyfile, dconf-profile): New procedures. (dconf-profiles?): New predicate. (dconf-configuration): New procedure. (dconf-profile->profile-file): Likewise. (dconf-profile->db-keyfile): Likewise. (dconf-profile->db-keyfile-dir): Likewise. (dconf-profile->db): Likewise. (dconf-profile->files): Likewise. (dconf-service-type): New service type. --- gnu/services/xorg.scm | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) (limited to 'gnu') diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index eb77822741..9205c6f9f4 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2021 Oleg Pykhalov ;;; Copyright © 2021 Josselin Poiret ;;; Copyright © 2022 Chris Marusich +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ #:autoload (gnu services sddm) (sddm-service-type) #:use-module (gnu artwork) #:use-module (gnu services) + #:use-module (gnu services configuration) #:use-module (gnu services shepherd) #:use-module (gnu system pam) #:use-module (gnu system setuid) @@ -114,6 +116,13 @@ localed-configuration? localed-service-type + dconf-keyfile + dconf-profile + dconf-profile-name + dconf-profile-content + dconf-profile-keyfile + dconf-service-type + gdm-configuration gdm-service-type @@ -803,6 +812,106 @@ to control the system locale and keyboard mapping from user programs such as the GNOME desktop environment.") (default-value (localed-configuration))))) + +;;; +;;; Dconf. +;;; + +(define-maybe text-config) + +(define-configuration/no-serialization dconf-keyfile + (name string + "The file name of the associated keyfile, e.g. \"00-login-screen\".") + (content text-config "The content of the associated keyfile.")) + +(define-configuration/no-serialization dconf-profile + (name string "The file name of the dconf system profile, which should match +the name of a user for which the profile is to be used with. To have the +profile used, the environment variable \"DCONF_PROFILE\" should be set to the +profile file, e.g.: +@example + export DCONF_PROFILE=/etc/dconf/profile/gdm +@end example") + (content maybe-text-config "The content of the Dconf profile. Unless +provided, it defaults to include the user database (\"user-db:NAME\") as well +as the system database (\"system-db:NAME\"), which corresponds to the +generated database, @file{/etc/dconf/db/NAME}.") + (keyfile dconf-keyfile "The keyfile associated with the profile")) + +(define dconf-profiles? + (list-of dconf-profile?)) + +(define-configuration/no-serialization dconf-configuration + (profiles dconf-profiles "The list of objects to populate.")) + +(define (dconf-profile->profile-file profile) + "Given PROFILE, a object, return a dconf profile file." + (let ((name (dconf-profile-name profile)) + (content (dconf-profile-content profile))) + (apply mixed-text-file + name + (if (maybe-value-set? content) + (interpose content "\n" 'suffix) + (interpose (list (string-append "user-db:" name) + (string-append "system-db:" name)) + "\n" 'suffix))))) + +(define (dconf-profile->db-keyfile profile) + "Given PROFILE, a object, return a dconf profile file." + (let ((keyfile (dconf-profile-keyfile profile))) + (apply mixed-text-file (dconf-keyfile-name keyfile) + (interpose (dconf-keyfile-content keyfile) "\n" 'suffix)))) + +(define (dconf-profile->db-keyfile-dir profile) + "Wrap the keyfile in a directory, to satisfy 'dconf compile'." + (let ((name (dconf-profile-name profile)) + (keyfile-name (dconf-keyfile-name (dconf-profile-keyfile profile)))) + (computed-file name + #~(begin + (mkdir #$output) + (symlink #$(dconf-profile->db-keyfile profile) + (string-append #$output "/" #$keyfile-name)))))) + +(define (dconf-profile->db profile) + "Compile the a object into a GVariant Database file." + (let ((name (dconf-profile-name profile))) + (computed-file + name + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (setenv "DCONF_PROFILE" #$(dconf-profile->profile-file profile)) + (invoke #$(file-append dconf "/bin/dconf") "compile" + #$output #$(dconf-profile->db-keyfile-dir profile))))))) + +(define (dconf-profile->files profile) + "Given PROFILE, a object, return a dconf directory +containing the associated profile, keyfile and database files to be assembled +under /etc." + (let ((name (dconf-profile-name profile)) + (keyfile-name (dconf-keyfile-name (dconf-profile-keyfile profile)))) + (list (list (string-append "dconf/profile/" name) + (dconf-profile->profile-file profile)) + (list (string-append "dconf/db/" name ".d/" keyfile-name) + (dconf-profile->db-keyfile profile)) + (list (string-append "dconf/db/" name) + (dconf-profile->db profile))))) + +(define dconf-service-type + (service-type + (name 'dconf-profile) + (extensions + (list (service-extension etc-service-type + (lambda (dconf-profiles) + (append-map dconf-profile->files + dconf-profiles))))) + (compose concatenate) + (extend append) + (default-value '()) + (description "Extend the @code{etc-service-type} to populate the file +hierarchy under @file{/etc/dconf} with the objects provided as +argument."))) + ;;; ;;; GNOME Desktop Manager. -- cgit v1.2.3 From aad4e4fc6bed1209479970f1bcd2f08ee2b53d12 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 22 Sep 2022 15:48:16 -0400 Subject: services: xorg: Add auto-suspend? field to . * gnu/services/xorg.scm () : New field. (gdm-dconf-profiles): New variable. * gnu/services/xorg.scm (gdm-shepherd-service) [!auto-suspend?]: Specify DCONF_PROFILE. (gdm-service-type): Extend DCONF-SERVICE-TYPE. * doc/guix.texi (X Window): Document the new field. --- doc/guix.texi | 6 ++++++ gnu/services/xorg.scm | 32 +++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 4e75a5c00e..27f63904cd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21107,6 +21107,12 @@ When @code{auto-login?} is false, GDM presents a log-in screen. When @code{auto-login?} is true, GDM logs in directly as @code{default-user}. +@item @code{auto-suspend?} (default @code{#t}) +When true, GDM will automatically suspend to RAM when nobody is +physically connected. When a machine is used via remote desktop or SSH, +this should be set to false to avoid GDM interrupting remote sessions or +rendering the machine unavailable. + @item @code{debug?} (default: @code{#f}) When true, GDM writes debug messages to its log. diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 9205c6f9f4..902fef0058 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -986,6 +986,7 @@ argument."))) (gdm gdm-configuration-gdm (default gdm)) (allow-empty-passwords? gdm-configuration-allow-empty-passwords? (default #t)) (auto-login? gdm-configuration-auto-login? (default #f)) + (auto-suspend? gdm-configuration-auto-suspend? (default #t)) (dbus-daemon gdm-configuration-dbus-daemon (default dbus-daemon-wrapper)) (debug? gdm-configuration-debug? (default #f)) (default-user gdm-configuration-default-user (default #f)) @@ -1001,6 +1002,30 @@ argument."))) (wayland-session gdm-configuration-wayland-session (default gdm-wayland-session-wrapper))) +(define (gdm-dconf-profiles config) + (if (gdm-configuration-auto-suspend? config) + '() + ;; This custom gconf profile works around a lack of configuration option + ;; to disable auto-suspend when no users are physically logged in (see: + ;; https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/22). + (list (dconf-profile + (name "gdm") + (content (list #~(begin + (use-modules (ice-9 textual-ports)) + (string-trim + (call-with-input-file + #$(file-append gdm "/share/dconf/profile/gdm") + get-string-all))) + "system-db:gdm")) + (keyfile (dconf-keyfile + (name "00-disable-suspend") + (content + (list "[org/gnome/settings-daemon/plugins/power]" + "sleep-inactive-ac-type='nothing'" + "sleep-inactive-battery-type='nothing'" + "sleep-inactive-ac-timeout=0" + "sleep-inactive-battery-timeout=0")))))))) + (define (gdm-configuration-file config) (mixed-text-file "gdm-custom.conf" "[daemon]\n" @@ -1073,7 +1098,10 @@ argument."))) (list #$(file-append (gdm-configuration-gdm config) "/bin/gdm")) #:environment-variables - (list (string-append + (list #$@(if (gdm-configuration-auto-suspend? config) + #~() + #~("DCONF_PROFILE=/etc/dconf/profile/gdm")) + (string-append "GDM_CUSTOM_CONF=" #$(gdm-configuration-file config)) (string-append @@ -1152,6 +1180,8 @@ polkit.addRule(function(action, subject) { gdm-shepherd-service) (service-extension account-service-type (const %gdm-accounts)) + (service-extension dconf-service-type + gdm-dconf-profiles) (service-extension pam-root-service-type gdm-pam-service) (service-extension polkit-service-type -- cgit v1.2.3 From 1c528a95cb92b7808e6603d7956185005583629f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 26 Jul 2022 15:02:53 -0400 Subject: services: Add xvnc-service-type. * gnu/services/vnc.scm: New file. * gnu/tests/vnc.scm: Likewise. * gnu/local.mk: Register them. --- doc/guix.texi | 163 ++++++++++++++++++++++++++++++++- gnu/local.mk | 2 + gnu/services/vnc.scm | 247 +++++++++++++++++++++++++++++++++++++++++++++++++++ gnu/tests/vnc.scm | 200 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 608 insertions(+), 4 deletions(-) create mode 100644 gnu/services/vnc.scm create mode 100644 gnu/tests/vnc.scm (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 27f63904cd..14592142dd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17554,6 +17554,7 @@ declaration. * Web Services:: Web servers. * Certificate Services:: TLS certificates via Let's Encrypt. * DNS Services:: DNS daemons. +* VNC Services:: VNC daemons. * VPN Services:: VPN daemons. * Network File System:: NFS related services. * Samba Services:: Samba services. @@ -21062,6 +21063,7 @@ started by the @dfn{login manager}, by default the GNOME Display Manager (GDM). @cindex GDM @cindex GNOME, login manager +@anchor{gdm} GDM of course allows users to log in into window managers and desktop environments other than GNOME; for those using GNOME, GDM is required for features such as automatic screen locking. @@ -21363,6 +21365,7 @@ Relogin after logout. @cindex lightdm, graphical login manager @cindex display manager, lightdm +@anchor{lightdm} @defvr {Scheme Variable} lightdm-service-type This is the type of the service to run the @url{https://github.com/canonical/lightdm,LightDM display manager}. Its @@ -21566,10 +21569,11 @@ Extra configuration values to append to the seat configuration section. @cindex Xorg, configuration @deftp {Data Type} xorg-configuration -This data type represents the configuration of the Xorg graphical display -server. Note that there is no Xorg service; instead, the X server is started -by a ``display manager'' such as GDM, SDDM, and SLiM@. Thus, the configuration -of these display managers aggregates an @code{xorg-configuration} record. +This data type represents the configuration of the Xorg graphical +display server. Note that there is no Xorg service; instead, the X +server is started by a ``display manager'' such as GDM, SDDM, LightDM or +SLiM@. Thus, the configuration of these display managers aggregates an +@code{xorg-configuration} record. @table @asis @item @code{modules} (default: @code{%default-xorg-modules}) @@ -30836,6 +30840,157 @@ Defaults to @samp{()}. @c %end of fragment +@node VNC Services +@subsection VNC Services +@cindex VNC (virtual network computing) +@cindex XDMCP (x display manager control protocol) + +The @code{(gnu services vnc)} module provides services related to +@dfn{Virtual Network Computing} (VNC), which makes it possible to +locally use graphical Xorg applications running on a remote machine. +Combined with a graphical manager that supports the @dfn{X Display +Manager Control Protocol}, such as GDM (@pxref{gdm}) or LightDM +(@pxref{lightdm}), it is possible to remote an entire desktop for a +multi-user environment. + +@subsubheading Xvnc + +Xvnc is a VNC server that spawns its own X window server; which means it +can run on headless servers. The Xvnc implementations provided by the +@code{tigervnc-server} and @code{turbovnc} aim to be fast and efficient. + +@defvar {Scheme Variable} xvnc-service-type + +The @code{xvnc-server-type} service can be configured via the +@code{xvnc-configuration} record, documented below. A second virtual +display could be made available on a remote machine for via the +following configuration: +@end defvar + +@lisp +(service xvnc-service-type (xvnc-configuration (display-number 10) +@end lisp + +As a demonstration, the @command{xclock} command could then be started +on the remote machine on display number 10, and it could be display +locally via the @command{vncviewer} command: +@example +# Start xclock on the remote machine. +ssh -L5910:localhost:5910 -- guix shell xclock -- env DISPLAY=:10 xclock +# Access it via VNC. +guix shell tigervnc-client -- vncviewer localhost:5910 +@end example + +The following configuration combines XDMCP and Inetd to allow multiple +users to concurrently use the remote system, login in graphically via +the GDM display manager: + +@lisp +(operating-system + [...] + (services (cons* + [...] + (service xvnc-service-type (xvnc-configuration + (display-number 5) + (localhost? #f) + (xdmcp? #t) + (inetd? #t))) + (modify-services %desktop-services + (gdm-service-type config => (gdm-configuration + (inherit config) + (auto-suspend? #f) + (xdmcp? #t))))))) +@end lisp + +A remote user could then connect to it by using the @command{vncviewer} +command or a compatible VNC client and start a desktop session of their +choosing: +@example +vncviewer remote-host:5905 +@end example + +@quotation Warning +Unless your machine is in a controlled environment, for security +reasons, the @code{localhost?} configuration of the +@code{xvnc-configuration} record should be left to its default @code{#t} +value and exposed via a secure means such as an SSH port forward. The +XDMCP port, UDP 177 should also be blocked from the outside by a +firewall, as it is not a secure protocol and can expose login +credentials in clear. +@end quotation + +@c Use (configuration->documentation 'xvnc-configuration) to regenerate +@c the documentation. +@c %start of fragment +@deftp {Data Type} xvnc-configuration +Available @code{xvnc-configuration} fields are: + +@table @asis +@item @code{xvnc} (default: @code{tigervnc-server}) (type: file-like) +The package that provides the Xvnc binary. + +@item @code{display-number} (default: @code{0}) (type: number) +The display number used by Xvnc. You should set this to a number not +already used a Xorg server. + +@item @code{geometry} (default: @code{"1024x768"}) (type: string) +The size of the desktop to be created. + +@item @code{depth} (default: @code{24}) (type: color-depth) +The pixel depth in bits of the desktop to be created. Accepted values +are 16, 24 or 32. + +@item @code{port} (type: maybe-port) +The port on which to listen for connections from viewers. When left +unspecified, it defaults to 5900 plus the display number. + +@item @code{ipv4?} (default: @code{#t}) (type: boolean) +Use IPv4 for incoming and outgoing connections. + +@item @code{ipv6?} (default: @code{#t}) (type: boolean) +Use IPv6 for incoming and outgoing connections. + +@item @code{password-file} (type: maybe-string) +The password file to use, if any. Refer to vncpasswd(1) to learn how to +generate such a file. + +@item @code{xdmcp?} (default: @code{#f}) (type: boolean) +Query the XDMCP server for a session. This enables users to log in a +desktop session from the login manager screen. For a multiple users +scenario, you'll want to enable the @code{inetd?} option as well, so +that each connection to the VNC server is handled separately rather than +shared. + +@item @code{inetd?} (default: @code{#f}) (type: boolean) +Use an Inetd-style service, which runs the Xvnc server on demand. + +@item @code{frame-rate} (default: @code{60}) (type: number) +The maximum number of updates per second sent to each client. + +@item @code{security-types} (default: @code{("None")}) (type: security-types) +The allowed security schemes to use for incoming connections. The +default is "None", which is safe given that Xvnc is configured to +authenticate the user via the display manager, and only for local +connections. Accepted values are any of the following: ("None" +"VncAuth" "Plain" "TLSNone" "TLSVnc" "TLSPlain" "X509None" "X509Vnc") + +@item @code{localhost?} (default: @code{#t}) (type: boolean) +Only allow connections from the same machine. It is set to #true by +default for security, which means SSH or another secure means should be +used to expose the remote port. + +@item @code{log-level} (default: @code{30}) (type: log-level) +The log level, a number between 0 and 100, 100 meaning most verbose +output. The log messages are output to syslog. + +@item @code{extra-options} (default: @code{()}) (type: strings) +This can be used to provide extra Xvnc options not exposed via this + record. + +@end table + +@end deftp +@c %end of fragment @node VPN Services @subsection VPN Services diff --git a/gnu/local.mk b/gnu/local.mk index 5976cbe90c..698070c639 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -694,6 +694,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/sysctl.scm \ %D%/services/telephony.scm \ %D%/services/version-control.scm \ + %D%/services/vnc.scm \ %D%/services/vpn.scm \ %D%/services/web.scm \ %D%/services/xorg.scm \ @@ -775,6 +776,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/telephony.scm \ %D%/tests/version-control.scm \ %D%/tests/virtualization.scm \ + %D%/tests/vnc.scm \ %D%/tests/web.scm INSTALLER_MODULES = \ diff --git a/gnu/services/vnc.scm b/gnu/services/vnc.scm new file mode 100644 index 0000000000..15c3c14fee --- /dev/null +++ b/gnu/services/vnc.scm @@ -0,0 +1,247 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Maxim Cournoyer +;;; +;;; 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 services vnc) + #:use-module (gnu packages vnc) + #:use-module ((gnu services) #:hide (delete)) + #:use-module (gnu system shadow) + #:use-module (gnu services configuration) + #:use-module (gnu services shepherd) + #:use-module (guix gexp) + #:use-module (guix records) + + #:export (xvnc-configuration + xvnc-configuration-xvnc + xvnc-configuration-display-number + xvnc-configuration-geometry + xvnc-configuration-depth + xvnc-configuration-port + xvnc-configuration-ipv4? + xvnc-configuration-ipv6? + xvnc-configuration-password-file + xvnc-configuration-xdmcp? + xvnc-configuration-inetd? + xvnc-configuration-frame-rate + xvnc-configuration-security-types + xvnc-configuration-localhost? + xvnc-configuration-log-level + xvnc-configuration-extra-options + + xvnc-service-type)) + +;;; +;;; Xvnc. +;;; + +(define (color-depth? x) + (member x '(16 24 32))) + +(define (port? x) + (and (number? x) + (and (>= x 0) (<= x 65535)))) + +(define-maybe/no-serialization port) + +(define-maybe/no-serialization string) + +(define %security-types '("None" "VncAuth" "Plain" "TLSNone" "TLSVnc" "TLSPlain" + "X509None" "X509Vnc")) + +(define (security-type? x) + (member x %security-types)) + +(define (security-types? x) + (and (list? x) + (and-map security-type? x))) + +(define (log-level? x) + (and (number? x) + (and (>= x 0) (<= x 100)))) + +(define (strings? x) + (and (list? x) + (and-map string? x))) + +(define-configuration/no-serialization xvnc-configuration + (xvnc + (file-like tigervnc-server) + "The package that provides the Xvnc binary.") + (display-number + (number 0) + "The display number used by Xvnc. You should set this to a number not +already used by a Xorg server. When remoting a complete desktop session via +XDMCP and using a compatible VNC viewer as provided by the +@code{tigervnc-client} or @code{turbovnc} packages, the geometry is +automatically adjusted.") + (geometry + (string "1024x768") + "The size of the desktop to be created.") + (depth + (color-depth 24) + "The pixel depth in bits of the desktop to be created. Accepted values are +16, 24 or 32.") + (port + maybe-port + "The port on which to listen for connections from viewers. When left +unspecified, it defaults to 5900 plus the display number.") + (ipv4? + (boolean #t) + "Use IPv4 for incoming and outgoing connections.") + (ipv6? + (boolean #t) + "Use IPv6 for incoming and outgoing connections.") + (password-file + maybe-string + "The password file to use, if any. Refer to vncpasswd(1) to learn how to +generate such a file.") + (xdmcp? + (boolean #f) + "Query the XDMCP server for a session. This enables users to log in a +desktop session from the login manager screen. For a multiple users scenario, +you'll want to enable the @code{inetd?} option as well, so that each +connection to the VNC server is handled separately rather than shared.") + (inetd? + (boolean #f) + "Use an Inetd-style service, which runs the Xvnc server on demand.") + (frame-rate + (number 60) + "The maximum number of updates per second sent to each client.") + (security-types + (security-types (list "None")) + (format #f "The allowed security schemes to use for incoming connections. +The default is \"None\", which is safe given that Xvnc is configured to +authenticate the user via the display manager, and only for local connections. +Accepted values are any of the following: ~s" %security-types)) + (localhost? + (boolean #t) + "Only allow connections from the same machine. It is set to @code{#true} +by default for security, which means SSH or another secure means should be +used to expose the remote port.") + (log-level + (log-level 30) + "The log level, a number between 0 and 100, 100 meaning most verbose +output. The log messages are output to syslog.") + (extra-options + (strings '()) + "This can be used to provide extra Xvnc options not exposed via this + record.")) + +(define (xvnc-configuration->command-line-arguments config) + "Derive the command line arguments to used to launch the Xvnc daemon from +CONFIG, a object." + (match-record config + (xvnc display-number geometry depth port ipv4? ipv6? password-file xdmcp? + inetd? frame-rate security-types localhost? log-level extra-options) + #~(list #$(file-append xvnc "/bin/Xvnc") + #$(format #f ":~a" display-number) + "-geometry" #$geometry + "-depth" #$(number->string depth) + #$@(if inetd? + (list "-inetd") + '()) + #$@(if (not inetd?) + (if (maybe-value-set? port) + (list "-rfbport" (number->string port)) + '()) + '()) + #$@(if (not inetd?) + (if ipv4? + (list "-UseIPv4") + '()) + '()) + #$@(if (not inetd?) + (if ipv6? + (list "-UseIPv6") + '()) + '()) + #$@(if (maybe-value-set? password-file) + (list "-PasswordFile" password-file) + '()) + "-FrameRate" #$(number->string frame-rate) + "-SecurityTypes" #$(string-join security-types ",") + #$@(if localhost? + (list "-localhost") + '()) + "-Log" #$(format #f "*:syslog:~a" log-level) + #$@(if xdmcp? + (list "-query" "localhost" "-once") + '()) + #$@extra-options))) + +(define %xvnc-accounts + (list (user-group + (name "xvnc") + (system? #t)) + (user-account + (name "xvnc") + (group "xvnc") + (system? #t) + (comment "User for Xvnc server")))) + +(define (xvnc-shepherd-service config) + "Return a for Xvnc with CONFIG." + (let* ((display-number (xvnc-configuration-display-number config)) + (port (if (maybe-value-set? (xvnc-configuration-port config)) + (xvnc-configuration-port config) + #f)) + (port* (or port (+ 5900 display-number)))) + (shepherd-service + (provision '(xvnc vncserver)) + (documentation "Run the Xvnc server.") + (requirement '(networking syslogd)) + (start (if (xvnc-configuration-inetd? config) + #~(let* ((inaddr (if #$(xvnc-configuration-localhost? config) + INADDR_LOOPBACK + INADDR_ANY)) + (in6addr (if #$(xvnc-configuration-localhost? config) + IN6ADDR_LOOPBACK + IN6ADDR_ANY)) + (ipv4-socket (and #$(xvnc-configuration-ipv4? config) + (make-socket-address AF_INET inaddr + #$port*))) + (ipv6-socket (and #$(xvnc-configuration-ipv6? config) + (make-socket-address AF_INET6 in6addr + #$port*)))) + (make-inetd-constructor + #$(xvnc-configuration->command-line-arguments config) + `(,@(if ipv4-socket + (list (endpoint ipv4-socket)) + '()) + ,@(if ipv6-socket + (list (endpoint ipv6-socket)) + '())) + #:user "xvnc" + #:group "xvnc")) + #~(make-forkexec-constructor + #$(xvnc-configuration->command-line-arguments config) + #:user "xvnc" + #:group "xvnc"))) + (stop #~(make-inetd-destructor))))) + +(define xvnc-service-type + (service-type + (name 'xvnc) + (default-value (xvnc-configuration)) + (description "Run the Xvnc server, which creates a virtual X11 session and +allow remote clients connecting to it via the remote framebuffer (RFB) +protocol.") + (extensions (list (service-extension + shepherd-root-service-type + (compose list xvnc-shepherd-service)) + (service-extension account-service-type + (const %xvnc-accounts)))))) diff --git a/gnu/tests/vnc.scm b/gnu/tests/vnc.scm new file mode 100644 index 0000000000..34c2db1203 --- /dev/null +++ b/gnu/tests/vnc.scm @@ -0,0 +1,200 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Maxim Cournoyer . +;;; +;;; 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 tests vnc) + #:use-module (gnu bootloader) + #:use-module (gnu bootloader grub) + #:use-module (gnu packages) + #:use-module (gnu packages ocr) + #:use-module (gnu packages glib) + #:use-module (gnu services) + #:use-module (gnu services dbus) + #:use-module (gnu services desktop) + #:use-module (gnu services networking) + #:use-module (gnu services ssh) + #:use-module (gnu services vnc) + #:use-module (gnu services xorg) + #:use-module (gnu system) + #:use-module (gnu system file-systems) + #:use-module (gnu system shadow) + #:use-module (gnu system vm) + #:use-module (gnu tests) + #:use-module (guix gexp) + #:use-module (guix modules) + #:export (%test-xvnc)) + +(define %xvnc-os + (operating-system + ;; Usual boilerplate. + (host-name "komputilo") + (timezone "Europe/Berlin") + (locale "en_US.UTF-8") + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (targets '("/dev/sdX")))) + (file-systems (cons (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext4")) + %base-file-systems)) + + (users (cons (user-account + (name "dummy") + (group "users") + (supplementary-groups '("wheel" "netdev" + "audio" "video"))) + %base-user-accounts)) + (packages (append (map specification->package + '("dbus" ;for dbus-run-session + "dconf" + "gnome-settings-daemon" ;for schemas + "ratpoison" + "tigervnc-client" + "xterm")) + %base-packages + (list `(,glib "bin") + glib))) + (services (cons* + (service openssh-service-type (openssh-configuration + (permit-root-login #t) + (allow-empty-passwords? #t))) + (service xvnc-service-type (xvnc-configuration + (display-number 5) + (security-types (list "None")) + (log-level 100) + (localhost? #f) + (xdmcp? #t) + (inetd? #t))) + (modify-services %desktop-services + (gdm-service-type config => (gdm-configuration + (inherit config) + (auto-login? #t) + (auto-suspend? #f) + (default-user "root") + (debug? #t) + (xdmcp? #t)))))))) + +(define (run-xvnc-test) + "Run tests in %XVNC-OS." + + (define os (marionette-operating-system + %xvnc-os + #:imported-modules (source-module-closure + '((gnu services herd))))) + + (define vm (virtual-machine + (operating-system os) + (memory-size 1024))) + + (define test + (with-imported-modules (source-module-closure + '((gnu build marionette) + (guix build utils))) + #~(begin + (use-modules (gnu build marionette) + (guix build utils) + (srfi srfi-26) + (srfi srfi-64)) + + (let ((marionette (make-marionette (list #$vm)))) + + (test-runner-current (system-test-runner #$output)) + (test-begin "xvnc") + + (test-assert "service running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'xvnc)) + marionette)) + + (test-assert "wait for port 5905, IPv4" + (wait-for-tcp-port 5905 marionette)) + + (test-assert "wait for port 5905, IPv6" + (wait-for-tcp-port 5905 marionette + #:address + '(make-socket-address + AF_INET6 (inet-pton AF_INET6 "::1") 5905))) + + (test-assert "gdm auto-suspend is disabled" + ;; More a GDM than a Xvnc test, but since it's a cross-cutting + ;; concern and we have everything set up here, we might as well + ;; check it here. + (marionette-eval + '(begin + ;; Check that DCONF_PROFILE is set... + (invoke "/bin/sh" "-lc" "\ +pgrep gdm | head -n1 | xargs -I{} grep -Fq DCONF_PROFILE /proc/{}/environ") + + ;; ... and that + (invoke "/bin/sh" "-lc" "\ +sudo -E -u gdm env DCONF_PROFILE=/etc/dconf/profile/gdm dbus-run-session \ +gsettings get org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type \ +| grep -Fq nothing")) + marionette)) + + (test-assert "vnc lands on the gdm login screen" + ;; This test runs vncviewer on the local VM and verifies that it + ;; manages to access the GDM login screen (via XDMCP). + (begin + (define (ratpoison-abort) + (marionette-control "sendkey ctrl-g" marionette)) + + (define (ratpoison-help) + (marionette-control "sendkey ctrl-t" marionette) + (marionette-type "?" marionette) + (sleep 1)) ;wait for help screen to appear + + (define (ratpoison-exec command) + (marionette-control "sendkey ctrl-t" marionette) + (marionette-type "!" marionette) + (marionette-type (string-append command "\n") marionette)) + + ;; Wait until the ratpoison help screen can be displayed; this + ;; means the window manager is ready. + (wait-for-screen-text marionette + (cut string-contains <> "key bindings") + #:ocr #$(file-append tesseract-ocr + "/bin/tesseract") + #:pre-action ratpoison-help + #:post-action ratpoison-abort) + + ;; Run vncviewer and expect the GDM login screen (accessed via + ;; XDMCP). This can take a while to appear on slower machines. + (ratpoison-exec "vncviewer localhost:5905") + ;; XXX: tesseract narrowly recognizes "Guix" as "uix" from the + ;; background image; ocrad fares worst. Sadly, 'Username' is + ;; not recognized at all. + (wait-for-screen-text marionette + (cut string-contains <> "uix") + #:ocr #$(file-append tesseract-ocr + "/bin/tesseract") + #:timeout 120))) + + (test-end))))) + + (gexp->derivation "xvnc-test" test)) + +(define %test-xvnc + (system-test + (name "xvnc") + (description "Basic tests for the Xvnc service. One of the tests validate +that XDMCP works with GDM, and is therefore heavy in terms of disk and memory +requirements.") + (value (run-xvnc-test)))) -- cgit v1.2.3 From 0c4966160054bc50e6ab3a4ac9c9a6a1826ab5a0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 7 Oct 2022 12:53:22 -0400 Subject: Revert "services: Add xvnc-service-type." This reverts commit 1c528a95cb92b7808e6603d7956185005583629f. This broke 'guix pull', for (yet) unknown reasons. --- doc/guix.texi | 163 +-------------------------------- gnu/local.mk | 2 - gnu/services/vnc.scm | 247 --------------------------------------------------- gnu/tests/vnc.scm | 200 ----------------------------------------- 4 files changed, 4 insertions(+), 608 deletions(-) delete mode 100644 gnu/services/vnc.scm delete mode 100644 gnu/tests/vnc.scm (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 14592142dd..27f63904cd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17554,7 +17554,6 @@ declaration. * Web Services:: Web servers. * Certificate Services:: TLS certificates via Let's Encrypt. * DNS Services:: DNS daemons. -* VNC Services:: VNC daemons. * VPN Services:: VPN daemons. * Network File System:: NFS related services. * Samba Services:: Samba services. @@ -21063,7 +21062,6 @@ started by the @dfn{login manager}, by default the GNOME Display Manager (GDM). @cindex GDM @cindex GNOME, login manager -@anchor{gdm} GDM of course allows users to log in into window managers and desktop environments other than GNOME; for those using GNOME, GDM is required for features such as automatic screen locking. @@ -21365,7 +21363,6 @@ Relogin after logout. @cindex lightdm, graphical login manager @cindex display manager, lightdm -@anchor{lightdm} @defvr {Scheme Variable} lightdm-service-type This is the type of the service to run the @url{https://github.com/canonical/lightdm,LightDM display manager}. Its @@ -21569,11 +21566,10 @@ Extra configuration values to append to the seat configuration section. @cindex Xorg, configuration @deftp {Data Type} xorg-configuration -This data type represents the configuration of the Xorg graphical -display server. Note that there is no Xorg service; instead, the X -server is started by a ``display manager'' such as GDM, SDDM, LightDM or -SLiM@. Thus, the configuration of these display managers aggregates an -@code{xorg-configuration} record. +This data type represents the configuration of the Xorg graphical display +server. Note that there is no Xorg service; instead, the X server is started +by a ``display manager'' such as GDM, SDDM, and SLiM@. Thus, the configuration +of these display managers aggregates an @code{xorg-configuration} record. @table @asis @item @code{modules} (default: @code{%default-xorg-modules}) @@ -30840,157 +30836,6 @@ Defaults to @samp{()}. @c %end of fragment -@node VNC Services -@subsection VNC Services -@cindex VNC (virtual network computing) -@cindex XDMCP (x display manager control protocol) - -The @code{(gnu services vnc)} module provides services related to -@dfn{Virtual Network Computing} (VNC), which makes it possible to -locally use graphical Xorg applications running on a remote machine. -Combined with a graphical manager that supports the @dfn{X Display -Manager Control Protocol}, such as GDM (@pxref{gdm}) or LightDM -(@pxref{lightdm}), it is possible to remote an entire desktop for a -multi-user environment. - -@subsubheading Xvnc - -Xvnc is a VNC server that spawns its own X window server; which means it -can run on headless servers. The Xvnc implementations provided by the -@code{tigervnc-server} and @code{turbovnc} aim to be fast and efficient. - -@defvar {Scheme Variable} xvnc-service-type - -The @code{xvnc-server-type} service can be configured via the -@code{xvnc-configuration} record, documented below. A second virtual -display could be made available on a remote machine for via the -following configuration: -@end defvar - -@lisp -(service xvnc-service-type (xvnc-configuration (display-number 10) -@end lisp - -As a demonstration, the @command{xclock} command could then be started -on the remote machine on display number 10, and it could be display -locally via the @command{vncviewer} command: -@example -# Start xclock on the remote machine. -ssh -L5910:localhost:5910 -- guix shell xclock -- env DISPLAY=:10 xclock -# Access it via VNC. -guix shell tigervnc-client -- vncviewer localhost:5910 -@end example - -The following configuration combines XDMCP and Inetd to allow multiple -users to concurrently use the remote system, login in graphically via -the GDM display manager: - -@lisp -(operating-system - [...] - (services (cons* - [...] - (service xvnc-service-type (xvnc-configuration - (display-number 5) - (localhost? #f) - (xdmcp? #t) - (inetd? #t))) - (modify-services %desktop-services - (gdm-service-type config => (gdm-configuration - (inherit config) - (auto-suspend? #f) - (xdmcp? #t))))))) -@end lisp - -A remote user could then connect to it by using the @command{vncviewer} -command or a compatible VNC client and start a desktop session of their -choosing: -@example -vncviewer remote-host:5905 -@end example - -@quotation Warning -Unless your machine is in a controlled environment, for security -reasons, the @code{localhost?} configuration of the -@code{xvnc-configuration} record should be left to its default @code{#t} -value and exposed via a secure means such as an SSH port forward. The -XDMCP port, UDP 177 should also be blocked from the outside by a -firewall, as it is not a secure protocol and can expose login -credentials in clear. -@end quotation - -@c Use (configuration->documentation 'xvnc-configuration) to regenerate -@c the documentation. -@c %start of fragment -@deftp {Data Type} xvnc-configuration -Available @code{xvnc-configuration} fields are: - -@table @asis -@item @code{xvnc} (default: @code{tigervnc-server}) (type: file-like) -The package that provides the Xvnc binary. - -@item @code{display-number} (default: @code{0}) (type: number) -The display number used by Xvnc. You should set this to a number not -already used a Xorg server. - -@item @code{geometry} (default: @code{"1024x768"}) (type: string) -The size of the desktop to be created. - -@item @code{depth} (default: @code{24}) (type: color-depth) -The pixel depth in bits of the desktop to be created. Accepted values -are 16, 24 or 32. - -@item @code{port} (type: maybe-port) -The port on which to listen for connections from viewers. When left -unspecified, it defaults to 5900 plus the display number. - -@item @code{ipv4?} (default: @code{#t}) (type: boolean) -Use IPv4 for incoming and outgoing connections. - -@item @code{ipv6?} (default: @code{#t}) (type: boolean) -Use IPv6 for incoming and outgoing connections. - -@item @code{password-file} (type: maybe-string) -The password file to use, if any. Refer to vncpasswd(1) to learn how to -generate such a file. - -@item @code{xdmcp?} (default: @code{#f}) (type: boolean) -Query the XDMCP server for a session. This enables users to log in a -desktop session from the login manager screen. For a multiple users -scenario, you'll want to enable the @code{inetd?} option as well, so -that each connection to the VNC server is handled separately rather than -shared. - -@item @code{inetd?} (default: @code{#f}) (type: boolean) -Use an Inetd-style service, which runs the Xvnc server on demand. - -@item @code{frame-rate} (default: @code{60}) (type: number) -The maximum number of updates per second sent to each client. - -@item @code{security-types} (default: @code{("None")}) (type: security-types) -The allowed security schemes to use for incoming connections. The -default is "None", which is safe given that Xvnc is configured to -authenticate the user via the display manager, and only for local -connections. Accepted values are any of the following: ("None" -"VncAuth" "Plain" "TLSNone" "TLSVnc" "TLSPlain" "X509None" "X509Vnc") - -@item @code{localhost?} (default: @code{#t}) (type: boolean) -Only allow connections from the same machine. It is set to #true by -default for security, which means SSH or another secure means should be -used to expose the remote port. - -@item @code{log-level} (default: @code{30}) (type: log-level) -The log level, a number between 0 and 100, 100 meaning most verbose -output. The log messages are output to syslog. - -@item @code{extra-options} (default: @code{()}) (type: strings) -This can be used to provide extra Xvnc options not exposed via this - record. - -@end table - -@end deftp -@c %end of fragment @node VPN Services @subsection VPN Services diff --git a/gnu/local.mk b/gnu/local.mk index 698070c639..5976cbe90c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -694,7 +694,6 @@ GNU_SYSTEM_MODULES = \ %D%/services/sysctl.scm \ %D%/services/telephony.scm \ %D%/services/version-control.scm \ - %D%/services/vnc.scm \ %D%/services/vpn.scm \ %D%/services/web.scm \ %D%/services/xorg.scm \ @@ -776,7 +775,6 @@ GNU_SYSTEM_MODULES = \ %D%/tests/telephony.scm \ %D%/tests/version-control.scm \ %D%/tests/virtualization.scm \ - %D%/tests/vnc.scm \ %D%/tests/web.scm INSTALLER_MODULES = \ diff --git a/gnu/services/vnc.scm b/gnu/services/vnc.scm deleted file mode 100644 index 15c3c14fee..0000000000 --- a/gnu/services/vnc.scm +++ /dev/null @@ -1,247 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Maxim Cournoyer -;;; -;;; 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 services vnc) - #:use-module (gnu packages vnc) - #:use-module ((gnu services) #:hide (delete)) - #:use-module (gnu system shadow) - #:use-module (gnu services configuration) - #:use-module (gnu services shepherd) - #:use-module (guix gexp) - #:use-module (guix records) - - #:export (xvnc-configuration - xvnc-configuration-xvnc - xvnc-configuration-display-number - xvnc-configuration-geometry - xvnc-configuration-depth - xvnc-configuration-port - xvnc-configuration-ipv4? - xvnc-configuration-ipv6? - xvnc-configuration-password-file - xvnc-configuration-xdmcp? - xvnc-configuration-inetd? - xvnc-configuration-frame-rate - xvnc-configuration-security-types - xvnc-configuration-localhost? - xvnc-configuration-log-level - xvnc-configuration-extra-options - - xvnc-service-type)) - -;;; -;;; Xvnc. -;;; - -(define (color-depth? x) - (member x '(16 24 32))) - -(define (port? x) - (and (number? x) - (and (>= x 0) (<= x 65535)))) - -(define-maybe/no-serialization port) - -(define-maybe/no-serialization string) - -(define %security-types '("None" "VncAuth" "Plain" "TLSNone" "TLSVnc" "TLSPlain" - "X509None" "X509Vnc")) - -(define (security-type? x) - (member x %security-types)) - -(define (security-types? x) - (and (list? x) - (and-map security-type? x))) - -(define (log-level? x) - (and (number? x) - (and (>= x 0) (<= x 100)))) - -(define (strings? x) - (and (list? x) - (and-map string? x))) - -(define-configuration/no-serialization xvnc-configuration - (xvnc - (file-like tigervnc-server) - "The package that provides the Xvnc binary.") - (display-number - (number 0) - "The display number used by Xvnc. You should set this to a number not -already used by a Xorg server. When remoting a complete desktop session via -XDMCP and using a compatible VNC viewer as provided by the -@code{tigervnc-client} or @code{turbovnc} packages, the geometry is -automatically adjusted.") - (geometry - (string "1024x768") - "The size of the desktop to be created.") - (depth - (color-depth 24) - "The pixel depth in bits of the desktop to be created. Accepted values are -16, 24 or 32.") - (port - maybe-port - "The port on which to listen for connections from viewers. When left -unspecified, it defaults to 5900 plus the display number.") - (ipv4? - (boolean #t) - "Use IPv4 for incoming and outgoing connections.") - (ipv6? - (boolean #t) - "Use IPv6 for incoming and outgoing connections.") - (password-file - maybe-string - "The password file to use, if any. Refer to vncpasswd(1) to learn how to -generate such a file.") - (xdmcp? - (boolean #f) - "Query the XDMCP server for a session. This enables users to log in a -desktop session from the login manager screen. For a multiple users scenario, -you'll want to enable the @code{inetd?} option as well, so that each -connection to the VNC server is handled separately rather than shared.") - (inetd? - (boolean #f) - "Use an Inetd-style service, which runs the Xvnc server on demand.") - (frame-rate - (number 60) - "The maximum number of updates per second sent to each client.") - (security-types - (security-types (list "None")) - (format #f "The allowed security schemes to use for incoming connections. -The default is \"None\", which is safe given that Xvnc is configured to -authenticate the user via the display manager, and only for local connections. -Accepted values are any of the following: ~s" %security-types)) - (localhost? - (boolean #t) - "Only allow connections from the same machine. It is set to @code{#true} -by default for security, which means SSH or another secure means should be -used to expose the remote port.") - (log-level - (log-level 30) - "The log level, a number between 0 and 100, 100 meaning most verbose -output. The log messages are output to syslog.") - (extra-options - (strings '()) - "This can be used to provide extra Xvnc options not exposed via this - record.")) - -(define (xvnc-configuration->command-line-arguments config) - "Derive the command line arguments to used to launch the Xvnc daemon from -CONFIG, a object." - (match-record config - (xvnc display-number geometry depth port ipv4? ipv6? password-file xdmcp? - inetd? frame-rate security-types localhost? log-level extra-options) - #~(list #$(file-append xvnc "/bin/Xvnc") - #$(format #f ":~a" display-number) - "-geometry" #$geometry - "-depth" #$(number->string depth) - #$@(if inetd? - (list "-inetd") - '()) - #$@(if (not inetd?) - (if (maybe-value-set? port) - (list "-rfbport" (number->string port)) - '()) - '()) - #$@(if (not inetd?) - (if ipv4? - (list "-UseIPv4") - '()) - '()) - #$@(if (not inetd?) - (if ipv6? - (list "-UseIPv6") - '()) - '()) - #$@(if (maybe-value-set? password-file) - (list "-PasswordFile" password-file) - '()) - "-FrameRate" #$(number->string frame-rate) - "-SecurityTypes" #$(string-join security-types ",") - #$@(if localhost? - (list "-localhost") - '()) - "-Log" #$(format #f "*:syslog:~a" log-level) - #$@(if xdmcp? - (list "-query" "localhost" "-once") - '()) - #$@extra-options))) - -(define %xvnc-accounts - (list (user-group - (name "xvnc") - (system? #t)) - (user-account - (name "xvnc") - (group "xvnc") - (system? #t) - (comment "User for Xvnc server")))) - -(define (xvnc-shepherd-service config) - "Return a for Xvnc with CONFIG." - (let* ((display-number (xvnc-configuration-display-number config)) - (port (if (maybe-value-set? (xvnc-configuration-port config)) - (xvnc-configuration-port config) - #f)) - (port* (or port (+ 5900 display-number)))) - (shepherd-service - (provision '(xvnc vncserver)) - (documentation "Run the Xvnc server.") - (requirement '(networking syslogd)) - (start (if (xvnc-configuration-inetd? config) - #~(let* ((inaddr (if #$(xvnc-configuration-localhost? config) - INADDR_LOOPBACK - INADDR_ANY)) - (in6addr (if #$(xvnc-configuration-localhost? config) - IN6ADDR_LOOPBACK - IN6ADDR_ANY)) - (ipv4-socket (and #$(xvnc-configuration-ipv4? config) - (make-socket-address AF_INET inaddr - #$port*))) - (ipv6-socket (and #$(xvnc-configuration-ipv6? config) - (make-socket-address AF_INET6 in6addr - #$port*)))) - (make-inetd-constructor - #$(xvnc-configuration->command-line-arguments config) - `(,@(if ipv4-socket - (list (endpoint ipv4-socket)) - '()) - ,@(if ipv6-socket - (list (endpoint ipv6-socket)) - '())) - #:user "xvnc" - #:group "xvnc")) - #~(make-forkexec-constructor - #$(xvnc-configuration->command-line-arguments config) - #:user "xvnc" - #:group "xvnc"))) - (stop #~(make-inetd-destructor))))) - -(define xvnc-service-type - (service-type - (name 'xvnc) - (default-value (xvnc-configuration)) - (description "Run the Xvnc server, which creates a virtual X11 session and -allow remote clients connecting to it via the remote framebuffer (RFB) -protocol.") - (extensions (list (service-extension - shepherd-root-service-type - (compose list xvnc-shepherd-service)) - (service-extension account-service-type - (const %xvnc-accounts)))))) diff --git a/gnu/tests/vnc.scm b/gnu/tests/vnc.scm deleted file mode 100644 index 34c2db1203..0000000000 --- a/gnu/tests/vnc.scm +++ /dev/null @@ -1,200 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Maxim Cournoyer . -;;; -;;; 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 tests vnc) - #:use-module (gnu bootloader) - #:use-module (gnu bootloader grub) - #:use-module (gnu packages) - #:use-module (gnu packages ocr) - #:use-module (gnu packages glib) - #:use-module (gnu services) - #:use-module (gnu services dbus) - #:use-module (gnu services desktop) - #:use-module (gnu services networking) - #:use-module (gnu services ssh) - #:use-module (gnu services vnc) - #:use-module (gnu services xorg) - #:use-module (gnu system) - #:use-module (gnu system file-systems) - #:use-module (gnu system shadow) - #:use-module (gnu system vm) - #:use-module (gnu tests) - #:use-module (guix gexp) - #:use-module (guix modules) - #:export (%test-xvnc)) - -(define %xvnc-os - (operating-system - ;; Usual boilerplate. - (host-name "komputilo") - (timezone "Europe/Berlin") - (locale "en_US.UTF-8") - (bootloader (bootloader-configuration - (bootloader grub-bootloader) - (targets '("/dev/sdX")))) - (file-systems (cons (file-system - (device (file-system-label "my-root")) - (mount-point "/") - (type "ext4")) - %base-file-systems)) - - (users (cons (user-account - (name "dummy") - (group "users") - (supplementary-groups '("wheel" "netdev" - "audio" "video"))) - %base-user-accounts)) - (packages (append (map specification->package - '("dbus" ;for dbus-run-session - "dconf" - "gnome-settings-daemon" ;for schemas - "ratpoison" - "tigervnc-client" - "xterm")) - %base-packages - (list `(,glib "bin") - glib))) - (services (cons* - (service openssh-service-type (openssh-configuration - (permit-root-login #t) - (allow-empty-passwords? #t))) - (service xvnc-service-type (xvnc-configuration - (display-number 5) - (security-types (list "None")) - (log-level 100) - (localhost? #f) - (xdmcp? #t) - (inetd? #t))) - (modify-services %desktop-services - (gdm-service-type config => (gdm-configuration - (inherit config) - (auto-login? #t) - (auto-suspend? #f) - (default-user "root") - (debug? #t) - (xdmcp? #t)))))))) - -(define (run-xvnc-test) - "Run tests in %XVNC-OS." - - (define os (marionette-operating-system - %xvnc-os - #:imported-modules (source-module-closure - '((gnu services herd))))) - - (define vm (virtual-machine - (operating-system os) - (memory-size 1024))) - - (define test - (with-imported-modules (source-module-closure - '((gnu build marionette) - (guix build utils))) - #~(begin - (use-modules (gnu build marionette) - (guix build utils) - (srfi srfi-26) - (srfi srfi-64)) - - (let ((marionette (make-marionette (list #$vm)))) - - (test-runner-current (system-test-runner #$output)) - (test-begin "xvnc") - - (test-assert "service running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'xvnc)) - marionette)) - - (test-assert "wait for port 5905, IPv4" - (wait-for-tcp-port 5905 marionette)) - - (test-assert "wait for port 5905, IPv6" - (wait-for-tcp-port 5905 marionette - #:address - '(make-socket-address - AF_INET6 (inet-pton AF_INET6 "::1") 5905))) - - (test-assert "gdm auto-suspend is disabled" - ;; More a GDM than a Xvnc test, but since it's a cross-cutting - ;; concern and we have everything set up here, we might as well - ;; check it here. - (marionette-eval - '(begin - ;; Check that DCONF_PROFILE is set... - (invoke "/bin/sh" "-lc" "\ -pgrep gdm | head -n1 | xargs -I{} grep -Fq DCONF_PROFILE /proc/{}/environ") - - ;; ... and that - (invoke "/bin/sh" "-lc" "\ -sudo -E -u gdm env DCONF_PROFILE=/etc/dconf/profile/gdm dbus-run-session \ -gsettings get org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type \ -| grep -Fq nothing")) - marionette)) - - (test-assert "vnc lands on the gdm login screen" - ;; This test runs vncviewer on the local VM and verifies that it - ;; manages to access the GDM login screen (via XDMCP). - (begin - (define (ratpoison-abort) - (marionette-control "sendkey ctrl-g" marionette)) - - (define (ratpoison-help) - (marionette-control "sendkey ctrl-t" marionette) - (marionette-type "?" marionette) - (sleep 1)) ;wait for help screen to appear - - (define (ratpoison-exec command) - (marionette-control "sendkey ctrl-t" marionette) - (marionette-type "!" marionette) - (marionette-type (string-append command "\n") marionette)) - - ;; Wait until the ratpoison help screen can be displayed; this - ;; means the window manager is ready. - (wait-for-screen-text marionette - (cut string-contains <> "key bindings") - #:ocr #$(file-append tesseract-ocr - "/bin/tesseract") - #:pre-action ratpoison-help - #:post-action ratpoison-abort) - - ;; Run vncviewer and expect the GDM login screen (accessed via - ;; XDMCP). This can take a while to appear on slower machines. - (ratpoison-exec "vncviewer localhost:5905") - ;; XXX: tesseract narrowly recognizes "Guix" as "uix" from the - ;; background image; ocrad fares worst. Sadly, 'Username' is - ;; not recognized at all. - (wait-for-screen-text marionette - (cut string-contains <> "uix") - #:ocr #$(file-append tesseract-ocr - "/bin/tesseract") - #:timeout 120))) - - (test-end))))) - - (gexp->derivation "xvnc-test" test)) - -(define %test-xvnc - (system-test - (name "xvnc") - (description "Basic tests for the Xvnc service. One of the tests validate -that XDMCP works with GDM, and is therefore heavy in terms of disk and memory -requirements.") - (value (run-xvnc-test)))) -- cgit v1.2.3 From 00e843050012961e9cc41b003ea9271eab718541 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 7 Oct 2022 13:25:37 -0400 Subject: Revert "Revert "services: Add xvnc-service-type."" This reverts commit 0c4966160054bc50e6ab3a4ac9c9a6a1826ab5a0. The fix appears in the subsequent commit, for clarity. --- doc/guix.texi | 163 ++++++++++++++++++++++++++++++++- gnu/local.mk | 2 + gnu/services/vnc.scm | 247 +++++++++++++++++++++++++++++++++++++++++++++++++++ gnu/tests/vnc.scm | 200 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 608 insertions(+), 4 deletions(-) create mode 100644 gnu/services/vnc.scm create mode 100644 gnu/tests/vnc.scm (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 27f63904cd..14592142dd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17554,6 +17554,7 @@ declaration. * Web Services:: Web servers. * Certificate Services:: TLS certificates via Let's Encrypt. * DNS Services:: DNS daemons. +* VNC Services:: VNC daemons. * VPN Services:: VPN daemons. * Network File System:: NFS related services. * Samba Services:: Samba services. @@ -21062,6 +21063,7 @@ started by the @dfn{login manager}, by default the GNOME Display Manager (GDM). @cindex GDM @cindex GNOME, login manager +@anchor{gdm} GDM of course allows users to log in into window managers and desktop environments other than GNOME; for those using GNOME, GDM is required for features such as automatic screen locking. @@ -21363,6 +21365,7 @@ Relogin after logout. @cindex lightdm, graphical login manager @cindex display manager, lightdm +@anchor{lightdm} @defvr {Scheme Variable} lightdm-service-type This is the type of the service to run the @url{https://github.com/canonical/lightdm,LightDM display manager}. Its @@ -21566,10 +21569,11 @@ Extra configuration values to append to the seat configuration section. @cindex Xorg, configuration @deftp {Data Type} xorg-configuration -This data type represents the configuration of the Xorg graphical display -server. Note that there is no Xorg service; instead, the X server is started -by a ``display manager'' such as GDM, SDDM, and SLiM@. Thus, the configuration -of these display managers aggregates an @code{xorg-configuration} record. +This data type represents the configuration of the Xorg graphical +display server. Note that there is no Xorg service; instead, the X +server is started by a ``display manager'' such as GDM, SDDM, LightDM or +SLiM@. Thus, the configuration of these display managers aggregates an +@code{xorg-configuration} record. @table @asis @item @code{modules} (default: @code{%default-xorg-modules}) @@ -30836,6 +30840,157 @@ Defaults to @samp{()}. @c %end of fragment +@node VNC Services +@subsection VNC Services +@cindex VNC (virtual network computing) +@cindex XDMCP (x display manager control protocol) + +The @code{(gnu services vnc)} module provides services related to +@dfn{Virtual Network Computing} (VNC), which makes it possible to +locally use graphical Xorg applications running on a remote machine. +Combined with a graphical manager that supports the @dfn{X Display +Manager Control Protocol}, such as GDM (@pxref{gdm}) or LightDM +(@pxref{lightdm}), it is possible to remote an entire desktop for a +multi-user environment. + +@subsubheading Xvnc + +Xvnc is a VNC server that spawns its own X window server; which means it +can run on headless servers. The Xvnc implementations provided by the +@code{tigervnc-server} and @code{turbovnc} aim to be fast and efficient. + +@defvar {Scheme Variable} xvnc-service-type + +The @code{xvnc-server-type} service can be configured via the +@code{xvnc-configuration} record, documented below. A second virtual +display could be made available on a remote machine for via the +following configuration: +@end defvar + +@lisp +(service xvnc-service-type (xvnc-configuration (display-number 10) +@end lisp + +As a demonstration, the @command{xclock} command could then be started +on the remote machine on display number 10, and it could be display +locally via the @command{vncviewer} command: +@example +# Start xclock on the remote machine. +ssh -L5910:localhost:5910 -- guix shell xclock -- env DISPLAY=:10 xclock +# Access it via VNC. +guix shell tigervnc-client -- vncviewer localhost:5910 +@end example + +The following configuration combines XDMCP and Inetd to allow multiple +users to concurrently use the remote system, login in graphically via +the GDM display manager: + +@lisp +(operating-system + [...] + (services (cons* + [...] + (service xvnc-service-type (xvnc-configuration + (display-number 5) + (localhost? #f) + (xdmcp? #t) + (inetd? #t))) + (modify-services %desktop-services + (gdm-service-type config => (gdm-configuration + (inherit config) + (auto-suspend? #f) + (xdmcp? #t))))))) +@end lisp + +A remote user could then connect to it by using the @command{vncviewer} +command or a compatible VNC client and start a desktop session of their +choosing: +@example +vncviewer remote-host:5905 +@end example + +@quotation Warning +Unless your machine is in a controlled environment, for security +reasons, the @code{localhost?} configuration of the +@code{xvnc-configuration} record should be left to its default @code{#t} +value and exposed via a secure means such as an SSH port forward. The +XDMCP port, UDP 177 should also be blocked from the outside by a +firewall, as it is not a secure protocol and can expose login +credentials in clear. +@end quotation + +@c Use (configuration->documentation 'xvnc-configuration) to regenerate +@c the documentation. +@c %start of fragment +@deftp {Data Type} xvnc-configuration +Available @code{xvnc-configuration} fields are: + +@table @asis +@item @code{xvnc} (default: @code{tigervnc-server}) (type: file-like) +The package that provides the Xvnc binary. + +@item @code{display-number} (default: @code{0}) (type: number) +The display number used by Xvnc. You should set this to a number not +already used a Xorg server. + +@item @code{geometry} (default: @code{"1024x768"}) (type: string) +The size of the desktop to be created. + +@item @code{depth} (default: @code{24}) (type: color-depth) +The pixel depth in bits of the desktop to be created. Accepted values +are 16, 24 or 32. + +@item @code{port} (type: maybe-port) +The port on which to listen for connections from viewers. When left +unspecified, it defaults to 5900 plus the display number. + +@item @code{ipv4?} (default: @code{#t}) (type: boolean) +Use IPv4 for incoming and outgoing connections. + +@item @code{ipv6?} (default: @code{#t}) (type: boolean) +Use IPv6 for incoming and outgoing connections. + +@item @code{password-file} (type: maybe-string) +The password file to use, if any. Refer to vncpasswd(1) to learn how to +generate such a file. + +@item @code{xdmcp?} (default: @code{#f}) (type: boolean) +Query the XDMCP server for a session. This enables users to log in a +desktop session from the login manager screen. For a multiple users +scenario, you'll want to enable the @code{inetd?} option as well, so +that each connection to the VNC server is handled separately rather than +shared. + +@item @code{inetd?} (default: @code{#f}) (type: boolean) +Use an Inetd-style service, which runs the Xvnc server on demand. + +@item @code{frame-rate} (default: @code{60}) (type: number) +The maximum number of updates per second sent to each client. + +@item @code{security-types} (default: @code{("None")}) (type: security-types) +The allowed security schemes to use for incoming connections. The +default is "None", which is safe given that Xvnc is configured to +authenticate the user via the display manager, and only for local +connections. Accepted values are any of the following: ("None" +"VncAuth" "Plain" "TLSNone" "TLSVnc" "TLSPlain" "X509None" "X509Vnc") + +@item @code{localhost?} (default: @code{#t}) (type: boolean) +Only allow connections from the same machine. It is set to #true by +default for security, which means SSH or another secure means should be +used to expose the remote port. + +@item @code{log-level} (default: @code{30}) (type: log-level) +The log level, a number between 0 and 100, 100 meaning most verbose +output. The log messages are output to syslog. + +@item @code{extra-options} (default: @code{()}) (type: strings) +This can be used to provide extra Xvnc options not exposed via this + record. + +@end table + +@end deftp +@c %end of fragment @node VPN Services @subsection VPN Services diff --git a/gnu/local.mk b/gnu/local.mk index 5976cbe90c..698070c639 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -694,6 +694,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/sysctl.scm \ %D%/services/telephony.scm \ %D%/services/version-control.scm \ + %D%/services/vnc.scm \ %D%/services/vpn.scm \ %D%/services/web.scm \ %D%/services/xorg.scm \ @@ -775,6 +776,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/telephony.scm \ %D%/tests/version-control.scm \ %D%/tests/virtualization.scm \ + %D%/tests/vnc.scm \ %D%/tests/web.scm INSTALLER_MODULES = \ diff --git a/gnu/services/vnc.scm b/gnu/services/vnc.scm new file mode 100644 index 0000000000..15c3c14fee --- /dev/null +++ b/gnu/services/vnc.scm @@ -0,0 +1,247 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Maxim Cournoyer +;;; +;;; 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 services vnc) + #:use-module (gnu packages vnc) + #:use-module ((gnu services) #:hide (delete)) + #:use-module (gnu system shadow) + #:use-module (gnu services configuration) + #:use-module (gnu services shepherd) + #:use-module (guix gexp) + #:use-module (guix records) + + #:export (xvnc-configuration + xvnc-configuration-xvnc + xvnc-configuration-display-number + xvnc-configuration-geometry + xvnc-configuration-depth + xvnc-configuration-port + xvnc-configuration-ipv4? + xvnc-configuration-ipv6? + xvnc-configuration-password-file + xvnc-configuration-xdmcp? + xvnc-configuration-inetd? + xvnc-configuration-frame-rate + xvnc-configuration-security-types + xvnc-configuration-localhost? + xvnc-configuration-log-level + xvnc-configuration-extra-options + + xvnc-service-type)) + +;;; +;;; Xvnc. +;;; + +(define (color-depth? x) + (member x '(16 24 32))) + +(define (port? x) + (and (number? x) + (and (>= x 0) (<= x 65535)))) + +(define-maybe/no-serialization port) + +(define-maybe/no-serialization string) + +(define %security-types '("None" "VncAuth" "Plain" "TLSNone" "TLSVnc" "TLSPlain" + "X509None" "X509Vnc")) + +(define (security-type? x) + (member x %security-types)) + +(define (security-types? x) + (and (list? x) + (and-map security-type? x))) + +(define (log-level? x) + (and (number? x) + (and (>= x 0) (<= x 100)))) + +(define (strings? x) + (and (list? x) + (and-map string? x))) + +(define-configuration/no-serialization xvnc-configuration + (xvnc + (file-like tigervnc-server) + "The package that provides the Xvnc binary.") + (display-number + (number 0) + "The display number used by Xvnc. You should set this to a number not +already used by a Xorg server. When remoting a complete desktop session via +XDMCP and using a compatible VNC viewer as provided by the +@code{tigervnc-client} or @code{turbovnc} packages, the geometry is +automatically adjusted.") + (geometry + (string "1024x768") + "The size of the desktop to be created.") + (depth + (color-depth 24) + "The pixel depth in bits of the desktop to be created. Accepted values are +16, 24 or 32.") + (port + maybe-port + "The port on which to listen for connections from viewers. When left +unspecified, it defaults to 5900 plus the display number.") + (ipv4? + (boolean #t) + "Use IPv4 for incoming and outgoing connections.") + (ipv6? + (boolean #t) + "Use IPv6 for incoming and outgoing connections.") + (password-file + maybe-string + "The password file to use, if any. Refer to vncpasswd(1) to learn how to +generate such a file.") + (xdmcp? + (boolean #f) + "Query the XDMCP server for a session. This enables users to log in a +desktop session from the login manager screen. For a multiple users scenario, +you'll want to enable the @code{inetd?} option as well, so that each +connection to the VNC server is handled separately rather than shared.") + (inetd? + (boolean #f) + "Use an Inetd-style service, which runs the Xvnc server on demand.") + (frame-rate + (number 60) + "The maximum number of updates per second sent to each client.") + (security-types + (security-types (list "None")) + (format #f "The allowed security schemes to use for incoming connections. +The default is \"None\", which is safe given that Xvnc is configured to +authenticate the user via the display manager, and only for local connections. +Accepted values are any of the following: ~s" %security-types)) + (localhost? + (boolean #t) + "Only allow connections from the same machine. It is set to @code{#true} +by default for security, which means SSH or another secure means should be +used to expose the remote port.") + (log-level + (log-level 30) + "The log level, a number between 0 and 100, 100 meaning most verbose +output. The log messages are output to syslog.") + (extra-options + (strings '()) + "This can be used to provide extra Xvnc options not exposed via this + record.")) + +(define (xvnc-configuration->command-line-arguments config) + "Derive the command line arguments to used to launch the Xvnc daemon from +CONFIG, a object." + (match-record config + (xvnc display-number geometry depth port ipv4? ipv6? password-file xdmcp? + inetd? frame-rate security-types localhost? log-level extra-options) + #~(list #$(file-append xvnc "/bin/Xvnc") + #$(format #f ":~a" display-number) + "-geometry" #$geometry + "-depth" #$(number->string depth) + #$@(if inetd? + (list "-inetd") + '()) + #$@(if (not inetd?) + (if (maybe-value-set? port) + (list "-rfbport" (number->string port)) + '()) + '()) + #$@(if (not inetd?) + (if ipv4? + (list "-UseIPv4") + '()) + '()) + #$@(if (not inetd?) + (if ipv6? + (list "-UseIPv6") + '()) + '()) + #$@(if (maybe-value-set? password-file) + (list "-PasswordFile" password-file) + '()) + "-FrameRate" #$(number->string frame-rate) + "-SecurityTypes" #$(string-join security-types ",") + #$@(if localhost? + (list "-localhost") + '()) + "-Log" #$(format #f "*:syslog:~a" log-level) + #$@(if xdmcp? + (list "-query" "localhost" "-once") + '()) + #$@extra-options))) + +(define %xvnc-accounts + (list (user-group + (name "xvnc") + (system? #t)) + (user-account + (name "xvnc") + (group "xvnc") + (system? #t) + (comment "User for Xvnc server")))) + +(define (xvnc-shepherd-service config) + "Return a for Xvnc with CONFIG." + (let* ((display-number (xvnc-configuration-display-number config)) + (port (if (maybe-value-set? (xvnc-configuration-port config)) + (xvnc-configuration-port config) + #f)) + (port* (or port (+ 5900 display-number)))) + (shepherd-service + (provision '(xvnc vncserver)) + (documentation "Run the Xvnc server.") + (requirement '(networking syslogd)) + (start (if (xvnc-configuration-inetd? config) + #~(let* ((inaddr (if #$(xvnc-configuration-localhost? config) + INADDR_LOOPBACK + INADDR_ANY)) + (in6addr (if #$(xvnc-configuration-localhost? config) + IN6ADDR_LOOPBACK + IN6ADDR_ANY)) + (ipv4-socket (and #$(xvnc-configuration-ipv4? config) + (make-socket-address AF_INET inaddr + #$port*))) + (ipv6-socket (and #$(xvnc-configuration-ipv6? config) + (make-socket-address AF_INET6 in6addr + #$port*)))) + (make-inetd-constructor + #$(xvnc-configuration->command-line-arguments config) + `(,@(if ipv4-socket + (list (endpoint ipv4-socket)) + '()) + ,@(if ipv6-socket + (list (endpoint ipv6-socket)) + '())) + #:user "xvnc" + #:group "xvnc")) + #~(make-forkexec-constructor + #$(xvnc-configuration->command-line-arguments config) + #:user "xvnc" + #:group "xvnc"))) + (stop #~(make-inetd-destructor))))) + +(define xvnc-service-type + (service-type + (name 'xvnc) + (default-value (xvnc-configuration)) + (description "Run the Xvnc server, which creates a virtual X11 session and +allow remote clients connecting to it via the remote framebuffer (RFB) +protocol.") + (extensions (list (service-extension + shepherd-root-service-type + (compose list xvnc-shepherd-service)) + (service-extension account-service-type + (const %xvnc-accounts)))))) diff --git a/gnu/tests/vnc.scm b/gnu/tests/vnc.scm new file mode 100644 index 0000000000..34c2db1203 --- /dev/null +++ b/gnu/tests/vnc.scm @@ -0,0 +1,200 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Maxim Cournoyer . +;;; +;;; 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 tests vnc) + #:use-module (gnu bootloader) + #:use-module (gnu bootloader grub) + #:use-module (gnu packages) + #:use-module (gnu packages ocr) + #:use-module (gnu packages glib) + #:use-module (gnu services) + #:use-module (gnu services dbus) + #:use-module (gnu services desktop) + #:use-module (gnu services networking) + #:use-module (gnu services ssh) + #:use-module (gnu services vnc) + #:use-module (gnu services xorg) + #:use-module (gnu system) + #:use-module (gnu system file-systems) + #:use-module (gnu system shadow) + #:use-module (gnu system vm) + #:use-module (gnu tests) + #:use-module (guix gexp) + #:use-module (guix modules) + #:export (%test-xvnc)) + +(define %xvnc-os + (operating-system + ;; Usual boilerplate. + (host-name "komputilo") + (timezone "Europe/Berlin") + (locale "en_US.UTF-8") + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (targets '("/dev/sdX")))) + (file-systems (cons (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext4")) + %base-file-systems)) + + (users (cons (user-account + (name "dummy") + (group "users") + (supplementary-groups '("wheel" "netdev" + "audio" "video"))) + %base-user-accounts)) + (packages (append (map specification->package + '("dbus" ;for dbus-run-session + "dconf" + "gnome-settings-daemon" ;for schemas + "ratpoison" + "tigervnc-client" + "xterm")) + %base-packages + (list `(,glib "bin") + glib))) + (services (cons* + (service openssh-service-type (openssh-configuration + (permit-root-login #t) + (allow-empty-passwords? #t))) + (service xvnc-service-type (xvnc-configuration + (display-number 5) + (security-types (list "None")) + (log-level 100) + (localhost? #f) + (xdmcp? #t) + (inetd? #t))) + (modify-services %desktop-services + (gdm-service-type config => (gdm-configuration + (inherit config) + (auto-login? #t) + (auto-suspend? #f) + (default-user "root") + (debug? #t) + (xdmcp? #t)))))))) + +(define (run-xvnc-test) + "Run tests in %XVNC-OS." + + (define os (marionette-operating-system + %xvnc-os + #:imported-modules (source-module-closure + '((gnu services herd))))) + + (define vm (virtual-machine + (operating-system os) + (memory-size 1024))) + + (define test + (with-imported-modules (source-module-closure + '((gnu build marionette) + (guix build utils))) + #~(begin + (use-modules (gnu build marionette) + (guix build utils) + (srfi srfi-26) + (srfi srfi-64)) + + (let ((marionette (make-marionette (list #$vm)))) + + (test-runner-current (system-test-runner #$output)) + (test-begin "xvnc") + + (test-assert "service running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'xvnc)) + marionette)) + + (test-assert "wait for port 5905, IPv4" + (wait-for-tcp-port 5905 marionette)) + + (test-assert "wait for port 5905, IPv6" + (wait-for-tcp-port 5905 marionette + #:address + '(make-socket-address + AF_INET6 (inet-pton AF_INET6 "::1") 5905))) + + (test-assert "gdm auto-suspend is disabled" + ;; More a GDM than a Xvnc test, but since it's a cross-cutting + ;; concern and we have everything set up here, we might as well + ;; check it here. + (marionette-eval + '(begin + ;; Check that DCONF_PROFILE is set... + (invoke "/bin/sh" "-lc" "\ +pgrep gdm | head -n1 | xargs -I{} grep -Fq DCONF_PROFILE /proc/{}/environ") + + ;; ... and that + (invoke "/bin/sh" "-lc" "\ +sudo -E -u gdm env DCONF_PROFILE=/etc/dconf/profile/gdm dbus-run-session \ +gsettings get org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type \ +| grep -Fq nothing")) + marionette)) + + (test-assert "vnc lands on the gdm login screen" + ;; This test runs vncviewer on the local VM and verifies that it + ;; manages to access the GDM login screen (via XDMCP). + (begin + (define (ratpoison-abort) + (marionette-control "sendkey ctrl-g" marionette)) + + (define (ratpoison-help) + (marionette-control "sendkey ctrl-t" marionette) + (marionette-type "?" marionette) + (sleep 1)) ;wait for help screen to appear + + (define (ratpoison-exec command) + (marionette-control "sendkey ctrl-t" marionette) + (marionette-type "!" marionette) + (marionette-type (string-append command "\n") marionette)) + + ;; Wait until the ratpoison help screen can be displayed; this + ;; means the window manager is ready. + (wait-for-screen-text marionette + (cut string-contains <> "key bindings") + #:ocr #$(file-append tesseract-ocr + "/bin/tesseract") + #:pre-action ratpoison-help + #:post-action ratpoison-abort) + + ;; Run vncviewer and expect the GDM login screen (accessed via + ;; XDMCP). This can take a while to appear on slower machines. + (ratpoison-exec "vncviewer localhost:5905") + ;; XXX: tesseract narrowly recognizes "Guix" as "uix" from the + ;; background image; ocrad fares worst. Sadly, 'Username' is + ;; not recognized at all. + (wait-for-screen-text marionette + (cut string-contains <> "uix") + #:ocr #$(file-append tesseract-ocr + "/bin/tesseract") + #:timeout 120))) + + (test-end))))) + + (gexp->derivation "xvnc-test" test)) + +(define %test-xvnc + (system-test + (name "xvnc") + (description "Basic tests for the Xvnc service. One of the tests validate +that XDMCP works with GDM, and is therefore heavy in terms of disk and memory +requirements.") + (value (run-xvnc-test)))) -- cgit v1.2.3 From 0169aee33e154c1fa8b299c7f126f3e94a8dc9a4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 7 Oct 2022 15:07:36 -0400 Subject: tests: xvnc: Do not use specification->package in OS definition. Doing so would cause the extra package dependencies to not be correctly registered as dependencies, which would lead to a silent failure when attempting to load or byte compile the module at the time guix build itself (e.g., when running 'guix pull'). * gnu/tests/vnc.scm (%xvnc-os) [packages]: Turn the the specification->package declaration into a list of package objects. --- gnu/tests/vnc.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/vnc.scm b/gnu/tests/vnc.scm index 34c2db1203..5c4bd43fa3 100644 --- a/gnu/tests/vnc.scm +++ b/gnu/tests/vnc.scm @@ -22,6 +22,10 @@ #:use-module (gnu packages) #:use-module (gnu packages ocr) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages ratpoison) + #:use-module (gnu packages vnc) + #:use-module (gnu packages xorg) #:use-module (gnu services) #:use-module (gnu services dbus) #:use-module (gnu services desktop) @@ -59,16 +63,15 @@ (supplementary-groups '("wheel" "netdev" "audio" "video"))) %base-user-accounts)) - (packages (append (map specification->package - '("dbus" ;for dbus-run-session - "dconf" - "gnome-settings-daemon" ;for schemas - "ratpoison" - "tigervnc-client" - "xterm")) - %base-packages - (list `(,glib "bin") - glib))) + (packages (cons* dbus ;for dbus-run-session + dconf + `(,glib "bin") + glib + gnome-settings-daemon ;for schemas + ratpoison + tigervnc-client + xterm + %base-packages)) (services (cons* (service openssh-service-type (openssh-configuration (permit-root-login #t) -- cgit v1.2.3 From 00ef6c18d5c6b22874221e9be74f3ba0641c0034 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 7 Oct 2022 21:42:17 +0200 Subject: gnu: giac: Fix build. * gnu/packages/algebra.scm (giac)[source]: Add a patch to fix build issue with Pari-GP 2.15. [arguments]<#:phase>: Skip another test. * gnu/packages/patches/giac-pari-gp-anyarg.patch: New file. * gnu/local.mk: Register it. This fixes . --- gnu/local.mk | 1 + gnu/packages/algebra.scm | 10 +++++++-- gnu/packages/patches/giac-pari-gp-anyarg.patch | 28 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/giac-pari-gp-anyarg.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 698070c639..a013647d7e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1187,6 +1187,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ + %D%/packages/patches/giac-pari-gp-anyarg.patch \ %D%/packages/patches/giara-fix-login.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-networking-gnutls-binding.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index f94aba1ebf..d4b7810308 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -339,7 +339,12 @@ precision.") "~parisse/debian/dists/stable/main/source/" "giac_" version ".tar.gz")) (sha256 - (base32 "1zh7bf0ag4vbyyj5n8lbvy2ivp0kshms40ra5lq1ff035rpx230j")))) + (base32 "1zh7bf0ag4vbyyj5n8lbvy2ivp0kshms40ra5lq1ff035rpx230j")) + (patches + ;; Patch borrowed from Sage math team. Giac 1.9.0-21 does not build + ;; since Pari-GP 2.15 upgrade. Reported upstream here: + ;; . + (search-patches "giac-pari-gp-anyarg.patch")))) (build-system gnu-build-system) (arguments (list @@ -355,9 +360,10 @@ precision.") (find-files "doc" "^Makefile")) (("/bin/cp") (which "cp"))))) (add-after 'unpack 'disable-failing-test - ;; FIXME: Test failing. Not sure why. + ;; FIXME: Tests failing. Not sure why. (lambda _ (substitute* "check/Makefile.in" + (("chk_fhan4") "") (("chk_fhan11") "")))) (add-after 'install 'fix-doc (lambda _ diff --git a/gnu/packages/patches/giac-pari-gp-anyarg.patch b/gnu/packages/patches/giac-pari-gp-anyarg.patch new file mode 100644 index 0000000000..0441f6bcf9 --- /dev/null +++ b/gnu/packages/patches/giac-pari-gp-anyarg.patch @@ -0,0 +1,28 @@ +From 041d16b521d8231e5b441015f08bb386f9d2a51c Mon Sep 17 00:00:00 2001 +From: Vincent Delecroix <20100.delecroix@gmail.com*> +Date: Thu, 15 Sep 2022 12:11:01 +0200 +Subject: ANYARG giac patch + +--- +diff --git a/src/pari.cc b/src/pari.cc +index 76ce8e1..50d08ab 100644 +--- a/src/pari.cc ++++ b/src/pari.cc +@@ -40,6 +40,13 @@ using namespace std; + + #ifdef HAVE_LIBPARI + ++// Anyarg disappeared from PARI 2.15.0 ++#ifdef __cplusplus ++# define ANYARG ... ++#else ++# define ANYARG ++#endif ++ + #ifdef HAVE_PTHREAD_H + #include + #endif + +-- +cgit v1.0-1-gd88e + -- cgit v1.2.3 From c78a1d250f8c5f2d3644bac2385ff4c9058079a5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 7 Oct 2022 19:34:58 +0200 Subject: gnu: Add texlive-zhspacing. * gnu/packages/tex.scm (texlive-zhspacing): New variable. --- gnu/packages/tex.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 1266d46861..8e7efa2a82 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6564,6 +6564,26 @@ Adobe's basic set.") ;; No license version specified. (license license:gpl3+))) +(define-public texlive-zhspacing + (package + (inherit + (simple-texlive-package "texlive-zhspacing" + (list "doc/generic/zhspacing/" + "tex/context/third/zhspacing/" + "tex/generic/zhspacing/" + "tex/xelatex/zhspacing/") + (base32 + "02hwa7yjwb6wxkkib83mjdbara5zcsixbp5xlawri8n9ah54vxjm") + #:trivial? #t)) + (home-page "https://ctan.org/macros/xetex/generic/zhspacing") + (synopsis "Spacing for mixed CJK-English documents in XeTeX") + (description + "The package manages spacing in a CJK document; between consecutive Chinese +letters, spaces are ignored, but a consistent space is inserted between Chinese +text and English (or mathematics). The package may be used by any document +format under XeTeX.") + (license license:lppl1.3+))) + (define-public texlive-zref (package (inherit (simple-texlive-package -- cgit v1.2.3 From 91334d36a45f80b4d7773498b8f23ba137404f36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 7 Oct 2022 19:48:24 +0200 Subject: gnu: Add font-google-noto-sans-cjk. * gnu/packages/fonts.scm (font-google-noto-sans-cjk): New variable. --- gnu/packages/fonts.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 8e829c6c17..43e23094ad 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -918,6 +918,28 @@ all languages with a consistent look and aesthetic. Its goal is to properly display all Unicode symbols.") (license license:silofl1.1))) +(define-public font-google-noto-sans-cjk + (package + (name "font-google-noto-sans-cjk") + (version "2.004") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/googlefonts/noto-cjk/releases/download/Sans" + version "/03_NotoSansCJK-OTC.zip")) + (file-name (string-append name "-" version ".zip")) + (sha256 + (base32 "1v9yda7r98g4a3pk0y3cjbgc1i2lv4ax0f0v6aqasfzz4ldlx3sj")))) + (build-system font-build-system) + (home-page "https://www.google.com/get/noto/") + (synopsis "Fonts to cover all languages") + (description "Google Noto Fonts is a family of fonts designed to support +all languages with a consistent look and aesthetic. Its goal is to properly +display all Unicode symbols. This package provides the Sans Serif variant of +CJK fonts.") + (license license:silofl1.1))) + (define-public font-google-roboto (package (name "font-google-roboto") -- cgit v1.2.3 From 2da9ceaeb92e768876f92bfb3374d04d5851e3a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 7 Oct 2022 19:48:40 +0200 Subject: gnu: Add font-google-noto-serif-cjk. * gnu/packages/fonts.scm (font-google-noto-serif-cjk): New variable. --- gnu/packages/fonts.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 43e23094ad..3ca4874fd9 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -940,6 +940,28 @@ display all Unicode symbols. This package provides the Sans Serif variant of CJK fonts.") (license license:silofl1.1))) +(define-public font-google-noto-serif-cjk + (package + (name "font-google-noto-serif-cjk") + (version "2.001") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/googlefonts/noto-cjk/releases/download/Serif" + version "/04_NotoSerifCJKOTC.zip")) + (file-name (string-append name "-" version ".zip")) + (sha256 + (base32 "1l6r3sz2s0vcyfx6ria7wqcq45zp40gxgg97lh8hpmajhzw301ig")))) + (build-system font-build-system) + (home-page "https://www.google.com/get/noto/") + (synopsis "Fonts to cover all languages") + (description "Google Noto Fonts is a family of fonts designed to support +all languages with a consistent look and aesthetic. Its goal is to properly +display all Unicode symbols. This package provides the Serif variant of CJK +fonts.") + (license license:silofl1.1))) + (define-public font-google-roboto (package (name "font-google-roboto") -- cgit v1.2.3 From 5463bdded17f2aad7b791da2f7a929661da4eecc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Oct 2022 00:46:50 +0200 Subject: gnu: Add font-arphic-ukai. * gnu/packages/fonts.scm (font-arphic-ukai): New variable. --- gnu/packages/fonts.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3ca4874fd9..2d653abf32 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2752,6 +2752,27 @@ This package contains the following outputs: ") (license license:gpl2))) +(define-public font-arphic-ukai + (package + (name "font-arphic-ukai") + (version "0.2.20080216.2") + (source (origin + (method url-fetch) + (uri (string-append "http://deb.debian.org/debian/pool/main" + "/f/fonts-arphic-ukai/fonts-arphic-ukai_" + version ".orig.tar.bz2")) + (sha256 + (base32 + "1lp3i9m6x5wrqjkh1a8vpyhmsrhvsa2znj2mx13qfkwza5rqv5ml")))) + (build-system font-build-system) + (home-page "https://www.freedesktop.org/wiki/Software/CJKUnifonts/") + (synopsis "Truetype fonts for Taiwanese and Hakka") + (description + "This package provides a set of Truetype fonts, which contain all +characters necessary to display Taiwanese and Hakka.") + (license (license:fsdg-compatible + "https://www.freedesktop.org/wiki/Arphic_Public_License/")))) + (define-public font-atui-feather (let ((version "0") (commit "c51fe7cedbcf2cbf4f1b993cef5d8def612dec1d") -- cgit v1.2.3 From dbdba682ed2f15c55954577ce98e7e32a4a77fad Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 7 Oct 2022 12:35:38 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.217. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.217. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2a2b1614f9..3972675a8d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -403,7 +403,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.216") +(define-public linux-libre-5.4-version "5.4.217") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -413,7 +413,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "19vyxa0yzdf4w48jamjfz6kpiaaa7mjjz5gs2awckzilfc0n4pyf"))) + (hash (base32 "0qrfrk0g1dky5apg8gdxczj2ir0g0z41zmdmbwwcxkxjz76jdf1b"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 4a47fcbdb4cbbc67330496cee0fc2898f59d4778 Mon Sep 17 00:00:00 2001 From: Dhruvin Gandhi Date: Thu, 23 Jun 2022 15:08:03 +0530 Subject: gnu: Add go-github-com-google-shlex. * gnu/packages/golang.scm (go-github-com-google-shlex): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/golang.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4a4c706509..4fd9b44c83 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2021 Lu Hui ;;; Copyright © 2022 Pier-Hugues Pellerin ;;; Copyright © 2022 muradm +;;; Copyright © 2022 Dhruvin Gandhi ;;; ;;; This file is part of GNU Guix. ;;; @@ -9990,6 +9991,28 @@ production-ready implementation, compatible with the original Jsonnet C++ implementation.") (license license:asl2.0))) +(define-public go-github-com-google-shlex + (package + (name "go-github-com-google-shlex") + (version "0.0.0-20191202100458-e7afc7fbc510") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/shlex") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14z8hqyik910wk2qwnzgz8mjsmiamxa0pj55ahbv0jx6j3dgvzfm")))) + (build-system go-build-system) + (arguments (list #:import-path "github.com/google/shlex")) + (home-page "https://github.com/google/shlex") + (synopsis "Simple lexer for Go") + (description + "@code{shlex} implements a simple lexer which splits input into tokens +using shell-style rules for quoting and commenting.") + (license license:asl2.0))) + (define-public go-github-com-gorilla-websocket (package (name "go-github-com-gorilla-websocket") -- cgit v1.2.3 From ddc59a63b74d31fe2e00aeaba1b2fb7dbd4d3be3 Mon Sep 17 00:00:00 2001 From: Dhruvin Gandhi Date: Thu, 23 Jun 2022 15:08:04 +0530 Subject: gnu: Add go-git-sr-ht-emersion-go-scfg. * gnu/packages/golang.scm (go-git-sr-ht-emersion-go-scfg): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/golang.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4fd9b44c83..aaad76d7ea 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9962,6 +9962,29 @@ kubernetes-sigs/yaml is a permanent fork of @url{https://github.com/ghodss/yaml,ghodss/yaml}.") (license (list license:expat license:bsd-3)))) +(define-public go-git-sr-ht-emersion-go-scfg + (package + (name "go-git-sr-ht-emersion-go-scfg") + (version "0.0.0-20211215104734-c2c7a15d6c99") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~emersion/go-scfg") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02gn8hz8zfv8y0krysx2wv951gw8hmhdfqf1ysidwm7i293365w4")))) + (build-system go-build-system) + (arguments (list #:import-path "git.sr.ht/~emersion/go-scfg")) + (propagated-inputs + (list go-github-com-google-shlex + go-github-com-davecgh-go-spew)) + (home-page "https://git.sr.ht/~emersion/go-scfg") + (synopsis "Go library for simple configuration file format") + (description "Package go-scfg parses scfg files.") + (license license:expat))) + (define-public go-github-com-google-go-jsonnet (package (name "go-github-com-google-go-jsonnet") -- cgit v1.2.3 From f0902bd2c0d0dc07197ce202f8a20bfeba91b07a Mon Sep 17 00:00:00 2001 From: Dhruvin Gandhi Date: Thu, 23 Jun 2022 15:08:05 +0530 Subject: gnu: Add go-git-sr-ht-emersion-gqlclient. * gnu/packages/golang.scm (go-git-sr-ht-emersion-gqlclient): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/golang.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index aaad76d7ea..cde002b727 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9985,6 +9985,27 @@ kubernetes-sigs/yaml is a permanent fork of (description "Package go-scfg parses scfg files.") (license license:expat))) +(define-public go-git-sr-ht-emersion-gqlclient + (package + (name "go-git-sr-ht-emersion-gqlclient") + (version "0.0.0-20220202181617-4e6e9c763dd2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~emersion/gqlclient") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1d9hmaz7yy02bk455gmaav818xi49sw69jyx6dxzymv6ln7r1cv1")))) + (build-system go-build-system) + (arguments (list #:import-path "git.sr.ht/~emersion/gqlclient")) + (home-page "https://git.sr.ht/~emersion/gqlclient") + (synopsis "GraphQL client and code generator") + (description + "This package provides a GraphQL client and code generator for Go.") + (license license:expat))) + (define-public go-github-com-google-go-jsonnet (package (name "go-github-com-google-go-jsonnet") -- cgit v1.2.3 From feee342b66ade14c7b88cb43fe064768ce83409f Mon Sep 17 00:00:00 2001 From: Dhruvin Gandhi Date: Thu, 23 Jun 2022 15:08:07 +0530 Subject: gnu: Add go-github-com-lunixbochs-vtclean. * gnu/packages/golang.scm (go-github-com-lunixbochs-vtclean): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/golang.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cde002b727..466d571c26 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6082,6 +6082,29 @@ network protocol.") (home-page "https://github.com/lucas-clemente/quic-go") (license license:expat))) +(define-public go-github-com-lunixbochs-vtclean + (package + (name "go-github-com-lunixbochs-vtclean") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lunixbochs/vtclean") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jqn33l1kzy4dk66zbvxz7rlgkgg34s9mhc8z0lrz0i88466zhd8")))) + (build-system go-build-system) + (arguments (list #:import-path "github.com/lunixbochs/vtclean")) + (home-page "https://github.com/lunixbochs/vtclean") + (synopsis "Filter out terminal escape sequences") + (description + "The @code{vtclean} provides the @command{vtclean} command and a library +designed to clean up raw terminal output by stripping escape sequences, +optionally preserving color.") + (license license:expat))) + (define-public go-github-com-francoispqt-gojay (package (name "go-github-com-francoispqt-gojay") -- cgit v1.2.3 From 5002e1ac05a029e6a5643733bc4f24ff29f3e268 Mon Sep 17 00:00:00 2001 From: Dhruvin Gandhi Date: Thu, 23 Jun 2022 15:08:06 +0530 Subject: gnu: Add go-github-com-juju-ansiterm. * gnu/packages/golang.scm (go-github-com-juju-ansiterm): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 466d571c26..53d1e38c28 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7849,6 +7849,33 @@ file system operations.") extensions.") (license license:expat)))) +(define-public go-github-com-juju-ansiterm + (package + (name "go-github-com-juju-ansiterm") + (version "0.0.0-20210929141451-8b71cc96ebdc") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/juju/ansiterm") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05mk7mlvg11dd6b0j0wlq547ghbmx2ywwrlbcb4kddpg7qaqp1va")))) + (build-system go-build-system) + (arguments (list #:import-path "github.com/juju/ansiterm")) + (propagated-inputs + (list go-gopkg-in-check-v1 + go-github-com-mattn-go-isatty + go-github-com-mattn-go-colorable + go-github-com-lunixbochs-vtclean)) + (home-page "https://github.com/juju/ansiterm") + (synopsis "Writer to output ANSI escape codes for color and styles") + (description + "The ansiterm package provides a writer to output the ANSI escape codes +for color and styles.") + (license license:lgpl3))) + (define-public go-github-com-kevinburke-ssh-config (package (name "go-github-com-kevinburke-ssh-config") -- cgit v1.2.3 From c20d684cc8b8b005f1afed6b3328d2eb9448fa09 Mon Sep 17 00:00:00 2001 From: Dhruvin Gandhi Date: Thu, 23 Jun 2022 15:08:08 +0530 Subject: gnu: Add hut. * gnu/packages/version-control.scm (hut): New variable. Signed-off-by: Maxim Cournoyer Modified-by: Maxim Cournoyer --- gnu/packages/version-control.scm | 68 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index bd0ad70ce8..c3a79bec55 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -45,6 +45,7 @@ ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 Maxime Devos +;;; Copyright © 2022 Dhruvin Gandhi ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,6 +105,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages mail) + #:use-module (gnu packages man) #:use-module (gnu packages maths) #:use-module (gnu packages nano) #:use-module (gnu packages ncurses) @@ -3456,3 +3458,69 @@ Git project instead of @command{git filter-branch}.") "Gitlint is a Git commit message linter written in Python: it checks your commit messages for style.") (license license:expat))) + +(define-public hut + (package + (name "hut") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~emersion/hut") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15ag8fibnahcfgd0w2j4k813z10ymi39rx8d3c8b9955zc62p1fr")))) + (build-system go-build-system) + (arguments + (list + #:import-path "git.sr.ht/~emersion/hut" + #:phases + #~(modify-phases %standard-phases + (replace 'build + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + ;; The flags are copied from (guix build go-build-system). + (setenv "CGO_LDFLAGS" "-s -w") + (invoke "make" "all" "GOFLAGS=-v -x")))) + (replace 'install + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (invoke "make" "install" + (string-append "PREFIX=" #$output)))))))) + (native-inputs + (list scdoc)) + (inputs + (list go-git-sr-ht-emersion-go-scfg + go-git-sr-ht-emersion-gqlclient + go-github-com-juju-ansiterm + go-github-com-spf13-cobra + go-golang-org-x-oauth2 + go-golang-org-x-term)) + (home-page "https://git.sr.ht/~emersion/hut") + (synopsis "CLI tool for sr.ht") + (description "@command{hut} is a CLI tool for +@uref{https://sr.ht/~sircmpwn/sourcehut/, sr.ht}. It helps you interact with +sr.ht's public services: +@table @asis +@item builds +submit and manage build jobs +@item git +create, and manage git repositories and artifacts +@item hg +list Mercurial repositories +@item lists +manage mailing lists and patches +@item meta +manage PGP, and SSH keys +@item pages +publish and manage hosted websites +@item paste +create and manage pastes +@item todo +create and manage trackers, tickets +@item graphql +interact with GraphQL APIs directly +@end table") + (license license:agpl3))) -- cgit v1.2.3 From 2cdd60dea14224344f00586199fa16210886d853 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 7 Oct 2022 15:25:59 +0000 Subject: gnu: git: Update to 2.38.0. * gnu/packages/version-control.scm (git): Update to 2.38.0. Signed-off-by: Maxim Cournoyer --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c3a79bec55..25ce7feb81 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -223,14 +223,14 @@ Python 3.3 and later, rather than on Python 2.") (define-public git (package (name "git") - (version "2.37.3") + (version "2.38.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0yp8hdj0w18jhmmdflzz74z418cw95i08pc22yycyn8nyvbl2il1")))) + "02ij201lyipv1w2zkcq4ng2bga2xkw58xnkbs1wdw50qdgiasglj")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -250,7 +250,7 @@ Python 3.3 and later, rather than on Python 2.") version ".tar.xz")) (sha256 (base32 - "053lj9wy8y2yr5jzpb0af4w50gz3ckhgc15wqx7is4z6k9a76lww")))) + "1qyn6rhwblshz0hp0kdc8lk22c1fv8avfr44sia0vzlbd82xj828")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) -- cgit v1.2.3 From c9d955d51e1c64b9ee51bda48503c2cced997945 Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Sat, 8 Oct 2022 00:47:12 -0400 Subject: gnu: Add ktimer. * gnu/packages/kde.scm (ktimer): New variable. --- gnu/packages/kde.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index f187c02ba4..20df62fdfa 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -898,6 +898,33 @@ charts.") partitions, floppy and CD drives, etc.) along with information on their capacity, free space, type and mount point. It also allows you to mount and unmount drives and view them in a file manager.") +(license license:gpl2+))) + +(define-public ktimer + (package + (name "ktimer") + (version "20.12.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/ktimer-" version ".tar.xz")) + (sha256 + (base32 + "12fz5v5ky03h18jl75fnq1zagjq8qzi1s1q7phjz5d1rbhwc57ls")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules + kdoctools)) + (inputs + (list kdbusaddons + ki18n + kio + knotifications)) + (home-page "https://kde.org/applications/utilities/ktimer") + (synopsis "Countdown Launcher") + (description "KTimer is a little tool to execute programs after some time. +It allows you to enter several tasks and to set a timer for each of them. The +timers for each task can be started, stopped, changed, or looped.") (license license:gpl2+))) (define-public kcachegrind -- cgit v1.2.3 From 59ce7ab95a036e9c6206cbc6f2a272fdc3f476e1 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 7 Oct 2022 20:41:28 +0800 Subject: gnu: egl-wayland: Update to 1.1.11. * gnu/packages/xorg.scm (egl-wayland): Update to 1.1.11. Signed-off-by: Maxim Cournoyer --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4cde48aa1b..e1df103666 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5331,7 +5331,7 @@ application-facing EGL functions.") (define-public egl-wayland (package (name "egl-wayland") - (version "1.1.10") + (version "1.1.11") (source (origin (method git-fetch) @@ -5340,7 +5340,7 @@ application-facing EGL functions.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "13hdczhsicp4bfkcjg2npslwjaqrajjv867gxjnmvk77scr09dvm")))) + (base32 "11a3j2rjai2vsway9ki5y3ncvhrwd300pz2zcq36mq3brbr1vgf5")))) (build-system meson-build-system) (native-inputs (list libglvnd ;needed for headers -- cgit v1.2.3 From 0b07c6febb323ed35f5ccae0295a733ae318e6d7 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 7 Oct 2022 22:00:12 +0800 Subject: gnu: wl-clipboard: Update to 2.1.0. * gnu/packages/xdisorg.scm (wl-clipboard): Update to 2.1.0. [arguments]<#:configure-flags>: Set completion files' installdir. Signed-off-by: Maxim Cournoyer --- gnu/packages/xdisorg.scm | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 9908f29191..2533744633 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2437,7 +2437,7 @@ binary to setuid-binaries: (define-public wl-clipboard (package (name "wl-clipboard") - (version "2.0.0") + (version "2.1.0") (source (origin (method git-fetch) @@ -2446,20 +2446,25 @@ binary to setuid-binaries: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d")))) + (base32 "1g6hcsn4klapvz3bw0k8syixwyyi4cl1c7vbc6f1a2hjpcf4pawn")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-file-names - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "src" "\\.c$") - (("\"(cat|rm)\"" _ command) - (string-append "\"" (assoc-ref inputs "coreutils") - "/bin/" command "\"")) - (("\"xdg-mime\"") - (string-append "\"" (assoc-ref inputs "xdg-utils") - "/bin/xdg-mime\"")))))))) + (list #:configure-flags + #~(list (string-append "-Dzshcompletiondir=" #$output + "/share/zsh/site-functions") + (string-append "-Dfishcompletiondir=" #$output + "/share/fish/completions")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-file-names + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src" "\\.c$") + (("\"(cat|rm)\"" _ command) + (string-append "\"" (assoc-ref inputs "coreutils") + "/bin/" command "\"")) + (("\"xdg-mime\"") + (string-append "\"" (assoc-ref inputs "xdg-utils") + "/bin/xdg-mime\"")))))))) (native-inputs (list pkg-config)) (inputs -- cgit v1.2.3 From a868595ebb17c16ca6a06d88fc6adca790377540 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Sun, 18 Sep 2022 19:34:40 +0000 Subject: gnu: weston: Update to 10.0.2. * gnu/packages/freedesktop.scm (weston): Update to 10.0.2. [inputs] Switch from pipewire to pipewire-0.3, use wayland-protocols-next. [native-inputs]: Add python-3. --- gnu/packages/freedesktop.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index c7339eb00e..4a9cf3229c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1165,18 +1165,18 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.") (define-public weston (package (name "weston") - (version "9.0.0") + (version "10.0.2") (source (origin (method url-fetch) (uri (string-append - "https://wayland.freedesktop.org/releases/" - "weston-" version ".tar.xz")) + "https://gitlab.freedesktop.org/wayland/weston/-/releases/" + version "/downloads/weston-" version ".tar.xz")) (sha256 (base32 - "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw")))) + "1rs92p7sfkw9lqlkfnqh5af19ym3x8l3hp3yfv117m7qv6h6qr49")))) (build-system meson-build-system) (native-inputs - (list mscgen pkg-config xorg-server)) + (list mscgen pkg-config python-3 xorg-server)) (inputs `(("cairo" ,cairo-xcb) ("colord" ,colord) @@ -1203,8 +1203,8 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.") ("mtdev" ,mtdev) ("linux-pam" ,linux-pam) ("pango" ,pango) - ("pipewire" ,pipewire) - ("wayland-protocols" ,wayland-protocols) + ("pipewire" ,pipewire-0.3) + ("wayland-protocols" ,wayland-protocols-next) ("xorg-server-xwayland" ,xorg-server-xwayland))) (propagated-inputs (list libxkbcommon pixman wayland)) -- cgit v1.2.3 From e1ee64b55a93706c42cf977cec3a339f1d9c78e1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Oct 2022 10:04:00 +0200 Subject: gnu: weston: Remove trailing #T from build phases. * gnu/packages/freedesktop.scm (weston)[arguments]: Remove trailing #T from build phases. --- gnu/packages/freedesktop.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 4a9cf3229c..10f0b2d620 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2017 Andy Wingo ;;; Copyright © 2015-2017, 2019, 2021-2022 Ludovic Courtès -;;; Copyright © 2015, 2017, 2018, 2019, 2021 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018, 2019, 2021, 2022 Ricardo Wurmus ;;; Copyright © 2015 David Hashe ;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau @@ -1233,23 +1233,19 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.") (substitute* '("libweston/launcher-logind.c" "libweston/weston-launch.c") (("#include ") - "#include ")) - #t)) + "#include ")))) (add-after 'configure 'patch-confdefs.h (lambda _ - (system "echo \"#define HAVE_SYSTEMD_LOGIN_209 1\" >> confdefs.h") - #t)) + (system "echo \"#define HAVE_SYSTEMD_LOGIN_209 1\" >> confdefs.h"))) (add-before 'check 'setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "XDG_RUNTIME_DIR" (getcwd)) - #t)) + (setenv "XDG_RUNTIME_DIR" (getcwd)))) (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - #t))))) + (setenv "DISPLAY" ":1")))))) (home-page "https://wayland.freedesktop.org") (synopsis "Reference implementation of a Wayland compositor") (description "Weston is the reference implementation of a Wayland -- cgit v1.2.3 From 4678f77b499e6a2bb7afff0b9a2d38aa19642bb7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Oct 2022 10:05:46 +0200 Subject: gnu: weston: Use plain list of inputs. * gnu/packages/freedesktop.scm (weston)[inputs]: Use new style. --- gnu/packages/freedesktop.scm | 56 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 10f0b2d620..109b7664d1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1178,34 +1178,34 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.") (native-inputs (list mscgen pkg-config python-3 xorg-server)) (inputs - `(("cairo" ,cairo-xcb) - ("colord" ,colord) - ("dbus" ,dbus) - ("elogind" ,elogind) - ("freerdp" ,freerdp) - ("glib" ,glib) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("lcms" ,lcms) - ("libdrm" ,libdrm) - ("libevdev" ,libevdev) - ("libinput" ,libinput-minimal) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libunwind" ,libunwind) - ("libva" ,libva) - ("libwebp" ,libwebp) - ("libx11" ,libx11) - ("libxcb" ,libxcb) - ("libxcursor" ,libxcursor) - ("libxml2" ,libxml2) - ("mesa" ,mesa) - ("mtdev" ,mtdev) - ("linux-pam" ,linux-pam) - ("pango" ,pango) - ("pipewire" ,pipewire-0.3) - ("wayland-protocols" ,wayland-protocols-next) - ("xorg-server-xwayland" ,xorg-server-xwayland))) + (list cairo-xcb + colord + dbus + elogind + freerdp + glib + gstreamer + gst-plugins-base + lcms + libdrm + libevdev + libinput-minimal + libjpeg-turbo + libpng + libunwind + libva + libwebp + libx11 + libxcb + libxcursor + libxml2 + mesa + mtdev + linux-pam + pango + pipewire-0.3 + wayland-protocols-next + xorg-server-xwayland)) (propagated-inputs (list libxkbcommon pixman wayland)) (arguments -- cgit v1.2.3 From 9e1c255b35a16c408fbd408c6690af6c30ea9180 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Oct 2022 10:09:07 +0200 Subject: gnu: weston: Use G-expression. * gnu/packages/freedesktop.scm (weston)[arguments]: Use gexp to remove references to %outputs and %build-inputs. --- gnu/packages/freedesktop.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 109b7664d1..ab37f04bef 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1209,22 +1209,23 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.") (propagated-inputs (list libxkbcommon pixman wayland)) (arguments - `(#:configure-flags - (list - ;; Otherwise, the RUNPATH will lack the final path component. - (string-append "-Dc_link_args=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib:" - (assoc-ref %outputs "out") "/lib/weston:" - (assoc-ref %outputs "out") "/lib/libweston-" - ,(version-major (package-version this-package))) - "-Dbackend-default=auto" - "-Dsystemd=false" - (string-append "-Dxwayland-path=" - (assoc-ref %build-inputs "xorg-server-xwayland") - "/bin/Xwayland")) - #:parallel-tests? #f ; Parallel tests cause failures. - #:phases - (modify-phases %standard-phases + (list + #:configure-flags + #~(list + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" + #$output "/lib:" + #$output "/lib/weston:" + #$output "/lib/libweston-" + #$(version-major (package-version this-package))) + "-Dbackend-default=auto" + "-Dsystemd=false" + (string-append "-Dxwayland-path=" + #$(this-package-input "xorg-server-xwayland") + "/bin/Xwayland")) + #:parallel-tests? #f ; Parallel tests cause failures. + #:phases + '(modify-phases %standard-phases (add-before 'configure 'use-elogind (lambda _ ;; Use elogind instead of systemd -- cgit v1.2.3 From f24b66bf4abcc13a7e34679d5b13afe111de3554 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Oct 2022 12:02:56 +0200 Subject: gnu: pigx-sars-cov-2: Update to 0.0.8. * gnu/packages/bioinformatics.scm (pigx-sars-cov-2): Update to 0.0.8. [arguments]: Add build phase 'unpack-databases; enable tests. [native-inputs]: Add origins for databases; remove automake and autoconf. [inputs]: Add r-data-table, r-deconvr, r-htmltools, r-jsonlite, r-knitr, and r-mass. --- gnu/packages/bioinformatics.scm | 59 ++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c6d63a7492..f2de09aa32 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11406,7 +11406,7 @@ based methods.") (define-public pigx-sars-cov-2 (package (name "pigx-sars-cov-2") - (version "0.0.7") + (version "0.0.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_sars-cov-2" @@ -11414,24 +11414,51 @@ based methods.") "/pigx_sars-cov-2-" version ".tar.gz")) (sha256 (base32 - "1bqm03ypf7l8lrkjkydxzn7vy0qlps3v9c5cpz2wb008zw44bi3k")))) + "1yf1y25asnhxz80dajs54wrhr0wyi9fldk7lxsnqrh7gpqp2dvcs")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;requires huge kraken database - #:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'autoreconf - (lambda _ - ;; https://github.com/BIMSBbioinfo/pigx_sars-cov-2/issues/123 - (substitute* "m4/ax_r_package.m4" - (("if\\(is.na\\(packageDescription\\(\"PKG\"\\)\\)\\)") - "if(system.file(package=\"PKG\") == \"\")")) - (invoke "autoreconf" "-vif"))) + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'unpack-databases + (lambda* (#:key inputs #:allow-other-keys) + ;; The tests need to be able to write caches to HOME. + ;; They also default to reading the databases from there. + (setenv "HOME" "/tmp") + ;; Unpack the three databases in the expected location. + (let ((root "/tmp/.local/share/pigx/databases") + (use-underscore (lambda (c) (if (equal? c #\-) #\_ c)))) + (for-each (lambda (db) + (let ((where (string-append root "/" + (string-map use-underscore db)))) + (mkdir-p where) + (invoke "tar" "-C" where + "-xf" (assoc-ref inputs db)))) + '("kraken-db" "krona-db" "vep-db"))))) (add-before 'configure 'set-PYTHONPATH (lambda _ (setenv "PYTHONPATH" (getenv "GUIX_PYTHONPATH"))))))) (native-inputs - (list automake autoconf)) + (let ((bimsb-origin + (lambda (name hash) + (origin + (method url-fetch) + (uri + (string-append "https://bimsbstatic.mdc-berlin.de/akalin/AAkalin_pathogenomics" + "/databases_small-20221006/" name)) + (sha256 (base32 hash)))))) + `(("kraken-db" + ,(bimsb-origin + "kraken_db.tar.gz" + "0sdm4xh5npg6c3y2pz8xgphim4qpglm8wdid6rlaaqsn6iikv0mz")) + ("krona-db" + ,(bimsb-origin + "krona_db.tar.gz" + "1rwy4gd3vw1gdjldrgf44c1xaa3vq8i3pgisjhrac81yx63x8f2h")) + ("vep-db" + ,(bimsb-origin + "vep_db.tar.gz" + "0d8hhi43zsw3wqm7gd0z0gpcdsc6h6ra0imn87hifl9a64jxqzxz"))))) (inputs (list bash-minimal bedtools @@ -11447,10 +11474,16 @@ based methods.") python-pyyaml python-wrapper r-base64url + r-data-table + r-deconvr r-dplyr r-dt r-ggplot2 + r-htmltools + r-jsonlite + r-knitr r-magrittr + r-mass r-minimal r-plotly r-qpcr -- cgit v1.2.3 From e49255ff18def1065f65194f679a1d07fd5a266e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 8 Oct 2022 12:00:32 +0200 Subject: gnu: guix: Update to 3170843. Fixes . * gnu/packages/package-management.scm (guix): Update to 3170843. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index d856b56fe3..03f480991a 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -165,8 +165,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.3.0") - (commit "17134b9ec1aad94d41d75217a919dd1b224549d2") - (revision 30)) + (commit "31708431c53524f05e6a0c9fed920cb773e7dd21") + (revision 31)) (package (name "guix") @@ -182,7 +182,7 @@ (commit commit))) (sha256 (base32 - "16z9jwnw8y39y5cpalcyrhfrv13z2ijwmil7lxccsfzqzks6wp9m")) + "1j8qq6zgr20d1gi4n5dmvd9afd3d0k2h86ypajfyaa6bxpfj5i1r")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 4b2b8b31d702154334bccbd4fc61adfb5c91c83e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Oct 2022 22:27:29 +0200 Subject: gnu: upower: Fix test failure on i686-linux. * gnu/packages/gnome.scm (upower)[arguments]: Add 'adjust-test-for-excess-precision' when 'target-x86-32?' returns true. --- gnu/packages/gnome.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 23ede13958..6f44bd6a39 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5819,7 +5819,19 @@ faster results and to avoid unnecessary server load.") ;; If not specified, udev will try putting history information ;; in /gnu/store. "-Dhistorydir=/var/lib/upower" - (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d")))) + (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d")) + #:phases (if (target-x86-32?) + #~(modify-phases %standard-phases + (add-after 'unpack 'adjust-test-for-excess-precision + (lambda _ + ;; Address test failure caused by excess precision + ;; on i686: + ;; . + (substitute* "src/linux/integration-test.py" + (("assertEqual(.*)40\\.0" _ middle) + (string-append + "assertAlmostEqual" middle "40.0")))))) + #~%standard-phases))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection -- cgit v1.2.3 From 5c4b76ce372899db9d6e85dbadfb168436e0123f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 8 Oct 2022 12:23:51 +0200 Subject: gnu: libgme: Do not retain reference on GCC. This reduces the closure size of libgme from 221MiB to 72MiB. * gnu/packages/audio.scm (libgme)[arguments]: Add #:configure-flags. --- gnu/packages/audio.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b1a91418da..f57c22240a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -366,7 +366,12 @@ Linux kernel.") "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb")))) (build-system cmake-build-system) (arguments - '(#:tests? #f)) ; no check target + '(#:tests? #f ;no check target + + ;; XXX: Building with '-fsanitize=undefined' leads to embedded C++ STL + ;; header file names in libgme.so, meaning that libgme retains a + ;; reference to GCC. Disable UBSAN to avoid that. + #:configure-flags '("-DENABLE_UBSAN=OFF"))) (home-page "https://bitbucket.org/mpyne/game-music-emu") (synopsis "Video game music file playback library") (description -- cgit v1.2.3 From ff5cbe320530f605b5d6774d49e2d8c0d4cb5aa2 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 8 Oct 2022 11:38:01 +0100 Subject: gnu: guix-build-coordinator: Update to 0-61.ed52f0b. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-61.ed52f0b. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 03f480991a..12cfdc8901 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1366,8 +1366,8 @@ environments.") "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) (define-public guix-build-coordinator - (let ((commit "31b3ab65da2d9a02f0453d12a81816b25c8ad75d") - (revision "60")) + (let ((commit "ed52f0bb40f5f2d771740c923540c0d8f6d3f1f3") + (revision "61")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1378,7 +1378,7 @@ environments.") (commit commit))) (sha256 (base32 - "1hh1qy3xqpani3zfbm3wi4zw7f8cnbfjk4q1z7ynailadlfrkblk")) + "0j5x3cpiikyqd4jaa2xl88xspvmqp69hlfi8frv2qihsqbbi7vq5")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 2f13e8fb4d41aceabc3f5508d7a374b925d76ae1 Mon Sep 17 00:00:00 2001 From: Alice BRENON Date: Tue, 13 Sep 2022 17:35:20 +0200 Subject: gnu: Add ghc-hxt-xpath. * gnu/packages/haskell-web.scm (ghc-hxt-xpath): New variable. Signed-off-by: Christopher Baines --- gnu/packages/haskell-web.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 1c2538b45e..0e82d65e27 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020, 2022 Kyle Meyer ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2022 Alice Brenon ;;; ;;; This file is part of GNU Guix. ;;; @@ -1541,6 +1542,26 @@ derivations of regular expressions.") introduces a more general approach for processing XML with Haskell.") (license license:expat))) +(define-public ghc-hxt-xpath + (package + (name "ghc-hxt-xpath") + (version "9.1.2.2") + (source (origin + (method url-fetch) + (uri (hackage-uri "hxt-xpath" version)) + (sha256 + (base32 + "0wlq9s01icalnvjkkilx5zaqp3ff4v5limj1xy8i18qpzjspqdsh")))) + (build-system haskell-build-system) + (inputs (list ghc-hxt)) + (home-page "https://github.com/UweSchmidt/hxt") + (synopsis "The XPath modules for HXT.") + (description + "This extension for the Haskell XML Toolbox defines data types to +represent XPath, navigation trees and primitives to select and edit subtrees +from them. Some primitives have both a functional and an arrow interface.") + (license license:expat))) + (define-public ghc-http-common (package (name "ghc-http-common") -- cgit v1.2.3 From 14afaa5381b1185bf9e3701ff09c5bab12dacfab Mon Sep 17 00:00:00 2001 From: Lu Hui Date: Fri, 16 Sep 2022 23:02:28 +0800 Subject: gnu: bdb: Fix targeting riscv64. * gnu/packages/libdaemon.scm (bdb)[native-inputs,arguments]: Treat targeting riscv64 like aarch64 is handled. Signed-off-by: Christopher Baines --- gnu/packages/dbm.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index 8b6804aa92..2d3cce9e15 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Leo Le Bouter ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021 LuHui ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,7 +66,8 @@ ;; for "--build", but not for "--host", so update config.sub. ,@(if (and (%current-target-system) (or (target-ppc64le? (%current-target-system)) - (target-aarch64? (%current-target-system)))) + (target-aarch64? (%current-target-system)) + (target-riscv64? (%current-target-system)))) `((add-after 'unpack 'update-config.sub (lambda* (#:key native-inputs #:allow-other-keys) (delete-file "dist/config.sub") @@ -118,7 +120,8 @@ (native-inputs (if (and (%current-target-system) (or (target-ppc64le? (%current-target-system)) - (target-aarch64? (%current-target-system)))) + (target-aarch64? (%current-target-system)) + (target-riscv64? (%current-target-system)))) `(("config" ,config)) ; for config.sub '())) (synopsis "Berkeley database") -- cgit v1.2.3 From 650c9c240095480cd9545b8bf5fea2365f817b22 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 8 Oct 2022 20:59:27 +0200 Subject: gnu: emacs-dante: Update to 1.7. * gnu/packages/emacs-xyz.scm (emacs-dante): Update to 1.7. [propagated-inputs]: Order alphabetically. --- gnu/packages/emacs-xyz.scm | 54 ++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a319f503b2..8d6da24978 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1798,35 +1798,33 @@ programs.") (license license:gpl3+)))) (define-public emacs-dante - (let ((commit "38b589417294c7ea44bf65b73b8046d950f9531b") - (revision "1")) - (package - (name "emacs-dante") - (version (git-version "1.6" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jyp/dante") - (commit commit))) - (sha256 - (base32 - "1mnmn635552zlwd4zr68jbvdjipl6gi4mi6wiyck28fsmq8kw96h")) - (file-name (git-file-name name version)))) - (build-system emacs-build-system) - (propagated-inputs - (list emacs-dash - emacs-f - emacs-flycheck - emacs-haskell-mode - emacs-s - emacs-company - emacs-lcr)) - (home-page "https://github.com/jyp/dante") - (synopsis "Minor mode for interactive Haskell") - (description - "This package provides a minor mode for Haskell development that + (package + (name "emacs-dante") + (version "1.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jyp/dante") + (commit version))) + (sha256 + (base32 + "0q7hackvaplh1f645ngd76f2ls5mvg93xicr3rkxr07hd36yihag")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + (list emacs-company + emacs-dash + emacs-f + emacs-flycheck + emacs-haskell-mode + emacs-lcr + emacs-s)) + (home-page "https://github.com/jyp/dante") + (synopsis "Minor mode for interactive Haskell") + (description + "This package provides a minor mode for Haskell development that supports type hints, definition-jumping, completion, and more.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-flycheck (package -- cgit v1.2.3 From 0b7abd5ab7b09be4a1d4a4725310a5c418d7b1f0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 8 Oct 2022 21:01:02 +0200 Subject: gnu: emacs-lcr: Update to 1.3. * gnu/packages/emacs-xyz.scm (emacs-lcr): Update to 1.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8d6da24978..654759a4cc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17197,7 +17197,7 @@ editing RPM spec files.") (define-public emacs-lcr (package (name "emacs-lcr") - (version "1.2") + (version "1.3") (source (origin (method git-fetch) @@ -17206,7 +17206,7 @@ editing RPM spec files.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1856i3xll0pjrnh9r1xvi8lywpnixps2znvkvvd5505wcp20bcxf")))) + (base32 "1xhrjvlx3vbjkwx31w18y854hk15qf7h5ccg8yb3jdxl0pm9f41f")))) (build-system emacs-build-system) (propagated-inputs (list emacs-dash)) -- cgit v1.2.3 From 74f94e9adacad2746c2c8ae7f3720a80a69d1b29 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 8 Oct 2022 21:02:06 +0200 Subject: gnu: emacs-org-re-reveal: Update to 3.16.1. * gnu/packages/emacs-xyz.scm (emacs-org-re-reveal): Update to 3.16.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 654759a4cc..8134a19d56 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21378,7 +21378,7 @@ powerful Org contents.") (define-public emacs-org-re-reveal (package (name "emacs-org-re-reveal") - (version "3.16.0") + (version "3.16.1") (source (origin (method git-fetch) @@ -21387,7 +21387,7 @@ powerful Org contents.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0w6v7x4y0wn8af48vfn8m5h46w09wncwgcc9q8pl3zf92s50drg7")))) + (base32 "1jzr7xlzinhfb0197anbkrr5zrs13f7kyznr5q3zyxdndhg6a53n")))) (build-system emacs-build-system) (propagated-inputs (list emacs-htmlize emacs-org)) -- cgit v1.2.3 From 68f09d1f91793a6ff6412d9cc88daca148a0b30d Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Fri, 7 Oct 2022 21:31:05 +0000 Subject: gnu: sameboy: Update to 0.15.6. * gnu/packages/emulators.scm (sameboy): Update to 0.15.6. Signed-off-by: Nicolas Goaziou --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 85912caf7f..38795b703c 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -773,7 +773,7 @@ and Game Boy Color games.") (define-public sameboy (package (name "sameboy") - (version "0.15.5") + (version "0.15.6") (source (origin (method git-fetch) @@ -782,7 +782,7 @@ and Game Boy Color games.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ly9x6cch0wdcnsp0qmrdl6r2h8805jp8hwji3fwswj8rlhxkpa7")))) + (base32 "0a2fcsnv7ykj4kk2vpq9jjn8yjrx34n5s186rqvgj3dzm8w6xijs")))) (build-system gnu-build-system) (native-inputs (list rgbds pkg-config)) -- cgit v1.2.3 From 79358a99cd46a27fdc716309ccee2596483ab9af Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 8 Oct 2022 22:21:24 -0400 Subject: gnu: btrbk: Update to 0.32.4. * gnu/packages/backup.scm (btrbk): Update to 0.32.4. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 0d03d2e87f..3725e3ff01 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1091,14 +1091,14 @@ interactive mode.") (define-public btrbk (package (name "btrbk") - (version "0.32.2") + (version "0.32.4") (source (origin (method url-fetch) (uri (string-append "https://digint.ch/download/btrbk/releases/" "btrbk-" version ".tar.xz")) (sha256 (base32 - "0gi0j09fm4pgw3dq0z27lkpyvrs3ssyqg9b46v5ba794z63w753z")))) + "1nl6cbzqkc2srwi1428vijq69rp5cdx7484zcx61ph0rnhg9srfc")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From d3d3caeeeb194c694e260970b23b29326781ce42 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 9 Oct 2022 02:17:55 -0400 Subject: gnu: icecat: Remove vestigial patch. This is a followup to commit bb762ac517ff5ab4e55a0efb7e1b534c36c2b7c3. * gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../icecat-use-older-reveal-hidden-html.patch | 70 ---------------------- 2 files changed, 71 deletions(-) delete mode 100644 gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a013647d7e..9a1aad300e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1315,7 +1315,6 @@ dist_patch_DATA = \ %D%/packages/patches/i7z-gcc-10.patch \ %D%/packages/patches/icecat-makeicecat.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ - %D%/packages/patches/icecat-use-older-reveal-hidden-html.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch\ diff --git a/gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch b/gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch deleted file mode 100644 index 228adc23f1..0000000000 --- a/gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 2e8618d22568b6e00892a17303d437dd700eca98 Mon Sep 17 00:00:00 2001 -From: Mark H Weaver -Date: Tue, 5 May 2020 21:27:41 -0400 -Subject: [PATCH] Revert "Update Reveal hidden HTML." - -I prefer the user interface of the old version. - -This reverts commit f6e3adb6b2344ee2c7bb453a305fd2d6fb4c194c. ---- - .../passive_improve_css.js | 23 ++++++++++++++----- - 1 file changed, 17 insertions(+), 6 deletions(-) - -diff --git a/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js b/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js -index 7692990..ca57982 100644 ---- a/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js -+++ b/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js -@@ -10,6 +10,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI - */ - - -+var bad = []; -+ - function escapeHTML (unsafe_str) { - return unsafe_str - .replace(/&/g, '&') -@@ -20,9 +22,14 @@ function escapeHTML (unsafe_str) { - .replace(/\//g, '/') - } - -+function dounhide(){ -+ for(var i = 0; i < bad.length; i++){ -+ bad[i].remove(); -+ } -+} -+ - console.log("passive_improve_css.js"); - function reveal_css(){ -- var bad = []; - - var elements = document.getElementsByTagName("style"); - for(var i = 0; i < elements.length; i++){ -@@ -41,16 +48,20 @@ function reveal_css(){ - - } - } -- if(bad.length > 0 && window.confirm("Hidden HTML detected, would you like to reveal it?")){ -- for(var i = 0; i < bad.length; i++){ -- bad[i].remove(); -- } -+ if(bad.length > 0){ -+ const insertedDiv = document.createElement('div'); -+ insertedDiv.innerHTML= '

' + -+ 'Reveal hidden elements' + -+ ''; -+ insertedDiv.style="position:fixed; bottom:1em; right:1em; opacity:0.8; z-index: 2147483647 !important; border-radius: 3px !important; background-color: #fff !important; padding: 0.5em !important; box-shadow: 0 0 3px grey !important; font-color:#bbb!important; cursor: pointer!important;"; -+ insertedDiv.addEventListener("click", dounhide, false); -+ document.body.insertBefore(insertedDiv, document.body.firstChild); - } - } - - reveal_css(); - -- - /* - var a = document.getElementsByTagName("style")[2]; - var btn = document.createElement("style"); // Create a