From a6b3bdb7fc5e59607c257b769a53f346c327e60d Mon Sep 17 00:00:00 2001 From: Artyom Bologov Date: Wed, 12 Apr 2023 14:07:36 +0400 Subject: gnu: sbcl-cl-colors2: Update to 0.5.0. * gnu/packages/lisp-xyz.scm (sbcl-cl-colors2) Update to 0.5.0 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 13e9e5bcfa..5f64809b28 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11691,11 +11691,11 @@ be used with @code{cl-yacc}.") (sbcl-package->ecl-package sbcl-cl-lex)) (define-public sbcl-cl-colors2 - (let ((commit "795aedee593b095fecde574bd999b520dd03ed24") - (revision "1")) + (let ((commit "d620e7fb504bbec3ed48cc7cd03f60ce2bb3735d") + (revision "2")) (package (name "sbcl-cl-colors2") - (version (git-version "0.2.1" revision commit)) + (version (git-version "0.5.0" revision commit)) (source (origin (method git-fetch) @@ -11704,7 +11704,7 @@ be used with @code{cl-yacc}.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0hlyf4h5chkjdp9armla5w4kw5acikk159sym7y8c4jbjp9x47ih")))) + (base32 "14wx006lv4bhf86z68484kphm5jsh86ns60pb4i1bi8kl8lp03r0")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-clunit2)) -- cgit v1.2.3 From d7a3b4008fa7e40bc1f5e29af9e6f1f6757ed0f1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 13 Apr 2023 23:27:14 +0100 Subject: gnu: js8call: Improve package style. * gnu/packages/radio.scm (js8call): Use Gexp and shift order of components. [tests]: Enable them. [arguments]: In fix-paths phase add more steps to modify test script. Replace check phase with in-project script. [native-inputs]: Remove labels. [inputs]: As above. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/radio.scm | 83 +++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index c589f95954..6f8b2ec9f7 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2022 Sheng Yang ;;; Copyright © 2022 Greg Hogan ;;; Copyright © 2022 Ryan Tolboom +;;; Copyright © 2023 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -1603,49 +1604,63 @@ focused on DXing and being shaped by community of DXers.JTDX") (base32 "149sjwc4zg6ckgq26af93p4fxappa4k9dh7rdy67g8ajfjad4cd8")) (modules '((guix build utils))) (snippet - '(begin - ;; Delete bundled boost to use the shared one. - (delete-file-recursively "boost") - #t)))) + #~(begin + ;; Delete bundled boost to use the shared one. + (delete-file-recursively "boost"))))) (build-system qt-build-system) - (native-inputs - (list asciidoc gfortran pkg-config qttools-5 ruby-asciidoctor)) - (inputs - `(("boost" ,boost) - ("fftw" ,fftw) - ("fftwf" ,fftwf) - ("hamlib" ,wsjtx-hamlib) - ("libusb" ,libusb) - ("qtbase" ,qtbase-5) - ("qtmultimedia-5" ,qtmultimedia-5) - ("qtserialport" ,qtserialport))) (arguments - `(#:tests? #f ; No test suite - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("DESTINATION /usr/share") - (string-append "DESTINATION " - (assoc-ref outputs "out") - "/share"))))) - (add-after 'unpack 'fix-hamlib - (lambda _ - (substitute* "CMake/Modules/Findhamlib.cmake" - (("set \\(ENV\\{PKG_CONFIG_PATH\\}.*\\)") - "set (__pc_path $ENV{PKG_CONFIG_PATH}) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda _ + ;; XXX: How to get the /tmp/.drv- path? Use + ;; output path for after install check phase instead. + (substitute* "media/tests/test" + (("~/js8call-prefix/build/js8") + (string-append #$output "/bin/js8")) + (("/opt/js8call/bin/js8") + (string-append #$output "/bin/js8"))) + (substitute* "CMakeLists.txt" + (("DESTINATION /usr/share") + (string-append "DESTINATION " #$output "/share"))))) + (add-after 'unpack 'fix-hamlib + (lambda _ + (substitute* "CMake/Modules/Findhamlib.cmake" + (("set \\(ENV\\{PKG_CONFIG_PATH\\}.*\\)") + "set (__pc_path $ENV{PKG_CONFIG_PATH}) list (APPEND __pc_path \"${__hamlib_pc_path}\") set (ENV{PKG_CONFIG_PATH} \"${__pc_path}\")")) - (substitute* "HamlibTransceiver.hpp" - (("#ifdef JS8_USE_LEGACY_HAMLIB") - "#if 1"))))))) + (substitute* "HamlibTransceiver.hpp" + (("#ifdef JS8_USE_LEGACY_HAMLIB") + "#if 1")))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "../js8call/media/tests" + (invoke "./test")))))))) + (native-inputs + (list asciidoc + gfortran + pkg-config + qttools-5 + ruby-asciidoctor)) + (inputs + (list boost + fftw + fftwf + libusb + qtbase-5 + qtmultimedia-5 + qtserialport + wsjtx-hamlib)) + (home-page "http://js8call.com/") (synopsis "Weak-signal ham radio communication program") (description "JS8Call is a software using the JS8 digital mode (a derivative of the FT8 mode) providing weak signal keyboard to keyboard messaging to amateur radio operators.") - (home-page "http://js8call.com/") (license license:gpl3))) (define-public xnec2c -- cgit v1.2.3 From fcb9ba2e71ed1e7af1f1c3ee51da639ba9483ec3 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 14 Apr 2023 14:25:38 +0200 Subject: gnu: js8call: Don't inherit from wsjtx. The inheritance has no effect as all the package fields are specified. * gnu/packages/radio.scm (js8call): Remove 'inherit' field. --- gnu/packages/radio.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 6f8b2ec9f7..8192aefb0f 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1592,7 +1592,6 @@ focused on DXing and being shaped by community of DXers.JTDX") (define-public js8call (package - (inherit wsjtx) (name "js8call") (version "2.2.0") (source -- cgit v1.2.3 From b3b5727e993ec79959a8b54dcca385eeb74907c2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 13 Apr 2023 22:05:20 +0100 Subject: gnu: Remove duplicate module imports from (gnu packages music). * gnu/packages/music.scm: Remove duplicated (guix build-system qt). Signed-off-by: Leo Famulari --- gnu/packages/music.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 69fe7009be..10281a6a12 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -84,11 +84,9 @@ #:use-module (guix build-system qt) #:use-module (guix build-system scons) #:use-module (guix build-system glib-or-gtk) - #:use-module (guix build-system qt) #:use-module (guix build-system waf) #:use-module (guix build-system trivial) #:use-module (guix build-system go) - #:use-module (guix build-system qt) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages algebra) -- cgit v1.2.3 From 1227811d1fde5bddb0ef45eadbfaf973e81e28dc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 13 Apr 2023 22:05:21 +0100 Subject: gnu: Sort use-module alphabetically in (gnu packages music). * gnu/packages/music.scm: Sort use-module alphabetically to ease maintenance. Signed-off-by: Leo Famulari --- gnu/packages/music.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 10281a6a12..054d48bb39 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -69,31 +69,31 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages music) - #:use-module (guix gexp) - #:use-module (guix utils) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build-system gnu) #:use-module (guix build-system ant) #:use-module (guix build-system cmake) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (guix build-system scons) - #:use-module (guix build-system glib-or-gtk) - #:use-module (guix build-system waf) #:use-module (guix build-system trivial) - #:use-module (guix build-system go) + #:use-module (guix build-system waf) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages algebra) #:use-module (gnu packages apr) + #:use-module (gnu packages assembly) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) - #:use-module (gnu packages assembly) #:use-module (gnu packages backup) #:use-module (gnu packages base) ;libbdf #:use-module (gnu packages bash) @@ -102,9 +102,9 @@ #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) #:use-module (gnu packages cdrom) - #:use-module (gnu packages code) #:use-module (gnu packages check) #:use-module (gnu packages cmake) + #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) @@ -123,13 +123,14 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages game-development) #:use-module (gnu packages gcc) - #:use-module (gnu packages gnupg) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnunet) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) #:use-module (gnu packages gpodder) #:use-module (gnu packages graphics) #:use-module (gnu packages graphviz) @@ -142,12 +143,13 @@ #:use-module (gnu packages imagemagick) #:use-module (gnu packages java) #:use-module (gnu packages kde-frameworks) - #:use-module (gnu packages libffi) #:use-module (gnu packages libevent) + #:use-module (gnu packages libffi) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) ; for alsa-utils #:use-module (gnu packages lirc) #:use-module (gnu packages llvm) + #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages mp3) #:use-module (gnu packages mpd) @@ -180,8 +182,8 @@ #:use-module (gnu packages stb) #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) - #:use-module (gnu packages texinfo) #:use-module (gnu packages tex) + #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) @@ -192,11 +194,9 @@ #:use-module (gnu packages wm) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages xiph) - #:use-module (gnu packages golang) - #:use-module (gnu packages lua) #:use-module ((srfi srfi-1) #:select (last))) (define-public audacious -- cgit v1.2.3 From cbba52aaf7ca9b05c3ff86bfda5d3a7969135e6b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 13 Apr 2023 22:05:22 +0100 Subject: gnu: abjad: Fix build. * gnu/packages/music.scm (abjad): Fix build. [arguments]: Use gexp. : Add disable-failing-tests phase to fix build process of the package. [propagated-inputs]: Move python-flake8, python-isort, python-mypy, python-pytest, python-pytest-cov, python-pytest-helpers-namespace, python-six, python-sphinx-autodoc-typehints from here ... [native-inputs]: ... to here. Remove python-black. Signed-off-by: Leo Famulari --- gnu/packages/music.scm | 61 ++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 054d48bb39..0a66ece40a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -52,6 +52,7 @@ ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Jonathan Brielmaier ;;; Copyright © 2023 Antero Mejr +;;; Copyright © 2023 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,6 +78,7 @@ #:use-module (guix build-system go) #:use-module (guix build-system meson) #:use-module (guix build-system perl) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (guix build-system scons) @@ -1554,50 +1556,51 @@ listeners answer questions about music quickly and simply.") (define-public abjad (package (name "abjad") + ;; XXX: The latest version which supports current Guix's Python 3.9.9. (version "3.4") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Abjad/abjad") - (commit (string-append "v" version)))) + (url "https://github.com/Abjad/abjad") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0s63vk9fifp0im9c31kb9ck39mbaxhrls993d8fvg0nkg41z1jnz")))) - (build-system python-build-system) + (base32 "0s63vk9fifp0im9c31kb9ck39mbaxhrls993d8fvg0nkg41z1jnz")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'loosen-requirements - (lambda _ - (substitute* "setup.py" - ;; Permit newer versions of uqbar. Remove for >3.4. - ((", <0\\.5\\.0") - "")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; See: https://stackoverflow.com/a/34140498 - (invoke "python" "-m" "pytest" "tests"))))))) + (list + #:phases + #~(modify-phases %standard-phases + ;; XXX. Permit newer version of uqbar, remove for >3.4. Remove in + ;; the next update. + (add-after 'unpack 'loosen-requirements + (lambda _ + (substitute* "setup.py" + ((", <0\\.5\\.0") "")))) + ;; FIXME: Check why it's failing with this: Note: compilation failed + ;; and \version outdated, did you update input syntax with + ;; convert-ly? + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "tests/test_ext_sphinx.py" + (("def test_ext_sphinx_01") "def __off_test_ext_sphinx_01"))))))) (inputs (list lilypond)) - (propagated-inputs - (list python-ply - python-quicktions - python-roman - python-six - python-uqbar - ;; XXX: These test dependencies(?) are listed as install_requires - ;; in setup.py. Propagate accordingly. - python-black - python-flake8 + (native-inputs + (list python-flake8 python-isort python-mypy python-pytest python-pytest-cov python-pytest-helpers-namespace + python-six python-sphinx-autodoc-typehints)) + (propagated-inputs + (list python-quicktions + python-ply + python-roman + python-uqbar)) (home-page "https://abjad.github.io") (synopsis "Python API for building LilyPond files") (description @@ -1607,7 +1610,7 @@ rests, chords, tuplets, beams and slurs in any score. Because Abjad extends the programming language, you can use Abjad to make systematic changes to music as you work. Because Abjad wraps the LilyPond music notation package, you can use Abjad to control the typographic detail of symbols on the page.") - (license license:expat))) + (license license:expat))) (define-public abjad-ext-rmakers (package -- cgit v1.2.3 From 2ffee7d92df1ae07659c113489717cc9343ddde9 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Thu, 1 Sep 2022 16:26:40 +0000 Subject: gnu: spirv-headers: Update to 1.2.198.0. * gnu/packages/vulkan.scm (spirv-headers): Update to 1.2.198.0. --- gnu/packages/vulkan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 9203731865..014c07bd56 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -44,16 +44,16 @@ (define-public spirv-headers (package (name "spirv-headers") - (version "1.5.3") + (version "1.2.198.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/SPIRV-Headers") - (commit version))) + (commit (string-append "sdk-" version)))) (sha256 (base32 - "069sivqajp7z4p44lmrz23lvf237xpkjxd4lzrg27836pwqcz9bj")) + "0v6ycgfxh9d2gzhxrnxgrn5gyg2cshg55767qdg46px8412j5lbi")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From e3c99fa2287ea982016e21a962e053a61ead59f1 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Thu, 1 Sep 2022 16:26:48 +0000 Subject: gnu: spirv-tools: Update to 2021.4. * gnu/packages/vulkan.scm (spirv-tools): Update to 2021.4. --- gnu/packages/vulkan.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 014c07bd56..eca83efe2f 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -76,7 +76,7 @@ and for the GLSL.std.450 extended instruction set. (define-public spirv-tools (package (name "spirv-tools") - (version "2020.2") + (version "2021.4") (source (origin (method git-fetch) @@ -84,7 +84,7 @@ and for the GLSL.std.450 extended instruction set. (url "https://github.com/KhronosGroup/SPIRV-Tools") (commit (string-append "v" version)))) (sha256 - (base32 "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6")) + (base32 "1f0kzgx8ishzxhzrcvcmpkmb3cigyya92p3bdabsgbjr6mkmcdj3")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 86cf8bac6a512c3520ab3a48d41e6be9478934ae Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Thu, 1 Sep 2022 16:27:00 +0000 Subject: gnu: vulkan-headers: Update to 1.2.202. * gnu/packages/vulkan.scm (vulkan-headers): Update to 1.2.202. --- gnu/packages/vulkan.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index eca83efe2f..9e9174ca7e 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -180,7 +180,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.2.164") + (version "1.2.202") (source (origin (method git-fetch) @@ -190,7 +190,7 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "11wzxvwim4jna1yssbmprl211dhmz8vmrd498zww3bghzlj7bljv")))) + "0lsjpxqb7k2mf0w1qadpki6vnwxr29kjg5y1jafl3pvk0mdy1azj")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. -- cgit v1.2.3 From c4fec03621c4ad3a5a27a46aef96a7ce894d51f7 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Thu, 1 Sep 2022 16:27:09 +0000 Subject: gnu: vulkan-loader: Update to 1.2.202. * gnu/packages/vulkan.scm (vulkan-loader): Update to 1.2.202. [arguments]: Enable tests by removing obsolete build phase 'disable-loader-tests and adjusting configure flags. --- gnu/packages/vulkan.scm | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 9e9174ca7e..6519f34f20 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -204,7 +204,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-loader (package (name "vulkan-loader") - (version "1.2.162") + (version "1.2.202") (source (origin (method git-fetch) @@ -214,32 +214,23 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "15gx9ab6w1sjq9hkpbas7z2f8f47j6mlln6p3w26qmydjj8gfjjv")))) + "1vsaa16clncz19lihgj39rdg4dspkxjay1ii6pkf6fpl1vkw1dh2")))) (build-system cmake-build-system) (arguments `(#:configure-flags ,#~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" #$(this-package-input "vulkan-headers")) - (string-append "-DCMAKE_INSTALL_INCLUDEDIR=" - #$(this-package-input "vulkan-headers") - "/include")) + (string-append "-DGOOGLETEST_INSTALL_DIR=" + (getcwd) "/source/external/googletest") + "-DBUILD_TESTS=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-googletest (lambda* (#:key inputs #:allow-other-keys) (let ((gtest (assoc-ref inputs "googletest:source"))) (when gtest (copy-recursively gtest "external/googletest")) - #t))) - (add-after 'unpack 'disable-loader-tests - (lambda _ - ;; Many tests require a Vulkan driver. Skip those. - (substitute* "tests/loader_validation_tests.cpp" - ((".*= vkCreateInstance.*" all) - (string-append "GTEST_SKIP();\n" all)) - (("TEST_F.*InstanceExtensionEnumerated.*" all) - (string-append all "\nGTEST_SKIP();\n"))) - #t))))) + #t)))))) (native-inputs `(("googletest:source" ,(package-source googletest)) ("libxrandr" ,libxrandr) -- cgit v1.2.3 From f9e201c2257e903d9b246f1bbd612637aeb8fd80 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Thu, 1 Sep 2022 16:27:22 +0000 Subject: gnu: vulkan-tools: Update to 1.2.201. * gnu/packages/vulkan.scm (vulkan-tools): Update to 1.2.201. --- gnu/packages/vulkan.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6519f34f20..76d115dc65 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -257,7 +257,7 @@ and the ICD.") (define-public vulkan-tools (package (name "vulkan-tools") - (version "1.2.162") + (version "1.2.201") (source (origin (method git-fetch) @@ -267,7 +267,7 @@ and the ICD.") (file-name (git-file-name name version)) (sha256 (base32 - "129wzk7xj3vn3c8b4p7fzkd0npl58118s2i1d88gsfnlix54nagq")))) + "1ik90d7pygaw2pq81brqmcjiczag3biqvgpqp3cpws07glf29lf9")))) (build-system cmake-build-system) (inputs (list glslang libxrandr vulkan-loader wayland)) -- cgit v1.2.3 From 7611acd624aa1048610fe66b57c169f68f8ec3a7 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Thu, 1 Sep 2022 16:27:30 +0000 Subject: gnu: shaderc: Update to 2021.3. * gnu/packages/vulkan.scm (shaderc): Update to 2021.3. --- gnu/packages/vulkan.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 76d115dc65..f7ed4858e8 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -289,7 +289,7 @@ API.") (define-public shaderc (package (name "shaderc") - (version "2020.4") + (version "2021.3") (source (origin (method git-fetch) @@ -299,7 +299,7 @@ API.") (file-name (git-file-name name version)) (sha256 (base32 - "07h78nd964h2bdm4drzws8i1gvyal8a3wlhbcm5qxqk6vknv8hrk")))) + "0qjwixcx74dvx68jl51x2mp2q1346hvhwxr8w3wk36nzla62k2s6")))) (build-system cmake-build-system) (arguments `(;; FIXME: Skip most of the tests, because enabling system gtest breaks -- cgit v1.2.3 From bf3ef805c6dbcb4fffd70b4cc01660970e9c2d65 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Thu, 1 Sep 2022 16:27:40 +0000 Subject: gnu: Add vulkan-validationlayers. * gnu/packages/vulkan.scm (vulkan-validationlayers): New variable. --- gnu/packages/vulkan.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index f7ed4858e8..83cd64847f 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Mathieu Othacehe +;;; Copyright © 2022 Kaelyn Takata ;;; ;;; This file is part of GNU Guix. ;;; @@ -390,3 +391,52 @@ shader compilation.") (synopsis "Direct3D 12 to Vulkan translation library") (description "vkd3d is a library for translating Direct3D 12 to Vulkan.") (license license:lgpl2.1)))) + +(define-public vulkan-validationlayers + (package + (name "vulkan-validationlayers") + (version "1.2.201") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/KhronosGroup/Vulkan-ValidationLayers") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jnz9cmy5d5g6jh9p4wr0qrlqlpfp07b3cizq37i5p1bcabdgmrz")))) + (build-system cmake-build-system) + (inputs (list glslang + libxrandr + mesa + shaderc + spirv-tools + vulkan-loader + wayland)) + (native-inputs (list pkg-config python spirv-headers vulkan-headers)) + (arguments + (list #:tests? #f ;no tests + #:configure-flags #~(list "-DUSE_ROBIN_HOOD_HASHING=OFF" + (string-append "-DGLSLANG_INSTALL_DIR=" + #$glslang) + (string-append + "-DSPIRV_HEADERS_INSTALL_DIR=" + #$spirv-headers) "-Wno-dev") + #:phases #~(modify-phases %standard-phases + (add-after 'install 'set-layer-path-in-manifest + (lambda _ + (let ((manifest (string-append #$output + "/share/vulkan/explicit_layer.d" + "/VkLayer_khronos_validation.json"))) + (substitute* manifest + (("\"libVkLayer_khronos_validation.so\"") + (string-append "\"" #$output + "/lib/libVkLayer_khronos_validation.so\""))))))))) + (home-page "https://github.com/KhronosGroup/Vulkan-ValidationLayers") + (synopsis "Khronos official validation layers for Vulkan") + (description + "Vulkan-ValidationLayers provides the Khronos official validation layers that +can assist development by enabling developers to verify their applications correctly +use the Vulkan API.") + (license license:asl2.0))) -- cgit v1.2.3 From 078f33e4206be799adde55eaac9a5b3125fb392d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 15 Nov 2022 13:16:18 +0100 Subject: gnu: vulkan-validationlayers: Avoid direct variable references. * gnu/packages/vulkan.scm (vulkan-validationlayers)[arguments]: Refer to GLSLANG and SPIRV-HEADERS from inputs, instead of the global variables. --- gnu/packages/vulkan.scm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 83cd64847f..74a06ab4c3 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -417,12 +417,19 @@ shader compilation.") (native-inputs (list pkg-config python spirv-headers vulkan-headers)) (arguments (list #:tests? #f ;no tests - #:configure-flags #~(list "-DUSE_ROBIN_HOOD_HASHING=OFF" - (string-append "-DGLSLANG_INSTALL_DIR=" - #$glslang) - (string-append - "-DSPIRV_HEADERS_INSTALL_DIR=" - #$spirv-headers) "-Wno-dev") + #:configure-flags + #~(list "-DUSE_ROBIN_HOOD_HASHING=OFF" + (string-append "-DGLSLANG_INSTALL_DIR=" + (dirname (dirname + (search-input-directory + %build-inputs + "include/glslang")))) + (string-append "-DSPIRV_HEADERS_INSTALL_DIR=" + (dirname (dirname + (search-input-directory + %build-inputs + "include/spirv")))) + "-Wno-dev") #:phases #~(modify-phases %standard-phases (add-after 'install 'set-layer-path-in-manifest (lambda _ -- cgit v1.2.3 From 8dcf3c16515e926ef06f8fd10fd9d2400359e0bc Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Wed, 16 Nov 2022 22:52:56 +0000 Subject: gnu: spirv-tools: Disable building static libraries. * gnu/packages/vulkan.scm (spirv-tools): Disable building static libraries to fix linking issues for packages such as mpv. Signed-off-by: Marius Bakke --- gnu/packages/vulkan.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 74a06ab4c3..5edf7ba81a 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -90,6 +90,9 @@ and for the GLSL.std.450 extended instruction set. (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" + ;; Some packages like mpv fail to link + ;; when the static libraries are built. + "-DSPIRV_TOOLS_BUILD_STATIC=OFF" (string-append "-DSPIRV-Headers_SOURCE_DIR=" (assoc-ref %build-inputs "spirv-headers"))))) -- cgit v1.2.3 From 7682d3faf93b11b6e9d70c7be51d1ed55267c2ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 15 Nov 2022 16:13:39 +0100 Subject: gnu: spirv-headers: Update to 1.3.231.1. * gnu/packages/vulkan.scm (spirv-headers): Update to 1.3.231.1. --- gnu/packages/vulkan.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 5edf7ba81a..13ad738d80 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -45,7 +45,7 @@ (define-public spirv-headers (package (name "spirv-headers") - (version "1.2.198.0") + (version "1.3.231.1") (source (origin (method git-fetch) @@ -54,7 +54,7 @@ (commit (string-append "sdk-" version)))) (sha256 (base32 - "0v6ycgfxh9d2gzhxrnxgrn5gyg2cshg55767qdg46px8412j5lbi")) + "0z8b485hryya2g0jxv7amwg3fjj7pchbgnsa5ldf5fwgh5js0icm")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 339208b1f9577b3579fcf75e0148f543987a4504 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 15 Nov 2022 16:14:02 +0100 Subject: gnu: spirv-tools: Update to 2022.4. * gnu/packages/vulkan.scm (spirv-tools): Update to 2022.4. --- gnu/packages/vulkan.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 13ad738d80..34f7f0f397 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -77,7 +77,7 @@ and for the GLSL.std.450 extended instruction set. (define-public spirv-tools (package (name "spirv-tools") - (version "2021.4") + (version "2022.4") (source (origin (method git-fetch) @@ -85,7 +85,7 @@ and for the GLSL.std.450 extended instruction set. (url "https://github.com/KhronosGroup/SPIRV-Tools") (commit (string-append "v" version)))) (sha256 - (base32 "1f0kzgx8ishzxhzrcvcmpkmb3cigyya92p3bdabsgbjr6mkmcdj3")) + (base32 "03d489ind2az7w7q1slj3mdc04372r3qqbnd7m9akxbg7yix1a5j")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 0d67490d6075b41409bcb4f96713f6d4472b6f49 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 15 Nov 2022 16:15:56 +0100 Subject: gnu: glslang: Update to 11.9.0. * gnu/packages/vulkan.scm (glslang): Update to 11.9.0. --- gnu/packages/vulkan.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 34f7f0f397..944e3de5a8 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -150,19 +150,17 @@ SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.") (define-public glslang (package (name "glslang") - (version "10-11.0.0") + (version "11.9.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/glslang") - ;; Tag "10-11.0.0" was moved to "11.0.0". - ;; FIXME: Use (commit version) on next update. - (commit "11.0.0"))) + (commit version))) (sha256 (base32 - "14mn2awswl022ls75mfpsnpsl0ai0jgfbqj3sxcsqawyj5f432py")) - (file-name (string-append name "-" version "-checkout")))) + "1q6gjlx2y6g0hfvahnw063anb4yb4ky82hfh3b7nbsm43crzzfb0")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments '(#:tests? #f ;FIXME: requires bundled SPIRV-Tools -- cgit v1.2.3 From a37288a2a20c13412f967f4acdd13de0a17e7f02 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 17 Nov 2022 03:11:20 +0100 Subject: gnu: libaom: Update to 3.5.0. * gnu/packages/video.scm (libaom): Update to 3.5.0. [arguments]: Remove obsolete configure flag. --- gnu/packages/video.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 72f3813ca5..68a3399fb2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -849,7 +849,7 @@ television and DVD. It is also known as AC-3.") (define-public libaom (package (name "libaom") - (version "3.3.0") + (version "3.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -858,7 +858,7 @@ television and DVD. It is also known as AC-3.") (file-name (git-file-name name version)) (sha256 (base32 - "024vhsx7bw9kajk65hhh5vmqrja0h33rmlcpngsj3yg4p8l29943")))) + "0arn8a88jz4mj69n8cs4qmrdjwhbvzsqgnx20wr9mq01b06kqich")))) (build-system cmake-build-system) (native-inputs (list perl pkg-config python)) ; to detect the version @@ -866,7 +866,6 @@ television and DVD. It is also known as AC-3.") `(#:tests? #f ; downloads many video clips #:configure-flags (list "-DBUILD_SHARED_LIBS=YES" - "-DENABLE_PIC=TRUE" "-DAOM_TARGET_CPU=generic" (string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "out"))) -- cgit v1.2.3 From b3051298b5f9d3ff34105fb3b789d53f8d6b56d6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Nov 2022 08:14:31 +0100 Subject: gnu: VLC: Fix build with dav1d 1.0. * gnu/packages/video.scm (vlc)[source](patches): New field. * gnu/packages/patches/vlc-dav1d-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 + gnu/packages/patches/vlc-dav1d-compat.patch | 70 +++++++++++++++++++++++++++++ gnu/packages/video.scm | 1 + 3 files changed, 72 insertions(+) create mode 100644 gnu/packages/patches/vlc-dav1d-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8088e8170b..3350129cb2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1994,6 +1994,7 @@ dist_patch_DATA = \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch \ + %D%/packages/patches/vlc-dav1d-compat.patch \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ diff --git a/gnu/packages/patches/vlc-dav1d-compat.patch b/gnu/packages/patches/vlc-dav1d-compat.patch new file mode 100644 index 0000000000..3cb737faba --- /dev/null +++ b/gnu/packages/patches/vlc-dav1d-compat.patch @@ -0,0 +1,70 @@ +Fix build against dav1d 1.0. + + https://code.videolan.org/videolan/vlc/-/merge_requests/1618 + +Patch adjusted for VLC 3.0 taken from Gentoo: + + https://gitweb.gentoo.org/repo/gentoo.git/tree/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch + +--- a/modules/codec/dav1d.c ++++ b/modules/codec/dav1d.c +@@ -63,10 +63,16 @@ vlc_module_begin () + set_category(CAT_INPUT) + set_subcategory(SUBCAT_INPUT_VCODEC) + ++#if DAV1D_API_VERSION_MAJOR >= 6 ++ add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_THREADS, ++ THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) ++ add_obsolete_string("dav1d-thread-tiles") // unused with dav1d 1.0 ++#else + add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS, + THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) + add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS, + THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false) ++#endif + vlc_module_end () + + /***************************************************************************** +@@ -294,6 +300,11 @@ static int OpenDecoder(vlc_object_t *p_this) + return VLC_ENOMEM; + + dav1d_default_settings(&p_sys->s); ++#if DAV1D_API_VERSION_MAJOR >= 6 ++ p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); ++ if (p_sys->s.n_threads == 0) ++ p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16; ++#else + p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles"); + if (p_sys->s.n_tile_threads == 0) + p_sys->s.n_tile_threads = +@@ -303,6 +314,7 @@ static int OpenDecoder(vlc_object_t *p_this) + p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); + if (p_sys->s.n_frame_threads == 0) + p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16; ++#endif + p_sys->s.allocator.cookie = dec; + p_sys->s.allocator.alloc_picture_callback = NewPicture; + p_sys->s.allocator.release_picture_callback = FreePicture; +@@ -313,12 +325,20 @@ static int OpenDecoder(vlc_object_t *p_this) + return VLC_EGENERIC; + } + ++#if DAV1D_API_VERSION_MAJOR >= 6 ++ msg_Dbg(p_this, "Using dav1d version %s with %d threads", ++ dav1d_version(), p_sys->s.n_threads); ++ ++ dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1); ++#else + msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads", + dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads); + ++ dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); ++#endif ++ + dec->pf_decode = Decode; + dec->pf_flush = FlushDecoder; +- dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); + + dec->fmt_out.video.i_width = dec->fmt_in.video.i_width; + dec->fmt_out.video.i_height = dec->fmt_in.video.i_height; +GitLab diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 68a3399fb2..c3e0c28216 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1952,6 +1952,7 @@ videoformats depend on the configuration flags of ffmpeg.") "https://download.videolan.org/pub/videolan/vlc/" (car (string-split version #\-)) "/vlc-" version ".tar.xz")) + (patches (search-patches "vlc-dav1d-compat.patch")) (sha256 (base32 "1v7db9icrb12yz7banq2wvpjpvqfrj031yj1kf5smn35qcwl82ap")))) -- cgit v1.2.3 From 0f4c1f1316dbd1233361f66b96e1ab0d18537938 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Sep 2022 17:39:36 +0200 Subject: gnu: python-pytest-mock: Update to 3.10.0. * gnu/packages/check.scm (python-pytest-mock): Update to 3.10.0. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index b54ca4f55f..8306eab5fc 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1586,13 +1586,13 @@ Python's @code{random.seed}.") (define-public python-pytest-mock (package (name "python-pytest-mock") - (version "3.6.1") + (version "3.10.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest-mock" version)) (sha256 - (base32 "0qhfmd05z3g88bnwq6644jl6p5wy01i4yy7h8883z9jjih2pl8a0")) + (base32 "0kzdwwdjw001qzf1n4qzh7c364rvmb0cmkfqdwr2l9bwxy2v1ggv")) (modules '((guix build utils))) (snippet ;; Some tests do a string match on Pytest output, and fails when -- cgit v1.2.3 From b14e54b5db08a2512cb6a82c11d5ada53fd5b9bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 5 Sep 2022 17:43:34 +0200 Subject: gnu: python-pytest-timeout: Update to 2.1.0. * gnu/packages/check.scm (python-pytest-timeout): Update to 2.1.0. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8306eab5fc..4985796165 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1698,14 +1698,14 @@ result back.") (define-public python-pytest-timeout (package (name "python-pytest-timeout") - (version "2.0.2") + (version "2.1.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest-timeout" version)) (sha256 (base32 - "04l1cd2qyp3fbccw95a8nqg682r647v7yil8807dgs7xv9a8pyg6")))) + "1nf339zg6qam3681f72j9c8fbqk8qcilna92psmzh4n60isa0z60")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 644a0193677958d5fcb863bd125a78d79fc99e1e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Nov 2022 09:50:54 +0100 Subject: gnu: xdg-utils: Resolve TODOs. * gnu/packages/freedesktop.scm (xdg-utils)[inputs]: Remove labels. [arguments]: Make cross-compilation fixes unconditional. Don't rely on labels. --- gnu/packages/freedesktop.scm | 124 ++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 78 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 043d1ec92b..5684bb1b94 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -474,79 +474,51 @@ display servers. It supports many different languages and emoji.") (name "xdg-utils") (version "1.1.3") (source - (origin - (method url-fetch) - (uri (string-append - "https://portland.freedesktop.org/download/xdg-utils-" - version ".tar.gz")) - (sha256 - (base32 - "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p")))) + (origin + (method url-fetch) + (uri (string-append + "https://portland.freedesktop.org/download/xdg-utils-" + version ".tar.gz")) + (sha256 + (base32 + "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p")))) (build-system gnu-build-system) (native-inputs (list docbook-xsl docbook-xml-4.1.2 libxslt w3m-for-tests xmlto)) (inputs - `(("awk" ,gawk) - ;; TODO(staging): Make this unconditional, to avoid canonical packages, - ;; see . - ,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for 'wrap-program' - '()) - ("coreutils" ,coreutils) - ,@(if (%current-target-system) - `(("file" ,file)) - '()) - ("grep" ,grep) - ("inetutils" ,inetutils) ; xdg-screensaver uses `hostname' - ("perl-file-mimeinfo" ,perl-file-mimeinfo) ; for mimeopen fallback - ("sed" ,sed) - ("xprop" ,xprop) ; for Xfce detecting - ("xset" ,xset))) ; for xdg-screensaver + (list bash-minimal ;for 'wrap-program' + coreutils + file + gawk + grep + inetutils ;xdg-screensaver uses `hostname' + perl-file-mimeinfo ;for mimeopen fallback + sed + xprop ;for Xfce detecting + xset)) ;for xdg-screensaver (arguments - `(#:tests? #f ; no check target + `(#:tests? #f ;no check target #:modules ((srfi srfi-26) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-hardcoded-paths - ;; TODO(staging): make unconditional - (,@(if (%current-target-system) - '(lambda* (#:key inputs #:allow-other-keys)) - '(lambda _)) - (substitute* "scripts/xdg-mime.in" - (("/usr/bin/file") - (,@(if (%current-target-system) - '(search-input-file inputs "bin/file") - '(which "file"))))) - (substitute* "scripts/xdg-open.in" - (("/usr/bin/printf") - (,@(if (%current-target-system) - '(search-input-file inputs "bin/printf") - '(which "printf"))))) - #t)) + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scripts/xdg-mime.in" + (("/usr/bin/file") + (search-input-file inputs "bin/file"))) + (substitute* "scripts/xdg-open.in" + (("/usr/bin/printf") + (search-input-file inputs "bin/printf"))))) (add-before 'build 'locate-catalog-files - ;; TODO(staging): Make unconditional for simplicity. - (lambda* (#:key inputs ,@(if (%current-target-system) - '(native-inputs) - '()) #:allow-other-keys) - ;; TODO(staging): Make unconditional for simplicity and - ;; to avoid depending on input labels. - (let ,(if (%current-target-system) - `((native-inputs (or native-inputs inputs)) - (xmldoc (search-input-directory native-inputs - "xml/dtd/docbook")) - (xsldoc - (search-input-directory - native-inputs - (string-append "xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl))))) - `((xmldoc - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook")) - (xsldoc - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl))))) + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let* ((native (or native-inputs inputs)) + (xmldoc (search-input-directory native + "xml/dtd/docbook")) + (xsldoc (search-input-directory + native + (string-append "xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl))))) (for-each (lambda (file) (substitute* file (("http://.*/docbookx\\.dtd") @@ -561,25 +533,21 @@ display servers. It supports many different languages and emoji.") (string-append "$(XMLTO) -x " xsldoc "/manpages/docbook.xsl man"))) (setenv "STYLESHEET" - (string-append xsldoc "/html/docbook.xsl")) - ;; TODO(staging): Might as well remove the #t while we are at - ;; it. - #t))) + (string-append xsldoc "/html/docbook.xsl"))))) (add-after 'install 'wrap-executables (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (let* ((out (assoc-ref outputs "out")) + (dependencies '("awk" "grep" "hostname" "ls" "mimeopen" + "sed" "xprop" "xset")) + (pkgs (map (lambda (cmd) + (search-input-file inputs + (string-append "bin/" cmd))) + dependencies)) + (bindirs (map dirname pkgs))) (with-directory-excursion (string-append out "/bin") - (let ((path-ext - (map (cute string-append <> "/bin") - (cons out - (map (cute assoc-ref inputs <>) - '("awk" "coreutils" "grep" "inetutils" - "perl-file-mimeinfo" "sed" "xprop" - "xset")))))) - (for-each (cute wrap-program <> - `("PATH" ":" prefix ,path-ext)) - (find-files ".")))) - #t)))))) + (for-each (cute wrap-program <> + `("PATH" ":" prefix ,bindirs)) + (find-files "."))))))))) (home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/") (synopsis "Freedesktop.org scripts for desktop integration") (description "The xdg-utils package is a set of simple scripts that -- cgit v1.2.3 From 47234c396061d5bb80d9c4fa1e330f1a3875d8d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Nov 2022 09:58:06 +0100 Subject: gnu: xdg-utils: Use G-expression. * gnu/packages/freedesktop.scm (xdg-utils)[arguments]: Use gexp. --- gnu/packages/freedesktop.scm | 102 ++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 5684bb1b94..672de9d55b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -497,57 +497,59 @@ display servers. It supports many different languages and emoji.") xprop ;for Xfce detecting xset)) ;for xdg-screensaver (arguments - `(#:tests? #f ;no check target - #:modules ((srfi srfi-26) + (list + #:tests? #f ;no check target + #:modules `((srfi srfi-26) ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-hardcoded-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "scripts/xdg-mime.in" - (("/usr/bin/file") - (search-input-file inputs "bin/file"))) - (substitute* "scripts/xdg-open.in" - (("/usr/bin/printf") - (search-input-file inputs "bin/printf"))))) - (add-before 'build 'locate-catalog-files - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let* ((native (or native-inputs inputs)) - (xmldoc (search-input-directory native - "xml/dtd/docbook")) - (xsldoc (search-input-directory - native - (string-append "xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl))))) - (for-each (lambda (file) - (substitute* file - (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd")))) - (find-files "scripts/desc" "\\.xml$")) - (substitute* "scripts/Makefile" - ;; Apparently `xmlto' does not bother to looks up the stylesheets - ;; specified in the XML, unlike the above substitition. Instead it - ;; uses a hard-coded URL. Work around it here, but if this is - ;; common perhaps we should hardcode this path in xmlto itself. - (("\\$\\(XMLTO\\) man") - (string-append "$(XMLTO) -x " xsldoc - "/manpages/docbook.xsl man"))) - (setenv "STYLESHEET" - (string-append xsldoc "/html/docbook.xsl"))))) - (add-after 'install 'wrap-executables - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dependencies '("awk" "grep" "hostname" "ls" "mimeopen" - "sed" "xprop" "xset")) - (pkgs (map (lambda (cmd) - (search-input-file inputs - (string-append "bin/" cmd))) - dependencies)) - (bindirs (map dirname pkgs))) - (with-directory-excursion (string-append out "/bin") - (for-each (cute wrap-program <> - `("PATH" ":" prefix ,bindirs)) - (find-files "."))))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-hardcoded-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scripts/xdg-mime.in" + (("/usr/bin/file") + (search-input-file inputs "bin/file"))) + (substitute* "scripts/xdg-open.in" + (("/usr/bin/printf") + (search-input-file inputs "bin/printf"))))) + (add-before 'build 'locate-catalog-files + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let* ((native (or native-inputs inputs)) + (xmldoc (search-input-directory native + "xml/dtd/docbook")) + (xsldoc (search-input-directory + native + (string-append "xml/xsl/docbook-xsl-" + #$(package-version + (this-package-native-input + "docbook-xsl")))))) + (for-each (lambda (file) + (substitute* file + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd")))) + (find-files "scripts/desc" "\\.xml$")) + (substitute* "scripts/Makefile" + ;; Apparently `xmlto' does not bother to looks up the stylesheets + ;; specified in the XML, unlike the above substitition. Instead it + ;; uses a hard-coded URL. Work around it here, but if this is + ;; common perhaps we should hardcode this path in xmlto itself. + (("\\$\\(XMLTO\\) man") + (string-append "$(XMLTO) -x " xsldoc + "/manpages/docbook.xsl man"))) + (setenv "STYLESHEET" + (string-append xsldoc "/html/docbook.xsl"))))) + (add-after 'install 'wrap-executables + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((dependencies '("awk" "grep" "hostname" "ls" "mimeopen" + "sed" "xprop" "xset")) + (pkgs (map (lambda (cmd) + (search-input-file inputs + (string-append "bin/" cmd))) + dependencies)) + (bindirs (map dirname pkgs))) + (with-directory-excursion (string-append #$output "/bin") + (for-each (cute wrap-program <> + `("PATH" ":" prefix ,bindirs)) + (find-files "."))))))))) (home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/") (synopsis "Freedesktop.org scripts for desktop integration") (description "The xdg-utils package is a set of simple scripts that -- cgit v1.2.3 From e7334321a53c21e11ee91b074916503c5798950c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Nov 2022 10:34:21 +0100 Subject: gnu: libx264: Update to 164-0.b093bbe. * gnu/packages/video.scm (libx264): Update to 164-0.b093bbe. (libx264-next): Remove variable. * gnu/packages/jami.scm (ffmpeg-jami)[inputs]: Don't use LIBX264-NEXT. --- gnu/packages/jami.scm | 3 +-- gnu/packages/video.scm | 27 +++------------------------ 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index acf57c2772..b350f1a74d 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -393,8 +393,7 @@ "mov ismv") (("fate-lavf-mov_rtphint:.*") "")))))))) (inputs (modify-inputs (package-inputs ffmpeg-5) - (replace "libvpx" libvpx-next) - (replace "libx264" libx264-next))))) + (replace "libvpx" libvpx-next))))) (define-public libjami (package diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c3e0c28216..3d621bb603 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -915,8 +915,8 @@ shared library and encoder and decoder command-line executables.") (define-public libx264 ;; There are no tags in the repository, so we take the version number from ;; the X264_BUILD variable defined in x264.h. - (let ((version "161") - (commit "4c2aafd864dd201832ec2be0fef4484925146650") + (let ((version "164") + (commit "b093bbe7d9bc642c8f24067cbdcc73bb43562eab") (revision "0")) (package (name "libx264") @@ -929,7 +929,7 @@ shared library and encoder and decoder command-line executables.") (file-name (git-file-name name version)) (sha256 (base32 - "1i6v9h3xx9pi0zmlj3anwwjxqa63sbhy9crrif8dphipwfn9hyg5")))) + "095pv8y6fqjg8mdvsfk12d0jqgyhip536a6vxhzm7qz8hfp96qhq")))) (build-system gnu-build-system) (native-inputs (list pkg-config nasm)) @@ -979,27 +979,6 @@ H.264 (MPEG-4 AVC) video streams.") "file://extras/cl.h" "See extras/cl.h in the distribution.")))))) -;;; TODO: Merge into libx264 on staging. -(define-public libx264-next - ;; There are no tags in the repository, so we take the version number from - ;; the X264_BUILD variable defined in x264.h. - (let ((version "164") - (commit "b093bbe7d9bc642c8f24067cbdcc73bb43562eab") - (revision "0")) - (package - (inherit libx264) - (name "libx264") - (version (git-version version revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://code.videolan.org/videolan/x264.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "095pv8y6fqjg8mdvsfk12d0jqgyhip536a6vxhzm7qz8hfp96qhq"))))))) - (define-public mkvtoolnix (package (name "mkvtoolnix") -- cgit v1.2.3 From af2cfa4b38bf4fe861e3621699a035bab6cb96c8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Nov 2022 10:36:31 +0100 Subject: gnu: libvpx: Update to 1.12.0. * gnu/packages/video.scm (libvpx): Update to 1.12.0. (libvpx-next): Remove variable. * gnu/packages/jami.scm (ffmpeg-jami)[inputs]: Remove. --- gnu/packages/jami.scm | 4 +--- gnu/packages/video.scm | 20 ++------------------ 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index b350f1a74d..4e8d36ca96 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -391,9 +391,7 @@ (substitute* "tests/fate/lavf-container.mak" (("mov mov_rtphint ismv") "mov ismv") - (("fate-lavf-mov_rtphint:.*") "")))))))) - (inputs (modify-inputs (package-inputs ffmpeg-5) - (replace "libvpx" libvpx-next))))) + (("fate-lavf-mov_rtphint:.*") "")))))))))) (define-public libjami (package diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 3d621bb603..5863282011 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2374,7 +2374,7 @@ To load this plugin, specify the following option when starting mpv: (define-public libvpx (package (name "libvpx") - (version "1.11.0") + (version "1.12.0") (source (origin (method git-fetch) (uri (git-reference @@ -2383,7 +2383,7 @@ To load this plugin, specify the following option when starting mpv: (file-name (git-file-name name version)) (sha256 (base32 - "00f1jrclai2b6ys78dpsg6r1mvcyxlna93vxcz8zjyia24c2pjsb")) + "1x12f2bd4jqd532rnixmwvcx8d29yxiacpcxqqh86qczc49la8gm")) (patches (search-patches "libvpx-CVE-2016-2818.patch")))) (build-system gnu-build-system) (arguments @@ -2413,22 +2413,6 @@ To load this plugin, specify the following option when starting mpv: (license license:bsd-3) (home-page "https://www.webmproject.org/"))) -;;; TODO: Merge into libvpx on staging. -(define-public libvpx-next - (package - (inherit libvpx) - (name "libvpx") - (version "1.12.0") - (source (origin - (inherit (package-source libvpx)) - (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1x12f2bd4jqd532rnixmwvcx8d29yxiacpcxqqh86qczc49la8gm")))))) - (define-public orf-dl (let ((commit "2dbbe7ef4e0efe0f3c1d59c503108e22d9065999") (revision "1")) -- cgit v1.2.3 From 3407a47c2afa6cd53b6372835b04f46a3c3fccd9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Nov 2022 10:39:07 +0100 Subject: gnu: sbcl: Resolve TODO. * gnu/packages/lisp.scm (sbcl)[source](modules, snippet): New fields. [arguments]: Remove phase. --- gnu/packages/lisp.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a8ee627d57..4f1243e8c0 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -435,7 +435,13 @@ an interpreter, a compiler, a debugger, and much more.") (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "1ahyrc3p9cf7y5zbgzvb9yxa8a480ccis4ksijlajck3z8n1dk24")))) + (base32 "1ahyrc3p9cf7y5zbgzvb9yxa8a480ccis4ksijlajck3z8n1dk24")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Don't force ARMv5. + (substitute* "src/runtime/Config.arm-linux" + (("-march=armv5") "")))))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs @@ -481,13 +487,6 @@ an interpreter, a compiler, a debugger, and much more.") (srfi srfi-1)) #:phases (modify-phases %standard-phases - ,@(if (target-arm32?) - ;; TODO: Move to snippet in staging. - `((add-after 'unpack 'dont-force-armv5 - (lambda _ - (substitute* "src/runtime/Config.arm-linux" - (("-march=armv5") ""))))) - '()) (delete 'configure) (add-after 'unpack 'fix-build-id ;; One of the build scripts makes a build id using the current date. -- cgit v1.2.3 From 2bbfd7e4aedc4361f57bfb17a0533f6e839e2818 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 19 Nov 2022 23:02:38 +0800 Subject: gnu: spirv-headers: Replace version with %vulkan-sdk-version. * gnu/packages/vulkan.scm (spirv-headers) [version]: Replace with %vulkan-sdk-version variable. Signed-off-by: Marius Bakke --- gnu/packages/vulkan.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 944e3de5a8..edf7fae73c 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -42,16 +42,18 @@ #:use-module (gnu packages wine) #:use-module (gnu packages xorg)) +(define %vulkan-sdk-version "sdk-1.3.231.1") + (define-public spirv-headers (package (name "spirv-headers") - (version "1.3.231.1") + (version %vulkan-sdk-version) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/SPIRV-Headers") - (commit (string-append "sdk-" version)))) + (commit version))) (sha256 (base32 "0z8b485hryya2g0jxv7amwg3fjj7pchbgnsa5ldf5fwgh5js0icm")) -- cgit v1.2.3 From f0895be9038fee4a4c162f72cddf8ff0c829dcf8 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 19 Nov 2022 23:02:39 +0800 Subject: gnu: spirv-tools: Replace version with %vulkan-sdk-version. * gnu/packages/vulkan.scm (spirv-tools)[version]: Replace with %vulkan-sdk-version. The commit of tag '2022.4' and 'sdk-1.3.231.1' are the same. Signed-off-by: Marius Bakke --- gnu/packages/vulkan.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index edf7fae73c..0ce612c1ea 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -79,13 +79,13 @@ and for the GLSL.std.450 extended instruction set. (define-public spirv-tools (package (name "spirv-tools") - (version "2022.4") + (version %vulkan-sdk-version) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/SPIRV-Tools") - (commit (string-append "v" version)))) + (commit version))) (sha256 (base32 "03d489ind2az7w7q1slj3mdc04372r3qqbnd7m9akxbg7yix1a5j")) (file-name (git-file-name name version)))) -- cgit v1.2.3 From 58eb426e3aa3aef40ed3984539839fa15c5d855a Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 19 Nov 2022 23:02:40 +0800 Subject: gnu: glslang: Update to sdk-1.3.231.1. * gnu/packages/vulkan.scm (glslang): Update to sdk-1.3.231.1. Signed-off-by: Marius Bakke --- gnu/packages/vulkan.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 0ce612c1ea..aee2786127 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -152,7 +152,7 @@ SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.") (define-public glslang (package (name "glslang") - (version "11.9.0") + (version %vulkan-sdk-version) (source (origin (method git-fetch) @@ -161,7 +161,7 @@ SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.") (commit version))) (sha256 (base32 - "1q6gjlx2y6g0hfvahnw063anb4yb4ky82hfh3b7nbsm43crzzfb0")) + "12a1zl8qxa28nbf6m67260c0lwdw3bqbj0jz1382wgm5px1fpqw6")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 3dfdec76775df7f919a6c068732bf35fb0420cd8 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 19 Nov 2022 23:02:41 +0800 Subject: gnu: spirv-cross: Update to sdk-1.3.231.1. * gnu/packages/vulkan.scm (spirv-cross): Update to sdk-1.3.231.1. Signed-off-by: Marius Bakke --- gnu/packages/vulkan.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index aee2786127..c1ecaeed3d 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -111,7 +111,7 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (define-public spirv-cross (package (name "spirv-cross") - (version "2020-05-19") + (version %vulkan-sdk-version) (source (origin (method git-fetch) @@ -119,7 +119,7 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (url "https://github.com/KhronosGroup/SPIRV-Cross") (commit version))) (sha256 - (base32 "0zyijp9zx9wbd4i5lwjap7n793iz6yjkf27la60dsffxl75yy9pd")) + (base32 "1ypbc1krkr0yywa1m976g3sjyb80l7hxwrnh6gp70w6va1dlnnn9")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From d158c3a6ad7b2e54dc58c1b1c68f2f26570b0b99 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 19 Nov 2022 23:02:42 +0800 Subject: gnu: shaderc: Update to 2022.3. * gnu/packages/vulkan.scm (shaderc): Update to 2022.3. Signed-off-by: Marius Bakke --- gnu/packages/vulkan.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index c1ecaeed3d..25d9d92718 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -293,7 +293,8 @@ API.") (define-public shaderc (package (name "shaderc") - (version "2021.3") + ;; shaderc doesn't follow the versioning scheme of vulkan sdk + (version "2022.3") (source (origin (method git-fetch) @@ -303,7 +304,7 @@ API.") (file-name (git-file-name name version)) (sha256 (base32 - "0qjwixcx74dvx68jl51x2mp2q1346hvhwxr8w3wk36nzla62k2s6")))) + "0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d")))) (build-system cmake-build-system) (arguments `(;; FIXME: Skip most of the tests, because enabling system gtest breaks @@ -335,7 +336,16 @@ API.") ,version ,(package-version spirv-tools) ,(package-version glslang)))) - #t))))) + #t)) + ;; see: https://github.com/google/shaderc/pull/1276 + (add-after 'do-not-look-for-bundled-sources 'drop-additional-glslang-deps + (lambda _ + (substitute* "glslc/CMakeLists.txt" + (("OSDependent OGLCompiler") "")) + (substitute* "libshaderc/CMakeLists.txt" + (("OSDependent OGLCompiler") "")) + (substitute* "libshaderc_util/CMakeLists.txt" + (("OSDependent OGLCompiler") ""))))))) (inputs (list glslang python spirv-headers spirv-tools)) (native-inputs -- cgit v1.2.3 From 5f8483e2f811ae9f196de2414258442d667b0e96 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 19 Nov 2022 23:02:43 +0800 Subject: gnu: vulkan-headers: Update to sdk-1.3.231.1. * gnu/packages/vulkan.scm (vulkan-headers): Update to sdk-1.3.231.1. Signed-off-by: Marius Bakke --- gnu/packages/vulkan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 25d9d92718..a75ec5c7a1 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -184,17 +184,17 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.2.202") + (version %vulkan-sdk-version) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Headers") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0lsjpxqb7k2mf0w1qadpki6vnwxr29kjg5y1jafl3pvk0mdy1azj")))) + "167zdank6pn66mzjdwgrdlmhmsy4v2k0nhw0nwg649k863rgi00j")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. -- cgit v1.2.3 From 8b670f5978a999f042c8eeb69411b3060162286b Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 19 Nov 2022 23:02:44 +0800 Subject: gnu: vulkan-loader: Update to sdk-1.3.231.1. * gnu/packages/vulkan.scm (vulkan-loader): Update to sdk-1.3.231.1. Signed-off-by: Marius Bakke --- gnu/packages/vulkan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index a75ec5c7a1..35353c1ffb 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -208,17 +208,17 @@ interpretation of the specifications for these languages.") (define-public vulkan-loader (package (name "vulkan-loader") - (version "1.2.202") + (version %vulkan-sdk-version) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Loader") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1vsaa16clncz19lihgj39rdg4dspkxjay1ii6pkf6fpl1vkw1dh2")))) + "0jx3hbmk0rlmh8mrwhn3l6ph6by3035pbndvm5ppikpljkf9lrhx")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From d08f1d8f23f79447f86a7aea7f4deda8162093fa Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 19 Nov 2022 23:02:45 +0800 Subject: gnu: vulkan-tools: Update to sdk-1.3.231.1. * gnu/packages/vulkan.scm (vulkan-tools): Update to sdk-1.3.231.1. Signed-off-by: Marius Bakke --- gnu/packages/vulkan.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 35353c1ffb..4cc4307977 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -261,20 +261,20 @@ and the ICD.") (define-public vulkan-tools (package (name "vulkan-tools") - (version "1.2.201") + (version %vulkan-sdk-version) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Tools") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1ik90d7pygaw2pq81brqmcjiczag3biqvgpqp3cpws07glf29lf9")))) + "0jzwjfx4c7y15wkwfhhc64rzljpi47bxrm5jw5blfsqjh8zsd27a")))) (build-system cmake-build-system) (inputs - (list glslang libxrandr vulkan-loader wayland)) + (list glslang libxrandr vulkan-loader wayland wayland-protocols)) (native-inputs (list pkg-config python vulkan-headers)) (arguments -- cgit v1.2.3 From a9f1f987e791a668f90fcd9bca840b1dd7c3629d Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 19 Nov 2022 23:02:46 +0800 Subject: gnu: vulkan-validationlayers: Update to sdk-1.3.231.1. * gnu/packages/vulkan.scm (vulkan-validationlayers): Update to sdk-1.3.231.1. [arguments]: Specify install directory for spirv-tools and vulkan-headers. Co-authored-by: Marius Bakke --- gnu/packages/vulkan.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 4cc4307977..b73db744f2 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -408,17 +408,17 @@ shader compilation.") (define-public vulkan-validationlayers (package (name "vulkan-validationlayers") - (version "1.2.201") + (version %vulkan-sdk-version) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-ValidationLayers") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1jnz9cmy5d5g6jh9p4wr0qrlqlpfp07b3cizq37i5p1bcabdgmrz")))) + "07djrk6yym4vl2b52wr09r8y649v5lark5hnr5rwvlxwxdmd9g75")))) (build-system cmake-build-system) (inputs (list glslang libxrandr @@ -442,6 +442,16 @@ shader compilation.") (search-input-directory %build-inputs "include/spirv")))) + (string-append "-DSPIRV_TOOLS_INSTALL_DIR=" + (dirname (dirname + (search-input-directory + %build-inputs + "include/spirv-tools")))) + (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" + (dirname (dirname + (search-input-directory + %build-inputs + "include/vulkan")))) "-Wno-dev") #:phases #~(modify-phases %standard-phases (add-after 'install 'set-layer-path-in-manifest -- cgit v1.2.3 From 332384b46932c167252cc82b1d9d6693fe4d92c5 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 19 Nov 2022 23:02:47 +0800 Subject: gnu: Add volk. * gnu/packages/vulkan.scm (volk): New variable. Signed-off-by: Marius Bakke --- gnu/packages/vulkan.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index b73db744f2..3cd868c7c2 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -470,3 +470,32 @@ shader compilation.") can assist development by enabling developers to verify their applications correctly use the Vulkan API.") (license license:asl2.0))) + +(define-public volk + (package + (name "volk") + (version %vulkan-sdk-version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zeux/volk") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xaw3kg754mknx8lfj1p74a9npjfvdvlpicvn0hla4495zpc10rq")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ;no test + #:configure-flags '("-DVOLK_INSTALL=ON" "-DVOLK_PULL_IN_VULKAN=ON"))) + (inputs (list vulkan-headers)) + (synopsis "Meta loader for Vulkan API") + (description + "Volk is a meta-loader for Vulkan. It allows you to dynamically load +entrypoints required to use Vulkan without linking the Vulkan loader. +Additionally, volk simplifies the use of Vulkan extensions by automatically +loading all associated entrypoints. Finally, volk enables loading Vulkan +entrypoints directly from the driver which can increase performance by +skipping loader dispatch overhead.") + (home-page "https://github.com/zeux/volk") + (license license:expat))) -- cgit v1.2.3 From a643718b0c60eb1e0365e95e710806dbaa226356 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Nov 2022 14:08:56 +0100 Subject: gnu: freeglut: Update to 3.4.0. * gnu/packages/gl.scm (freeglut): Update to 3.4.0. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 4ae96032cd..65f3a03718 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -110,7 +110,7 @@ as ASCII text.") (define-public freeglut (package (name "freeglut") - (version "3.2.2") + (version "3.4.0") (source (origin (method url-fetch) (uri (string-append @@ -118,7 +118,7 @@ as ASCII text.") "/download/v" version "/freeglut-" version ".tar.gz")) (sha256 (base32 - "0l3s57zw51fy3mn5qfdm4z775kfhflgxppanaxmskfzh5l44m565")))) + "1v7ayg3a03mv8b6lsr1qm21lbr8xg8dh3gdfxnbhl64vbn8wn2rw")))) (build-system cmake-build-system) (arguments '(#:tests? #f ;no test target -- cgit v1.2.3 From 8d8786ba7254bc0511c1eab09a7d47a8e682746f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Nov 2022 14:16:18 +0100 Subject: gnu: libical: Update to 3.0.16. * gnu/packages/calendar.scm (libical): Update to 3.0.16. --- gnu/packages/calendar.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 32a8f23f19..cf4286100d 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -121,7 +121,7 @@ the library for handling time zones and leap seconds.") (define-public libical (package (name "libical") - (version "3.0.14") + (version "3.0.16") (source (origin (method url-fetch) (uri (string-append @@ -129,7 +129,7 @@ the library for handling time zones and leap seconds.") version "/libical-" version ".tar.gz")) (sha256 (base32 - "13ycghsi4iv8mnm0xv97bs0x6qvfhdxkw20n3yhcc7bg6n0bg122")))) + "0cqc1wpalxmxjx8dmcaga9w8kd5l7944hqmidz43hifaf7fhaixl")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; test suite appears broken -- cgit v1.2.3 From 8a04972ecf7b21639ce41545e263b48262ef1abc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Nov 2022 14:16:36 +0100 Subject: gnu: libwebp: Update to 1.2.4. * gnu/packages/image.scm (libwebp): Update to 1.2.4. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index a236ff7e9a..ceb33dfcd7 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1303,7 +1303,7 @@ language bindings to VIGRA.") (define-public libwebp (package (name "libwebp") - (version "1.2.2") + (version "1.2.4") (source (origin ;; No tarballs are provided for >0.6.1. @@ -1314,7 +1314,7 @@ language bindings to VIGRA.") (file-name (git-file-name name version)) (sha256 (base32 - "1khqkm5j9aiii9jfsbxzzyz3x33sifzcx537cyjyb3a2g2rl969k")))) + "1jndbc99dd19a6d7h4ds51xyak7gfddkbi41nxdm8n23w7ks35r8")))) (build-system gnu-build-system) (inputs (list freeglut -- cgit v1.2.3 From 6e9995ffedf0694acc57b0ab70be498a98c790c5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Nov 2022 14:17:01 +0100 Subject: gnu: bluez: Update to 5.66. * gnu/packages/linux.scm (bluez): Update to 5.66. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9df451ebcc..d1c2094fa1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5727,7 +5727,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (version "5.64") + (version "5.66") (source (origin (method url-fetch) (uri (string-append @@ -5735,7 +5735,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "0d6yl7l5zrlx5w3y503k72m9xsydx6gi1c65icchq1xknrjpwhxf")))) + "0x5mn9x6g626izxnw236933wvq83qagsh9qc9ac9550cb55sdzir")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From 28f7a5e9d79a0a4ac3c91e5df9ebef114a4faf34 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Nov 2022 14:20:10 +0100 Subject: gnu: OpenAL: Update to 1.22.2. * gnu/packages/audio.scm (openal): Update to 1.22.2. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index cf7fcd87c8..ca2b12f6fe 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3313,7 +3313,7 @@ lv2-c++-tools.") (define-public openal (package (name "openal") - (version "1.20.1") + (version "1.22.2") (source (origin (method url-fetch) (uri (string-append @@ -3321,7 +3321,7 @@ lv2-c++-tools.") version ".tar.bz2")) (sha256 (base32 - "0vax0b1lgd4212bpxa1rciz52d4mv3dkfvcbbhzw4cjp698v1kmn")))) + "081xgkma2a19dscwx21xdpklh8gq399w4f1fx737qsx7rnawr55f")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 399dd75f3a2fd7bb54c7987fba20b980f38a0579 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Nov 2022 14:26:24 +0100 Subject: gnu: glew: Update to 2.2.0. * gnu/packages/gl.scm (glew): Update to 2.2.0. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 65f3a03718..b945c6c5b8 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -615,14 +615,14 @@ glxdemo, glxgears, glxheads, and glxinfo.") (define-public glew (package (name "glew") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/glew/glew/" version "/glew-" version ".tgz")) (sha256 (base32 - "159wk5dc0ykjbxvag5i1m2mhp23zkk6ra04l26y3jc3nwvkr3ph4")) + "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From b0d378256e9976748250b1d4272d85a514a0070e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Nov 2022 14:32:47 +0100 Subject: gnu: glew: Omit static library. * gnu/packages/gl.scm (glew)[arguments]: Add phase to delete libGLEW.a. While at it, convert to G-expression. --- gnu/packages/gl.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b945c6c5b8..fd69e6dbeb 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -632,12 +632,15 @@ glxdemo, glxgears, glxheads, and glxinfo.") #t)))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases (delete 'configure)) - #:make-flags (list (string-append "GLEW_PREFIX=" - (assoc-ref %outputs "out")) - (string-append "GLEW_DEST=" - (assoc-ref %outputs "out"))) - #:tests? #f)) ;no 'check' target + (list #:make-flags #~(list (string-append "GLEW_PREFIX=" #$output) + (string-append "GLEW_DEST=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'install 'delete-static + (lambda _ + (delete-file (string-append #$output "/lib/libGLEW.a"))))) + #:tests? #f)) ;no 'check' target (inputs (list libxi libxmu libx11 mesa)) -- cgit v1.2.3 From cc93e5f42436ed6c76d22217ba42f25af2393b9b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Sep 2022 03:20:54 +0200 Subject: gnu: perl-http-message: Update to 6.37. * gnu/packages/web.scm (perl-http-message): Update to 6.37. [native-inputs]: Add PERL-TEST-NEEDS. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 90337b8dd8..207a6de357 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3607,7 +3607,7 @@ processing of request data as it arrives.") (define-public perl-http-message (package (name "perl-http-message") - (version "6.18") + (version "6.37") (source (origin (method url-fetch) (uri (string-append @@ -3615,10 +3615,10 @@ processing of request data as it arrives.") version ".tar.gz")) (sha256 (base32 - "04lih0fn89jpyk74c4aq1rzq18h8v4zd3x0lik2r9dl8sdqd2q6h")))) + "00nq0xnpdba4valzgvzy3fgvck1ijrksdyzb4w9q6j72hl5dln8f")))) (build-system perl-build-system) (native-inputs - (list perl-try-tiny)) + (list perl-test-needs perl-try-tiny)) (propagated-inputs (list perl-encode-locale perl-http-date perl-io-html perl-lwp-mediatypes perl-uri)) -- cgit v1.2.3 From 7889b546b58fcec947ad87b9f9ffc5ece4b58dea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Sep 2022 03:21:49 +0200 Subject: gnu: perl-try-tiny: Update to 0.31. * gnu/packages/perl.scm (perl-try-tiny): Update to 0.31. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 64089f9dd3..335e08d146 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -11318,7 +11318,7 @@ Tree::Simple::Visitor::* objects.") (define-public perl-try-tiny (package (name "perl-try-tiny") - (version "0.30") + (version "0.31") (source (origin (method url-fetch) @@ -11326,7 +11326,7 @@ Tree::Simple::Visitor::* objects.") "Try-Tiny-" version ".tar.gz")) (sha256 (base32 - "0szgvlz19yz3mq1lbzmwh8w5dh6agg5s16xv22zrnl83r7ax0nys")))) + "1ghidhh2wasxbmjsdsyfcy20wgli3m58dkj6ixnv4xa0i8fx601k")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Try-Tiny") (synopsis "Minimal try/catch with proper preservation of $@@") -- cgit v1.2.3 From 248d6fb8e9decd00f24e5831f5191185abbefd65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Sep 2022 03:22:21 +0200 Subject: gnu: perl-test-fatal: Update to 0.016. * gnu/packages/perl-check.scm (perl-test-fatal): Update to 0.016. --- gnu/packages/perl-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 6562390d20..7bf58832bc 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -546,7 +546,7 @@ Test::More and friends.") (define-public perl-test-fatal (package (name "perl-test-fatal") - (version "0.014") + (version "0.016") (source (origin (method url-fetch) @@ -554,7 +554,7 @@ Test::More and friends.") "Test-Fatal-" version ".tar.gz")) (sha256 (base32 - "1c6bs68mss4q7cyapkv2c0jn66i21050p0faxf3s3417gdffzp5w")))) + "13vqdyk95y89msk1r8g1vp1jw6rzkl1y76lprnw3085sy8qd90vj")))) (build-system perl-build-system) (propagated-inputs (list perl-try-tiny)) (home-page "https://metacpan.org/release/Test-Fatal") -- cgit v1.2.3 From 80d84f76cdcf8115ef6f659353131ce1dce58cc4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Sep 2022 03:22:58 +0200 Subject: gnu: perl-http-daemon: Update to 6.14. * gnu/packages/web.scm (perl-http-daemon): Update to 6.14. [native-inputs]: Add PERL-MODULE-BUILD and PERL-TEST-NEEDS. --- gnu/packages/web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 207a6de357..63c8317e33 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3535,16 +3535,18 @@ object knows about.") (define-public perl-http-daemon (package (name "perl-http-daemon") - (version "6.01") + (version "6.14") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-" + "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-" version ".tar.gz")) (sha256 (base32 - "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3")))) + "079fkcq2vdrzdf0bml52kz73n9gdv1xg0qf72c9v505v7izpwxph")))) (build-system perl-build-system) + (native-inputs + (list perl-module-build perl-test-needs)) (propagated-inputs (list perl-http-message perl-lwp-mediatypes)) (license license:perl-license) -- cgit v1.2.3 From 6d42bdd96095f09690a16bdc67a586c19efcc2f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Sep 2022 03:23:56 +0200 Subject: gnu: perl-io-socket-ssl: Update to 2.075. * gnu/packages/web.scm (perl-io-socket-ssl): Update to 2.075. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 63c8317e33..467a91523f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3848,14 +3848,14 @@ and IPv6 sockets, intended as a replacement for IO::Socket::INET.") (define-public perl-io-socket-ssl (package (name "perl-io-socket-ssl") - (version "2.068") + (version "2.075") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/S/SU/SULLR/" "IO-Socket-SSL-" version ".tar.gz")) (sha256 (base32 - "1ycgzg1l7p07y5wc0vzgnj122vm51p5aqpi4s56pp0piaq0gq824")))) + "135fvlvqcnmf0m0s8xqk015k7pyas1hiij5visb1l60y1cif43n3")))) (build-system perl-build-system) (propagated-inputs (list perl-net-ssleay -- cgit v1.2.3 From 96386f334e1d8a6fc1055397c3e9a2a300e48fa3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Sep 2022 21:56:10 +0200 Subject: gnu: libpipeline: Update to 1.5.6. * gnu/packages/man.scm (libpipeline): Update to 1.5.6. --- gnu/packages/man.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index febcb5a4a8..00efff0387 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -107,7 +107,7 @@ textfiles to roff for terminal display, and also to HTML for the web.") (define-public libpipeline (package (name "libpipeline") - (version "1.5.3") + (version "1.5.6") (source (origin (method url-fetch) (uri (string-append @@ -115,7 +115,7 @@ textfiles to roff for terminal display, and also to HTML for the web.") version ".tar.gz")) (sha256 (base32 - "1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx")))) + "15xpx7kbzkn63ab8mkghv7jkzji8pdbsyxm7ygjji19rvkkvkyv0")))) (build-system gnu-build-system) (home-page "https://libpipeline.nongnu.org/") (synopsis "C library for manipulating pipelines of subprocesses") -- cgit v1.2.3 From 616860d6cb25bdcb06c0e0f5bfe377044c5582e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Sep 2022 21:57:02 +0200 Subject: gnu: libseccomp: Update to 2.5.4. * gnu/packages/linux.scm (libseccomp): Update to 2.5.4. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d1c2094fa1..80443fc43b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7146,7 +7146,7 @@ of flash storage.") (define-public libseccomp (package (name "libseccomp") - (version "2.5.3") + (version "2.5.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/seccomp/libseccomp/" @@ -7154,7 +7154,7 @@ of flash storage.") "/libseccomp-" version ".tar.gz")) (sha256 (base32 - "0xhan73zn4p0n7s8vx6s47wjmidvk4x8r90vfbljairn6f3mq1jr")))) + "1nyb3lspc5bsirpsx89vah3n54pmwlgxrwsfaxl01kq50i004afq")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static") -- cgit v1.2.3 From c65bc18f870c33251909aa0e3dd97dd9088f7ea4 Mon Sep 17 00:00:00 2001 From: dan Date: Sun, 20 Nov 2022 21:49:31 +0800 Subject: gnu: Add vulkan-memory-allocator. * gnu/packages/vulkan.scm (vulkan-memory-allocator): New variable. Signed-off-by: Marius Bakke --- gnu/packages/vulkan.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 3cd868c7c2..ddf965a3aa 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2022 Kaelyn Takata +;;; Copyright © 2022 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -499,3 +500,32 @@ entrypoints directly from the driver which can increase performance by skipping loader dispatch overhead.") (home-page "https://github.com/zeux/volk") (license license:expat))) + +(define-public vulkan-memory-allocator + (package + (name "vulkan-memory-allocator") + (version "3.0.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hpzjwl5bgqv9hmf1fdldihfllcbdg515f391a200klg0rnixdds")))) + (build-system cmake-build-system) + (arguments + ;; no test + `(#:tests? #f)) + (inputs (list vulkan-loader vulkan-headers)) + (synopsis "Vulkan memory allocation library") + (description + "The Vulkan Memory Allocator (VMA) library provides a simple and easy to +integrate API to help users allocate memory for Vulkan buffer and image +storage.") + (home-page + "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator") + (license license:expat))) -- cgit v1.2.3 From 4daa9c353f2e9261ca74a3ffc7ceaf685b2f21c1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Nov 2022 20:52:54 +0100 Subject: gnu: vulkan-loader: Update to 1.3.232. * gnu/packages/vulkan.scm (vulkan-loader): Update to 1.3.232. --- gnu/packages/vulkan.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ddf965a3aa..1f6aae5585 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages wine) #:use-module (gnu packages xorg)) +;; Note: Remember to change vulkan-loader version when bumping this. (define %vulkan-sdk-version "sdk-1.3.231.1") (define-public spirv-headers @@ -209,17 +210,19 @@ interpretation of the specifications for these languages.") (define-public vulkan-loader (package (name "vulkan-loader") - (version %vulkan-sdk-version) + ;; XXX: Take a slightly newer commit to fix a test failure on i686: + ;; https://github.com/KhronosGroup/Vulkan-Loader/pull/1036 + (version "sdk-1.3.232") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/Vulkan-Loader") - (commit version))) + (commit "v1.3.232"))) (file-name (git-file-name name version)) (sha256 (base32 - "0jx3hbmk0rlmh8mrwhn3l6ph6by3035pbndvm5ppikpljkf9lrhx")))) + "0w69sh669sx9pwlvv2rv92ds2hm2rbzsa6qqcmd8kcad0qfq7dz2")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From c684e5f4e46b8ee945e195e957a2e7e1ed5331bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Nov 2022 20:56:27 +0100 Subject: gnu: vulkan-loader: Remove input labels. * gnu/packages/vulkan.scm (vulkan-loader)[native-inputs]: Remove labels. [arguments]: Use SEARCH-INPUT-DIRECTORY instead of label. While at it remove use of THIS-PACKAGE-INPUT. --- gnu/packages/vulkan.scm | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1f6aae5585..8d2c93c5dc 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -225,26 +225,29 @@ interpretation of the specifications for these languages.") "0w69sh669sx9pwlvv2rv92ds2hm2rbzsa6qqcmd8kcad0qfq7dz2")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - ,#~(list - (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" - #$(this-package-input "vulkan-headers")) - (string-append "-DGOOGLETEST_INSTALL_DIR=" - (getcwd) "/source/external/googletest") - "-DBUILD_TESTS=ON") - #:phases (modify-phases %standard-phases - (add-after 'unpack 'unpack-googletest - (lambda* (#:key inputs #:allow-other-keys) - (let ((gtest (assoc-ref inputs "googletest:source"))) - (when gtest - (copy-recursively gtest "external/googletest")) - #t)))))) + (list + #:configure-flags + #~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" + (dirname (dirname + (search-input-directory + %build-inputs "include/vulkan")))) + (string-append "-DGOOGLETEST_INSTALL_DIR=" + (getcwd) "/source/external/googletest") + "-DBUILD_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-googletest + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let ((gtest (search-input-directory (or native-inputs inputs) + "googletest"))) + (copy-recursively (dirname gtest) + "external/googletest"))))))) (native-inputs - `(("googletest:source" ,(package-source googletest)) - ("libxrandr" ,libxrandr) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("wayland" ,wayland))) + (list (package-source googletest) + libxrandr + pkg-config + python + wayland)) (inputs (list vulkan-headers)) (home-page -- cgit v1.2.3 From 88d7612aaa0aa8d4d9420767b69952cc62d4aab6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 8 Sep 2022 19:55:23 +0200 Subject: gnu: MariaDB: Update to 10.10.2. * gnu/packages/databases.scm (mariadb): Update to 10.9.3. [source](snippet): Remove adjustments for deprecated TokuDB. [arguments]: Remove obsolete #:configure-flags. Build with system libfmt. Adjust tests for 10.10.2, and mariadb_config file name. Remove patch phase. [native-inputs]: Remove obsolete patch. [inputs]: Add FMT. Change from OPENSSL-1.1 to OPENSSL. * gnu/tests/databases.scm (%mysql-os): Adjust config file so MariaDB works on overlayfs. --- gnu/local.mk | 1 - gnu/packages/databases.scm | 79 +++++---------------- gnu/packages/patches/mariadb-link-libatomic.patch | 83 ----------------------- gnu/tests/databases.scm | 6 +- 4 files changed, 21 insertions(+), 148 deletions(-) delete mode 100644 gnu/packages/patches/mariadb-link-libatomic.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3350129cb2..d4d5740b86 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1523,7 +1523,6 @@ dist_patch_DATA = \ %D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/mailutils-variable-lookup.patch \ %D%/packages/patches/make-impure-dirs.patch \ - %D%/packages/patches/mariadb-link-libatomic.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ %D%/packages/patches/mathjax-disable-webpack.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 0dc2e38e38..952eaeb206 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -133,6 +133,7 @@ #:use-module (gnu packages perl-web) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-build) @@ -900,7 +901,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.5.12") + (version "10.10.2") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.com/MariaDB" @@ -908,21 +909,11 @@ Language.") version ".tar.gz")) (sha256 (base32 - "1gg4h9ahmk78cx01zyw0fqr6hhd78fsyhs0s34p3gi9hkak1qkxb")) + "1ciw7y08wms9g3hzhyria49r1b9n5wpbhkndazv95d925c8x1jsp")) (modules '((guix build utils))) (snippet '(begin - ;; Delete bundled snappy and xz. - (delete-file-recursively "storage/tokudb/PerconaFT/third_party") - (substitute* "storage/tokudb/PerconaFT/CMakeLists.txt" - ;; This file checks that the bundled sources are present and - ;; declares build procedures for them. - (("^include\\(TokuThirdParty\\)") "")) - (substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt" - ;; Don't attempt to use the procedures we just removed. - ((" build_lzma build_snappy") "")) - - ;; Preserve CMakeLists.txt for these. + ;; Delete bundled libraries, but preserve CMakeLists.txt. (for-each (lambda (file) (unless (string-suffix? "CMakeLists.txt" file) (delete-file file))) @@ -934,21 +925,10 @@ Language.") `(#:configure-flags (list "-DBUILD_CONFIG=mysql_release" - ;; Linking with libarchive fails, like this: - - ;; ld: /gnu/store/...-libarchive-3.2.2/lib/libarchive.a(archive_entry.o): - ;; relocation R_X86_64_32 against `.bss' can not be used when - ;; making a shared object; recompile with -fPIC - - ;; For now, disable the features that that use libarchive (xtrabackup). - "-DWITH_LIBARCHIVE=OFF" - - ;; Disable the TokuDB engine, because its test suite frequently fails, - ;; and loading it crashes the server: . - "-DTOKUDB_OK=OFF" ;; Ensure the system libraries are used. "-DWITH_JEMALLOC=yes" + "-DWITH_LIBFMT=system" "-DWITH_PCRE=system" "-DWITH_SSL=system" "-DWITH_ZLIB=system" @@ -988,14 +968,6 @@ Language.") #:parallel-tests? ,(target-x86-64?) #:phases (modify-phases %standard-phases - ,@(if (target-ppc32?) - `((add-after 'unpack 'apply-libatomics-patch - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch-file - (assoc-ref inputs - "mariadb-link-libatomic.patch"))) - (invoke "patch" "-p1" "-i" patch-file))))) - '()) (add-after 'unpack 'adjust-output-references (lambda _ ;; The build system invariably prepends $CMAKE_INSTALL_PREFIX @@ -1031,6 +1003,9 @@ Language.") "main.explain_non_select" "main.upgrade_MDEV-19650" "roles.acl_statistics" + "main.stat_tables_innodb" + "main.stat_tables" + "main.mysql_upgrade" ;; Probably same as above, test failure reported upstream: ;; . @@ -1057,36 +1032,19 @@ Language.") disabled-tests) (close-port unstable-tests) - ;; XXX: These fail because they expect a latin1 charset and - ;; collation. See . - (substitute* '("mysql-test/main/gis_notembedded.result" - "mysql-test/main/system_mysql_db.result") - (("latin1_swedish_ci") "utf8_general_ci") - (("\tlatin1") "\tutf8")) - (substitute* "mysql-test/suite/binlog/t/binlog_mysqlbinlog_stop_never.test" (("/bin/bash") (which "bash"))) - (substitute* "mysql-test/mysql-test-run.pl" + (substitute* "mysql-test/mariadb-test-run.pl" (("/bin/ls") (which "ls")) (("/bin/sh") (which "sh")))))) - (add-before 'configure 'disable-plugins - (lambda _ - (let ((disable-plugin (lambda (name) - (call-with-output-file - (string-append "plugin/" name - "/CMakeLists.txt") - (lambda (port) - (format port "\n"))))) - (disabled-plugins '(;; XXX: Causes a test failure. - "disks"))) - (for-each disable-plugin disabled-plugins)))) (replace 'check (lambda* (#:key (tests? #t) parallel-tests? #:allow-other-keys) (if tests? (with-directory-excursion "mysql-test" - (invoke "./mtr" "--verbose" + (invoke "./mariadb-test-run" + "--verbose" "--retry=3" "--suite=main" "--testcase-timeout=40" @@ -1133,7 +1091,7 @@ Language.") (mkdir-p (string-append dev "/lib")) (rename-file (string-append lib "/lib/pkgconfig") (string-append dev "/lib/pkgconfig")) - (rename-file (string-append lib "/bin/mariadb_config") + (rename-file (string-append out "/bin/mariadb_config") (string-append dev "/bin/mariadb_config")) (rename-file (string-append out "/bin/mysql_config") (string-append dev "/bin/mysql_config")) @@ -1146,19 +1104,14 @@ Language.") (("-lssl -lcrypto" all) (string-append "-L" openssl "/lib " all))))))))) (native-inputs - (if (target-ppc32?) - `(("mariadb-link-libatomic.patch" - ,(search-patch "mariadb-link-libatomic.patch")) - ("patch" ,patch) - ("bison" ,bison) - ("perl" ,perl)) - (list bison perl))) + (list bison perl)) (inputs - `(("jemalloc" ,jemalloc) + `(("fmt" ,fmt) + ("jemalloc" ,jemalloc) ("libaio" ,libaio) ("libxml2" ,libxml2) ("ncurses" ,ncurses) - ("openssl" ,openssl-1.1) + ("openssl" ,openssl) ("pam" ,linux-pam) ("pcre2" ,pcre2) ("xz" ,xz) diff --git a/gnu/packages/patches/mariadb-link-libatomic.patch b/gnu/packages/patches/mariadb-link-libatomic.patch deleted file mode 100644 index f331067b6e..0000000000 --- a/gnu/packages/patches/mariadb-link-libatomic.patch +++ /dev/null @@ -1,83 +0,0 @@ -https://github.com/MariaDB/server/commit/f502ccbcb5dfce29067434885a23db8d1bd5f134.patch -This was apparently merged in 10.8.2. - -From f502ccbcb5dfce29067434885a23db8d1bd5f134 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= -Date: Fri, 15 Oct 2021 16:51:05 +0300 -Subject: [PATCH] Link with libatomic to enable C11 atomics support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some architectures (mips) require libatomic to support proper -atomic operations. Check first if support is available without -linking, otherwise use the library. - -Contributors: -James Cowgill -Jessica Clarke -Vicențiu Ciorbaru ---- - configure.cmake | 20 +++++++++++++++++++- - mysys/CMakeLists.txt | 4 ++++ - sql/CMakeLists.txt | 1 - - 3 files changed, 23 insertions(+), 2 deletions(-) - -diff --git a/configure.cmake b/configure.cmake -index 7a1369d77703f..db8742bb93b5a 100644 ---- a/configure.cmake -+++ b/configure.cmake -@@ -895,7 +895,25 @@ int main() - long long int *ptr= &var; - return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); - }" --HAVE_GCC_C11_ATOMICS) -+HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) -+IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) -+ SET(HAVE_GCC_C11_ATOMICS True) -+ELSE() -+ SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) -+ LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") -+ CHECK_CXX_SOURCE_COMPILES(" -+ int main() -+ { -+ long long int var= 1; -+ long long int *ptr= &var; -+ return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); -+ }" -+ HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) -+ IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) -+ SET(HAVE_GCC_C11_ATOMICS True) -+ ENDIF() -+ SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES}) -+ENDIF() - - IF(WITH_VALGRIND) - SET(HAVE_valgrind 1) -diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt -index f97e3b4d3904c..09d3f726ffc74 100644 ---- a/mysys/CMakeLists.txt -+++ b/mysys/CMakeLists.txt -@@ -78,6 +78,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} - ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY}) - DTRACE_INSTRUMENT(mysys) - -+IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) -+ TARGET_LINK_LIBRARIES(mysys atomic) -+ENDIF() -+ - IF(HAVE_BFD_H) - TARGET_LINK_LIBRARIES(mysys bfd) - ENDIF(HAVE_BFD_H) -diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt -index 5f5d7daf1a5bc..f574f1f20295d 100644 ---- a/sql/CMakeLists.txt -+++ b/sql/CMakeLists.txt -@@ -307,7 +307,6 @@ IF(WITH_MYSQLD_LDFLAGS) - "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}") - ENDIF() - -- - FIND_PACKAGE(BISON 2.0) - - diff --git a/gnu/tests/databases.scm b/gnu/tests/databases.scm index 2ca13577a1..92be1a829b 100644 --- a/gnu/tests/databases.scm +++ b/gnu/tests/databases.scm @@ -389,7 +389,11 @@ data double PRECISION NULL (define %mysql-os (simple-operating-system - (service mysql-service-type))) + (service mysql-service-type + (mysql-configuration + ;; Disable O_DIRECT since it's not supported on overlayfs. + ;; See . + (extra-content "innodb-flush-method = fsync"))))) (define* (run-mysql-test) "Run tests in %MYSQL-OS." -- cgit v1.2.3 From aeed9d884ef1615be1285cee60e2496be46426a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 28 Oct 2022 21:58:05 +0200 Subject: gnu: MariaDB: Remove input labels. * gnu/packages/databases.scm (mariadb)[arguments]: Don't reference OpenSSL by label. [inputs]: Remove labels. --- gnu/packages/databases.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 952eaeb206..bc3821480a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1058,13 +1058,12 @@ Language.") "--skip-rpl" "--skip-test-list=unstable-tests")) (format #t "test suite not run~%")))) - (add-after - 'install 'post-install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) + (add-after 'install 'post-install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) (dev (assoc-ref outputs "dev")) (lib (assoc-ref outputs "lib")) - (openssl (assoc-ref inputs "openssl"))) + (openssl (dirname (search-input-file inputs "lib/libssl.so")))) (substitute* (list (string-append out "/bin/mariadb-install-db") (string-append out "/bin/mysql_install_db")) (("basedir=\"\"") @@ -1102,20 +1101,20 @@ Language.") (substitute* (list (string-append dev "/bin/mysql_config") (string-append dev "/lib/pkgconfig/mariadb.pc")) (("-lssl -lcrypto" all) - (string-append "-L" openssl "/lib " all))))))))) + (string-append "-L" openssl " " all))))))))) (native-inputs (list bison perl)) (inputs - `(("fmt" ,fmt) - ("jemalloc" ,jemalloc) - ("libaio" ,libaio) - ("libxml2" ,libxml2) - ("ncurses" ,ncurses) - ("openssl" ,openssl) - ("pam" ,linux-pam) - ("pcre2" ,pcre2) - ("xz" ,xz) - ("zlib" ,zlib))) + (list fmt + jemalloc + libaio + libxml2 + ncurses + openssl + linux-pam + pcre2 + xz + zlib)) ;; The test suite is very resource intensive and can take more than three ;; hours on a x86_64 system. Give slow and busy machines some leeway. (properties '((timeout . 64800))) ;18 hours -- cgit v1.2.3 From 968137837ec9e16cfe1e8902929af87d518b520c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Nov 2022 21:31:54 +0100 Subject: gnu: NSPR: Update to 4.35. * gnu/packages/nss.scm (nspr): Update to 4.35. --- gnu/packages/nss.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 60247f34a2..6e4583115c 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -40,7 +40,7 @@ (define-public nspr (package (name "nspr") - (version "4.34") + (version "4.35") (source (origin (method url-fetch) (uri (string-append @@ -48,7 +48,7 @@ version "/src/nspr-" version ".tar.gz")) (sha256 (base32 - "177rxcf3lglabs7sgwcvf72ww4v56qa71lc495wl13sxs4f03vxy")))) + "13xwda56yhp1w7v02qvlxvlqiniw8kr4g3fxlljmv6wnlmz2k8vy")))) (build-system gnu-build-system) (inputs (list perl ;for 'compile-et.pl' -- cgit v1.2.3 From f7b87f777552dd515183334f11f8fcd518c8fa15 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Nov 2022 21:32:14 +0100 Subject: gnu: NSS: Update to 3.85. * gnu/packages/nss.scm (nss): Update to 3.85. * gnu/packages/certs.scm (nss-certs): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/nss.scm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index b8dfe96e6d..122882980b 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -131,7 +131,7 @@ that was originally contributed to Debian.") ;; XXX We used to refer to the nss package here, but that eventually caused ;; module cycles. The below is a quick copy-paste job that must be kept in ;; sync manually. Surely there's a better way…? - (version "3.81") + (version "3.85") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -142,7 +142,7 @@ that was originally contributed to Debian.") "nss-" version ".tar.gz"))) (sha256 (base32 - "19ncvhz45dhr0nmymwkxspq9l44gaafkspxiwxbqs1hpnqxmzgx8")) + "15yj2gddlp68wj1k9q4q70vs6r7zx5qkbavcppmls5di212xdndg")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-3.56-pkgconfig.patch" "nss-getcwd-nonnull.patch" diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 6e4583115c..056fdba450 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -126,7 +126,7 @@ in the Mozilla clients.") (replacement nss/fixed) ;; Also update and test the nss-certs package, which duplicates version and ;; source to avoid a top-level variable reference & module cycle. - (version "3.81") + (version "3.85") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -137,7 +137,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "19ncvhz45dhr0nmymwkxspq9l44gaafkspxiwxbqs1hpnqxmzgx8")) + "15yj2gddlp68wj1k9q4q70vs6r7zx5qkbavcppmls5di212xdndg")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-3.56-pkgconfig.patch" "nss-getcwd-nonnull.patch" @@ -200,7 +200,7 @@ in the Mozilla clients.") ;; leading to test failures: ;; . To ;; work around that, set the time to roughly the release date. - (invoke "faketime" "2022-06-01" "./nss/tests/all.sh")) + (invoke "faketime" "2022-11-01" "./nss/tests/all.sh")) (format #t "test suite not run~%")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 0a5243913cdc491d3df03949195d38a77c3c87b0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 23 Nov 2022 20:39:50 +0100 Subject: gnu: modem-manager: Update to 1.18.12. * gnu/packages/freedesktop.scm (modem-manager): Update to 1.18.12. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 672de9d55b..b6cf45b728 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1772,7 +1772,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") (define-public modem-manager (package (name "modem-manager") - (version "1.18.10") + (version "1.18.12") (source (origin (method url-fetch) (uri (string-append @@ -1780,7 +1780,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") "ModemManager-" version ".tar.xz")) (sha256 (base32 - "1sv53lvz9nfbq6jzprl5xhai0vylc01kglcdrgz2vszf5615y98n")))) + "0c74n5jl1qvq2qlbwzfkgxny8smjcgkid1nhdnl6qnlmbn9f8r5l")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From b9bf70c346c3f2bcdf31af25cd72403c1dfa2dc9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 23 Nov 2022 20:41:36 +0100 Subject: gnu: libcdio: Fix test failure with glibc 2.36. * gnu/packages/patches/libcdio-glibc-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/cdrom.scm (libcdio)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/cdrom.scm | 1 + gnu/packages/patches/libcdio-glibc-compat.patch | 43 +++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 gnu/packages/patches/libcdio-glibc-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index d4d5740b86..9ff3caa67f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1491,6 +1491,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-newer-libconfig.patch \ %D%/packages/patches/lierolibre-remove-arch-warning.patch \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ + %D%/packages/patches/libcdio-glibc-compat.patch \ %D%/packages/patches/linbox-fix-pkgconfig.patch \ %D%/packages/patches/linphone-desktop-without-sdk.patch \ %D%/packages/patches/linux-libre-infodocs-target.patch \ diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index cfb2b6b686..dcb90a634d 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -113,6 +113,7 @@ caching facility provided by the library.") (method url-fetch) (uri (string-append "mirror://gnu/libcdio/libcdio-" version ".tar.bz2")) + (patches (search-patches "libcdio-glibc-compat.patch")) (sha256 (base32 "0avi6apv5ydjy6b9c3z9a46rvp5i57qyr09vr7x4nndxkmcfjl45")))) diff --git a/gnu/packages/patches/libcdio-glibc-compat.patch b/gnu/packages/patches/libcdio-glibc-compat.patch new file mode 100644 index 0000000000..1d325bce96 --- /dev/null +++ b/gnu/packages/patches/libcdio-glibc-compat.patch @@ -0,0 +1,43 @@ +Fix test failure with glibc 2.36: + + https://savannah.gnu.org/bugs/?62948 + +Patch taken from upstream: + + https://git.savannah.gnu.org/cgit/libcdio.git/commit/?id=56335fff0f21d294cd0e478d49542a43e9495ed0 + +diff --git a/test/driver/realpath.c b/test/driver/realpath.c +index 289253e..cd46d62 100644 +--- a/test/driver/realpath.c ++++ b/test/driver/realpath.c +@@ -1,5 +1,7 @@ + /* -*- C -*- +- Copyright (C) 2010-2012, 2015, 2017 Rocky Bernstein ++ ++ Copyright (C) 2010-2012, 2015, 2017, 2022 Rocky Bernstein ++ + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -175,16 +177,17 @@ main(int argc, const char *argv[]) + rc = check_rc(symlink(psz_symlink_file, psz_symlink_file), + "symlink", psz_symlink_file); + if (0 == rc) { +- cdio_realpath(psz_symlink_file, psz_file_check); +- if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) { ++ char *retvalue = cdio_realpath(psz_symlink_file, psz_file_check); ++ if (0 != retvalue) { ++ if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) { + fprintf(stderr, "direct cdio_realpath cycle test failed. %s vs %s\n", + psz_file_check, symlink_file); + rc = 5; + goto err_exit; ++ } ++ check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file); + } +- check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file); + } +- + } + + check_rc(unlink(psz_orig_file), "unlink", psz_orig_file); -- cgit v1.2.3 From ea041be41781787e5613995ba43e0e3dd29f2781 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 Nov 2022 11:00:31 +0100 Subject: gnu: sdl2: Update to 2.26.0. * gnu/packages/sdl.scm (sdl2): Update to 2.26.0. --- gnu/packages/sdl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index b37ab08642..c07a23548c 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2019, 2020 Nicolas Goaziou -;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019, 2022 Marius Bakke ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Oleg Pykhalov @@ -115,7 +115,7 @@ joystick, and graphics hardware.") (package (inherit sdl) (name "sdl2") - (version "2.24.0") + (version "2.26.0") (source (origin (method url-fetch) (uri @@ -123,7 +123,7 @@ joystick, and graphics hardware.") version ".tar.gz")) (sha256 (base32 - "15vd9najhjh6s9z9hhx7zp51iby690a1g3h7kcwjvyb82x5w7r4i")))) + "15djpp1bkf5d9mfh3xv9zlr925zq65k3gpvb9g497kpbkwbdf040")))) (arguments (substitute-keyword-arguments (package-arguments sdl) ((#:configure-flags flags) -- cgit v1.2.3 From dd8a6ace60e83f1da620edcc4b27cfa570bb83a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 Nov 2022 11:01:48 +0100 Subject: gnu: openboardview: Update to 9.0.3. * gnu/packages/electronics.scm (openboardview): Update to 9.0.3. [source](patches): Remove obsolete patch. * gnu/packages/patches/openboardview-use-system-utf8.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/electronics.scm | 7 ++-- .../patches/openboardview-use-system-utf8.patch | 48 ---------------------- 3 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 gnu/packages/patches/openboardview-use-system-utf8.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9ff3caa67f..61623c801d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1617,7 +1617,6 @@ dist_patch_DATA = \ %D%/packages/patches/onnx-skip-model-downloads.patch \ %D%/packages/patches/openbios-aarch64-riscv64-support.patch \ %D%/packages/patches/openboardview-use-system-imgui.patch \ - %D%/packages/patches/openboardview-use-system-utf8.patch \ %D%/packages/patches/openbox-python3.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 98b71e041e..4d7f4d2e05 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -252,7 +252,7 @@ supported devices, as well as input/output file format support.") (define-public openboardview (package (name "openboardview") - (version "8.95.2") + (version "9.0.3") (source (origin (method git-fetch) (uri (git-reference @@ -270,11 +270,10 @@ supported devices, as well as input/output file format support.") (delete-file-recursively f))) (scandir "." (negate (cut member <> keep)))))) (patches - (search-patches "openboardview-use-system-imgui.patch" - "openboardview-use-system-utf8.patch")) + (search-patches "openboardview-use-system-imgui.patch")) (sha256 (base32 - "1n2yfi8wpky0y231kq2zdgwn7f7kff8m53m904hxi5ppmwhx1d6q")))) + "0wmplzgi3rpkcajdrnkxvqhgxrn6qdxa6vwgd24bm10ryyhiqw54")))) (build-system cmake-build-system) (arguments (list diff --git a/gnu/packages/patches/openboardview-use-system-utf8.patch b/gnu/packages/patches/openboardview-use-system-utf8.patch deleted file mode 100644 index 25b5952bda..0000000000 --- a/gnu/packages/patches/openboardview-use-system-utf8.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 251e23422f37c93a3f460fb660c5e5bfa8200d91 Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer -Date: Sun, 2 Dec 2018 16:40:39 -0500 -Subject: [PATCH] build system: Allow using utf8.h from the system. - ---- - src/CMakeLists.txt | 12 ++++++++---- - src/openboardview/CMakeLists.txt | 1 + - 2 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 90442ed..26d4a69 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -8,10 +8,14 @@ if(NOT WIN32 OR MINGW) - endif() - - ## utf8.h ## --execute_process( -- COMMAND git submodule update --init src/utf8 -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} --) -+FIND_PATH(UTF8_INCLUDE_DIR utf8.h) -+if(NOT UTF8_INCLUDE_DIR) -+ execute_process( -+ COMMAND git submodule update --init src/utf8 -+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} -+ ) -+ set(UTF8_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/utf8) -+endif() - - ## zlib ## - find_package(ZLIB) -diff --git a/src/openboardview/CMakeLists.txt b/src/openboardview/CMakeLists.txt -index b0bdbe3..6c4564c 100644 ---- a/src/openboardview/CMakeLists.txt -+++ b/src/openboardview/CMakeLists.txt -@@ -44,6 +44,7 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${IMGUI_INCLUDE_DIRS} -+ ${UTF8_INCLUDE_DIR} - ${GLAD_INCLUDE_DIRS} - ${GTK_INCLUDE_DIRS} - ${OPENGL_INCLUDE_DIR} --- -2.34.0 - -- cgit v1.2.3 From 89297d2f5a2b53fa4fcc757e87d57bb24a80ed94 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 Nov 2022 11:04:55 +0100 Subject: gnu: sdl2-image: Add upstream-name property. * gnu/packages/sdl.scm (sdl2-image)[properties]: New field. --- gnu/packages/sdl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index c07a23548c..a41cfd4b47 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -478,7 +478,8 @@ directory.") (sha256 (base32 "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx")))) (propagated-inputs - (propagated-inputs-with-sdl2 sdl-image)))) + (propagated-inputs-with-sdl2 sdl-image)) + (properties '((upstream-name . "SDL2_image"))))) (define-public sdl2-mixer (package (inherit sdl-mixer) -- cgit v1.2.3 From 780cfb5edac2aacade60e80e1240dd9d191b597c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 Nov 2022 11:05:16 +0100 Subject: gnu: sdl2-mixer: Add upstream-name property. * gnu/packages/sdl.scm (sdl2-mixer)[properties]: New field. --- gnu/packages/sdl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index a41cfd4b47..2a0ffab824 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -517,7 +517,8 @@ directory.") (native-inputs `(("pkgconfig" ,pkg-config))) ; Needed to find the opus library. (propagated-inputs - (propagated-inputs-with-sdl2 sdl-mixer)))) + (propagated-inputs-with-sdl2 sdl-mixer)) + (properties '((upstream-name . "SDL2_mixer"))))) (define-public sdl2-net (package (inherit sdl-net) -- cgit v1.2.3 From 2b17608884d84d47d269a7da5433c90ee3dd62df Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 Nov 2022 11:05:44 +0100 Subject: gnu: sdl2-net: Add upstream-name property. * gnu/packages/sdl.scm (sdl2-net)[properties]: New field. --- gnu/packages/sdl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 2a0ffab824..620d375827 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -534,7 +534,8 @@ directory.") (base32 "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm")))) (propagated-inputs - (propagated-inputs-with-sdl2 sdl-net)))) + (propagated-inputs-with-sdl2 sdl-net)) + (properties '((upstream-name . "SDL2_net"))))) (define-public sdl2-ttf (package (inherit sdl-ttf) -- cgit v1.2.3 From 0e86ee89d4867632bc96a1979ffe0301d3ee45c5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 Nov 2022 11:06:15 +0100 Subject: gnu: sdl2-ttf: Add upstream-name property. * gnu/packages/sdl.scm (sdl2-ttf)[properties]: New field. --- gnu/packages/sdl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 620d375827..f5d7c7e019 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -555,7 +555,8 @@ directory.") (base32 "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59")))) (propagated-inputs - (propagated-inputs-with-sdl2 sdl-ttf)))) + (propagated-inputs-with-sdl2 sdl-ttf)) + (properties '((upstream-name . "SDL2_ttf"))))) (define-public guile-sdl (package -- cgit v1.2.3 From 8a90bec175701add41fb6f8b28c4dfedf49ca464 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 Nov 2022 11:08:12 +0100 Subject: gnu: sdl2-image: Update to 2.6.2. * gnu/packages/sdl.scm (sdl2-image): Update to 2.6.2. --- gnu/packages/sdl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index f5d7c7e019..7bc3aaffd3 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -468,7 +468,7 @@ directory.") (define-public sdl2-image (package (inherit sdl-image) (name "sdl2-image") - (version "2.0.5") + (version "2.6.2") (source (origin (method url-fetch) @@ -476,7 +476,7 @@ directory.") (string-append "https://www.libsdl.org/projects/SDL_image/release/" "SDL2_image-" version ".tar.gz")) (sha256 - (base32 "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx")))) + (base32 "0xs7h5cp0sz082rn1bqjqbrgwjhwcskz9i6ikiisq2yhv2s5yda8")))) (propagated-inputs (propagated-inputs-with-sdl2 sdl-image)) (properties '((upstream-name . "SDL2_image"))))) -- cgit v1.2.3 From f30bd944ce7d104c7a99e7b674bbdef18ffc8e99 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 Nov 2022 11:08:49 +0100 Subject: gnu: sdl2-mixer: Update to 2.6.2. * gnu/packages/sdl.scm (sdl2-mixer): Update to 2.6.2. [arguments]: Don't inherit; update configure flags for 2.6.2. [inputs]: Clear. [propagated-inputs]: Add FLAC, FLUIDSYNTH, LIBMODPLUG, LIBVORBIS, MPG123, and OPUSFILE. --- gnu/packages/sdl.scm | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 7bc3aaffd3..402de1eee6 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -484,7 +484,7 @@ directory.") (define-public sdl2-mixer (package (inherit sdl-mixer) (name "sdl2-mixer") - (version "2.0.4") + (version "2.6.2") (source (origin (method url-fetch) @@ -497,27 +497,31 @@ directory.") (delete-file-recursively "external") #t)) (sha256 - (base32 "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl")))) + (base32 "0wd35a9fcj1bv534k9cr4jdk076dpiqq0ayk6cybmv3d6q8aiplc")))) (arguments - (substitute-keyword-arguments (package-arguments sdl-mixer) - ((#:configure-flags flags) - `(cons* - "--disable-music-opus-shared" - ;; These options were renamed in SDL2 mixer. Keeping the inherited - ;; variants produces a harmless warning. - "--disable-music-mod-modplug-shared" - "--disable-music-midi-fluidsynth-shared" - ,flags)))) - (inputs - (modify-inputs (package-inputs sdl-mixer) - (delete "libmikmod") - (prepend opusfile - ;; The default MOD library changed in SDL2 mixer. - libmodplug))) + (list #:tests? #f ;no tests + #:configure-flags + #~'(;; Prefer system libraries to bundled codecs. + "--enable-music-flac-libflac" + "--enable-music-midi-fluidsynth" + "--enable-music-mod-modplug" + "--enable-music-mp3-mpg123" + "--enable-music-ogg-vorbis" + "--enable-music-opus" + ;; Link the libraries instead of dlopening them. + "--enable-music-flac-libflac-shared=no" + "--enable-music-midi-fluidsynth-shared=no" + "--enable-music-mod-modplug-shared=no" + "--enable-music-mp3-mpg123-shared=no" + "--enable-music-ogg-vorbis-shared=no" + "--enable-music-opus-shared=no"))) (native-inputs - `(("pkgconfig" ,pkg-config))) ; Needed to find the opus library. + (list pkg-config)) + (inputs '()) (propagated-inputs - (propagated-inputs-with-sdl2 sdl-mixer)) + (modify-inputs (propagated-inputs-with-sdl2 sdl-mixer) + ;; In Requires.private of SDL2_mixer.pc. + (append flac fluidsynth libmodplug libvorbis mpg123 opusfile))) (properties '((upstream-name . "SDL2_mixer"))))) (define-public sdl2-net -- cgit v1.2.3 From 1d8c130360ab176446ea73a4f940ef10763242aa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 Nov 2022 11:09:06 +0100 Subject: gnu: sdl2-net: Update to 2.2.0. * gnu/packages/sdl.scm (sdl2-net): Update to 2.2.0. --- gnu/packages/sdl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 402de1eee6..2e372b0d35 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -527,7 +527,7 @@ directory.") (define-public sdl2-net (package (inherit sdl-net) (name "sdl2-net") - (version "2.0.1") + (version "2.2.0") (source (origin (method url-fetch) @@ -536,7 +536,7 @@ directory.") "SDL2_net-" version ".tar.gz")) (sha256 (base32 - "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm")))) + "1svzhpf7k48jfga8ph127l99lwpgs5g5isgl9ybp2qiii0cqjjjf")))) (propagated-inputs (propagated-inputs-with-sdl2 sdl-net)) (properties '((upstream-name . "SDL2_net"))))) -- cgit v1.2.3 From 2d25b083b5eb4ccfda653620f938ba82d50c58a6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 Nov 2022 11:09:40 +0100 Subject: gnu: sdl2-ttf: Update to 2.20.1. * gnu/packages/sdl.scm (sdl2-ttf): Update to 2.20.1. --- gnu/packages/sdl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 2e372b0d35..330b7d1c13 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -544,7 +544,7 @@ directory.") (define-public sdl2-ttf (package (inherit sdl-ttf) (name "sdl2-ttf") - (version "2.0.15") + (version "2.20.1") (source (origin (method url-fetch) (uri @@ -557,7 +557,7 @@ directory.") #t)) (sha256 (base32 - "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59")))) + "0mqcgpcvzp927xv1gs51f2wqly9k9f8nxfxi69lxlfncyd8svkbq")))) (propagated-inputs (propagated-inputs-with-sdl2 sdl-ttf)) (properties '((upstream-name . "SDL2_ttf"))))) -- cgit v1.2.3 From a9b7639d4273bb7b10da4475010b14eb6eb2c64b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 Nov 2022 11:16:19 +0100 Subject: gnu: sdl2-ttf: Fix source snippet. * gnu/packages/sdl.scm (sdl2-ttf)[source](snippet): Actually delete bundled libraries. [arguments]: New field. [propagated-inputs]: Add FREETYPE and HARFBUZZ. --- gnu/packages/sdl.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 330b7d1c13..28e05ad420 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -551,15 +551,19 @@ directory.") (string-append "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-" version ".tar.gz")) (modules '((guix build utils))) - (snippet (begin - ;; Remove bundled libraries. - '(delete-file-recursively "external") - #t)) + (snippet + ;; Remove bundled libraries. + '(delete-file-recursively "external")) (sha256 (base32 "0mqcgpcvzp927xv1gs51f2wqly9k9f8nxfxi69lxlfncyd8svkbq")))) + (arguments + (list #:configure-flags #~'("--enable-freetype-builtin=no" + "--enable-harfbuzz-builtin=no"))) (propagated-inputs - (propagated-inputs-with-sdl2 sdl-ttf)) + (modify-inputs (propagated-inputs-with-sdl2 sdl-ttf) + ;; In Requires.private of SDL2_ttf.pc. + (prepend harfbuzz freetype))) (properties '((upstream-name . "SDL2_ttf"))))) (define-public guile-sdl -- cgit v1.2.3 From 2b893735a5a8e5174b98136dafea5acf9fe2596d Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 5 Nov 2022 20:33:51 +0800 Subject: gnu: libva: Update to 2.16.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (libva): Update to 2.16.0. Signed-off-by: Ludovic Courtès --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5863282011..8938c9835d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1501,14 +1501,14 @@ quality and performance.") (define-public libva (package (name "libva") - (version "2.15.0") + (version "2.16.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/intel/libva/releases/download/" version "/libva-" version ".tar.bz2")) (sha256 - (base32 "1jhy8qzfp4ydbxs9qd9km7k5wq8r4s2vq20r1q07lgld8l4x93i5")))) + (base32 "070aj9nw681a4m7f5xb662hhyib0w9q0i0s9v8vplh9cvfhaqpqi")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) -- cgit v1.2.3 From 2f8437524bea1792eed80cb914a1c6d3f83f44f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 1 Dec 2022 17:54:46 +0100 Subject: gnu: rust-pkg-config: Update to 0.3.26. * gnu/packages/crates-io.scm (rust-pkg-config-0.3): Update to 0.3.26. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 435efff276..80dd284751 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41185,7 +41185,7 @@ with additional support for PKCS#8v2 asymmetric key packages (RFC 5958).") (define-public rust-pkg-config-0.3 (package (name "rust-pkg-config") - (version "0.3.19") + (version "0.3.26") (source (origin (method url-fetch) @@ -41193,7 +41193,7 @@ with additional support for PKCS#8v2 asymmetric key packages (RFC 5958).") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0k4860955riciibxr8bhnklp79jydp4xfylwdn5v9kj96hxlac9q")))) + "0q2i61dhqvawc51zfzl3jich57w0cjgfa894hn6ings7ffgsbjba")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs -- cgit v1.2.3 From e38bb1c51ca0cf0a4f0acf6444701a23a5240a18 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 1 Dec 2022 17:56:41 +0100 Subject: gnu: rust-x11: Update to 2.20.1. * gnu/packages/crates-graphics.scm (rust-x11-2): Update to 2.20.1. [propagated-inputs]: Add MESA. --- gnu/packages/crates-graphics.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index a1b29a4022..2f072354a0 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages assembly) #:use-module (gnu packages crates-io) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -3103,7 +3104,7 @@ the platform-specific getters provided by winit, or another library.") (define-public rust-x11-2 (package (name "rust-x11") - (version "2.18.2") + (version "2.20.1") (source (origin (method url-fetch) @@ -3111,12 +3112,14 @@ the platform-specific getters provided by winit, or another library.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0wz7l6dlbraa9zalh9i45v9wibvkir9m2m1sg0jnzcbcaj9d1v3p")))) + (base32 "10pbvmcyqm6j6zr4zk7znk8silmilihv8jxmbxbl1b0pkidqsqy2")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (propagated-inputs + (list mesa)) (home-page "https://github.com/erlepereira/x11-rs") (synopsis "X11 library bindings for Rust") (description "This crate provides X11 library bindings for Rust.") -- cgit v1.2.3 From f1a5d9ff1820aac99565451ce3066c5151080935 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 1 Dec 2022 18:06:50 +0100 Subject: gnu: rust-xcb: Add 1.2.0. * gnu/packages/crates-io.scm (rust-xcb-1): New variable. (rust-xcb-0.9): Inherit from it. --- gnu/packages/crates-io.scm | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 80dd284751..7e1513e98f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) @@ -67996,8 +67997,43 @@ extended attributes.") (license (list license:asl2.0 license:expat)))) +(define-public rust-xcb-1 + (package + (name "rust-xcb") + (version "1.2.0") + (source (origin + (method url-fetch) + (uri (crate-uri "xcb" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ifnchjzf9xlwy6pfa90mwa6j43bx2bi5xl40m5gykymwbbv9bhg")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-build-flags '("--all-features") + #:cargo-test-flags '("--all-features") + #:cargo-development-inputs + (("rust-gl" ,rust-gl-0.14) + ("rust-png" ,rust-png-0.17) + ("rust-x11" ,rust-x11-2)) + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-quick-xml" ,rust-quick-xml-0.22) + ("rust-x11" ,rust-x11-2)))) + (inputs + (list mesa)) ;required by rust-x11-2 + (native-inputs + (list pkg-config)) + (home-page "https://github.com/rust-x-bindings/rust-xcb") + (synopsis "Rust bindings and wrappers for XCB") + (description + "This package provides Rust bindings and wrappers for XCB.") + (license license:expat))) + (define-public rust-xcb-0.9 (package + (inherit rust-xcb-1) (name "rust-xcb") (version "0.9.0") (source @@ -68020,12 +68056,7 @@ extended attributes.") (inputs (list libx11 libxcb xcb-proto)) (native-inputs - (list pkg-config python)) - (home-page "https://github.com/rtbo/rust-xcb") - (synopsis "Rust bindings and wrappers for XCB") - (description - "This package provides Rust bindings and wrappers for XCB.") - (license license:expat))) + (list pkg-config python)))) (define-public rust-xcursor-0.3 (package -- cgit v1.2.3 From abf6cbc0f32aa81894e4f58a75b20b527ab41aa5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 1 Dec 2022 19:17:41 +0100 Subject: gnu: rust-arbitrary: Update to 1.2.0. * gnu/packages/crates-io.scm (rust-arbitrary-1, rust-derive-arbitrary-1): Update to 1.2.0. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7e1513e98f..49fd18916b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2894,14 +2894,14 @@ last place (ULPs) comparisons.") (define-public rust-arbitrary-1 (package (name "rust-arbitrary") - (version "1.0.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (crate-uri "arbitrary" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "14a6r7q9b1kf1m7810p8bcl51q11mrwc5z7fjkz0lx6kdvyk0x13")))) + (base32 "106qgz0qxs202xlvjfyvw8dkb6ynr1ymmcclfh89l56mj2zpzm19")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -16401,14 +16401,14 @@ Rust.") (define-public rust-derive-arbitrary-1 (package (name "rust-derive-arbitrary") - (version "1.0.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (crate-uri "derive_arbitrary" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0nig0iydva7a9h9i9qyi6an9w5qjafmn3qlzvdqqiw0x2kp824jz")))) + (base32 "0zw12jc6k6aixqs6m2rsj56grhx2xjw2l8rhr8rj1wj897qdy0s9")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 1e9ec6affe3878b5ba7730c3d2d1eda6d1d01169 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 1 Dec 2022 19:18:33 +0100 Subject: gnu: rust-tinyvec: Update to 1.6.0. * gnu/packages/crates-io.scm (rust-tinyvec-1): Update to 1.6.0. [arguments]: Add RUST-ARBITRARY-1 to #:cargo-inputs. --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 49fd18916b..d9981c7679 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -60267,19 +60267,20 @@ C library.") (define-public rust-tinyvec-1 (package (name "rust-tinyvec") - (version "1.2.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (crate-uri "tinyvec" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hn3fkpb9nca9nf9znz2dxlp4ccv37hnbh67aczpzpmpbgq20ljv")))) + (base32 "0l6bl2h62a5m44jdnpn7lmj14rd44via8180i7121fvm73mmrk47")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-serde" ,rust-serde-1) + (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-serde" ,rust-serde-1) ("rust-tinyvec-macros" ,rust-tinyvec-macros-0.1)))) (home-page "https://crates.io/crates/tinyvec") (synopsis "Safe vec-like data structures") -- cgit v1.2.3 From 540871ba8cb17522d5e23d6912e8476a7c4550dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 1 Dec 2022 19:49:53 +0100 Subject: gnu: Add rust-uuid-macro-internal. * gnu/packages/crates-io.scm (rust-uuid-macro-internal): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d9981c7679..fb70d2b4c6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -65497,6 +65497,31 @@ first byte.") ("rust-serde" ,rust-serde-1) ("rust-sha1" ,rust-sha1-0.2)))))) +(define-public rust-uuid-macro-internal-1 + (package + (name "rust-uuid-macro-internal") + (version "1.2.2") + (source (origin + (method url-fetch) + (uri (crate-uri "uuid-macro-internal" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1n3nw8vydhm5l3d32j3wgdwfd68rg71m400y4ijyd4s5i7r8kg3k")))) + (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)))) + (home-page "https://github.com/uuid-rs/uuid") + (synopsis "@code{uuid!} macro implementation details") + (description + "This package contains private implementation details of the +@code{uuid!} macro. It is not intended for direct usage.") + ;; The user can choose either license. + (license (list license:asl2.0 license:expat)))) + (define-public rust-v-frame-0.2 (package (name "rust-v-frame") -- cgit v1.2.3 From d4869c846d6eb5aa1c048bf7b11a117c46de1c3c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 2 Dec 2022 20:49:37 +0100 Subject: gnu: rust-crypto-common: Update to 0.1.6. * gnu/packages/crates-io.scm (rust-crypto-common-0.1): Update to 0.1.6. [arguments]: Add RUST-TYPENUM to #:cargo-inputs. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fb70d2b4c6..dfd77b1286 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14195,24 +14195,26 @@ using const generics.") (define-public rust-crypto-common-0.1 (package (name "rust-crypto-common") - (version "0.1.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "crypto-common" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1l4q4ync13i056vjc775v0za8qh987da7yvrjj25q909cd9nngb8")))) + (version "0.1.6") + (source (origin + (method url-fetch) + (uri (crate-uri "crypto-common" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cvby95a6xg7kxdz5ln3rl9xh66nz66w46mm3g56ri1z5x815yqv")))) (build-system cargo-build-system) (arguments - `(#:skip-build? - #t - #:cargo-inputs - (("rust-generic-array" ,rust-generic-array-0.14) - ("rust-rand-core" ,rust-rand-core-0.6)))) + `(#:cargo-inputs + (("rust-generic-array" ,rust-generic-array-0.14) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-typenum" ,rust-typenum-1)))) (home-page "https://github.com/RustCrypto/traits") (synopsis "Common cryptographic traits") - (description "Common cryptographic traits") + (description + "This package contains a collection of traits which describe functionality +of cryptographic primitives.") + ;; The user can choose either license. (license (list license:expat license:asl2.0)))) (define-public rust-crypto-mac-0.11 -- cgit v1.2.3 From 11583b9cb2b1b9765f4966dd17bed829396bc00f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 2 Dec 2022 20:53:12 +0100 Subject: gnu: rust-cookie: Move versions closer together. * gnu/packages/crates-io.scm (rust-cookie-0.15): Move above other cookies. (rust-cookie-0.12): Inherit from it. --- gnu/packages/crates-io.scm | 74 ++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dfd77b1286..fa6501cf9a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12495,8 +12495,42 @@ semantics than those provided by @code{as} or @code{From}/@code{Into}.") (description "Convert strings into any case.") (license license:expat))) +(define-public rust-cookie-0.15 + (package + (name "rust-cookie") + (version "0.15.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cookie" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "03gql9c2l0wg3hpfp67wg2ns21wysk0xsjxwdbjrf0s6grrcgwfm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-aes-gcm" ,rust-aes-gcm-0.8) + ("rust-base64" ,rust-base64-0.13) + ("rust-hkdf" ,rust-hkdf-0.10) + ("rust-hmac" ,rust-hmac-0.10) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-rand" ,rust-rand-0.8) + ("rust-sha2" ,rust-sha2-0.9) + ("rust-subtle" ,rust-subtle-2) + ("rust-time" ,rust-time-0.2) + ("rust-version-check" ,rust-version-check-0.9)))) + (home-page "https://github.com/SergioBenitez/cookie-rs") + (synopsis + "Crate for parsing HTTP cookie headers and managing a cookie jar") + (description + "Parse HTTP cookie headers and manage a cookie jar with this crate. +It supports signed and private (encrypted + signed) jars.") + ;; The user can choose either license. + (license (list license:expat license:asl2.0)))) + (define-public rust-cookie-0.12 (package + (inherit rust-cookie-0.15) (name "rust-cookie") (version "0.12.0") (source @@ -12508,20 +12542,12 @@ semantics than those provided by @code{as} or @code{From}/@code{Into}.") (sha256 (base32 "1mdvqixahcywvqp0y8k2skkgbpfhsp0w73l9mz93dcrx1gq091l8")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-base64" ,rust-base64-0.10) ("rust-ring" ,rust-ring-0.14) ("rust-time" ,rust-time-0.1) - ("rust-url" ,rust-url-1)))) - (home-page "https://github.com/SergioBenitez/cookie-rs") - (synopsis - "Crate for parsing HTTP cookie headers and managing a cookie jar") - (description - "Parse HTTP cookie headers and manage a cookie jar with this crate. -It supports signed and private (encrypted + signed) jars.") - (license (list license:asl2.0 license:expat)))) + ("rust-url" ,rust-url-1)))))) (define-public rust-cookie-0.11 (package @@ -12641,36 +12667,6 @@ contents of the OS-level clipboard.") numbers using the CORDIC method.") (license license:bsd-3))) -(define-public rust-cookie-0.15 - (package - (name "rust-cookie") - (version "0.15.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "cookie" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "03gql9c2l0wg3hpfp67wg2ns21wysk0xsjxwdbjrf0s6grrcgwfm")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-aes-gcm" ,rust-aes-gcm-0.8) - ("rust-base64" ,rust-base64-0.13) - ("rust-hkdf" ,rust-hkdf-0.10) - ("rust-hmac" ,rust-hmac-0.10) - ("rust-percent-encoding" ,rust-percent-encoding-2) - ("rust-rand" ,rust-rand-0.8) - ("rust-sha2" ,rust-sha2-0.9) - ("rust-subtle" ,rust-subtle-2) - ("rust-time" ,rust-time-0.2) - ("rust-version-check" ,rust-version-check-0.9)))) - (home-page "https://github.com/SergioBenitez/cookie-rs") - (synopsis "HTTP cookie parsing and cookie jar management") - (description "This package provides HTTP cookie parsing and cookie jar -management. It supports signed and private (encrypted, authenticated) jars.") - (license (list license:expat license:asl2.0)))) - (define-public rust-core2-0.3 (package (name "rust-core2") -- cgit v1.2.3 From d3a2e011b4f602b8e8859ca58bbedfe99ec488cb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 2 Dec 2022 20:56:30 +0100 Subject: gnu: rust-const-oid: Add 0.9.1. * gnu/packages/crates-io.scm (rust-const-oid-0.9): New variable. (rust-const-oid-0.6): Inherit from it. --- gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fa6501cf9a..4650475e40 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12313,8 +12313,32 @@ the browser's console.") const functions with conditional compilations.") (license (list license:asl2.0 license:expat)))) +(define-public rust-const-oid-0.9 + (package + (name "rust-const-oid") + (version "0.9.1") + (source (origin + (method url-fetch) + (uri (crate-uri "const-oid" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fyxvwnl3x6bxhy08a3g4ryf8mky6wnhwd6ll4g6mjxgfnk1ihyf")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t)) + (home-page "https://github.com/RustCrypto/formats/tree/master/const-oid") + (synopsis "Implementation of the ISO/IEC Object Identifier (OID)") + (description + "This package is a const-friendly implementation of the ISO/IEC Object +Identifier (OID) standard as defined in ITU X.660, with support for BER/DER +encoding/decoding as well as heapless no_std (i.e., embedded) support.") + ;; The user can choose either license. + (license (list license:asl2.0 license:expat)))) + (define-public rust-const-oid-0.6 (package + (inherit rust-const-oid-0.9) (name "rust-const-oid") (version "0.6.2") (source @@ -12324,15 +12348,7 @@ const functions with conditional compilations.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "12vv7csqqjj0x1l5mf51lgqiw76k5c3mb1yzfhfcqysks2j2lvwx")))) - (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) - (home-page "https://github.com/RustCrypto/formats/tree/master/const-oid") - (synopsis "Implementation of the ISO/IEC Object Identifier (OID)") - (description - "This package is a const-friendly implementation of the ISO/IEC Object -Identifier (OID) standard as defined in ITU X.660, with support for BER/DER -encoding/decoding as well as heapless no_std (i.e., embedded) support.") - (license (list license:asl2.0 license:expat)))) + (arguments `(#:skip-build? #t)))) (define-public rust-const-random-0.1 (package -- cgit v1.2.3 From b8998b99ef89313f87b79fc36ff20ddc61269c93 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 2 Dec 2022 21:00:59 +0100 Subject: gnu: rust-typenum: Update to 1.15.0. * gnu/packages/crates-io.scm (rust-typenum-1): Update to 1.15.0. [arguments]: Add RUST-SCALE-INFO-1 to #:cargo-inputs. --- gnu/packages/crates-io.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4650475e40..2fc9174b5e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -64108,7 +64108,7 @@ deserialization.") (define-public rust-typenum-1 (package (name "rust-typenum") - (version "1.12.0") + (version "1.15.0") (source (origin (method url-fetch) @@ -64116,8 +64116,10 @@ deserialization.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0cvbksljz61ian21fnn0h51kphl0pwpzb932bv4s0rwy1wh8lg1p")))) + "11yrvz1vd43gqv738yw1v75rzngjbs7iwcgzjy3cq5ywkv2imy6w")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-scale-info" ,rust-scale-info-1)))) (home-page "https://github.com/paholg/typenum") (synopsis "Rust library for type-level numbers evaluated at compile time") (description "Typenum is a Rust library for type-level numbers evaluated at -- cgit v1.2.3 From b0d6ac6134d6b302212ff2621e6438138f739a63 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 2 Dec 2022 21:04:23 +0100 Subject: gnu: rust-bytemuck-derive: Update to 1.3.0. * gnu/packages/crates-io.scm (rust-bytemuck-derive-1): Update to 1.3.0. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2fc9174b5e..ce91d27b00 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8635,7 +8635,7 @@ in a byte slice, fast.") (define-public rust-bytemuck-derive-1 (package (name "rust-bytemuck-derive") - (version "1.0.0") + (version "1.3.0") (source (origin (method url-fetch) @@ -8643,7 +8643,7 @@ in a byte slice, fast.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1k59b6g2d87nf32qwhp73vng3al0zklxg64iiwf0pkxy74xf5ni8")))) + "1d1j74dgq9b0wx73hvirsyzr3hmi7ip16bfvwc3q0bzic2wk7qjz")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From f624eb0300ebee846b1609b7de9a1c389eda5deb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 2 Dec 2022 21:06:36 +0100 Subject: gnu: rust-bytemuck: Update to 1.12.3. * gnu/packages/crates-io.scm (rust-bytemuck-1): Update to 1.12.3. (rust-bytemuck-1.5): Remove variable. (rust-glam-0.17, rust-glam-0.16, rust-glam-0.15, rust-glam-0.14, rust-glam-0.13, rust-nalgebra-0.26)[arguments]: Change from RUST-BYTEMUCK-1.15 to RUST-BYTEMUCK-1. --- gnu/packages/crates-io.scm | 39 ++++++++------------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ce91d27b00..b8ca9a599c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8586,33 +8586,10 @@ in a byte slice, fast.") ("rust-quickcheck" ,rust-quickcheck-0.6) ("rust-rand" ,rust-rand-0.4)))))) -(define-public rust-bytemuck-1.5 - (package - (name "rust-bytemuck") - (version "1.5.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "bytemuck" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "18355qn3r9yp7ibg00r688sjx58g2qsjylwyq15w5b41b46asjss")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-bytemuck-derive" ,rust-bytemuck-derive-1)))) - (home-page "https://github.com/Lokathor/bytemuck") - (synopsis "Crate for mucking around with piles of bytes") - (description - "This package provides a crate for mucking around with piles of bytes.") - (license license:zlib))) - (define-public rust-bytemuck-1 (package (name "rust-bytemuck") - (version "1.4.0") + (version "1.12.3") (source (origin (method url-fetch) @@ -8621,7 +8598,7 @@ in a byte slice, fast.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "071043n73hwi55z9c55ga4v52v8a7ri56gqja8r98clkdyxns14j")))) + "0zwlaqkrp7r7bnl2n40x9ncpspb93d8xcckar61f54nal7csi8xa")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -24011,7 +23988,7 @@ libcurl, which is intended to be used with the @code{git2} crate.") `(#:skip-build? #t #:cargo-inputs (("rust-approx" ,rust-approx-0.5) - ("rust-bytemuck" ,rust-bytemuck-1.5) + ("rust-bytemuck" ,rust-bytemuck-1) ("rust-mint" ,rust-mint-0.5) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rand" ,rust-rand-0.8) @@ -24039,7 +24016,7 @@ graphics.") `(#:skip-build? #t ; TODO: we need a more recent criterion #:cargo-inputs (("rust-approx" ,rust-approx-0.4) - ("rust-bytemuck" ,rust-bytemuck-1.5) + ("rust-bytemuck" ,rust-bytemuck-1) ("rust-mint" ,rust-mint-0.5) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rand" ,rust-rand-0.8) @@ -24066,7 +24043,7 @@ graphics.") (arguments `(#:skip-build? #t ; TODO: we need a more recent criterion #:cargo-inputs - (("rust-bytemuck" ,rust-bytemuck-1.5) + (("rust-bytemuck" ,rust-bytemuck-1) ("rust-mint" ,rust-mint-0.5) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rand" ,rust-rand-0.8) @@ -24093,7 +24070,7 @@ graphics.") (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-bytemuck" ,rust-bytemuck-1.5) + (("rust-bytemuck" ,rust-bytemuck-1) ("rust-mint" ,rust-mint-0.5) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rand" ,rust-rand-0.8) @@ -24124,7 +24101,7 @@ graphics.") (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-bytemuck" ,rust-bytemuck-1.5) + (("rust-bytemuck" ,rust-bytemuck-1) ("rust-mint" ,rust-mint-0.5) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rand" ,rust-rand-0.7) @@ -34407,7 +34384,7 @@ transformations and statically-sized or dynamically-sized matrices.") (("rust-abomonation" ,rust-abomonation-0.7) ("rust-alga" ,rust-alga-0.9) ("rust-approx" ,rust-approx-0.4) - ("rust-bytemuck" ,rust-bytemuck-1.5) + ("rust-bytemuck" ,rust-bytemuck-1) ("rust-glam" ,rust-glam-0.13) ("rust-matrixcompare-core" ,rust-matrixcompare-core-0.1) ("rust-matrixmultiply" ,rust-matrixmultiply-0.3) -- cgit v1.2.3 From 5228d02c80a1021117a485af81a95de9d80ff023 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 2 Dec 2022 21:21:18 +0100 Subject: gnu: rust-uuid: Add 1.2.2. * gnu/packages/crates-io.scm (rust-uuid-1): New variable. (rust-uuid-0.8): Inherit from it. --- gnu/packages/crates-io.scm | 47 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b8ca9a599c..577983a222 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -65404,8 +65404,47 @@ first byte.") (base32 "0zamsj2986shm4x9zncjf2m5qy9scaw7qnxw4f89b2afpg6a8wl7")))))) +(define-public rust-uuid-1 + (package + (name "rust-uuid") + (version "1.2.2") + (source (origin + (method url-fetch) + (uri (crate-uri "uuid" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0k6fchay62ryjhkxsbbj38030lm3797c13vsp54bkd9ij3gf0bj2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1) + ("rust-trybuild" ,rust-trybuild-1) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) + ("rust-windows-sys" ,rust-windows-sys-0.42)) + #:cargo-inputs + (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-atomic" ,rust-atomic-0.5) + ("rust-getrandom" ,rust-getrandom-0.2) + ("rust-md-5" ,rust-md-5-0.10) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-sha1-smol" ,rust-sha1-smol-1) + ("rust-slog" ,rust-slog-2) + ("rust-uuid-macro-internal" ,rust-uuid-macro-internal-1) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-zerocopy" ,rust-zerocopy-0.6)))) + (home-page "https://github.com/uuid-rs/uuid") + (synopsis "Library to generate and parse UUIDs") + (description + "This package provides a library to generate and parse UUIDs.") + ;; The user can choose either license. + (license (list license:asl2.0 license:expat)))) + (define-public rust-uuid-0.8 (package + (inherit rust-uuid-1) (name "rust-uuid") (version "0.8.2") (source @@ -65417,7 +65456,6 @@ first byte.") (sha256 (base32 "1dy4ldcp7rnzjy56dxh7d2sgrcvn4q77y0a8r0a48946h66zjp5w")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -65426,12 +65464,7 @@ first byte.") ("rust-serde" ,rust-serde-1) ("rust-sha1" ,rust-sha1-0.6) ("rust-slog" ,rust-slog-2) - ("rust-winapi" ,rust-winapi-0.3)))) - (home-page "https://github.com/uuid-rs/uuid") - (synopsis "Library to generate and parse UUIDs") - (description - "This package provides a library to generate and parse UUIDs.") - (license (list license:asl2.0 license:expat)))) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-uuid-0.7 (package -- cgit v1.2.3 From a664ac9bc47204c222dfbed8948bbeb002a4236c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 2 Dec 2022 21:24:36 +0100 Subject: gnu: rust-bytecheck: Add 0.6.9. * gnu/packages/crates-io.scm (rust-bytecheck-0.6, rust-bytecheck-derive-0.6): New variables. (rust-bytecheck-0.5, rust-bytecheck-derive-0.5): Inherit accordingly. --- gnu/packages/crates-io.scm | 61 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 577983a222..c89352b89c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8466,8 +8466,33 @@ of built-in fundamental numeric types.") "This package provides a library for interaction with units of bytes.") (license license:expat))) +(define-public rust-bytecheck-0.6 + (package + (name "rust-bytecheck") + (version "0.6.9") + (source (origin + (method url-fetch) + (uri (crate-uri "bytecheck" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0vs0a8p3bpaz3vc15zknqkd5ajgzgswf2bmd1mbwdbdm28naq76i")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bytecheck-derive" ,rust-bytecheck-derive-0.6) + ("rust-ptr-meta" ,rust-ptr-meta-0.1) + ("rust-simdutf8" ,rust-simdutf8-0.1) + ("rust-uuid" ,rust-uuid-1)))) + (home-page "https://github.com/rkyv/bytecheck") + (synopsis "Type validation framework") + (description "This package provides a type validation framework for +Rust.") + (license license:expat))) + (define-public rust-bytecheck-0.5 (package + (inherit rust-bytecheck-0.6) (name "rust-bytecheck") (version "0.5.2") (source @@ -8477,22 +8502,40 @@ of built-in fundamental numeric types.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0q11ap6nqj0rsc8ypwjh918916zlrcrzdgqm175gnpb2yn9axyh1")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bytecheck-derive" ,rust-bytecheck-derive-0.5) ("rust-log" ,rust-log-0.4) ("rust-ptr-meta" ,rust-ptr-meta-0.1) - ("rust-simdutf8" ,rust-simdutf8-0.1)))) + ("rust-simdutf8" ,rust-simdutf8-0.1)))))) + +(define-public rust-bytecheck-derive-0.6 + (package + (name "rust-bytecheck-derive") + (version "0.6.9") + (source (origin + (method url-fetch) + (uri (crate-uri "bytecheck_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1gxr63mi91rrjzfzcb8pfwsnarp9i2w1n168nc05aq4fx7mpdr8k")))) + (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)))) (home-page "https://github.com/rkyv/bytecheck") - (synopsis "Type validation framework") - (description "This package provides a type validation framework for -Rust.") + (synopsis "Derive macro for bytecheck") + (description "This package provides a Derive macro for bytecheck, the type +validation framework for Rust.") (license license:expat))) (define-public rust-bytecheck-derive-0.5 (package + (inherit rust-bytecheck-derive-0.6) (name "rust-bytecheck-derive") (version "0.5.2") (source @@ -8502,17 +8545,11 @@ Rust.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0grbkwwv5j91n7zrimci6fh4k79flxga3mkjg50jysnyraizi088")))) - (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)))) - (home-page "https://github.com/rkyv/bytecheck") - (synopsis "Derive macro for bytecheck") - (description "This package provides a Derive macro for bytecheck, the type -validation framework for Rust.") - (license license:expat))) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-bytecount-0.6 (package -- cgit v1.2.3 From e30618c95b51f6cb24b69de89bbe39ab1ff9900c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 2 Dec 2022 21:32:53 +0100 Subject: gnu: Add rust-rend. * gnu/packages/crates-io.scm (rust-rend-0.3): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c89352b89c..9cd3221c4b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46682,6 +46682,26 @@ uses finite automata and guarantees linear time matching on all inputs.") #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))))) +(define-public rust-rend-0.3 + (package + (name "rust-rend") + (version "0.3.6") + (source (origin + (method url-fetch) + (uri (crate-uri "rend" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15fz3rw8c74586kxl6dcdn4s864ph884wfpg9shgnbrnnss69bvr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bytecheck" ,rust-bytecheck-0.6)))) + (home-page "https://github.com/rkyv/rend") + (synopsis "Endian-aware primitives for Rust") + (description + "This package provides endian-aware primitives for Rust.") + (license license:expat))) + (define-public rust-reopen-0.3 (package (name "rust-reopen") -- cgit v1.2.3 From ba3c5aa6a2d7e35ff13c10f62f86efa7bf54bddf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 2 Dec 2022 21:30:33 +0100 Subject: gnu: rust-rkyv: Add 0.7.39. * gnu/packages/crates-io.scm (rust-rkyv-0.7, rust-rkyv-derive-0.7): New variables. (rust-rkyv-0.6, rust-rkyv-derive-0.6): Inherit accordingly. --- gnu/packages/crates-io.scm | 65 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9cd3221c4b..6b458e98ed 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49671,8 +49671,37 @@ sub-processes using a fork-like interface.") (base32 "1n3iw9kaq70dw1rvvma0gjwydbj0f2mvvqvrva69f5cl6yv1dnd0")))))) +(define-public rust-rkyv-0.7 + (package + (name "rust-rkyv") + (version "0.7.39") + (source (origin + (method url-fetch) + (uri (crate-uri "rkyv" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "05gdspzw03hq6l58si4ixfj5xd27ljw6fiqksggnvn87bd4b7hnf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bytecheck" ,rust-bytecheck-0.6) + ("rust-hashbrown" ,rust-hashbrown-0.12) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-ptr-meta" ,rust-ptr-meta-0.1) + ("rust-rend" ,rust-rend-0.3) + ("rust-rkyv-derive" ,rust-rkyv-derive-0.7) + ("rust-seahash" ,rust-seahash-4) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-tinyvec" ,rust-tinyvec-1) + ("rust-uuid" ,rust-uuid-1)))) + (home-page "https://github.com/rkyv/rkyv") + (synopsis "Zero-copy deserialization framework for Rust") + (description "Rkyv is a zero-copy deserialization framework for Rust.") + (license license:expat))) + (define-public rust-rkyv-0.6 (package + (inherit rust-rkyv-0.7) (name "rust-rkyv") (version "0.6.7") (source @@ -49682,7 +49711,6 @@ sub-processes using a fork-like interface.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "01wsn0i8gsw958j892w8i4fyzjdsyhrh7c5zajig049kbqz5n4yb")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -49690,14 +49718,35 @@ sub-processes using a fork-like interface.") ("rust-memoffset" ,rust-memoffset-0.6) ("rust-ptr-meta" ,rust-ptr-meta-0.1) ("rust-rkyv-derive" ,rust-rkyv-derive-0.6) - ("rust-seahash" ,rust-seahash-4)))) + ("rust-seahash" ,rust-seahash-4)))))) + + +(define-public rust-rkyv-derive-0.7 + (package + (name "rust-rkyv-derive") + (version "0.7.39") + (source (origin + (method url-fetch) + (uri (crate-uri "rkyv_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1i1lmir3lm8zj8k1an7j2rchv1admqhysh6r6bfkcgmmi3fdmbkf")))) + (build-system cargo-build-system) + (arguments + `(;#:skip-build? #t + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) (home-page "https://github.com/rkyv/rkyv") - (synopsis "Zero-copy deserialization framework for Rust") - (description "Rkyv is a zero-copy deserialization framework for Rust.") + (synopsis "Derive macro for zero-copy deserialization framework") + (description "This package provides a Derive macro for the rkyv +deserialization framework.") (license license:expat))) (define-public rust-rkyv-derive-0.6 (package + (inherit rust-rkyv-derive-0.7) (name "rust-rkyv-derive") (version "0.6.7") (source @@ -49707,18 +49756,12 @@ sub-processes using a fork-like interface.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1mc7rnps41gdywahsffqlypsp9jqmp0r6hlh2nxm31bddfgli3xs")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) - (home-page "https://github.com/rkyv/rkyv") - (synopsis "Derive macro for zero-copy deserialization framework") - (description "This package provides a Derive macro for the rkyv -deserialization framework.") - (license license:expat))) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-ryu-1 (package -- cgit v1.2.3 From 6a859731ff96eda36877c68dcbc4d15ef5c537ab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 2 Dec 2022 21:36:52 +0100 Subject: gnu: Add rust-speedy. * gnu/packages/crates-io.scm (rust-speedy-0.8, rust-speedy-derive-0.8): New variables. --- gnu/packages/crates-io.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6b458e98ed..549836f0f3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -54990,6 +54990,57 @@ maximal amount of configuration possible intended.") "An RSpec inspired minimal testing framework for Rust.") (license license:expat))) +(define-public rust-speedy-0.8 + (package + (name "rust-speedy") + (version "0.8.5") + (source (origin + (method url-fetch) + (uri (crate-uri "speedy" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02crzzdlaadz2ya2ij86wamsixbklhp6lbbnji6wz46rkdhqdmip")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-glam" ,rust-glam-0.17) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-memoffset" ,rust-memoffset-0.7) + ("rust-regex" ,rust-regex-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-speedy-derive" ,rust-speedy-derive-0.8) + ("rust-uuid" ,rust-uuid-1)))) + (home-page "https://github.com/koute/speedy") + (synopsis "Binary serialization framework") + (description + "This package provides a fast binary serialization framework for Rust.") + ;; The user can choose either license. + (license (list license:expat license:asl2.0)))) + +(define-public rust-speedy-derive-0.8 + (package + (name "rust-speedy-derive") + (version "0.8.5") + (source (origin + (method url-fetch) + (uri (crate-uri "speedy-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xx4v0h2i6ncnvi7v5y5l44xh12v4pjfkakahk6f27c0c084lazb")))) + (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)))) + (home-page "https://github.com/koute/speedy") + (synopsis "Binary serialization framework") + (description + "This package provides a fast binary serialization framework, +@code{#[derive(Readable, Writable)]} support") + (license (list license:expat license:asl2.0)))) + (define-public rust-spin-0.9 (package (name "rust-spin") -- cgit v1.2.3 From 2c0bb5bbaa0ee23ab7ac863f17844140fa5fb736 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 2 Dec 2022 21:43:59 +0100 Subject: gnu: rust-ordered-float: Add 3.4.0. * gnu/packages/crates-io.scm (rust-ordered-float-3): New variable. (rust-ordered-float-2): Inherit from it. --- gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 549836f0f3..910e0c9bae 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38222,8 +38222,37 @@ system for OpenSSL.") PartialOrd types, like floats.") (license (list license:expat license:asl2.0)))) +(define-public rust-ordered-float-3 + (package + (name "rust-ordered-float") + (version "3.4.0") + (source (origin + (method url-fetch) + (uri (crate-uri "ordered-float" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1gr31ksgbqariv6hz3s5bc15a5vh4k65dyn8m7j59lhnji0b2knq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-proptest" ,rust-proptest-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-schemars" ,rust-schemars-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-speedy" ,rust-speedy-0.8)))) + (home-page "https://github.com/reem/rust-ordered-float") + (synopsis "Wrappers for total ordering on floats") + (description + "This package provides wrappers for total ordering on floats in Rust.") + (license license:expat))) + (define-public rust-ordered-float-2 (package + (inherit rust-ordered-float-3) (name "rust-ordered-float") (version "2.1.1") (source @@ -38235,7 +38264,6 @@ PartialOrd types, like floats.") (sha256 (base32 "0632g8bacvras6nig1bb1ihgc560476jkrb3is6n542ll86q8vvn")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -38243,12 +38271,7 @@ PartialOrd types, like floats.") (("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs - (("rust-serde-test" ,rust-serde-test-1)))) - (home-page "https://github.com/reem/rust-ordered-float") - (synopsis "Wrappers for total ordering on floats") - (description - "This package provides wrappers for total ordering on floats in Rust.") - (license license:expat))) + (("rust-serde-test" ,rust-serde-test-1)))))) (define-public rust-ordered-float-1 (package -- cgit v1.2.3 From 3e024b461ae78e43ca6930cfba61e5f69d8f625e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 00:03:31 +0100 Subject: gnu: rust-proc-macro2: Update to 1.0.47. * gnu/packages/crates-io.scm (rust-proc-macro2-1): Update to 1.0.47. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 910e0c9bae..936c408945 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42962,7 +42962,7 @@ in your code.") (define-public rust-proc-macro2-1 (package (name "rust-proc-macro2") - (version "1.0.43") + (version "1.0.47") (source (origin (method url-fetch) @@ -42970,7 +42970,7 @@ in your code.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1avvpf4qki8mg2na60yr3afbsfl5p6vllac6516xgwy93g3a4b0a")))) + "09g7alc7mlbycsadfh7lwskr1qfxbiic9qp9z751cqz3n04dk8sy")))) (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--lib") -- cgit v1.2.3 From 779cea2345ca381d60630db44d7b13cdd23e17f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 00:04:53 +0100 Subject: gnu: rust-syn: Update to 1.0.105. * gnu/packages/crates-io.scm (rust-syn-1): Update to 1.0.105. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 936c408945..3271c359a3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -57206,7 +57206,7 @@ interface") (define-public rust-syn-1 (package (name "rust-syn") - (version "1.0.99") + (version "1.0.105") (source (origin (method url-fetch) @@ -57214,7 +57214,7 @@ interface") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "04xba78p559nl737llv7nqcwm723dp6ah5bbp0h5w1amqrpfznsq")))) + "0279ivl07g0y5fs5bwmglhkdvi99ypcm36yb774f8bbh8lyv9fb0")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From adbffb00eb706e1c47a6cecd3c6b8fea5740a68c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 00:11:26 +0100 Subject: gnu: rust-serde-derive: Skip build. * gnu/packages/crates-io.scm (rust-serde-derive-1)[arguments]: Add #:skip-build?, because it does not work; and to break a dependency cycle with RUST-SERDE-1, which is removed from #:cargo-development-inputs. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3271c359a3..9909729057 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -51892,12 +51892,11 @@ TOML/JSON/MessagePack strings and serializable values.") (base32 "0dym0l8a0pch0mkqnhrf89n4wngzwf0d1z88hb8dhs456acic87d")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)) - #:cargo-development-inputs - (("rust-serde" ,rust-serde-1)))) + ("rust-syn" ,rust-syn-1)))) (home-page "https://serde.rs") (synopsis "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]") -- cgit v1.2.3 From 08c6a8f953fb5a735cbaca2dc26e1595e0a41c72 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 00:13:44 +0100 Subject: gnu: rust-serde: Update to 1.0.148. * gnu/packages/crates-io.scm (rust-serde-1, rust-serde-derive-1): Update to 1.0.148. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9909729057..7973893fb4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -51527,14 +51527,14 @@ fragment of code.") (define-public rust-serde-1 (package (name "rust-serde") - (version "1.0.133") + (version "1.0.148") (source (origin (method url-fetch) (uri (crate-uri "serde" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16lq33l09nkm0hxdhfjjmh3yjv83rrcqw9lbxb8y4q3va5km0mlp")))) + (base32 "1p62a9n1527bv3k0fmjgny1ps12mr90v3qbn0rnis6d09fxn8gz5")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -51882,14 +51882,14 @@ TOML/JSON/MessagePack strings and serializable values.") (define-public rust-serde-derive-1 (package (name "rust-serde-derive") - (version "1.0.133") + (version "1.0.148") (source (origin (method url-fetch) (uri (crate-uri "serde-derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0dym0l8a0pch0mkqnhrf89n4wngzwf0d1z88hb8dhs456acic87d")))) + (base32 "031cp7vd2zq479zjrzpwpfzhphilgng30dv1pyx22dd5b9194m55")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 2278caa4807b39584f9bbd12d491811b3594d390 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 00:15:18 +0100 Subject: gnu: Add rust-toml-datetime. * gnu/packages/crates-io.scm (rust-toml-datetime-0.5): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7973893fb4..9864d9fa6f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -62272,6 +62272,27 @@ serializing Rust structures.") (license (list license:asl2.0 license:expat)))) +(define-public rust-toml-datetime-0.5 + (package + (name "rust-toml-datetime") + (version "0.5.0") + (source (origin + (method url-fetch) + (uri (crate-uri "toml_datetime" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zcjvygkix0hm7nv7i6ag4fd0l1pglga1wyq2l8zgy0fgpjm32w0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/toml-rs/toml") + (synopsis "TOML-compatible datetime type") + (description + "This package provides a TOML-compatible datetime type for Rust.") + ;; The user can choose either license. + (license (list license:expat license:asl2.0)))) + (define-public rust-toml-edit-0.14 (package (name "rust-toml-edit") -- cgit v1.2.3 From 1c4bf48e524d7f01bbeb6d722b5f4211f54b3144 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 00:18:49 +0100 Subject: gnu: rust-itertools: Update to 0.10.5. * gnu/packages/crates-io.scm (rust-itertools-0.10): Update to 0.10.5. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9864d9fa6f..edb1bad45e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28427,14 +28427,14 @@ whether or not a given path points to an executable file.") (define-public rust-itertools-0.10 (package (name "rust-itertools") - (version "0.10.3") + (version "0.10.5") (source (origin (method url-fetch) (uri (crate-uri "itertools" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1qy55fqbaisr9qgbn7cvdvqlfqbh1f4ddf99zwan56z7l6gx3ad9")))) + (base32 "0ww45h7nxx5kj6z2y6chlskxd1igvs4j507anr6dzg99x1h25zdh")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 4147751e3d7ea18ac8ebe182f12007c5268744a0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 00:23:12 +0100 Subject: gnu: rust-slab: Update to 0.4.7. * gnu/packages/crates-io.scm (rust-slab-0.4): Update to 0.4.7. [arguments]: New field. [native-inputs]: Add RUST-AUTOCFG-1. --- gnu/packages/crates-io.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index edb1bad45e..aa12223eaf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -53877,7 +53877,7 @@ designed for @code{immutable.rs}.") (define-public rust-slab-0.4 (package (name "rust-slab") - (version "0.4.2") + (version "0.4.7") (source (origin (method url-fetch) @@ -53885,8 +53885,15 @@ designed for @code{immutable.rs}.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1y59xsa27jk84sxzswjk60xcjf8b4fm5960jwpznrrcmasyva4f1")))) + "1vyw3rkdfdfkzfa1mh83s237sll8v5kazfwxma60bq4b59msf526")))) (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-1) + ("rust-serde-test" ,rust-serde-test-1)) + #:cargo-inputs (("rust-serde" ,rust-serde-1)))) + (native-inputs + (list rust-autocfg-1)) (home-page "https://github.com/carllerche/slab") (synopsis "Pre-allocated storage for a uniform data type") (description "This create provides a pre-allocated storage for a uniform -- cgit v1.2.3 From 767995e14278724a6266c7a95ccebc59ebe3cf8b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 13:07:33 +0100 Subject: gnu: rust-crossbeam-deque: Update to 0.8.2. * gnu/packages/crates-io.scm (rust-crossbeam-deque-0.8): Update to 0.8.2. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aa12223eaf..e84423250c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13710,18 +13710,17 @@ message passing.") (define-public rust-crossbeam-deque-0.8 (package (name "rust-crossbeam-deque") - (version "0.8.0") + (version "0.8.2") (source (origin (method url-fetch) (uri (crate-uri "crossbeam-deque" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ad995vzq74k7jd1pgn9zxbacyzj9ii6l0svhlb2dxzy8vxnxbwl")))) + (base32 "1z6ifz35lyk0mw818xcl3brgss2k8islhgdmfk9s5fwjnr982pki")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) ("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.9) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)))) -- cgit v1.2.3 From 17069dd3733b74d886e102de7ee9ecc9e86c21a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 13:28:06 +0100 Subject: gnu: rust-rustc-rayon: Add 0.4. * gnu/packages/crates-io.scm (rust-rustc-rayon-0.4, rust-rustc-rayon-core-0.4): New variables. (rust-rustc-rayon-0.3, rust-rustc-rayon-core-0.3): Inherit accordingly. --- gnu/packages/crates-io.scm | 80 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 19 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e84423250c..528b1a339f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48573,8 +48573,41 @@ hex conversion traits.") (sha256 (base32 "07pff94vqc1mhrqp9i06xzayiad4xfx7588zkqsdw875lpkqrsqc")))))) +(define-public rust-rustc-rayon-0.4 + (package + (name "rust-rustc-rayon") + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (crate-uri "rustc-rayon" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ykjr1i56jmi8ykkcr7x555wnxki1vsi703mz6n2x7k0naqg0y8s")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ;XXX can not find rayon? + #:cargo-inputs + (("rust-autocfg" ,rust-autocfg-1) + ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7) + ("rust-either" ,rust-either-1) + ("rust-rustc-rayon-core" ,rust-rustc-rayon-core-0.4)) + #:cargo-development-inputs + (("rust-docopt" ,rust-docopt-1)))) + (home-page "https://github.com/rust-lang/rustc-rayon") + (synopsis + "Simple work-stealing parallelism for Rust - fork for rustc") + (description + "Rustc-rayon is a fork of the Rayon crate. It adds a few \"in progress\" +features that rustc is using, mostly around deadlock detection. These features +are not stable and should not be used by others -- though they may find their +way into rayon proper at some point. In general, if you are not rustc, you +should be using the real rayon crate, not rustc-rayon.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-rustc-rayon-0.3 (package + (inherit rust-rustc-rayon-0.4) (name "rust-rustc-rayon") (version "0.3.0") (source @@ -48586,7 +48619,6 @@ hex conversion traits.") (sha256 (base32 "0fjvy8bf0hd1zq9d3fdxbdp4z4p1k8jfyx51k5qip3wk1pwnf9zk")))) - (build-system cargo-build-system) (arguments `(#:tests? #f #:cargo-inputs @@ -48600,20 +48632,39 @@ hex conversion traits.") ("rust-rand" ,rust-rand-0.6) ("rust-rand-xorshift" ,rust-rand-xorshift-0.1) ("rust-serde" ,rust-serde-1) - ("rust-serde-derive" ,rust-serde-derive-1)))) + ("rust-serde-derive" ,rust-serde-derive-1)))))) + +(define-public rust-rustc-rayon-core-0.4 + (package + (name "rust-rustc-rayon-core") + (version "0.4.1") + (source (origin + (method url-fetch) + (uri (crate-uri "rustc-rayon-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0c4cf58056ya3282c24bnyq39cwm1rd1m96lymfbb6yvl12929h2")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ;XXX cannot find rayon_core? + #:cargo-inputs + (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) + ("rust-num-cpus" ,rust-num-cpus-1)))) (home-page "https://github.com/rust-lang/rustc-rayon") - (synopsis - "Simple work-stealing parallelism for Rust - fork for rustc") + (synopsis "Core APIs for Rayon - fork for rustc") (description - "Rustc-rayon is a fork of the Rayon crate. It adds a few \"in progress\" -features that rustc is using, mostly around deadlock detection. These features -are not stable and should not be used by others -- though they may find their -way into rayon proper at some point. In general, if you are not rustc, you -should be using the real rayon crate, not rustc-rayon.") + "Note: This package is an unstable fork made for use in rustc + +Rayon-core represents the \"core, stable\" APIs of Rayon: join, scope, and so +forth, as well as the ability to create custom thread-pools with ThreadPool.") (license (list license:asl2.0 license:expat)))) (define-public rust-rustc-rayon-core-0.3 (package + (inherit rust-rustc-rayon-core-0.4) (name "rust-rustc-rayon-core") (version "0.3.0") (source @@ -48625,7 +48676,6 @@ should be using the real rayon crate, not rustc-rayon.") (sha256 (base32 "1cwc50mcclzfmhmi87953fjk6cc9ppmchn9mlwzfllq03y1jf97a")))) - (build-system cargo-build-system) (arguments `(#:tests? #f #:cargo-inputs @@ -48638,15 +48688,7 @@ should be using the real rayon crate, not rustc-rayon.") (("rust-libc" ,rust-libc-0.2) ("rust-rand" ,rust-rand-0.6) ("rust-rand-xorshift" ,rust-rand-xorshift-0.1) - ("rust-scoped-tls" ,rust-scoped-tls-1)))) - (home-page "https://github.com/rust-lang/rustc-rayon") - (synopsis "Core APIs for Rayon - fork for rustc") - (description - "Note: This package is an unstable fork made for use in rustc - -Rayon-core represents the \"core, stable\" APIs of Rayon: join, scope, and so -forth, as well as the ability to create custom thread-pools with ThreadPool.") - (license (list license:asl2.0 license:expat)))) + ("rust-scoped-tls" ,rust-scoped-tls-1)))))) (define-public rust-rustc-serialize-0.3 (package -- cgit v1.2.3 From 8e2ee145cca6a84a06de1fe84c75f7aa325f7da6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 13:34:14 +0100 Subject: gnu: rust-indexmap: Update to 1.9.2. * gnu/packages/crates-io.scm (rust-indexmap-1): Update to 1.9.2. [arguments]: Adjust dependencies accordingly. --- gnu/packages/crates-io.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 528b1a339f..ee9b6185e3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27428,28 +27428,28 @@ that efficiently appends and removes common indentation after every newline.") (define-public rust-indexmap-1 (package (name "rust-indexmap") - (version "1.7.0") + (version "1.9.2") (source (origin (method url-fetch) (uri (crate-uri "indexmap" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19b2zwfajhsfcgny0clv8y4jppy704znfhv8nv2dw9a18l2kcqxw")))) + (base32 "16dkr2h5p379jcr8rnb420396yvzid2myirc2w70zcf43yffg18q")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-autocfg" ,rust-autocfg-1) - ("rust-hashbrown" ,rust-hashbrown-0.11) - ("rust-rayon" ,rust-rayon-1) + (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rustc-rayon" ,rust-rustc-rayon-0.4) ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-fnv" ,rust-fnv-1) ("rust-fxhash" ,rust-fxhash-0.2) - ("rust-itertools" ,rust-itertools-0.9) + ("rust-itertools" ,rust-itertools-0.10) ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-quickcheck" ,rust-quickcheck-0.9) - ("rust-rand" ,rust-rand-0.7) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8) ("rust-serde-derive" ,rust-serde-derive-1)))) (home-page "https://github.com/bluss/indexmap") (synopsis "Hash table with consistent order and fast iteration") -- cgit v1.2.3 From 784dffe129a5ddcebfa134106a8126600151d332 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 13:39:45 +0100 Subject: gnu: rust-tokio-util: Add 0.7.4. * gnu/packages/crates-io.scm (rust-tokio-util-0.7): New variable. (rust-tokio-util-0.6): Inherit from it. --- gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ee9b6185e3..f7bfbe3a64 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -62132,17 +62132,17 @@ stream-based WebSocket implementation.") (description "Unix Domain sockets for Tokio.") (license license:expat))) -(define-public rust-tokio-util-0.6 +(define-public rust-tokio-util-0.7 (package (name "rust-tokio-util") - (version "0.6.4") + (version "0.7.4") (source (origin (method url-fetch) (uri (crate-uri "tokio-util" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0agvfvvgh225vgb2z9w83lwqcqsy3pvkcbvnaz7m7rj6dg6facgc")))) + (base32 "0h67jb56bsxy4pi1a41pda8d52569ci5clvqv3c6cg9vy1sy1chb")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -62152,16 +62152,42 @@ stream-based WebSocket implementation.") ("rust-futures-io" ,rust-futures-io-0.3) ("rust-futures-sink" ,rust-futures-sink-0.3) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-log" ,rust-log-0.4) + ("rust-hashbrown" ,rust-hashbrown-0.12) ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) ("rust-slab" ,rust-slab-0.4) - ("rust-tokio" ,rust-tokio-1)))) + ("rust-tokio" ,rust-tokio-1) + ("rust-tracing" ,rust-tracing-0.1)))) (home-page "https://tokio.rs") (synopsis "Additional utilities for working with Tokio") (description "This package provides additional utilities for working with Tokio.") (license license:expat))) +(define-public rust-tokio-util-0.6 + (package + (inherit rust-tokio-util-0.7) + (name "rust-tokio-util") + (version "0.6.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-util" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0agvfvvgh225vgb2z9w83lwqcqsy3pvkcbvnaz7m7rj6dg6facgc")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-slab" ,rust-slab-0.4) + ("rust-tokio" ,rust-tokio-1)))))) + (define-public rust-tokio-util-0.4 (package (inherit rust-tokio-util-0.6) -- cgit v1.2.3 From a3b603d578910e021d086c2d2c962189dbf543c2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 13:41:10 +0100 Subject: gnu: rust-combine: Update to 4.6.6. * gnu/packages/crates-io.scm (rust-combine-4): Update to 4.6.6. [arguments]: Update #:cargo-inputs. Add #:cargo-development-inputs. Don't skip build. --- gnu/packages/crates-io.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f7bfbe3a64..c171d5a50e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11484,17 +11484,18 @@ colors.") (define-public rust-combine-4 (package (name "rust-combine") - (version "4.6.3") + (version "4.6.6") (source (origin (method url-fetch) (uri (crate-uri "combine" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0qihymj493vvs054gzpcmp4lzb098zrj2p9miv19yzvrrjm2gdsh")))) + (base32 "1m7s43cpi36vihmlda217xxgsdni3pbwgwfsa9zimdghhjfnxv9m")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-development-inputs + (("rust-partial-io" ,rust-partial-io-0.3)) #:cargo-inputs (("rust-bytes" ,rust-bytes-1) ("rust-bytes" ,rust-bytes-0.5) @@ -11506,7 +11507,7 @@ colors.") ("rust-tokio" ,rust-tokio-1) ("rust-tokio" ,rust-tokio-0.3) ("rust-tokio" ,rust-tokio-0.2) - ("rust-tokio-util" ,rust-tokio-util-0.6)))) + ("rust-tokio-util" ,rust-tokio-util-0.7)))) (home-page "https://github.com/Marwes/combine") (synopsis "Parser combinators on arbitrary streams with zero-copy support") (description -- cgit v1.2.3 From f04d71aff5d916e63f29ba358f0cc03820b9959b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 16:00:40 +0100 Subject: gnu: Add rust-ciborium-io. * gnu/packages/crates-io.scm (rust-ciborium-io-0.2): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c171d5a50e..5abf1f3e8f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10343,6 +10343,25 @@ transfer coding.") (sha256 (base32 "11yghnd24w0i9p8g368c3pg7qh9nfz7kgri6pywja9pnmakj13a9")))))) +(define-public rust-ciborium-io-0.2 + (package + (name "rust-ciborium-io") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (crate-uri "ciborium-io" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0sdkk7l7pqi2nsbm9c6g8im1gb1qdd83l25ja9xwhg07mx9yfv9l")))) + (build-system cargo-build-system) + (home-page "https://github.com/enarx/ciborium") + (synopsis "Simplified Read/Write traits") + (description + "This package provides simplified Read/Write traits for @code{no_std} +usage.") + (license license:asl2.0))) + (define-public rust-ci-info-0.3 (package (name "rust-ci-info") -- cgit v1.2.3 From 87bad06909ea01e994e8ae7e981d5ce61b733eac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 16:04:08 +0100 Subject: gnu: Add rust-ciborium-ll. * gnu/packages/crates-io.scm (rust-ciborium-ll-0.2): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5abf1f3e8f..fdc42c1fa7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10362,6 +10362,28 @@ transfer coding.") usage.") (license license:asl2.0))) +(define-public rust-ciborium-ll-0.2 + (package + (name "rust-ciborium-ll") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (crate-uri "ciborium-ll" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06ygqh33k3hp9r9mma43gf189b6cyq62clk65f4w1q54nni30c11")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-hex" ,rust-hex-0.4)) + #:cargo-inputs (("rust-ciborium-io" ,rust-ciborium-io-0.2) + ("rust-half" ,rust-half-1)))) + (home-page "https://github.com/enarx/ciborium") + (synopsis "Low-level CBOR codec primitives") + (description + "This package provides low-level primitives for parsing the CBOR codec.") + (license license:asl2.0))) + (define-public rust-ci-info-0.3 (package (name "rust-ci-info") -- cgit v1.2.3 From 77337a18637159d11ce2a1ac893d736f5f08bd7d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 16:14:29 +0100 Subject: gnu: rust-rstest: Add 0.11.0. * gnu/packages/crates-io.scm (rust-rstest-0.11): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fdc42c1fa7..2f0328cc3c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -47666,6 +47666,27 @@ rust.") and table-based tests.") (license (list license:expat license:asl2.0)))) +(define-public rust-rstest-0.11 + (package + (inherit rust-rstest-0.15) + (name "rust-rstest") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (crate-uri "rstest" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02nh4kpfg1j4v95fhc0bxx9ak3wnz5jg70f94z92wfzyx9mcd212")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-rustc-version" ,rust-rustc-version-0.4) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-rstest-0.10 (package (inherit rust-rstest-0.15) -- cgit v1.2.3 From 2d438e4b8744ac86756561bce5b860d20fae74ed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 16:16:10 +0100 Subject: gnu: Add rust-ciborium. * gnu/packages/crates-io.scm (rust-ciborium-0.2): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2f0328cc3c..9cc5c292ff 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10343,6 +10343,34 @@ transfer coding.") (sha256 (base32 "11yghnd24w0i9p8g368c3pg7qh9nfz7kgri6pywja9pnmakj13a9")))))) +(define-public rust-ciborium-0.2 + (package + (name "rust-ciborium") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (crate-uri "ciborium" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "13vqkm88kaq8nvxhaj6qsl0gsc16rqsin014fx5902y6iib3ghdh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ciborium-io" ,rust-ciborium-io-0.2) + ("rust-ciborium-ll" ,rust-ciborium-ll-0.2) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-hex" ,rust-hex-0.4) + ("rust-rand" ,rust-rand-0.8) + ("rust-rstest" ,rust-rstest-0.11) + ("rust-serde-bytes" ,rust-serde-bytes-0.11)))) + (home-page "https://github.com/enarx/ciborium") + (synopsis "Serde implementation of CBOR") + (description + "This package provides CBOR serialization implementations for serde.") + (license license:asl2.0))) + (define-public rust-ciborium-io-0.2 (package (name "rust-ciborium-io") -- cgit v1.2.3 From ec2b5f9133eeae83728e1f804f8ecbe954323e67 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 16:23:04 +0100 Subject: gnu: Add rust-anes. * gnu/packages/crates-io.scm (rust-anes-0.1): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9cc5c292ff..c324f570d0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2679,6 +2679,31 @@ it outputs messages to Android's logcat.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4)))))) +(define-public rust-anes-0.1 + (package + (name "rust-anes") + (version "0.1.6") + (source (origin + (method url-fetch) + (uri (crate-uri "anes" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16bj1ww1xkwzbckk32j2pnbn5vk6wgsl3q4p3j9551xbcarwnijb")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ;FIXME: unresolved import anes::parser..? + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)))) + (home-page "https://github.com/zrzka/anes-rs") + (synopsis "Parse ANSI escape sequences") + (description + "This package contains an ANSI escape sequences provider and parser.") + ;; The user can choose either license. + (license (list license:expat license:asl2.0)))) + (define-public rust-ansi-parser-0.6 (package (name "rust-ansi-parser") -- cgit v1.2.3 From a90ed005a34da5bab28b1032f127d9908464de9d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 16:29:40 +0100 Subject: gnu: rust-criterion-plot: Add 0.5.0. * gnu/packages/crates-io.scm (rust-criterion-plot-0.5): New variable. (rust-criterion-plot-0.4): Inherit from it. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c324f570d0..a91abdd14b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13590,8 +13590,35 @@ Rust.") criterion.") (license (list license:expat license:asl2.0)))) +(define-public rust-criterion-plot-0.5 + (package + (name "rust-criterion-plot") + (version "0.5.0") + (source (origin + (method url-fetch) + (uri (crate-uri "criterion-plot" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1c866xkjqqhzg4cjvg01f8w6xc1j3j7s58rdksl52skq89iq4l3b")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-itertool-num" ,rust-itertools-num-0.1) + ("rust-num-complex" ,rust-num-complex-0.4) + ("rust-rand" ,rust-rand-0.8)) + #:cargo-inputs + (("rust-cast" ,rust-cast-0.3) + ("rust-itertools" ,rust-itertools-0.10)))) + (home-page "https://github.com/bheisler/criterion.rs") + (synopsis "Criterion's plotting library") + (description "This package provides criterion's plotting library.") + ;; The user can choose either license. + (license (list license:expat license:asl2.0)))) + (define-public rust-criterion-plot-0.4 (package + (inherit rust-criterion-plot-0.5) (name "rust-criterion-plot") (version "0.4.4") (source @@ -13602,7 +13629,6 @@ criterion.") (string-append name "-" version ".tar.gz")) (sha256 (base32 "0mys2zkizh5az6ax77m5aqifk0vz35rn0a6wykvmjx9gkzg9c2fh")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cast" ,rust-cast-0.2) @@ -13610,11 +13636,7 @@ criterion.") #:cargo-development-inputs (("rust-itertools-num" ,rust-itertools-num-0.1) ("rust-num-complex" ,rust-num-complex-0.2) - ("rust-rand" ,rust-rand-0.4)))) - (home-page "https://github.com/bheisler/criterion.rs") - (synopsis "Criterion's plotting library") - (description "This package provides criterion's plotting library.") - (license (list license:expat license:asl2.0)))) + ("rust-rand" ,rust-rand-0.4)))))) (define-public rust-criterion-plot-0.3 (package -- cgit v1.2.3 From ca657551e87860ea47ed6dbc2f3e4e3405e0a73b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 16:33:33 +0100 Subject: gnu: rust-criterion: Add 0.4.0. * gnu/packages/crates-io.scm (rust-criterion-0.4): New variable. (rust-criterion-0.3): Inherit from it. --- gnu/packages/crates-io.scm | 59 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a91abdd14b..b4d1f584e2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13478,8 +13478,59 @@ final xor value. It has many built-in CRC functions.") Rust.") (license license:bsd-3))) +(define-public rust-criterion-0.4 + (package + (name "rust-criterion") + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (crate-uri "criterion" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jsl4r0yc3fpkyjbi8aa1jrm69apqq9rxwnjnd9brqmaq44nxiz7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anes" ,rust-anes-0.1) + ("rust-async-std" ,rust-async-std-1) + ("rust-atty" ,rust-atty-0.2) + ("rust-cast" ,rust-cast-0.3) + ("rust-ciborium" ,rust-ciborium-0.2) + ("rust-clap" ,rust-clap-3) + ("rust-criterion-plot" ,rust-criterion-plot-0.5) + ("rust-csv" ,rust-csv-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-oorandom" ,rust-oorandom-11.1) + ("rust-plotters" ,rust-plotters-0.3) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-smol" ,rust-smol-1) + ("rust-tinytemplate" ,rust-tinytemplate-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-walkdir" ,rust-walkdir-2)) + #:cargo-development-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-futures" ,rust-futures-0.3) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://bheisler.github.io/criterion.rs/book/index.html") + (synopsis "Statistics-driven micro-benchmarking library") + (description + "This package provides a statistics-driven micro-benchmarking library.") + ;; The user can choose either license. + (license (list license:asl2.0 license:expat)))) + (define-public rust-criterion-0.3 (package + (inherit rust-criterion-0.4) (name "rust-criterion") (version "0.3.5") (source @@ -13490,7 +13541,6 @@ Rust.") (string-append name "-" version ".tar.gz")) (sha256 (base32 "044d2x7cxfvw2g558lzyllcv7jcdkw9xmacmb0nzx8pv4pyxl10n")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) @@ -13520,12 +13570,7 @@ Rust.") ("rust-futures" ,rust-futures-0.3) ("rust-quickcheck" ,rust-quickcheck-1) ("rust-rand" ,rust-rand-0.8) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://bheisler.github.io/criterion.rs/book/index.html") - (synopsis "Statistics-driven micro-benchmarking library") - (description - "This package provides a statistics-driven micro-benchmarking library.") - (license (list license:asl2.0 license:expat)))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-criterion-0.2 (package -- cgit v1.2.3 From 3ef26c8adcc15ae4e4ea12d9f8a5d423794dbbef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 16:53:34 +0100 Subject: gnu: rust-clap-lex: Add 0.3.0. * gnu/packages/crates-io.scm (rust-clap-lex-0.3): New variable. (rust-clap-lex-0.2): Inherit from it. --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b4d1f584e2..004ac427c2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10885,28 +10885,45 @@ for programs written with Clap.") with Clap to generate Fig completion scripts.") (license (list license:expat license:asl2.0)))) -(define-public rust-clap-lex-0.2 +(define-public rust-clap-lex-0.3 (package (name "rust-clap-lex") - (version "0.2.4") + (version "0.3.0") (source (origin (method url-fetch) - (uri (crate-uri "clap-lex" version)) + (uri (crate-uri "clap_lex" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18")))) + "1a4dzbnlxiamfsn0pnkhn7n9bdfjh66j9fxm6mmr7d227vvrhh8d")))) (build-system cargo-build-system) (arguments - (list #:cargo-inputs - `(("rust-os-str-bytes" ,rust-os-str-bytes-6)))) + `(#:cargo-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-6)))) (home-page "https://github.com/clap-rs/clap/tree/master/clap_lex") (synopsis "Command line parser for Clap") (description - "This package provides a parser for command line options. As opposed to a -declarative parser, @code{rust-clap-lex} processes arguments as a stream of tokens.") + "This package provides a parser for command line options. As opposed +to a declarative parser, @code{rust-clap-lex} processes arguments as a +stream of tokens.") + ;; The user can choose either license. (license (list license:expat license:asl2.0)))) +(define-public rust-clap-lex-0.2 + (package + (inherit rust-clap-lex-0.3) + (name "rust-clap-lex") + (version "0.2.4") + (source (origin + (method url-fetch) + (uri (crate-uri "clap-lex" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs `(("rust-os-str-bytes" ,rust-os-str-bytes-6)))))) + (define-public rust-clearscreen-1 (package (name "rust-clearscreen") -- cgit v1.2.3 From 8d74703777ba2a93bc7140ee6190d107b3bad43c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 17:02:00 +0100 Subject: gnu: rust-hermit-abi: Add 0.2.6. * gnu/packages/crates-io.scm (rust-hermit-abi-0.2): New variable. (rust-hermit-abi-0.1): Inherit from it. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 004ac427c2..b92ae6acd9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25785,8 +25785,35 @@ consistent, and reasonably well performing.") #:cargo-inputs (("rust-unicode-segmentation" ,rust-unicode-segmentation-1)))))) +(define-public rust-hermit-abi-0.2 + (package + (name "rust-hermit-abi") + (version "0.2.6") + (source (origin + (method url-fetch) + (uri (crate-uri "hermit-abi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1iz439yz9qzk3rh9pqx2rz5c4107v3qbd7bppfsbzb1mzr02clgf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))) + (home-page "https://github.com/hermitcore/rusty-hermit") + (synopsis "Small interface to call functions from RustyHermit") + (description + "Hermit-abi is small interface to call functions from the unikernel RustyHermit. +It is used to build the target x86_64-unknown-hermit.") + ;; The user can choose either license. + (license (list license:expat license:asl2.0)))) + (define-public rust-hermit-abi-0.1 (package + (inherit rust-hermit-abi-0.2) (name "rust-hermit-abi") (version "0.1.10") (source @@ -25798,19 +25825,12 @@ consistent, and reasonably well performing.") (sha256 (base32 "0blmmzik5cs79ivq70s9gal8ypgzj50wnl2hwsaam46gjjbz2p3j")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) ("rust-libc" ,rust-libc-0.2) - ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))) - (home-page "https://github.com/hermitcore/rusty-hermit") - (synopsis "Small interface to call functions from RustyHermit") - (description - "Hermit-abi is small interface to call functions from the unikernel RustyHermit. -It is used to build the target x86_64-unknown-hermit.") - (license (list license:expat license:asl2.0)))) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))))) (define-public rust-hex-0.4 (package -- cgit v1.2.3 From 82e2e3dd53fe0093700f69f434af4402dacf69ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 17:09:49 +0100 Subject: gnu: rust-os-pipe: Update to 1.1.2. * gnu/packages/crates-io.scm (rust-os-pipe-1): Update to 1.1.2. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b92ae6acd9..e37beb73bc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38546,19 +38546,19 @@ under its new name.") (define-public rust-os-pipe-1 (package (name "rust-os-pipe") - (version "1.0.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (crate-uri "os-pipe" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0mczqmqrkzmln4xg5ki1gwgykf4dsii0h4p7fxf667889ysz54ic")))) + (base32 "0fa640v9bi1qcq3jgq1p76lphi4fwj4a9msrmfrq87n1z3qm58n6")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-winapi" ,rust-winapi-0.3)))) + ("rust-windows-sys" ,rust-windows-sys-0.42)))) (native-inputs (list python-minimal-wrapper)) ; For the tests. (home-page "https://github.com/oconnor663/os_pipe.rs") -- cgit v1.2.3 From aec7244a752e8ee49121ebfda2aec1818a009e83 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 17:12:16 +0100 Subject: gnu: rust-io-lifetimes: Add 1.0.3. * gnu/packages/crates-io.scm (rust-io-lifetimes-1): New variable. (rust-io-lifetimes-0.7): Inherit from it. --- gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e37beb73bc..8d1ed0e340 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28307,8 +28307,38 @@ versions < 0.2.") ;; Either license can be chosen at the users option. (license (list license:expat license:asl2.0)))) +(define-public rust-io-lifetimes-1 + (package + (name "rust-io-lifetimes") + (version "1.0.3") + (source (origin + (method url-fetch) + (uri (crate-uri "io-lifetimes" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0g76f1c4w3cgyl6qn3kfmi7srphrmjhx3a0rl4qks4ib4n9jl4a6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-fs-err" ,rust-fs-err-2) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.8) + ("rust-os-pipe" ,rust-os-pipe-1) + ("rust-socket2" ,rust-socket2-0.4) + ("rust-tokio" ,rust-tokio-1) + ("rust-windows-sys" ,rust-windows-sys-0.42)))) + (home-page "https://github.com/sunfishcode/io-lifetimes") + (synopsis "Low-level I/O ownership and borrowing library") + (description + "This package provides a low-level I/O ownership and borrowing +library.") + ;; The user can choose either license. + (license (list license:asl2.0 license:expat)))) + (define-public rust-io-lifetimes-0.7 (package + (inherit rust-io-lifetimes-1) (name "rust-io-lifetimes") (version "0.7.5") (source (origin @@ -28318,7 +28348,6 @@ versions < 0.2.") (sha256 (base32 "0x10ak2iy4p24g7bnp1rfrq6aqddjlzkykgwjdayi7nl97wmxkjr")))) - (build-system cargo-build-system) (arguments (list #:cargo-inputs `(("rust-async-std" ,rust-async-std-1) @@ -28328,14 +28357,7 @@ versions < 0.2.") ("rust-os-pipe" ,rust-os-pipe-1) ("rust-socket2" ,rust-socket2-0.4) ("rust-tokio" ,rust-tokio-1) - ("rust-windows-sys" ,rust-windows-sys-0.42)))) - (home-page "https://github.com/sunfishcode/io-lifetimes") - (synopsis "Low-level I/O ownership and borrowing library") - (description - "This package provides a low-level I/O ownership and borrowing -library.") - (license (list license:asl2.0 - license:expat)))) + ("rust-windows-sys" ,rust-windows-sys-0.42)))))) (define-public rust-iovec-0.1 (package -- cgit v1.2.3 From 723fa11938fdef445d3d80cf458885711f2e0c23 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 17:20:32 +0100 Subject: gnu: rust-linux-raw-sys: Add 0.1.3. * gnu/packages/crates-io.scm (rust-linux-raw-sys-0.1): New variable. (rust-linux-raw-sys-0.0.46): Inherit from it. --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8d1ed0e340..d658442587 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31269,8 +31269,37 @@ in plain text. It is smart about where a link ends, such as with trailing punctuation.") (license (list license:expat license:asl2.0)))) +(define-public rust-linux-raw-sys-0.1 + (package + (name "rust-linux-raw-sys") + (version "0.1.3") + (source (origin + (method url-fetch) + (uri (crate-uri "linux-raw-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zxlp1c4h7kkc4ldgcj5cn7dzynvlksg8y0s9czn2v1sjvc0i7wg")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-static-assertions" ,rust-static-assertions-1)) + #:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))) + (home-page "https://github.com/sunfishcode/linux-raw-sys") + (synopsis "Generated bindings for Linux APIs") + (description + "This package provides automatically generated bindings for +Linux userspace APIs.") + ;; The user can choose either license, or a variant of ASL2.0 with + ;; LLVM exception. See COPYRIGHT in the repository. + (license (list license:asl2.0 license:expat)))) + (define-public rust-linux-raw-sys-0.0.46 (package + (inherit rust-linux-raw-sys-0.1) (name "rust-linux-raw-sys") (version "0.0.46") (source (origin @@ -31287,14 +31316,7 @@ punctuation.") ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)) #:cargo-development-inputs `(("rust-libc" ,rust-libc-0.2) - ("rust-static-assertions" ,rust-static-assertions-1)))) - (home-page "https://github.com/sunfishcode/linux-raw-sys") - (synopsis "Generated bindings for Linux APIs") - (description - "This package provides automatically generated bindings for -Linux userspace APIs.") - (license (list license:asl2.0 - license:expat)))) + ("rust-static-assertions" ,rust-static-assertions-1)))))) (define-public rust-libssh2-sys-0.2 (package -- cgit v1.2.3 From 0e9e472f03a6b0b86600849654fbed5d60219a7d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 17:27:19 +0100 Subject: gnu: rust-rustix: Add 0.36.4. * gnu/packages/crates-io.scm (rust-rustix-0.36): New variable. (rust-rustix-0.35): Inherit from it. --- gnu/packages/crates-io.scm | 53 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d658442587..b77ac6efa6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49242,8 +49242,51 @@ rustc compiler.") `(("rust-failure" ,rust-failure-0.1) ,@(alist-delete "rust-anyhow" cargo-inputs))))))) +(define-public rust-rustix-0.36 + (package + (name "rust-rustix") + (version "0.36.4") + (source (origin + (method url-fetch) + (uri (crate-uri "rustix" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08vwnvf76nkgb2bbxf8cn51c43x6sc9k462khrwbb2z0g19fi4yb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-ctor" ,rust-ctor-0.1) + ("rust-errno" ,rust-errno-0.2) + ("rust-flate2" ,rust-flate2-1) + ("rust-io-lifetimes" ,rust-io-lifetimes-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-memoffset" ,rust-memoffset-0.7) + ("rust-serial-test" ,rust-serial-test-0.6)) + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cc" ,rust-cc-1) + ("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-errno" ,rust-errno-0.2) + ("rust-io-lifetimes" ,rust-io-lifetimes-1) + ("rust-itoa" ,rust-itoa-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-linux-raw-sys" ,rust-linux-raw-sys-0.1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) + ("rust-windows-sys" ,rust-windows-sys-0.42)))) + (home-page "https://github.com/bytecodealliance/rustix") + (synopsis "Safe Rust bindings to POSIX syscalls") + (description + "This package provides safe Rust bindings to POSIX syscalls.") + ;; Apache 2.0, Apache 2.0 with LLVM exception, or Expat. + (license (list license:asl2.0 license:expat)))) + (define-public rust-rustix-0.35 (package + (inherit rust-rustix-0.36) (name "rust-rustix") (version "0.35.13") (source (origin @@ -49253,7 +49296,6 @@ rustc compiler.") (sha256 (base32 "1yfmkj5nwghxd3nha5ywf1cj6zqh44qwm0cavwifr1ppcmnilykj")))) - (build-system cargo-build-system) (arguments (list #:cargo-inputs `(("rust-bitflags" ,rust-bitflags-1) @@ -49278,14 +49320,7 @@ rustc compiler.") ("rust-libc" ,rust-libc-0.2) ("rust-memoffset" ,rust-memoffset-0.6) ("rust-serial-test" ,rust-serial-test-0.6) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/bytecodealliance/rustix") - (synopsis "Safe Rust bindings to POSIX syscalls") - (description - "This package provides safe Rust bindings to POSIX syscalls.") - ;; Apache 2.0, Apache 2.0 with LLVM exception, or Expat. - (license (list license:asl2.0 - license:expat)))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-rustls-0.20 (package -- cgit v1.2.3 From 8fbf62a6f95df994d16f73496513279bfcecaa8f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Dec 2022 17:31:02 +0100 Subject: gnu: Add rust-is-terminal. * gnu/packages/crates-io.scm (rust-is-terminal): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b77ac6efa6..10cd347b2f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28623,6 +28623,31 @@ and locking in the core framework.") whether or not a given path points to an executable file.") (license (list license:expat license:asl2.0)))) +(define-public rust-is-terminal-0.4 + (package + (name "rust-is-terminal") + (version "0.4.1") + (source (origin + (method url-fetch) + (uri (crate-uri "is-terminal" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0c2322dg9s35h87ln33w6qsjlgplhzza89rwmkvac4r9ikvhjxlj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-hermit-abi" ,rust-hermit-abi-0.2) + ("rust-io-lifetimes" ,rust-io-lifetimes-1) + ("rust-rustix" ,rust-rustix-0.36) + ("rust-windows-sys" ,rust-windows-sys-0.42)))) + (home-page "https://github.com/sunfishcode/is-terminal") + (synopsis "Test whether a given stream is a terminal") + (description + "@code{is-terminal} is a simple utility that tests whether a given +stream runs in a TTY.") + (license license:expat))) + (define-public rust-iso8601-0.3 (package (name "rust-iso8601") -- cgit v1.2.3 From 031fab603b50055053d4b089845a7484e0202fc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Dec 2022 10:47:29 +0100 Subject: gnu: glslang: Install all libraries. * gnu/packages/patches/glslang-install-static-libs.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/vulkan.scm (glslang)[source](patches): New field. --- gnu/local.mk | 1 + .../patches/glslang-install-static-libs.patch | 61 ++++++++++++++++++++++ gnu/packages/vulkan.scm | 1 + 3 files changed, 63 insertions(+) create mode 100644 gnu/packages/patches/glslang-install-static-libs.patch diff --git a/gnu/local.mk b/gnu/local.mk index 61623c801d..9bd2b7e374 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1249,6 +1249,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-2.29-supported-locales.patch \ %D%/packages/patches/glibc-static-nss.patch \ %D%/packages/patches/glibc-supported-locales.patch \ + %D%/packages/patches/glslang-install-static-libs.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ diff --git a/gnu/packages/patches/glslang-install-static-libs.patch b/gnu/packages/patches/glslang-install-static-libs.patch new file mode 100644 index 0000000000..a155dde30e --- /dev/null +++ b/gnu/packages/patches/glslang-install-static-libs.patch @@ -0,0 +1,61 @@ +Install OGLCompiler et.al. even when building shared libraries. Also fix +CMake file locations. + +Patch taken from Gentoo: + + https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch + +diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt +--- a/OGLCompilersDLL/CMakeLists.txt ++++ b/OGLCompilersDLL/CMakeLists.txt +@@ -41,7 +41,7 @@ if(WIN32) + source_group("Source" FILES ${SOURCES}) + endif(WIN32) + +-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) ++if(ENABLE_GLSLANG_INSTALL) + install(TARGETS OGLCompiler EXPORT glslang-targets) + + # Backward compatibility +@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) + message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::OGLCompiler) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(OGLCompiler ALIAS glslang::OGLCompiler) +diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt +--- a/glslang/CMakeLists.txt ++++ b/glslang/CMakeLists.txt +@@ -203,7 +203,7 @@ endif() + ################################################################################ + if(ENABLE_GLSLANG_INSTALL) + install(TARGETS glslang EXPORT glslang-targets) +- if(NOT BUILD_SHARED_LIBS) ++ if(BUILD_SHARED_LIBS) + install(TARGETS MachineIndependent EXPORT glslang-targets) + install(TARGETS GenericCodeGen EXPORT glslang-targets) + +diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt +--- a/glslang/OSDependent/Unix/CMakeLists.txt ++++ b/glslang/OSDependent/Unix/CMakeLists.txt +@@ -52,7 +52,7 @@ else() + target_link_libraries(OSDependent Threads::Threads) + endif() + +-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) ++if(ENABLE_GLSLANG_INSTALL) + install(TARGETS OSDependent EXPORT glslang-targets) + + # Backward compatibility +@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) + message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::OSDependent) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(OSDependent ALIAS glslang::OSDependent) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 8d2c93c5dc..dffc6c2cdd 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -161,6 +161,7 @@ SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.") (uri (git-reference (url "https://github.com/KhronosGroup/glslang") (commit version))) + (patches (search-patches "glslang-install-static-libs.patch")) (sha256 (base32 "12a1zl8qxa28nbf6m67260c0lwdw3bqbj0jz1382wgm5px1fpqw6")) -- cgit v1.2.3 From a957aacf880e8ccee007cb61b9aafe92c7fabcf1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Dec 2022 11:04:56 +0100 Subject: gnu: python-chardet: Update to 5.1.0. * gnu/packages/python-xyz.scm (python-chardet): Update to 5.1.0. [build-system]: Change to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove custom check phase in favor of #:test-flags. --- gnu/packages/python-xyz.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 60055b19aa..cf2af55284 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14608,26 +14608,24 @@ simulation, statistical modeling, machine learning and much more.") (define-public python-chardet (package (name "python-chardet") - (version "5.0.0") + (version "5.1.0") (source (origin (method url-fetch) (uri (pypi-uri "chardet" version)) (sha256 (base32 - "1amqmz8731ly6f9rkbk09w4jqgmmgyxykd1bawhgrdbqzlmxys03")))) + "1r9ixxnish9j3dq4h0z0cwlkr4f5lgi6d8mhbzw59hbbjlmp2qhd")))) (native-inputs (list python-pytest)) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - (list #:phases + (list #:test-flags + ;; Disable test that fails sporadically: + ;; https://github.com/chardet/chardet/issues/256 + #~'("-k" "not test_detect_all_and_detect_one_should_agree") + #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "pytest" "-vv" "-k" - ;; Disable test that fails sporadically: - ;; https://github.com/chardet/chardet/issues/256 - "not test_detect_all_and_detect_one_should_agree"))) ;; This package provides a 'chardetect' executable that only ;; depends on Python, so customize the wrap phase to avoid ;; adding pytest and friends in order to save size. -- cgit v1.2.3 From 588dbc0df997bd52720af1f3fd3cb1ee7c5d2d3d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Dec 2022 11:06:15 +0100 Subject: gnu: sdl2: Update to 2.26.1. * gnu/packages/sdl.scm (sdl2): Update to 2.26.1. --- gnu/packages/sdl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 28e05ad420..4a964eca19 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -115,7 +115,7 @@ joystick, and graphics hardware.") (package (inherit sdl) (name "sdl2") - (version "2.26.0") + (version "2.26.1") (source (origin (method url-fetch) (uri @@ -123,7 +123,7 @@ joystick, and graphics hardware.") version ".tar.gz")) (sha256 (base32 - "15djpp1bkf5d9mfh3xv9zlr925zq65k3gpvb9g497kpbkwbdf040")))) + "011y6x13z8sd8dlya6d01f1z9czv9gn3gciq21ip2h6pxg3pqlq2")))) (arguments (substitute-keyword-arguments (package-arguments sdl) ((#:configure-flags flags) -- cgit v1.2.3 From 8924aa56e99e6bb856d882a9dca81b289d664c40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Dec 2022 11:34:31 +0100 Subject: gnu: postgresql@14: Update to 14.6. * gnu/packages/databases.scm (postgresql-14): Update to 14.6. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index bc3821480a..0f2dce00a1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1240,14 +1240,14 @@ pictures, sounds, or video.") (package (inherit postgresql-15) (name "postgresql") - (version "14.4") + (version "14.6") (source (origin (inherit (package-source postgresql-15)) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0slg7ld5mldmv3pn1wxxwglm4s3xc6c91ixx24apj713qlvn4fy2")))))) + "08nzkq321fzfi8ba8gck9zxxg7xvv8vz3mbl4avrmlq933y4122h")))))) (define-public postgresql-13 (package -- cgit v1.2.3 From e915abd50163c94cad612de7c378b785f56fb4fd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 22 Dec 2022 10:51:52 +0200 Subject: gnu: less: Update to 608. * gnu/packages/less.scm (less): Update to 608. --- gnu/packages/less.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm index 99bcb043b9..1ac15c369e 100644 --- a/gnu/packages/less.scm +++ b/gnu/packages/less.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020, 2021, 2022 Michael Rohleder ;;; Copyright © 2022 Hartmut Goebel +;;; Copyright © 2022 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,7 +37,7 @@ (define-public less (package (name "less") - (version "590") + (version "608") (source (origin (method url-fetch) @@ -46,7 +47,7 @@ version ".tar.gz"))) (patches (search-patches "less-hurd-path-max.patch")) (sha256 - (base32 "044fl3izmsi8n1vqzsqdp65q0qyyn5kmsg4sk7id0mxzx15zbbba")))) + (base32 "02f2d9d6hyf03va28ip620gjc6rf4aikmdyk47h7frqj18pbx6m6")))) (build-system gnu-build-system) (inputs (list ncurses)) (home-page "https://www.gnu.org/software/less/") -- cgit v1.2.3 From ac785300fd3b3ef99b5eb3cfab62d50546cd6ca2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Jan 2023 19:34:10 +0100 Subject: gnu: VLC: Remove obsolete patch. This reverts 372b037540395b688a0406c89709fdc3af880e4a, which became obsolete with af74211d987d2b8510e2f4937e65f6480754886f. * gnu/packages/video.scm (vlc)[source](patches): Remove. * gnu/packages/patches/vlc-dav1d-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/patches/vlc-dav1d-compat.patch | 70 ----------------------------- gnu/packages/video.scm | 1 - 3 files changed, 72 deletions(-) delete mode 100644 gnu/packages/patches/vlc-dav1d-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9bd2b7e374..1231d37234 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1994,7 +1994,6 @@ dist_patch_DATA = \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch \ - %D%/packages/patches/vlc-dav1d-compat.patch \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ diff --git a/gnu/packages/patches/vlc-dav1d-compat.patch b/gnu/packages/patches/vlc-dav1d-compat.patch deleted file mode 100644 index 3cb737faba..0000000000 --- a/gnu/packages/patches/vlc-dav1d-compat.patch +++ /dev/null @@ -1,70 +0,0 @@ -Fix build against dav1d 1.0. - - https://code.videolan.org/videolan/vlc/-/merge_requests/1618 - -Patch adjusted for VLC 3.0 taken from Gentoo: - - https://gitweb.gentoo.org/repo/gentoo.git/tree/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch - ---- a/modules/codec/dav1d.c -+++ b/modules/codec/dav1d.c -@@ -63,10 +63,16 @@ vlc_module_begin () - set_category(CAT_INPUT) - set_subcategory(SUBCAT_INPUT_VCODEC) - -+#if DAV1D_API_VERSION_MAJOR >= 6 -+ add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_THREADS, -+ THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) -+ add_obsolete_string("dav1d-thread-tiles") // unused with dav1d 1.0 -+#else - add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS, - THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) - add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS, - THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false) -+#endif - vlc_module_end () - - /***************************************************************************** -@@ -294,6 +300,11 @@ static int OpenDecoder(vlc_object_t *p_this) - return VLC_ENOMEM; - - dav1d_default_settings(&p_sys->s); -+#if DAV1D_API_VERSION_MAJOR >= 6 -+ p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); -+ if (p_sys->s.n_threads == 0) -+ p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16; -+#else - p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles"); - if (p_sys->s.n_tile_threads == 0) - p_sys->s.n_tile_threads = -@@ -303,6 +314,7 @@ static int OpenDecoder(vlc_object_t *p_this) - p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); - if (p_sys->s.n_frame_threads == 0) - p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16; -+#endif - p_sys->s.allocator.cookie = dec; - p_sys->s.allocator.alloc_picture_callback = NewPicture; - p_sys->s.allocator.release_picture_callback = FreePicture; -@@ -313,12 +325,20 @@ static int OpenDecoder(vlc_object_t *p_this) - return VLC_EGENERIC; - } - -+#if DAV1D_API_VERSION_MAJOR >= 6 -+ msg_Dbg(p_this, "Using dav1d version %s with %d threads", -+ dav1d_version(), p_sys->s.n_threads); -+ -+ dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1); -+#else - msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads", - dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads); - -+ dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); -+#endif -+ - dec->pf_decode = Decode; - dec->pf_flush = FlushDecoder; -- dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); - - dec->fmt_out.video.i_width = dec->fmt_in.video.i_width; - dec->fmt_out.video.i_height = dec->fmt_in.video.i_height; -GitLab diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8938c9835d..9f3aa998b2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1931,7 +1931,6 @@ videoformats depend on the configuration flags of ffmpeg.") "https://download.videolan.org/pub/videolan/vlc/" (car (string-split version #\-)) "/vlc-" version ".tar.xz")) - (patches (search-patches "vlc-dav1d-compat.patch")) (sha256 (base32 "1v7db9icrb12yz7banq2wvpjpvqfrj031yj1kf5smn35qcwl82ap")))) -- cgit v1.2.3 From bef257a1d7e37aaf8e7a635036505a0b3eec1578 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Jan 2023 20:27:08 +0100 Subject: gnu: vulkan-loader: Refer to vulkan-headers in pkg-config file. * gnu/packages/vulkan.scm (vulkan-loader)[arguments]: Add phase. --- gnu/packages/vulkan.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index dffc6c2cdd..e0ff2dc71b 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -237,6 +237,14 @@ interpretation of the specifications for these languages.") "-DBUILD_TESTS=ON") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-pkg-config-file + (lambda* (#:key inputs #:allow-other-keys) + (let ((vulkan-headers (dirname (search-input-directory + inputs "include/vulkan")))) + ;; Ensure the pkg-config file refers to vulkan-headers. + (substitute* "loader/vulkan.pc.in" + (("^includedir=.*") + (string-append "includedir=" vulkan-headers "\n")))))) (add-after 'unpack 'unpack-googletest (lambda* (#:key native-inputs inputs #:allow-other-keys) (let ((gtest (search-input-directory (or native-inputs inputs) -- cgit v1.2.3 From 5a190fce5f37cfa102d87d7c94c98fb73c6281d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Jan 2023 20:58:53 +0100 Subject: gnu: vulkan-loader: Don't build (and install) googletest. * gnu/packages/vulkan.scm (vulkan-loader)[arguments]: Add phase to use system googletest. Remove unpack-googletest phase. [native-inputs]: Change from (PACKAGE-SOURCE GOOGLETEST) to GOOGLETEST. --- gnu/packages/vulkan.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index e0ff2dc71b..dfc073b379 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner -;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020, 2023 Marius Bakke ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2022 Kaelyn Takata ;;; Copyright © 2022 dan @@ -232,8 +232,6 @@ interpretation of the specifications for these languages.") (dirname (dirname (search-input-directory %build-inputs "include/vulkan")))) - (string-append "-DGOOGLETEST_INSTALL_DIR=" - (getcwd) "/source/external/googletest") "-DBUILD_TESTS=ON") #:phases #~(modify-phases %standard-phases @@ -245,14 +243,19 @@ interpretation of the specifications for these languages.") (substitute* "loader/vulkan.pc.in" (("^includedir=.*") (string-append "includedir=" vulkan-headers "\n")))))) - (add-after 'unpack 'unpack-googletest - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let ((gtest (search-input-directory (or native-inputs inputs) - "googletest"))) - (copy-recursively (dirname gtest) - "external/googletest"))))))) + (add-after 'unpack 'use-system-googletest + (lambda _ + ;; Inform the build system that googletest is already built. + (substitute* "CMakeLists.txt" + ((".*if\\(TARGET gtest\\)") + (string-append " find_package(GTest REQUIRED)\n" + " if(true)"))) + ;; Use the namespaced variable. + (substitute* "tests/framework/CMakeLists.txt" + (("PUBLIC gtest ") + "PUBLIC GTest::gtest "))))))) (native-inputs - (list (package-source googletest) + (list googletest libxrandr pkg-config python -- cgit v1.2.3 From ac861b18c19aca3968aee71716b3625581dc33ed Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 16:58:51 +0200 Subject: gnu: rust-crossbeam-utils-0.8: Update to 0.8.14. * gnu/packages/crates-io.scm (rust-crossbeam-utils-0.8): Update to 0.8.14. [cargo-inputs]: Remove rust-once-cell-1. [cargo-development-inputs]: Add rust-rand-0.8, rust-rustversion-1. --- gnu/packages/crates-io.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 10cd347b2f..0f02a9940a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14051,20 +14051,22 @@ message passing.") (define-public rust-crossbeam-utils-0.8 (package (name "rust-crossbeam-utils") - (version "0.8.11") + (version "0.8.14") (source (origin (method url-fetch) (uri (crate-uri "crossbeam-utils" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1g426qw2j7czkbg0vw6mzifhgy1ng4qgpp2sn4vlamkvvi57v22i")))) + (base32 "17wjbnlj4whbdvc1syk2gfy8maqx01sg2hmqpdnjh9l7g7x6ddsg")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) - ("rust-loom" ,rust-loom-0.5) - ("rust-once-cell" ,rust-once-cell-1)))) + ("rust-loom" ,rust-loom-0.5)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.8) + ("rust-rustversion" ,rust-rustversion-1)))) (home-page "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils") (synopsis "Utilities for concurrent programming") -- cgit v1.2.3 From e424c8ba2110a82c613b0b4520c004af25b0fea4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 17:00:08 +0200 Subject: gnu: rust-lock-api-0.4: Update to 0.4.9. * gnu/packages/crates-io.scm (rust-lock-api-0.4): Update to 0.4.9. [cargo-inputs]: Add rust-autocfg-1. --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0f02a9940a..54f6150721 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31480,7 +31480,7 @@ by inspecting the system for user preference.") (define-public rust-lock-api-0.4 (package (name "rust-lock-api") - (version "0.4.5") + (version "0.4.9") (source (origin (method url-fetch) @@ -31488,11 +31488,12 @@ by inspecting the system for user preference.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "028izfyraynijd9h9x5miv1vmg6sjnw1v95wgm7f4xlr7h4lsaki")))) + "1py41vk243hwk345nhkn5nw0bd4m03gzjmprdjqq6rg5dwv12l23")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-owning-ref" ,rust-owning-ref-0.4) + (("rust-autocfg" ,rust-autocfg-1) + ("rust-owning-ref" ,rust-owning-ref-0.4) ("rust-scopeguard" ,rust-scopeguard-1) ("rust-serde" ,rust-serde-1)))) (home-page "https://github.com/Amanieu/parking_lot") -- cgit v1.2.3 From c36d77a0541d2e2cbe47e1322d71cca10b26b151 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 17:01:21 +0200 Subject: gnu: rust-once-cell-1: Update to 1.17.0. * gnu/packages/crates-io.scm (rust-once-cell-1): Update to 1.17.0. [arguments]: Disable tests. [cargo-inputs]: Add rust-critical-section-1. [cargo-development-inputs]: Add rust-critical-section-1. --- gnu/packages/crates-io.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 54f6150721..919bbbb26d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38070,7 +38070,7 @@ other crates to create safe wrappers around Oniguruma.") (define-public rust-once-cell-1 (package (name "rust-once-cell") - (version "1.15.0") + (version "1.17.0") (source (origin (method url-fetch) @@ -38078,14 +38078,17 @@ other crates to create safe wrappers around Oniguruma.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1q9r8c0ls1qgjp89p4rd36sjv4671pz6710c106ajwcv2c2asbg8")))) + "0rpackaf6ljxkcaa3svaiak1ddsbh0hqf5z3l7bb78hyfjhznqbg")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? #f ; Needs a newer rust + #:cargo-inputs (("rust-atomic-polyfill" ,rust-atomic-polyfill-1) + ("rust-critical-section" ,rust-critical-section-1) ("rust-parking-lot-core" ,rust-parking-lot-core-0.9)) #:cargo-development-inputs - (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) + (("rust-critical-section" ,rust-critical-section-1) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1)))) (home-page "https://github.com/matklad/once_cell") -- cgit v1.2.3 From 1577a6b23934c81f96848b5bce2744d891bd08ba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 17:03:07 +0200 Subject: gnu: rust-parking-lot-0.12: Fix build. * gnu/packages/crates-io.scm (rust-parking-lot-0.12)[arguments]: Enable tests. [cargo-inputs]: Remove rust-instant-0.1. Replace rust-parking-lot-core-0.8 with 0.9. [cargo-development-inputs]: Add rust-bincode-1, rust-rand-0.8. --- gnu/packages/crates-io.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 919bbbb26d..6b8fd82d08 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39365,11 +39365,12 @@ unparking.") (base32 "13r2xk7mnxfc5g0g6dkdxqdqad99j7s7z8zhzz4npw5r0g0v4hip")))) (build-system cargo-build-system) (arguments - (list #:skip-build? #t - #:cargo-inputs - `(("rust-instant" ,rust-instant-0.1) - ("rust-lock-api" ,rust-lock-api-0.4) - ("rust-parking-lot-core" ,rust-parking-lot-core-0.8)))) + (list #:cargo-inputs + `(("rust-lock-api" ,rust-lock-api-0.4) + ("rust-parking-lot-core" ,rust-parking-lot-core-0.9)) + #:cargo-development-inputs + `(("rust-bincode" ,rust-bincode-1) + ("rust-rand" ,rust-rand-0.8)))) (home-page "https://github.com/Amanieu/parking_lot") (synopsis "Efficient implementations of the standard synchronization primitives") -- cgit v1.2.3 From 2914db06f4fda5317a3c01f48098ff99c0dce365 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 17:05:05 +0200 Subject: gnu: rust-parking-lot-core-0.9: Update to 0.9.6. * gnu/packages/crates-io.scm (rust-parking-lot-core-0.9): Update to 0.9.6. [cargo-inputs]: Replace rust-windows-sys-0.36 with 0.42. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6b8fd82d08..dd13f42202 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39504,14 +39504,14 @@ synchronization primitives.") (define-public rust-parking-lot-core-0.9 (package (name "rust-parking-lot-core") - (version "0.9.3") + (version "0.9.6") (source (origin (method url-fetch) (uri (crate-uri "parking_lot_core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ab95rljb99rm51wcic16jgbajcr6lgbqkrr21w7bc2wyb5pk8h9")))) + "1grkf6s7zgl5blgw941g98z5csfjbrxavprspc8396aw9f0zh7ms")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -39522,7 +39522,7 @@ synchronization primitives.") ("rust-redox-syscall" ,rust-redox-syscall-0.2) ("rust-smallvec" ,rust-smallvec-1) ("rust-thread-id" ,rust-thread-id-4) - ("rust-windows-sys" ,rust-windows-sys-0.36)))) + ("rust-windows-sys" ,rust-windows-sys-0.42)))) (home-page "https://github.com/Amanieu/parking_lot") (synopsis "API for creating custom synchronization primitives") (description "This package provides an advanced API for creating custom -- cgit v1.2.3 From 381b41e43c5d3f84b6118c825178d706e94808c1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 17:06:28 +0200 Subject: gnu: newsboat: Update to 2.30.1. * gnu/packages/syndication.scm (newsboat): Update to 2.30.1. --- gnu/packages/syndication.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 769cc85d37..55c9d871e3 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2019, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2021 Felix Gruber @@ -223,14 +223,14 @@ cards.") (define-public newsboat (package (name "newsboat") - (version "2.29") + (version "2.30.1") (source (origin (method url-fetch) (uri (string-append "https://newsboat.org/releases/" version "/newsboat-" version ".tar.xz")) (sha256 - (base32 "0szx4pivkaja8v399m6v7ycp1xprm4cz7n5z929g4j191hg81f8q")))) + (base32 "0bv0al3inay6jsggaz2zja4j9jp1ffn8bp4i4jr8wd1c9asgsgs1")))) (build-system cargo-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 793463eeef00b2d58bcb8fa52f7b3d548c6f24be Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 17:07:11 +0200 Subject: gnu: rust-critical-section-1: Update to 1.1.1. * gnu/packages/crates-io.scm (rust-critical-section-1): Update to 1.1.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dd13f42202..29d013cecc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13727,14 +13727,14 @@ criterion.") (define-public rust-critical-section-1 (package (name "rust-critical-section") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (crate-uri "critical-section" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "06p0j7yy289six3k7j3m3f1phk9n7h9x2cd8fjfbw6fhh4aaaayh")))) + "0ljyfwzl8avwsr42kqmg7mmcw01d5rn1m8gnw48y2j95bnns0j35")))) (build-system cargo-build-system) (home-page "https://github.com/rust-embedded/critical-section") (synopsis "Critical section abstraction") -- cgit v1.2.3 From 59073c6bdc48f03ab18ca3721db43b57e46d583d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 17:07:12 +0200 Subject: gnu: rust-regex-1: Update to 1.7.1. * gnu/packages/crates-io.scm (rust-regex-1): Update to 1.7.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 29d013cecc..9fcd326b1c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46648,14 +46648,14 @@ memory to speed up reallocation.") (define-public rust-regex-1 (package (name "rust-regex") - (version "1.6.0") + (version "1.7.1") (source (origin (method url-fetch) (uri (crate-uri "regex" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "12wqvyh4i75j7pc8sgvmqh4yy3qaj4inc4alyv1cdf3lf4kb6kjc")))) + (base32 "0czp6hxg02lm02hvlhp9xjkd65cjcagw119crnaznwd5idsabaj8")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 791dd7f999f51dd2d7d946a42acf9fc69aa7c8c2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 17:07:12 +0200 Subject: gnu: rust-serde-1: Update to 1.0.152. * gnu/packages/crates-io.scm (rust-serde-1): Update to 1.0.152. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9fcd326b1c..ba0245512d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -51899,14 +51899,14 @@ fragment of code.") (define-public rust-serde-1 (package (name "rust-serde") - (version "1.0.148") + (version "1.0.152") (source (origin (method url-fetch) (uri (crate-uri "serde" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1p62a9n1527bv3k0fmjgny1ps12mr90v3qbn0rnis6d09fxn8gz5")))) + (base32 "1ysykpc4a9f1yn7zikdwhyfs0bpa7mlc8vsm7sl4glr1606iyzdv")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 8e819eaebb96abded96caa65fbbe2c4c1ef2d11a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 17:07:13 +0200 Subject: gnu: rust-serde-derive-1: Update to 1.0.152. * gnu/packages/crates-io.scm (rust-serde-derive-1): Update to 1.0.152. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ba0245512d..ab37de840f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52254,14 +52254,14 @@ TOML/JSON/MessagePack strings and serializable values.") (define-public rust-serde-derive-1 (package (name "rust-serde-derive") - (version "1.0.148") + (version "1.0.152") (source (origin (method url-fetch) (uri (crate-uri "serde-derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "031cp7vd2zq479zjrzpwpfzhphilgng30dv1pyx22dd5b9194m55")))) + (base32 "07jlbk3khspawlqayr5lhzgqirv031ap4p8asw199l7ciq8psj5g")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 750a5190a41e5817ebed34e6f66c0c0ec0a3754a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 18:24:09 +0200 Subject: gnu: rust-memchr-2: Update to 2.5.0. * gnu/packages/crates-io.scm (rust-memchr-2): Update to 2.5.0. [arguments]: Don't skip tests. [cargo-inputs]: Add rust-compiler-builtins-0.1, rust-rustc-std-workspace-core-1. [cargo-development-inputs]: Add rust-quickcheck-1. --- gnu/packages/crates-io.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ab37de840f..46b92387aa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32899,7 +32899,7 @@ unstable -Z self-profile flag.") (define-public rust-memchr-2 (package (name "rust-memchr") - (version "2.4.1") + (version "2.5.0") (source (origin (method url-fetch) @@ -32908,12 +32908,15 @@ unstable -Z self-profile flag.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0smq8xzd40njqpfzv5mghigj91fzlfrfg842iz8x0wqvw2dw731h")))) + "0vanfk5mzs1g1syqnj03q8n0syggnhn55dq535h2wxr7rwpfbzrd")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-libc" ,rust-libc-0.2)))) + `(#:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-1)))) (home-page "https://github.com/BurntSushi/rust-memchr") (synopsis "Safe interface to memchr") (description "The @code{memchr} crate provides heavily optimized routines -- cgit v1.2.3 From 0cd4ee43cbd0ac212414c54a6c7f1fbda793b8b2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 18:25:38 +0200 Subject: gnu: rust-nom-7: Update to 7.1.2. * gnu/packages/crates-io.scm (rust-nom-7): Update to 7.1.2. [cargo-inputs]: Remove rust-version-check-0.9. [cargo-development-inputs]: Remove rust-criterion-0.3, rust-jemallocator-0.3. [arguments]: Remove phase setting location of libjemalloc_pic.a. [native-inputs]: Remove jemalloc. (rust-n0m-6)[native-inputs]: Explicitly add jemalloc. --- gnu/packages/crates-io.scm | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 46b92387aa..9e778b0862 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36337,7 +36337,7 @@ implementation (which is unstable / requires nightly).") (define-public rust-nom-7 (package (name "rust-nom") - (version "7.1.1") + (version "7.1.2") (source (origin (method url-fetch) @@ -36346,29 +36346,16 @@ implementation (which is unstable / requires nightly).") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0djc3lq5xihnwhrvkc4bj0fd58sjf632yh6hfiw545x355d3x458")))) + "132lkkqd8hcbmpb90hncwknr7rn6knfq7774d679k74iqilpfl75")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Tests require example directory, not included in tarball. #:cargo-inputs (("rust-memchr" ,rust-memchr-2) - ("rust-minimal-lexical" ,rust-minimal-lexical-0.2) - ("rust-version-check" ,rust-version-check-0.9)) + ("rust-minimal-lexical" ,rust-minimal-lexical-0.2)) #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.3) - ("rust-doc-comment" ,rust-doc-comment-0.3) - ("rust-jemallocator" ,rust-jemallocator-0.3) - ("rust-proptest" ,rust-proptest-1)) - #:phases - (modify-phases %standard-phases - (add-after 'configure 'override-jemalloc - (lambda* (#:key inputs #:allow-other-keys) - (let ((jemalloc (assoc-ref inputs "jemalloc"))) - (setenv "JEMALLOC_OVERRIDE" - (string-append jemalloc "/lib/libjemalloc_pic.a"))) - #t))))) - (native-inputs - (list jemalloc)) + (("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-proptest" ,rust-proptest-1)))) (home-page "https://github.com/Geal/nom") (synopsis "Byte-oriented, zero-copy, parser combinators library") @@ -36411,7 +36398,8 @@ combinators library.") (let ((jemalloc (assoc-ref inputs "jemalloc"))) (setenv "JEMALLOC_OVERRIDE" (string-append jemalloc "/lib/libjemalloc_pic.a"))) - #t))))))) + #t))))) + (native-inputs (list jemalloc)))) (define-public rust-nom-5 (package -- cgit v1.2.3 From 1d564a5235fd3b409b5d96dbb15bd53cdf330735 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 18:28:44 +0200 Subject: gnu: rust-nom-6: Update to 6.2.1. * gnu/packages/crates-io.scm (rust-nom-6): Update to 6.2.1. [snippet]: Add snippet to not limit rust-memchr-2 to versions under 2.4.0. [cargo-inputs]: Add rust-funty-1. --- gnu/packages/crates-io.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9e778b0862..2f6686f6d1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36368,7 +36368,7 @@ combinators library.") (package (inherit rust-nom-7) (name "rust-nom") - (version "6.0.1") + (version "6.2.1") (source (origin (method url-fetch) @@ -36377,11 +36377,18 @@ combinators library.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1w0ppq112myzwk23c8m0wmq0nv73xvn0g9gl2kfm83aadgylq0w8")))) + "19h3l5hajpcszwl6nzcmgs4mpng73ifn6akslq7n4g1s12wm2p4w")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow any version of memchr 2. + (substitute* "Cargo.toml" + ((">=2.0, <2.4") "2.0")))))) (arguments `(#:tests? #f ; Tests require example directory, not included in tarball. #:cargo-inputs (("rust-bitvec" ,rust-bitvec-0.19) + ("rust-funty" ,rust-funty-1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-lexical-core" ,rust-lexical-core-0.7) ("rust-memchr" ,rust-memchr-2) -- cgit v1.2.3 From 9a1d86a17fdd7ab56e958268b0da8980d0c0443b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 18:58:22 +0200 Subject: gnu: rust-codespan-reporting-0.11: Update to 0.11.1. * gnu/packages/crates-io.scm (rust-codespan-reporting-0.11): Update to 0.11.1. [arguments]: Don't skip build. [cargo-development-inputs]: Add rust-anyhow-1, rust-insta-1, rust-lazy-static-1, rust-peg-0.6, rust-rustline-6, rust-structopt-0.3, rust-unindent-0.1. --- gnu/packages/crates-io.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2f6686f6d1..b9ca9955e4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11417,21 +11417,28 @@ CMAKE environmental variable is set.") (define-public rust-codespan-reporting-0.11 (package (name "rust-codespan-reporting") - (version "0.11.0") + (version "0.11.1") (source (origin (method url-fetch) (uri (crate-uri "codespan-reporting" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "04wwbn2c5rcfz3zn4kj7nyvpj37hn5cxh0m8w1r3af4ak6w45kn6")))) + (base32 "0vkfay0aqk73d33kh79k1kqxx06ka22894xhqi89crnc6c6jff1m")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-serde" ,rust-serde-1) ("rust-termcolor" ,rust-termcolor-1) - ("rust-unicode-width" ,rust-unicode-width-0.1)))) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-insta" ,rust-insta-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-peg" ,rust-peg-0.6) + ("rust-rustyline" ,rust-rustyline-6) + ("rust-structopt" ,rust-structopt-0.3) + ("rust-unindent" ,rust-unindent-0.1)))) (home-page "https://github.com/brendanzab/codespan") (synopsis "Beautiful diagnostic reporting for text-based programming languages") (description -- cgit v1.2.3 From 457540b264983f361163eec97c04d99d86f3c286 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 19:00:37 +0200 Subject: gnu: rust-cxx-1: Update to 1.0.86. * gnu/packages/crates-io.scm (rust-cxx-1, rust-cxxbridge-flags-1, rust-cxxbridge-macro-1): Update to 1.0.86. (rust-cxx-build-1): Update to 1.0.86. [cargo-development-inputs]: Add rust-cxx-1. (rust-cxx-gen-0.7): Update to 0.7.86. [cargo-inputs]: Remove rust-cc-1. --- gnu/packages/crates-io.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b9ca9955e4..3319e599bc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15219,7 +15219,7 @@ attributes.") (define-public rust-cxx-1 (package (name "rust-cxx") - (version "1.0.49") + (version "1.0.86") (source (origin (method url-fetch) @@ -15228,7 +15228,7 @@ attributes.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0xj29zzd45bkk797902h22kppzmrzm7v9a2wijfiqr964vhrldk5")))) + "0yc5gz723hiwqk7waygj63655fh5vzq3551p1j2wyzc06xf0glai")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Cannot compile cxx-test-suite. @@ -15279,7 +15279,7 @@ attributes.") (define-public rust-cxx-build-1 (package (name "rust-cxx-build") - (version "1.0.49") + (version "1.0.86") (source (origin (method url-fetch) @@ -15288,7 +15288,7 @@ attributes.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0shmkgv3cnh06ws1p555znj1hh23phynaz73rgnz95gradsdwnwg")))) + "0w5a2wdkdh44gmi0psynaazx4j7d1947sr7nyaccayxjc4gjhi2h")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -15300,7 +15300,8 @@ attributes.") ("rust-scratch" ,rust-scratch-1) ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs - (("rust-cxx-gen" ,rust-cxx-gen-0.7) + (("rust-cxx" ,rust-cxx-1) + ("rust-cxx-gen" ,rust-cxx-gen-0.7) ("rust-pkg-config" ,rust-pkg-config-0.3)))) (home-page "https://cxx.rs") (synopsis "C++ code generator") @@ -15339,7 +15340,7 @@ crate into a Cargo build.") (define-public rust-cxx-gen-0.7 (package (name "rust-cxx-gen") - (version "0.7.49") + (version "0.7.86") (source (origin (method url-fetch) @@ -15348,12 +15349,11 @@ crate into a Cargo build.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08v366jxd2vc8jc2cbvrga0866pwfcaq6hl8yylfx0vhs2n53j53")))) + "1z08a3c4xpnz91a4nc2b4f2kbmadjrrimr8awx1k4g0rmjdmq5mr")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-cc" ,rust-cc-1) - ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) + (("rust-codespan-reporting" ,rust-codespan-reporting-0.11) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))) @@ -15409,7 +15409,7 @@ crate into higher level tools.") (define-public rust-cxxbridge-flags-1 (package (name "rust-cxxbridge-flags") - (version "1.0.49") + (version "1.0.86") (source (origin (method url-fetch) @@ -15418,7 +15418,7 @@ crate into higher level tools.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "18cv8a8sgyiwfqspdyfq18jizf0rlhg90ibdl0zp8jhcv498s6gr")))) + "073qx3gnf8df9xzfy9xfcz9b79m0638x4a0isfq2fb527g4hpdb1")))) (build-system cargo-build-system) (home-page "https://github.com/dtolnay/cxx") (synopsis "Compiler configuration of the `cxx` crate") @@ -15444,7 +15444,7 @@ crate (implementation detail).") (define-public rust-cxxbridge-macro-1 (package (name "rust-cxxbridge-macro") - (version "1.0.49") + (version "1.0.86") (source (origin (method url-fetch) @@ -15453,7 +15453,7 @@ crate (implementation detail).") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0gkwvihw74dh8p3fz3552wnxanrpwmwfy38ylz2z8knjq0y8y4v3")))) + "19c7pjvjll72yb9wyrmpdylwqglizn8kayww8qcm24b2gvd1zrir")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 8f656accc0ad311f4086662db3f258ced6758ff2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 19:04:06 +0200 Subject: gnu: rust-link-cplusplus-1: Update to 1.0.8. * gnu/packages/crates-io.scm (rust-link-cplusplus-1): Update to 1.0.8. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3319e599bc..664b5f2ced 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31189,7 +31189,7 @@ to count the number of lines in a file.") (define-public rust-link-cplusplus-1 (package (name "rust-link-cplusplus") - (version "1.0.4") + (version "1.0.8") (source (origin (method url-fetch) @@ -31198,7 +31198,7 @@ to count the number of lines in a file.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0m7365ig7r88x7b4gkzj5m7b6wiq42pi1ign7mvyq63jr22sfspr")))) + "1x84vvg7gn94x9zrvd67602h3ricmhlv19cpl2alzhqkqz4hglpc")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cc" ,rust-cc-1)))) -- cgit v1.2.3 From 7f1f51a464ef97c71198a2e5c45a55147f1cb268 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 19:04:06 +0200 Subject: gnu: rust-trybuild-1: Update to 1.0.75. * gnu/packages/crates-io.scm (rust-trybuild-1): Update to 1.0.75. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 664b5f2ced..4067a7f372 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -64255,14 +64255,14 @@ the Trust-DNS client to use rustls for TLS.") (define-public rust-trybuild-1 (package (name "rust-trybuild") - (version "1.0.54") + (version "1.0.75") (source (origin (method url-fetch) (uri (crate-uri "trybuild" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0gzxbal0zdjnwilsisgbm59c242gvym8dafwsl5s8b5nhvzl6hzh")))) + (base32 "1wylxysdpbjz3cddaxvjnfk8vadi05chdivwg9l878c7b8hjq8gi")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 58b1ff41ab09f1ebc293939fbf8942d986d31a4b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 19:46:13 +0200 Subject: gnu: rust-serde-big-array-0.3: Update to 0.3.3. * gnu/packages/crates-io.scm (rust-serde-big-array-0.3): Update to 0.3.3. [cargo-inputs]: Move rust-serde-derive-1 ... [cargo-development-inputs]: ... to here. --- gnu/packages/crates-io.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4067a7f372..05c416d7ff 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -51971,21 +51971,21 @@ fragment of code.") (define-public rust-serde-big-array-0.3 (package (name "rust-serde-big-array") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (crate-uri "serde-big-array" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0qpy3nk3dpxrrmcfmcnsijad10yi0jxy1x6gc6bbwywma9vhxchq")))) + (base32 "190hrlbilvarn5almh3n2s4di9qagxnz3chv6xaw1c72dygzacfd")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-serde" ,rust-serde-1) - ("rust-serde-derive" ,rust-serde-derive-1)) + (("rust-serde" ,rust-serde-1)) #:cargo-development-inputs - (("rust-serde-json" ,rust-serde-json-1)))) + (("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/est31/serde-big-array") (synopsis "Big array helper for serde") (description "This package provides a big array helper for serde.") -- cgit v1.2.3 From dadad45b233889b9f0e20ff8cfa8a9718cb440bf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 19:47:22 +0200 Subject: gnu: rust-serde-bytes-0.11: Update to 0.11.8. * gnu/packages/crates-io.scm (rust-serde-bytes-0.11): Update to 0.11.8. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 05c416d7ff..05ee9c116e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52034,7 +52034,7 @@ fragment of code.") (define-public rust-serde-bytes-0.11 (package (name "rust-serde-bytes") - (version "0.11.5") + (version "0.11.8") (source (origin (method url-fetch) @@ -52042,11 +52042,10 @@ fragment of code.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1fcb6sw8wkrj4ylm118wkb31hw124nkjnqyhbgqnd8w85zfhgbhn")))) + (base32 "06a8lv3x1zm1ynzq6xri4k46zklnzh62i6y47w4rjvxkypzwb3bi")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) -- cgit v1.2.3 From a6189ee876c370e4795754fc81a7f9d94a7121e6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 19:48:06 +0200 Subject: gnu: rust-serde-json-1: Update to 1.0.91. * gnu/packages/crates-io.scm (rust-serde-json-1): Update to 1.0.91. [cargo-development-inputs]: Add rust-indoc-1, rust-ref-cast-1, rust-serde-1. --- gnu/packages/crates-io.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 05ee9c116e..4652181d55 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52361,14 +52361,14 @@ data. This crate provides a wrapper that works with any existing Serde (define-public rust-serde-json-1 (package (name "rust-serde-json") - (version "1.0.74") + (version "1.0.91") (source (origin (method url-fetch) (uri (crate-uri "serde-json" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hiixjnrnrvvpyh58av73ds924zgzi4wl0mv8p9nan0w0v6vjazf")))) + (base32 "10v8vb4959ayycw1zmqvxxi758djqkskchj6qal0fjbi6daj6z47")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -52378,7 +52378,10 @@ data. This crate provides a wrapper that works with any existing Serde ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-automod" ,rust-automod-1) + ("rust-indoc" ,rust-indoc-1) + ("rust-ref-cast" ,rust-ref-cast-1) ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde" ,rust-serde-1) ("rust-serde-bytes" ,rust-serde-bytes-0.11) ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-stacker" ,rust-serde-stacker-0.1) -- cgit v1.2.3 From 977b2affeb2f9037cd15770fec0349b024ba22d6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 19:49:11 +0200 Subject: gnu: rust-serde-path-to-error-0.1: Update to 0.1.9. * gnu/packages/crates-io.scm (rust-serde-path-to-error-0.1): Update to 0.1.9. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4652181d55..fb54367665 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52420,7 +52420,7 @@ data. This crate provides a wrapper that works with any existing Serde (define-public rust-serde-path-to-error-0.1 (package (name "rust-serde-path-to-error") - (version "0.1.4") + (version "0.1.9") (source (origin (method url-fetch) @@ -52428,12 +52428,10 @@ data. This crate provides a wrapper that works with any existing Serde (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0n5ilbsxvi174m2fd506ivd43kws0yh523li1xz0zqh60ngi1xj2")))) + (base32 "0hbkdhmz82hwx5bxasym776f74jlvnivsx00l4qi7jb3nli4zc16")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-serde-derive" ,rust-serde-derive-1) -- cgit v1.2.3 From 8177666917b780b5f3fd9265ade291f8cc2f5908 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 19:49:58 +0200 Subject: gnu: rust-serde-repr-0.1: Update to 0.1.10. * gnu/packages/crates-io.scm (rust-serde-repr-0.1): Update to 0.1.10. [arguments]: Don't skip build. [cargo-development-inputs]: Add rust-rustversion-1, rust-serde-1, rust-serde-json-1, rust-trybuild-1. --- gnu/packages/crates-io.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fb54367665..a69bf3f3df 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52482,21 +52482,25 @@ commonly used by Ruby on Rails via Rack.") (define-public rust-serde-repr-0.1 (package (name "rust-serde-repr") - (version "0.1.6") + (version "0.1.10") (source (origin (method url-fetch) (uri (crate-uri "serde_repr" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0xhwamlb1ax3w87mpq0awcphwchprh93y1hb47rm3c0p3favgiid")))) + (base32 "0knbzc87nlrfnm1jh3zmx77hxflnzk0xl8xcv7jvn3m2fkxcjpls")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/dtolnay/serde-repr") (synopsis "Serialize and deserialize C-like enum as underlying repr") (description -- cgit v1.2.3 From 7e7c548433ff5be5efe726c2900b0f2df9d831b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 19:51:17 +0200 Subject: gnu: rust-serde-test-1: Update to 1.0.152. * gnu/packages/crates-io.scm (rust-serde-test-1): Update to 1.0.152. [arguments]: Skip tests. --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a69bf3f3df..3246b72fc6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52539,7 +52539,7 @@ by dynamically growing the stack.") (define-public rust-serde-test-1 (package (name "rust-serde-test") - (version "1.0.113") + (version "1.0.152") (source (origin (method url-fetch) @@ -52548,10 +52548,11 @@ by dynamically growing the stack.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "02s7zjs12m5abk13j5farc00rzissk1anpl015vawpzz914jsan3")))) + "17pdigm0w1wvch7vpnk13199wn3gmkb0883l0hr53qv75l6j249n")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? #f ; Requires a newer rust + #:cargo-inputs (("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-serde" ,rust-serde-1) -- cgit v1.2.3 From 404b091c744480eae1576da1b18bad8d66185ae0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 19:52:03 +0200 Subject: gnu: rust-serde-urlencoded-0.7: Update to 0.7.1. * gnu/packages/crates-io.scm (rust-serde-urlencoded-0.7): Update to 0.7.1. [cargo-inputs]: Replace rust-itoa-0.4 with 1. [cargo-development-inputs]: Add rust-serde-derive-1. --- gnu/packages/crates-io.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3246b72fc6..6662f6e192 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52614,21 +52614,23 @@ by dynamically growing the stack.") (define-public rust-serde-urlencoded-0.7 (package (name "rust-serde-urlencoded") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (crate-uri "serde_urlencoded" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1s9wnjrak5a0igfhcghhz51kvi7n010j5rs9lmhd5hfrz2kmgypd")))) + (base32 "1zgklbdaysj3230xivihs30qi5vkhigg323a9m62k8jwf4a1qjfk")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-form-urlencoded" ,rust-form-urlencoded-1) - ("rust-itoa" ,rust-itoa-0.4) + ("rust-itoa" ,rust-itoa-1) ("rust-ryu" ,rust-ryu-1) - ("rust-serde" ,rust-serde-1)))) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-serde-derive" ,rust-serde-derive-1)))) (home-page "https://github.com/nox/serde_urlencoded") (synopsis "`x-www-form-urlencoded` meets Serde") (description -- cgit v1.2.3 From d9a5f785d69959d015b49452d1fece92307c3175 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 19:53:12 +0200 Subject: gnu: rust-serde-yaml-0.8: Update to 0.8.26. * gnu/packages/crates-io.scm (rust-serde-yaml-0.8): Update to 0.8.26. [cargo-inputs]: Remove rust-dtoa-0.4, rust-linked-hash-map-0.5. Add rust-indexmap-1, rust-ryu-1. [cargo-development-inputs]: Add rust-anyhow-1. --- gnu/packages/crates-io.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6662f6e192..d16a0519f3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52712,23 +52712,24 @@ for later processing.") (define-public rust-serde-yaml-0.8 (package (name "rust-serde-yaml") - (version "0.8.17") + (version "0.8.26") (source (origin (method url-fetch) (uri (crate-uri "serde_yaml" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "08xvb5zxz3x5dgx0fy1q0aq9aa9fibcvi75333wnnwk1mga4wr8m")))) + (base32 "06y7gxy312mink8nsnmci9cw0ykpgsdcxmayg0snmdbnnwrp92jp")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-dtoa" ,rust-dtoa-0.4) - ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) + (("rust-indexmap" ,rust-indexmap-1) + ("rust-ryu" ,rust-ryu-1) ("rust-serde" ,rust-serde-1) ("rust-yaml-rust" ,rust-yaml-rust-0.4)) #:cargo-development-inputs - (("rust-indoc" ,rust-indoc-1) + (("rust-anyhow" ,rust-anyhow-1) + ("rust-indoc" ,rust-indoc-1) ("rust-serde-derive" ,rust-serde-derive-1)))) (home-page "https://github.com/dtolnay/serde-yaml") (synopsis "YAML support for Serde") -- cgit v1.2.3 From dda306da78fad2cdaa8bbba54bc580626eac0809 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 19:54:20 +0200 Subject: gnu: rust-serde-ignored-0.1: Update to 0.1.7. * gnu/packages/crates-io.scm (rust-serde-ignored-0.1): Update to 0.1.7. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d16a0519f3..d94235aa6b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52334,7 +52334,7 @@ derive macros.") (define-public rust-serde-ignored-0.1 (package (name "rust-serde-ignored") - (version "0.1.2") + (version "0.1.7") (source (origin (method url-fetch) @@ -52343,7 +52343,7 @@ derive macros.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0bzz3546g3p01hgwh6jh0gyqdwc28xcp3pir4al2wbsgs4wpsb0w")))) + "19j5mrngznhxa7yfvxwmc4dc0mdzvm7w92i0m4adz2xshx04mswl")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From ed15877656f136660ea7a601ad7343468388a3ba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Jan 2023 19:54:20 +0200 Subject: gnu: rust-serde-stacker-0.1: Update to 0.1.7. * gnu/packages/crates-io.scm (rust-serde-stacker-0.1): Update to 0.1.7. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d94235aa6b..c04037ca60 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52512,7 +52512,7 @@ of a C-like enum.") (define-public rust-serde-stacker-0.1 (package (name "rust-serde-stacker") - (version "0.1.4") + (version "0.1.7") (source (origin (method url-fetch) @@ -52521,7 +52521,7 @@ of a C-like enum.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1qlfpy0nmxrvahz4hs9p1y84rb0vy6mbxn1lfgvq6fryls8j7jgl")))) + "1zgwd22cswfsjsxmnpf97nw5fzyv0s6mif5blbb948q7qgskvxrm")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 1befc52f67ff9ef38f23acfee57b4a02bc79104d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 13 Jan 2023 10:40:04 +0200 Subject: gnu: rust-crossbeam-0.8: Update to 0.8.2. * gnu/packages/crates-io.scm (rust-crossbeam-0.8): Update to 0.8.2. [arguments]: Don't skip build. [cargo-development-inputs]: Add rust-rand-0.8. --- gnu/packages/crates-io.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c04037ca60..14a87357d7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13775,24 +13775,25 @@ criterion.") (define-public rust-crossbeam-0.8 (package (name "rust-crossbeam") - (version "0.8.0") + (version "0.8.2") (source (origin (method url-fetch) (uri (crate-uri "crossbeam" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "103xnwzkk1zd9kiy6f0f131ap433qfkc757wyrha5bxa7pmsc0gx")))) + (base32 "0b0s0ans81ja6gm7awlaw3k2rqywzmhq4mm9ra8yaak16q6sy098")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8) ("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.9) ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.3) - ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)))) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.8)))) (home-page "https://github.com/crossbeam-rs/crossbeam") (synopsis "Tools for concurrent programming in Rust") (description "This package provides tools for concurrent programming.") -- cgit v1.2.3 From e67c8315e00ba720ad7cd72aee1becc0ec496024 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 13 Jan 2023 10:41:04 +0200 Subject: gnu: rust-crossbeam-epoch-0.9: Update to 0.9.13. * gnu/packages/crates-io.scm (rust-crossbeam-epoch-0.9): Update to 0.9.13. [arguments]: Don't skip build. [cargo-inputs]: Remove rust-const-fn-0.4, rust-lazy-static-1. Replace rust-memoffset-0.6 with 0.7. Add rust-autocfg-1. [cargo-development-inputs]: Add rust-rand-0.8, rust-rustversion-1. --- gnu/packages/crates-io.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 14a87357d7..f171f5a194 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13942,24 +13942,26 @@ message passing.") (define-public rust-crossbeam-epoch-0.9 (package (name "rust-crossbeam-epoch") - (version "0.9.1") + (version "0.9.13") (source (origin (method url-fetch) (uri (crate-uri "crossbeam-epoch" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "17anyfg5azjpmcfidq6wn4phj9h0a0zqcxksi33w44akz4wsgam1")))) + (base32 "0nlxkmx3q93jvsshnmwaiich6bf7ddq1jzhzmaw4pxrf9hgsza81")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if-1) - ("rust-const-fn" ,rust-const-fn-0.4) + `(#:cargo-inputs + (("rust-autocfg" ,rust-autocfg-1) + ("rust-cfg-if" ,rust-cfg-if-1) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-memoffset" ,rust-memoffset-0.6) - ("rust-scopeguard" ,rust-scopeguard-1)))) + ("rust-loom" ,rust-loom-0.5) + ("rust-memoffset" ,rust-memoffset-0.7) + ("rust-scopeguard" ,rust-scopeguard-1)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.8) + ("rust-rustversion" ,rust-rustversion-1)))) (home-page "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch") (synopsis "Epoch-based garbage collection") -- cgit v1.2.3 From 295db056d7dac9fc3b413bb313e06259b20593b2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 13 Jan 2023 10:43:10 +0200 Subject: gnu: rust-crossbeam-queue-0.3: Update to 0.3.8. * gnu/packages/crates-io.scm (rust-crossbeam-queue-0.3): Update to 0.3.8. [cargo-development-inputs]: Add rust-rand-0.6. --- gnu/packages/crates-io.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f171f5a194..f589ba63ba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13997,19 +13997,21 @@ message passing.") (define-public rust-crossbeam-queue-0.3 (package (name "rust-crossbeam-queue") - (version "0.3.6") + (version "0.3.8") (source (origin (method url-fetch) (uri (crate-uri "crossbeam-queue" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19ram1wp87i57w834hwl95mzz9g53qlzkraq6lvab629n21jbm0w")))) + (base32 "1p9s6n4ckwdgxkb7a8ay9zjzmgc8ppfbxix2vr07rwskibmb7kyi")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) - ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)))) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.6)))) (home-page "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils") (synopsis "Concurrent queues in Rust") -- cgit v1.2.3 From 34a5f2af163ac6b6946fcce126a05252cc78ed96 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 13 Jan 2023 10:43:55 +0200 Subject: gnu: rust-crossbeam-channel-0.4: Update to 0.4.4. * gnu/packages/crates-io.scm (rust-crossbeam-channel-0.4): Update to 0.4.4. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f589ba63ba..b51e4d8e79 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13853,7 +13853,7 @@ message passing.") (package (inherit rust-crossbeam-channel-0.5) (name "rust-crossbeam-channel") - (version "0.4.2") + (version "0.4.4") (source (origin (method url-fetch) @@ -13862,7 +13862,7 @@ message passing.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0qd05n5bcwafkmbzq1lspwrfi29xnzlw46qarg1sl0lwj68qdvfc")))) + "11zvmp8p94vaqp4xyhzymw8xndnpwq12x5qgvxkway7lprygwlxi")))) (arguments `(#:cargo-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) -- cgit v1.2.3 From de95363da6005ae5c80665e9e1297424bd4d985d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 13 Jan 2023 10:43:56 +0200 Subject: gnu: rust-crossbeam-deque-0.7: Update to 0.7.4. * gnu/packages/crates-io.scm (rust-crossbeam-deque-0.7): Update to 0.7.4. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b51e4d8e79..d95dcfde32 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13921,7 +13921,7 @@ message passing.") (package (inherit rust-crossbeam-deque-0.8) (name "rust-crossbeam-deque") - (version "0.7.3") + (version "0.7.4") (source (origin (method url-fetch) @@ -13930,7 +13930,7 @@ message passing.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "11c2c0x5grdba3ah3g94yn6b8s47xi8qwm85h8hq5vmf9nbsy0lz")))) + "1v99xcdjk4zixvxnq7pssip670mlyhw1ma3qc88ca11jxnfz43y2")))) (arguments `(#:cargo-inputs (("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.8) -- cgit v1.2.3 From c4eae0cd631623f0c5a570aab9b5278460eabf6d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 14 Jan 2023 22:15:03 +0200 Subject: gnu: rust-cast-0.2: Update to 0.2.7. * gnu/packages/crates-io.scm (rust-cast-0.2): Update to 0.2.7. [arguments]: Don't skip build. [cargo-inputs]: Replace rust-rustc-version-0.2 with 0.4. --- gnu/packages/crates-io.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d95dcfde32..6cda74be40 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9699,7 +9699,7 @@ box''.") (package (inherit rust-cast-0.3) (name "rust-cast") - (version "0.2.3") + (version "0.2.7") (source (origin (method url-fetch) @@ -9708,12 +9708,11 @@ box''.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1c5z7zryj0zwnhdgs6rw5dfvnlwc1vm19jzrlgx5055alnwk952b")))) + "16p3bqi3qad1qdjgjc1r0x72iinj1aw2k8fw5zx2l51s52sdl92c")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-rustc-version" ,rust-rustc-version-0.2)) + `(#:cargo-inputs + (("rust-rustc-version" ,rust-rustc-version-0.4)) #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.9)))))) -- cgit v1.2.3 From c35c2a5a93595ca130c8c0e29021d6f3c7dea6ae Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 14 Jan 2023 22:16:01 +0200 Subject: gnu: rust-markup5ever-0.10: Update to 0.10.1. * gnu/packages/crates-io.scm (rust-markup5ever-0.10): Update to 0.10.1. [cargo-inputs]: Remove rust-serde-1, rust-serde-derive-1, rust-serde-json-1. Sort alphabetically. --- gnu/packages/crates-io.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6cda74be40..c62e465e8f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32355,7 +32355,7 @@ algorithms. It supports CBC block cipher mode, PKCS5 padding and 64, 128, (define-public rust-markup5ever-0.10 (package (name "rust-markup5ever") - (version "0.10.0") + (version "0.10.1") (source (origin (method url-fetch) @@ -32364,19 +32364,16 @@ algorithms. It supports CBC block cipher mode, PKCS5 padding and 64, 128, (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1aqxl1lsc8s6ycsw5ibwynadnb9qpiab4ggwgdq9pjlnjdk8vqxa")))) + "1zf8iq2czd6kz99fjs3pgf5c17lfz75ds31khkfiqbc50gxl0kx2")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-log" ,rust-log-0.4) ("rust-phf" ,rust-phf-0.8) - ("rust-string-cache" ,rust-string-cache-0.8) - ("rust-tendril" ,rust-tendril-0.4) ("rust-phf-codegen" ,rust-phf-codegen-0.8) - ("rust-serde" ,rust-serde-1) - ("rust-serde-derive" ,rust-serde-derive-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5)))) + ("rust-string-cache" ,rust-string-cache-0.8) + ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5) + ("rust-tendril" ,rust-tendril-0.4)))) (home-page "https://github.com/servo/html5ever") (synopsis "Common code for xml5ever and html5ever") (description -- cgit v1.2.3 From 11101fbdfe6b2b3f9095675bd7ca9e99c0c3e6b8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 14 Jan 2023 22:17:18 +0200 Subject: gnu: rust-rayon-1: Update to 1.6.1. * gnu/packages/crates-io.scm (rust-rayon-1): Update to 1.6.1. [cargo-inputs]: Remove rust-autocfg-1, rust-crossbeam-dequeue-1, rust-docopt-1, rust-serde-1. --- gnu/packages/crates-io.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c62e465e8f..6697937d98 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46200,27 +46200,23 @@ accessors.") (define-public rust-rayon-1 (package (name "rust-rayon") - (version "1.5.1") + (version "1.6.1") (source (origin (method url-fetch) (uri (crate-uri "rayon" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "143dl2453bazgk7rwjrickmyqd0ks3q69nfz8axcins19n0clsn0")))) + (base32 "1dsr0yyfgdsg8ggh37kq678mfa5j3js6p16ksb7knazhml9s5cvd")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-autocfg" ,rust-autocfg-1) - ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8) - ("rust-either" ,rust-either-1) + (("rust-either" ,rust-either-1) ("rust-rayon-core" ,rust-rayon-core-1)) #:cargo-development-inputs - (("rust-docopt" ,rust-docopt-1) - ("rust-lazy-static" ,rust-lazy-static-1) + (("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand" ,rust-rand-0.8) - ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) - ("rust-serde" ,rust-serde-1)))) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)))) (home-page "https://github.com/rayon-rs/rayon") (synopsis "Simple work-stealing parallelism for Rust") (description -- cgit v1.2.3 From c4aa69da97ed9285e902cbed010c8dbaa3104c51 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 14 Jan 2023 22:18:26 +0200 Subject: gnu: rust-rayon-core-1: Update to 1.10.1. * gnu/packages/crates-io.scm (rust-rayon-core-1): Update to 1.10.1. [cargo-inputs]: Remove rust-lazy-static-1. Replace rust-rand-0.7 with 0.8, rust-rand-xorshift-0.2 with 0.3. --- gnu/packages/crates-io.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6697937d98..daeef41dc7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46275,14 +46275,14 @@ Rust.") (define-public rust-rayon-core-1 (package (name "rust-rayon-core") - (version "1.9.1") + (version "1.10.1") (source (origin (method url-fetch) (uri (crate-uri "rayon-core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "13kdcnqp2p1a5a3amamfjpnm7ay463vq4dfxy4rrh9shr3i210fp")))) + (base32 "1lvavqk42lmll47q008j8y6nw54f3sfvcjlbaa26iaq0bnpi1i6a")))) (build-system cargo-build-system) (arguments ;; One of the tests attempts to overflow the stack, but the compiler has @@ -46292,12 +46292,11 @@ Rust.") (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8) ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) - ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-cpus" ,rust-num-cpus-1)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-rand" ,rust-rand-0.7) - ("rust-rand-xorshift" ,rust-rand-xorshift-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) ("rust-scoped-tls" ,rust-scoped-tls-1)))) (home-page "https://github.com/rayon-rs/rayon") (synopsis "Core APIs for Rayon") -- cgit v1.2.3 From 036d979c2357627be9cfbd7ddf27edcd27a843bc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 14 Jan 2023 22:19:45 +0200 Subject: gnu: rust-data-url-0.1: Update to 0.1.1. * gnu/packages/crates-io.scm (rust-data-url-0.1): Update to 0.1.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index daeef41dc7..f5c66be99e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15945,7 +15945,7 @@ hexadecimal, base32, and base64.") (define-public rust-data-url-0.1 (package (name "rust-data-url") - (version "0.1.0") + (version "0.1.1") (source (origin (method url-fetch) @@ -15954,7 +15954,7 @@ hexadecimal, base32, and base64.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "176wa1n8h71iwyaxhar4sqwrgrvb5sxk26az0fy88vnxrsffjgyk")))) + "14z15yiyklp5dv0k0q6pd83irrn0y8hj9y3fj17akkrbf37byc1s")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From cdaf01af5af57699cf0a417f4d3b8cb37a02af48 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 14 Jan 2023 22:19:45 +0200 Subject: gnu: rust-xml5ever-0.16: Update to 0.16.2. * gnu/packages/crates-io.scm (rust-xml5ever-0.16): Update to 0.16.2. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f5c66be99e..c1da275c83 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -68890,7 +68890,7 @@ including a line breaking iterator.") (define-public rust-xml5ever-0.16 (package (name "rust-xml5ever") - (version "0.16.1") + (version "0.16.2") (source (origin (method url-fetch) @@ -68899,7 +68899,7 @@ including a line breaking iterator.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0nbapmdrn4zqry5p01l2mmbb48fcq0gga377p1c4lkb1x3k546qb")))) + "0rfqys8yyigkzrqcrn5c6r10v42pwxahccyyzhc293px30w1cd4j")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From e21f98f6f1ebac041b1d56b989d2b7691169e890 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:01:14 +0200 Subject: gnu: rust-dtoa-0.4: Update to 0.4.8. * gnu/packages/crates-io.scm (rust-dtoa-0.4): Update to 0.4.8. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c1da275c83..25fc858b4e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18285,7 +18285,7 @@ Rust.") (define-public rust-dtoa-0.4 (package (name "rust-dtoa") - (version "0.4.4") + (version "0.4.8") (source (origin (method url-fetch) @@ -18293,9 +18293,8 @@ Rust.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0phbm7i0dpn44gzi07683zxaicjap5064w62pidci4fhhciv8mza")))) + "1c5j0wz118dhrczx6spc5za7dnbfxablr4adyahg9aknrsc9i2an")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/dtolnay/dtoa") (synopsis "Fast functions for printing floating-point primitives") (description "This crate provides fast functions for printing -- cgit v1.2.3 From aec6e7aacb60dd39323e64a5b97e24a74f472665 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:02:00 +0200 Subject: gnu: rust-dota-short-0.3: Update to 0.3.3. * gnu/packages/crates-io.scm (rust-dtoa-short-0.3): Update to 0.3.3. [cargo-development-inputs]: Replace rust-float-cmp-0.3 with 0.4. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 25fc858b4e..5dccd863e6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18305,7 +18305,7 @@ floating-point primitives to an @code{io::Write}.") (define-public rust-dtoa-short-0.3 (package (name "rust-dtoa-short") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) @@ -18314,13 +18314,13 @@ floating-point primitives to an @code{io::Write}.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1wkn7ziqffq8hj0a411lgn7674ackzdk734ikp230rmp2f2hn0jr")))) + "1mh22nwja3v8922h0hq77c29k1da634lvkn9cvg9xrqhmqlk7q5x")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-dtoa" ,rust-dtoa-0.4)) #:cargo-development-inputs - (("rust-float-cmp" ,rust-float-cmp-0.3)))) + (("rust-float-cmp" ,rust-float-cmp-0.4)))) (home-page "https://github.com/upsuper/dtoa-short") (synopsis "Serialize float number and truncate to certain precision") (description -- cgit v1.2.3 From 45401533ded93fbfaa90b2650bee4dfcbd5e4be8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:02:55 +0200 Subject: gnu: rust-either-1: Update to 1.8.0. * gnu/packages/crates-io.scm (rust-either-1): Update to 1.8.0. [arguments]: Don't skip build. [cargo-development-inputs]: Add rust-serde-json-1. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5dccd863e6..6488469f24 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18681,7 +18681,7 @@ signing, and verification in pure Rust.") (define-public rust-either-1 (package (name "rust-either") - (version "1.6.1") + (version "1.8.0") (source (origin (method url-fetch) @@ -18690,11 +18690,11 @@ signing, and verification in pure Rust.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0mwl9vngqf5jvrhmhn9x60kr5hivxyjxbmby2pybncxfqhf4z3g7")))) + "15z70yaivlkpx27vzv99ibf8d2x5jp24yn69y0xi20w86v4c3rch")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-serde" ,rust-serde-1)))) + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/bluss/either") (synopsis "Enum @code{Either} with variants @code{Left} and @code{Right}") -- cgit v1.2.3 From f597f90df267630598591cec97c974c924d0933b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:05:30 +0200 Subject: gnu: rust-erased-serde-0.3: Update to 0.3.24. * gnu/packages/crates-io.scm (rust-erased-serde-0.3): Update to 0.3.24. [arguments]: Don't skip build. [cargo-inputs]: Add rust-rustversion-1, rust-serde-cbor-0.11, rust-trybuild-1. --- gnu/packages/crates-io.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6488469f24..25ba9c436f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19793,7 +19793,7 @@ deserialized from environment variables.") (define-public rust-erased-serde-0.3 (package (name "rust-erased-serde") - (version "0.3.11") + (version "0.3.24") (source (origin (method url-fetch) @@ -19802,16 +19802,17 @@ deserialized from environment variables.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lgkpkk7nx6f24gmr3psyj8d2avc9701r9jyw1i4ssp10lbnv2yq")))) + "0zdaj96bf39h75rkdxkd1znik97s3j7m8ppgbxxfq5y0h59n1jp4")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)) #:cargo-development-inputs - (;("rust-serde-cbor" ,rust-serde-cbor-0.9) + (("rust-rustversion" ,rust-rustversion-1) + ("rust-serde-cbor" ,rust-serde-cbor-0.11) ("rust-serde-derive" ,rust-serde-derive-1) - ("rust-serde-json" ,rust-serde-json-1)))) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/dtolnay/erased-serde") (synopsis "Type-erased Serialize and Serializer traits") (description -- cgit v1.2.3 From dd7a863f1be2558d8d6b20f1b4a448e8f3e8598c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:06:49 +0200 Subject: gnu: rust-matches-0.1: Update to 0.1.9. * gnu/packages/crates-io.scm (rust-matches-0.1): Update to 0.1.9. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 25ba9c436f..70e6c5857d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32479,7 +32479,7 @@ statement, the first matching branch is the item that gets emitted.") (define-public rust-matches-0.1 (package (name "rust-matches") - (version "0.1.8") + (version "0.1.9") (source (origin (method url-fetch) @@ -32487,9 +32487,8 @@ statement, the first matching branch is the item that gets emitted.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "020axl4q7rk9vz90phs7f8jas4imxal9y9kxl4z4v7a6719mrz3z")))) + "0gw5ib38jfgyyah8nyyxr036grqv1arkf1srgfa4h386dav7iqx3")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/SimonSapin/rust-std-candidates") (synopsis "Macro to evaluate whether an expression matches a pattern") (description "This package provides a macro to evaluate, as a boolean, -- cgit v1.2.3 From 406f48675ee55542b4d5b5183f020dc0db01ab98 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:07:32 +0200 Subject: gnu: rust-matrixmultiply-0.2: Update to 0.2.4. * gnu/packages/crates-io.scm (rust-matrixmultiply-0.2): Update to 0.2.4. [cargo-development-inputs]: Replace rust-itertools-0.7 with 0.8. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 70e6c5857d..1d93d831cb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32662,7 +32662,7 @@ parallelize and optimize.") (package (inherit rust-matrixmultiply-0.3) (name "rust-matrixmultiply") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) @@ -32670,13 +32670,13 @@ parallelize and optimize.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "13s7nfd3dfcsrixld2lk8c563ih5xzczl2w36hprfc016rkfrxyl")))) + "1hc4vp19x823xgkm374wsxnzmqbjhmyaj5nr0lhm9k9i02x0cs4i")))) (arguments `(#:cargo-inputs (("rust-rawpointer" ,rust-rawpointer-0.2)) #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) - ("rust-itertools" ,rust-itertools-0.7)))))) + ("rust-itertools" ,rust-itertools-0.8)))))) (define-public rust-matrixmultiply-0.1 (package -- cgit v1.2.3 From 5daeaa6c8afbef450e003d16b5640737f183d535 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:09:41 +0200 Subject: gnu: rust-packed-simd-2-0.3: Update to 0.3.8. * gnu/packages/crates-io.scm (rust-packed-simd-2-0.3): Update to 0.3.8. [source]: Generalize snippet allowing newer versions of dependencies. [arguments]: Don't skip build. Remove trailing #t from phases. [cargo-inputs]: Replace rust-cfg-if-0.1 with 1. --- gnu/packages/crates-io.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1d93d831cb..5811004125 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38968,7 +38968,7 @@ normally prevent moving a type that has been borrowed from.") (define-public rust-packed-simd-2-0.3 (package (name "rust-packed-simd-2") - (version "0.3.6") + (version "0.3.8") (source (origin (method url-fetch) @@ -38976,21 +38976,17 @@ normally prevent moving a type that has been borrowed from.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1i8hmhsyzqsas2rhxg088mcwvzljrqhvf8lfz8b1dj6g2rkw1h3i")) + (base32 "10p2bm0p57shg3arlpfwm6z0bbnlkyr4g0dlkmpwvz6qaba4r4d1")) (modules '((guix build utils))) (snippet '(begin ;; Unpin the dependencies. (substitute* "Cargo.toml" - (("=0.2.73") "^0.2.73") - (("=0.3.23") "^0.3.23")) - #t)))) + (("version = \"=") "version = \"^")))))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; error[E0432]: unresolved import `packed_simd` - #:skip-build? #t - #:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if-0.1) + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) ("rust-core-arch" ,rust-core-arch-0.1) ("rust-libm" ,rust-libm-0.1) ("rust-sleef-sys" ,rust-sleef-sys-0.1)) @@ -39003,8 +38999,7 @@ normally prevent moving a type that has been borrowed from.") (modify-phases %standard-phases (add-after 'unpack 'enable-unstable-features (lambda _ - (setenv "RUSTC_BOOTSTRAP" "1") - #t))))) + (setenv "RUSTC_BOOTSTRAP" "1")))))) (home-page "https://github.com/rust-lang-nursery/packed_simd") (synopsis "Portable Packed SIMD vectors") (description "Portable Packed SIMD vectors.") -- cgit v1.2.3 From 897f2357afb931877b8b8ae8f4a734bc0b9a6cf6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:12:07 +0200 Subject: gnu: rust-pest-2: Update to 2.5.3. * gnu/packages/crates-io.scm (rust-pest-2): Update to 2.5.3. [cargo-inputs]: Add rust-bytecount-0.6, rust-memchr-2, rust-thiserror-1. (rust-pest-derive-2, rust-pest-generator-2): Update to 2.5.3. (rust-pest-meta-2): Update to 2.5.3. [cargo-inputs]: Remove rust-maplit-1, rust-sha-1-0.8. Add rust-once-cell-1, rust-sha2-0.10. --- gnu/packages/crates-io.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5811004125..6ad4d612ba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40682,7 +40682,7 @@ algorithm.") (define-public rust-pest-2 (package (name "rust-pest") - (version "2.1.3") + (version "2.5.3") (source (origin (method url-fetch) @@ -40691,13 +40691,16 @@ algorithm.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0lry80bm90x47nq71wxq83kjrm9ashpz4kbm92p90ysdx4m8gx0h")))) + "02n3b2hv9ciysybs9qzxza25gp8493dd7r8b57kfkxwi9nhb8ms2")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-serde" ,rust-serde-1) + (("rust-bytecount" ,rust-bytecount-0.6) + ("rust-memchr" ,rust-memchr-2) + ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1) ("rust-ucd-trie" ,rust-ucd-trie-0.1)))) (home-page "https://pest.rs/") (synopsis "The Elegant Parser") @@ -40707,7 +40710,7 @@ algorithm.") (define-public rust-pest-derive-2 (package (name "rust-pest-derive") - (version "2.1.0") + (version "2.5.3") (source (origin (method url-fetch) @@ -40716,7 +40719,7 @@ algorithm.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1l5jfa6ril71cw5nsiw0r45br54dd8cj2r1nc2d1wq6wb3jilgc3")))) + "19m0wd2lcg6d2halnlfcgl0mfpgjy5a29q875vk6bp8c7cwxl714")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -40731,7 +40734,7 @@ algorithm.") (define-public rust-pest-generator-2 (package (name "rust-pest-generator") - (version "2.1.1") + (version "2.5.3") (source (origin (method url-fetch) @@ -40740,7 +40743,7 @@ algorithm.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1h3z8jccki87mn7gppy4292s1ah98z4md998w5pd04jpkclwz7vv")))) + "0z52iw9g9jcg8v7d56s9m49cbl1k5wsxax1wjl1666f8v0s3dda6")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -40758,7 +40761,7 @@ algorithm.") (define-public rust-pest-meta-2 (package (name "rust-pest-meta") - (version "2.1.2") + (version "2.5.3") (source (origin (method url-fetch) @@ -40767,14 +40770,14 @@ algorithm.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0iymvrh7lcfi8iarkgq0hwgarr00np3l4xg4bx42rmvgi6czshyz")))) + "0lbskklh77xnyk1yr8c387l80s37s30lrfv636s7hild58rz3x0f")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-maplit" ,rust-maplit-1) + (("rust-once-cell" ,rust-once-cell-1) ("rust-pest" ,rust-pest-2) - ("rust-sha-1" ,rust-sha-1-0.8)))) + ("rust-sha2" ,rust-sha2-0.10)))) (home-page "https://pest.rs") (synopsis "Pest meta language parser and validator") (description -- cgit v1.2.3 From 05b4932fb452e0a5b966ceb446005b2846e3535c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:14:44 +0200 Subject: gnu: rust-phf-0.10: Update to 0.10.1. * gnu/packages/crates-io.scm (rust-phf-0.10): Update to 0.10.1. [arguments]: Don't skip build. Skip tests. [cargo-inputs]: Add rust-serde-1. --- gnu/packages/crates-io.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6ad4d612ba..dd1c5ae51d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40874,21 +40874,22 @@ and graph algorithms.") (define-public rust-phf-0.10 (package (name "rust-phf") - (version "0.10.0") + (version "0.10.1") (source (origin (method url-fetch) (uri (crate-uri "phf" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "17s0k0z1rjczk37cpbmn718h7dkqci1kk9w2spbmjjwc06qkvz5r")))) + (base32 "0naj8n5nasv5hj5ldlva3cl6y3sv7zp3kfgqylhbrg55v3mg3fzs")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; Doc tests fail. #:cargo-inputs (("rust-phf-macros" ,rust-phf-macros-0.10) ("rust-phf-shared" ,rust-phf-shared-0.10) - ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)))) + ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) + ("rust-serde" ,rust-serde-1)))) (home-page "https://github.com/sfackler/rust-phf") (synopsis "Runtime support for perfect hash function data structures") (description "This package provides runtime support for perfect hash -- cgit v1.2.3 From 3a0ce99bd33f940bf2d2cc5f375adc3119f41f60 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:16:09 +0200 Subject: gnu: rust-rand-0.8: Update to 0.8.5. * gnu/packages/crates-io.scm (rust-rand-0.8): Update to 0.8.5. [arguments]: Don't skip build. [cargo-inputs]: Remove rust-hc-0.3. [cargo-development-inputs]: Add rust-bincode-1, rust-rand-pcg-0.3. --- gnu/packages/crates-io.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dd1c5ae51d..66d730e4e1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45196,25 +45196,26 @@ learnt from TrieMap and Sequence Trie.") (define-public rust-rand-0.8 (package (name "rust-rand") - (version "0.8.4") + (version "0.8.5") (source (origin (method url-fetch) (uri (crate-uri "rand" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1n5wska2fbfj4dsfz8mc0pd0dgjlrb6c9anpk5mwym345rip6x9f")))) + (base32 "013l6931nn7gkc23jz5mm3qdhf93jjf0fg64nz2lp4i51qd8vbrl")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-packed-simd-2" ,rust-packed-simd-2-0.3) ("rust-rand-chacha" ,rust-rand-chacha-0.3) ("rust-rand-core" ,rust-rand-core-0.6) - ("rust-rand-hc" ,rust-rand-hc-0.3) - ("rust-serde" ,rust-serde-1)))) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1) + ("rust-rand-pcg" ,rust-rand-pcg-0.3)))) (home-page "https://crates.io/crates/rand") (synopsis "Random number generators and other randomness functionality") (description -- cgit v1.2.3 From 1a5a17f5de6ffd92b07b25431489f67976b18e3e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:17:22 +0200 Subject: gnu: rust-rand-chacha-0.3: Update to 0.3.1. * gnu/packages/crates-io.scm (rust-rand-chacha-0.3): Update to 0.3.1. [arguments]: Don't skip build. [cargo-inputs]: Add rust-serde-1. [cargo-development-inputs]: Add rust-serde-json-1. --- gnu/packages/crates-io.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 66d730e4e1..9f4048c32b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45353,20 +45353,22 @@ useful types and distributions, and some randomness-related algorithms.") (define-public rust-rand-chacha-0.3 (package (name "rust-rand-chacha") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (crate-uri "rand_chacha" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "03df2xh5nbdvwr17qm3sviaxa95r8yhm1nil2pr0pqf90p7ka9z1")))) + (base32 "123x2adin558xbhvqb8w4f6syjsdkmqff8cxwhmjacpsl1ihmhg6")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-ppv-lite86" ,rust-ppv-lite86-0.2) - ("rust-rand-core" ,rust-rand-core-0.6)))) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://crates.io/crates/rand_chacha") (synopsis "ChaCha random number generator") (description -- cgit v1.2.3 From 9eead8fa06d243b380ce2baee86847e6cbaf5010 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:18:25 +0200 Subject: gnu: rust-rand-core-0.6: Update to 0.6.4. * gnu/packages/crates-io.scm (rust-rand-core-0.6): Update to 0.6.4. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9f4048c32b..6c89e168bd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45416,18 +45416,17 @@ useful types and distributions, and some randomness-related algorithms.") (define-public rust-rand-core-0.6 (package (name "rust-rand-core") - (version "0.6.2") + (version "0.6.4") (source (origin (method url-fetch) (uri (crate-uri "rand_core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1rvas1afjvd2827b8mf2ilg78h3ksl9npkrdds3wbw9x33mndkrl")))) + (base32 "0b4j2v4cb5krak1pv6kakv4sz6xcwbrmy2zckc32hsigbrwy82zc")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.2) ("rust-serde" ,rust-serde-1)))) (home-page "https://rust-random.github.io/book") -- cgit v1.2.3 From 68855f41def68f2d0ca6c458881c7f362f2cae97 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:19:08 +0200 Subject: gnu: rust-rand-distr-0.4: Update to 0.4.3. * gnu/packages/crates-io.scm (rust-rand-distr-0.4): Update to 0.4.3. [source]: Remove snippet. [cargo-inputs]: Remove rust-average-0.13, rust-special-0.8. [cargo-development-inputs]: Add rust-average-0.13, rust-rand-0.8, rust-special-0.8. --- gnu/packages/crates-io.scm | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6c89e168bd..e540e7e863 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45513,30 +45513,25 @@ tools for implementation.") (define-public rust-rand-distr-0.4 (package (name "rust-rand-distr") - (version "0.4.2") + (version "0.4.3") (source (origin (method url-fetch) (uri (crate-uri "rand_distr" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0brd2946xfapm2bmhmczfbwck041x7khsfhqxw1f24kxis7m8kcn")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "Cargo.toml" - ;; The resolver feature is not supported by our versions of Cargo. - (("resolver = \"2\".*") "")))))) + (base32 "0cgfwg3z0pkqhrl0x90c77kx70r6g9z4m6fxq9v0h2ibr2dhpjrj")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-average" ,rust-average-0.13) - ("rust-num-traits" ,rust-num-traits-0.2) + (("rust-num-traits" ,rust-num-traits-0.2) ("rust-rand" ,rust-rand-0.8) - ("rust-serde" ,rust-serde-1) - ("rust-special" ,rust-special-0.8)) + ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs - (("rust-rand-pcg" ,rust-rand-pcg-0.3)))) + (("rust-average" ,rust-average-0.13) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-pcg" ,rust-rand-pcg-0.3) + ("rust-special" ,rust-special-0.8)))) (home-page "https://rust-random.github.io/book/") (synopsis "Sampling from random number distributions") (description "This package provides tool for sampling from random number -- cgit v1.2.3 From 26b030aa04a8f636bcec550b717911b38c3723a2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:21:02 +0200 Subject: gnu: rust-rand-hc-0.3: Update to 0.3.1. * gnu/packages/crates-io.scm (rust-rand-hc-0.3): Update to 0.3.1. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e540e7e863..f8a8fe3662 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45588,7 +45588,7 @@ distributions.") (define-public rust-rand-hc-0.3 (package (name "rust-rand-hc") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) @@ -45596,11 +45596,10 @@ distributions.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0wra6ar22zdjkry9dsq1mg620m4h3qb9s8rfykkz4im4crqfz41i")))) + (base32 "1rwpykyvhkxs4jvqdja3mzp9dqaqamzn113cxaigs9z2dmcry7nm")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.6)))) (home-page "https://crates.io/crates/rand_hc") (synopsis "HC128 random number generator") -- cgit v1.2.3 From 2405d7f1c4f6d1a4686d6c119363a23501d1437d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:21:38 +0200 Subject: gnu: rust-semver-1: Update to 1.0.16. * gnu/packages/crates-io.scm (rust-semver-1): Update to 1.0.16. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f8a8fe3662..1d131a21b9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -51603,18 +51603,17 @@ macOS and iOS.") (define-public rust-semver-1 (package (name "rust-semver") - (version "1.0.3") + (version "1.0.16") (source (origin (method url-fetch) (uri (crate-uri "semver" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gna1p10i86sf1pqfqndkwl0wks35x84yvjw77c74ckzxrbsqfjz")))) + (base32 "0amsbj3572r1kx5wdcpcgfhfwbmcc17axp9adc6nkiwg6xkrbg2q")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)))) (home-page "https://docs.rs/crate/semver") (synopsis "Semantic version parsing and comparison") -- cgit v1.2.3 From ad0c2e83cfc6336ae03ec4a3a5e8f2b92f2be80c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:22:17 +0200 Subject: gnu: rust-smallvec-1: Update to 1.10.0. * gnu/packages/crates-io.scm (rust-smallvec-1): Update to 1.10.0. [cargo-development-inputs]: Add rust-debugger-test-0.1, rust-debugger-test-parser-0.1. --- gnu/packages/crates-io.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1d131a21b9..d292ccfa49 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -54753,7 +54753,7 @@ inline storage.") (define-public rust-smallvec-1 (package (name "rust-smallvec") - (version "1.9.0") + (version "1.10.0") (source (origin (method url-fetch) @@ -54762,14 +54762,16 @@ inline storage.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lfss4vs5z5njm3ac9c499s5m1gphzm5a7gxcbw1zncpjmsdpl1g")))) + "1q2k15fzxgwjpcdv3f323w24rbbfyv711ayz85ila12lg7zbw1x5")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1)))) + (("rust-bincode" ,rust-bincode-1) + ("rust-debugger-test" ,rust-debugger-test-0.1) + ("rust-debugger-test-parser" ,rust-debugger-test-parser-0.1)))) (home-page "https://github.com/servo/rust-smallvec") (synopsis "Small vector optimization") (description -- cgit v1.2.3 From 67bcb8e3b6fdb17a29ee738a6c56c4673d0428ee Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:23:34 +0200 Subject: gnu: rust-string-cache-0.8: Update to 0.8.4. * gnu/packages/crates-io.scm (rust-string-cache-0.8): Update to 0.8.4. [cargo-inputs]: Remove rust-lazy-static-1. Replace rust-phf-shared-0.8 with 0.10. Add rust-once-cell-1, rust-parking-lot-0.12. --- gnu/packages/crates-io.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d292ccfa49..ac9d05b5af 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56635,7 +56635,7 @@ configurable byte storage.") (define-public rust-string-cache-0.8 (package (name "rust-string-cache") - (version "0.8.0") + (version "0.8.4") (source (origin (method url-fetch) @@ -56644,13 +56644,14 @@ configurable byte storage.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12i0synp8l0qpnzi5qki4pjq3jx28ykikyffjjjg6fsfxddwfh19")))) + "020ahbx93gp85s3k3k5c342j10ml0b77i4q4hri180xmlavr8d11")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-new-debug-unreachable" ,rust-new-debug-unreachable-1) - ("rust-phf-shared" ,rust-phf-shared-0.8) + (("rust-new-debug-unreachable" ,rust-new-debug-unreachable-1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-phf-shared" ,rust-phf-shared-0.10) ("rust-precomputed-hash" ,rust-precomputed-hash-0.1) ("rust-serde" ,rust-serde-1)))) (home-page "https://github.com/servo/string-cache") -- cgit v1.2.3 From 818cab3558a53e9aae2992bbce61752700e292cd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:27:51 +0200 Subject: gnu: rust-string-cache-codegen-0.5: Update to 0.5.2. * gnu/packages/crates-io.scm (rust-string-cache-codegen-0.5: Update to 0.5.2. [cargo-inputs]: Replace rust-phf-generator-0.8 with 0.10, rust-phf-shared-0.8 with 0.10. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ac9d05b5af..8ddeef9c17 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56691,7 +56691,7 @@ developed as part of the Servo project.") (define-public rust-string-cache-codegen-0.5 (package (name "rust-string-cache-codegen") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) @@ -56700,12 +56700,12 @@ developed as part of the Servo project.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "15vbk5i7kkj5bbx7f0fi477js4svw5py39gi4rk74anj35g8wk7j")))) + "1249fafaa7r3m67zxcbcw1bddanygv13r3209bvlzgi2ny4h5cvb")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-phf-generator" ,rust-phf-generator-0.8) - ("rust-phf-shared" ,rust-phf-shared-0.8) + (("rust-phf-generator" ,rust-phf-generator-0.10) + ("rust-phf-shared" ,rust-phf-shared-0.10) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1)))) (home-page "https://github.com/servo/string-cache") -- cgit v1.2.3 From 862e10f4f2452f317b5e81e839ce63dbc0bcff5b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:29:02 +0200 Subject: gnu: rust-tendril-0.4: Update to 0.4.3. * gnu/packages/crates-io.scm (rust-tendril-0.4): Update to 0.4.3. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8ddeef9c17..76f312cffe 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -59326,7 +59326,7 @@ directories.") (define-public rust-tendril-0.4 (package (name "rust-tendril") - (version "0.4.1") + (version "0.4.3") (source (origin (method url-fetch) @@ -59335,11 +59335,10 @@ directories.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0fsx7blrrzgca8aa2yqy8zxyi8s7amskhgkk1ml5sbaqyalyszvh")))) + "1c3vip59sqwxn148i714nmkrvjzbk7105vj0h92s6r64bw614jnj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-encoding" ,rust-encoding-0.2) ("rust-encoding-rs" ,rust-encoding-rs-0.8) ("rust-futf" ,rust-futf-0.1) -- cgit v1.2.3 From c4b460c5557fb903d3b5389afdebe6bdca60e076 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:30:03 +0200 Subject: gnu: rust-decimal-2: Update to 2.1.0. * gnu/packages/crates-io.scm (rust-decimal-2): Update to 2.1.0. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 76f312cffe..b08c7946c3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16185,7 +16185,7 @@ verifying the contents.") (define-public rust-decimal-2 (package (name "rust-decimal") - (version "2.0.4") + (version "2.1.0") (source (origin (method url-fetch) @@ -16194,7 +16194,7 @@ verifying the contents.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vb3i8vg1dxrw3kzbfiag3gg7rdjd73z80mwbwkq60vnphiqfig6")))) + "0k8ij9brz6kdk7j4hq916s85qrplpy3ixs9v9h1ibsxsj5zbg2js")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From aeb22ecfcb7a1e7a3f84772bee87f70ed5b4f859 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:30:04 +0200 Subject: gnu: rust-encoding-rs-0.8: Update to 0.8.31. * gnu/packages/crates-io.scm (rust-encoding-rs-0.8): Update to 0.8.31. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b08c7946c3..7c233e047f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19241,7 +19241,7 @@ encodings.") (define-public rust-encoding-rs-0.8 (package (name "rust-encoding-rs") - (version "0.8.28") + (version "0.8.31") (source (origin (method url-fetch) @@ -19250,7 +19250,7 @@ encodings.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0rf0r99q4kgjrx22kx7pjyjg4lm21599y3ggvy3hzj2spi7h5pw0")))) + "0azc6rblf75vd862ymjahdfch27j1sshb7zynshrx7ywi5an6llq")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 427332de55cb654e96b74a3a57b2890c3498279b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:30:04 +0200 Subject: gnu: rust-futf-0.1: Update to 0.1.5. * gnu/packages/crates-io.scm (rust-futf-0.1): Update to 0.1.5. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7c233e047f..394b8a6eaa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22297,7 +22297,7 @@ stabilized, and eventually removed. This library reïnstates these traits.") (define-public rust-futf-0.1 (package (name "rust-futf") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) @@ -22306,7 +22306,7 @@ stabilized, and eventually removed. This library reïnstates these traits.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0fxc18bnabird5jl941nsd6d25vq8cn8barmz4d30dlkzbiir73w")))) + "0hvqk2r7v4fnc34hvc3vkri89gn52d5m9ihygmwn75l1hhp0whnz")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From a450da3778a03db4f577bd8210238dcf2c680383 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:30:05 +0200 Subject: gnu: rust-libm-0.2: Update to 0.2.6. * gnu/packages/crates-io.scm (rust-libm-0.2): Update to 0.2.6. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 394b8a6eaa..cf02a56a9e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30660,7 +30660,7 @@ functions and static variables these libraries contain.") (define-public rust-libm-0.2 (package (name "rust-libm") - (version "0.2.1") + (version "0.2.6") (source (origin (method url-fetch) @@ -30669,7 +30669,7 @@ functions and static variables these libraries contain.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0akh56sh51adhagmk9l84dyrlz60gv8ri05xhr13i1b18czkpmy7")))) + "1ywg7jfcgfv4jypxi3f6rpf7n9509ky695bfzy1fqhms7ymhi09l")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From fdfc39ddcd6b33bf176fc8db8bc873de741cc7a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:30:05 +0200 Subject: gnu: rust-new-debug-unreachable-1: Update to 1.0.4. * gnu/packages/crates-io.scm (rust-new-debug-unreachable-1): Update to 1.0.4. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cf02a56a9e..7cf4fcae6f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35624,7 +35624,7 @@ cryptographic library.") (define-public rust-new-debug-unreachable-1 (package (name "rust-new-debug-unreachable") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) @@ -35633,7 +35633,7 @@ cryptographic library.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0c1br326qa0rrzxrn2rd5ah7xaprig2i9r4rwsx06vnvc1f003zl")))) + "0m1bg3wz3nvxdryg78x4i8hh9fys4wp2bi0zg821dhvf44v4g8p4")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t)) (home-page -- cgit v1.2.3 From b47fbee18c3a16ff344f7a9d1211d8c0d600e9a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:30:05 +0200 Subject: gnu: rust-num-rational-0.2: Update to 0.2.4. * gnu/packages/crates-io.scm (rust-num-rational-0.2): Update to 0.2.4. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7cf4fcae6f..eed144694a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -37461,7 +37461,7 @@ directly.") (package (inherit rust-num-rational-0.3) (name "rust-num-rational") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) @@ -37470,7 +37470,7 @@ directly.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "18q3vq3xldhaj0z3f92am8f59m1awywgdj28c7wvx0bcksgwfkfs")))) + "1vsaz96chxcgpqd5a0dq8hb3b4sj6dnlhwmpbkf4mx6vnls0202w")))) (arguments `(#:cargo-inputs (("rust-num-bigint" ,rust-num-bigint-0.2) -- cgit v1.2.3 From 54cdf86e91b674dfecfa5ad858823b3780bbb35e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:30:06 +0200 Subject: gnu: rust-rand-pcg-0.3: Update to 0.3.1. * gnu/packages/crates-io.scm (rust-rand-pcg-0.3): Update to 0.3.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eed144694a..31b71234a6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45792,7 +45792,7 @@ generator based on timing jitter.") (define-public rust-rand-pcg-0.3 (package (name "rust-rand-pcg") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) @@ -45800,7 +45800,7 @@ generator based on timing jitter.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1w47awndfhgcc31zbji66pwndqmc6lsyairqi9b17f82f19riqbx")))) + "0gn79wzs5b19iivybwa09wv4lhi4kbcqciasiqqynggnr8cd1jjr")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From b7e8447118e15b230ed37802c6986f01adf9b7e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jan 2023 11:30:06 +0200 Subject: gnu: rust-utf-8-0.7: Update to 0.7.6. * gnu/packages/crates-io.scm (rust-utf-8-0.7): Update to 0.7.6. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 31b71234a6..6c8ac48f0b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -65891,7 +65891,7 @@ Unix users and groups.") (define-public rust-utf-8-0.7 (package (name "rust-utf-8") - (version "0.7.5") + (version "0.7.6") (source (origin (method url-fetch) @@ -65900,7 +65900,7 @@ Unix users and groups.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1iw5rp4i3mfi9k51picbr5bgjqhjcmnxx7001clh5ydq31y2zr05")))) + "1a9ns3fvgird0snjkd3wbdhwd3zdpc2h5gpyybrfr6ra5pkqxk09")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t)) (home-page "https://github.com/SimonSapin/rust-utf8") -- cgit v1.2.3 From 576954cda173ee7f8d3087e3ba77b48b622a645f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 22 Jan 2023 11:15:45 +0200 Subject: gnu: rust-pin-project-0.4: Update to 0.4.30. * gnu/packages/crates-io.scm (rust-pin-project-0.4): Update to 0.4.30. [source]: Add snippet to relax dependency requirements. [arguments]: Don't skip tests. [cargo-development-inputs]: Add rust-rustversion-1, rust-ryu-1, rust-serde-json-1, rust-toml-0.5, rust-trybuild-1. (rust-pin-project-internal-0.4): Update to 0.4.30. [cargo-development-inputs]: Add rust-rustversion-1. --- gnu/packages/crates-io.scm | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6c8ac48f0b..843d4429a5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -53,6 +53,7 @@ #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -41258,18 +41259,28 @@ function data structures.") (package (inherit rust-pin-project-1) (name "rust-pin-project") - (version "0.4.22") + (version "0.4.30") (source (origin (method url-fetch) (uri (crate-uri "pin-project" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05wwxy46j9z27ibbiisjqk0rivf0z00h4al1f92mwjp9pz6sdqqj")))) + (base32 "0nlxmsiq39bc73iryh92yslrp2jzlkdjjxd7rv5sjzpflljgkw1y")) + (snippet + #~(begin + (use-modules (guix build utils)) + (substitute* "Cargo.toml" + (("version = \"=") "version = \"^")))))) (arguments - `(#:tests? #f ; XXX: Fix-me. - #:cargo-inputs - (("rust-pin-project-internal" ,rust-pin-project-internal-0.4)))))) + `(#:cargo-inputs + (("rust-pin-project-internal" ,rust-pin-project-internal-0.4)) + #:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-1) + ("rust-ryu" ,rust-ryu-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-toml" ,rust-toml-0.5) + ("rust-trybuild" ,rust-trybuild-1)))))) (define-public rust-pin-project-auxiliary-macro-0.0 (package @@ -41318,20 +41329,22 @@ crate.") (package (inherit rust-pin-project-internal-1) (name "rust-pin-project-internal") - (version "0.4.22") + (version "0.4.30") (source (origin (method url-fetch) (uri (crate-uri "pin-project-internal" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1xxac6f3ip45zqbfcmmk748ywjw9sbavz1fcswvqgn3rrx2zs3va")))) + (base32 "07p6mwz6kz317a6n3p93yk4llj939ihqdz7d1mwl7gmyx468s745")))) (arguments - `(#:tests? #f ; XXX: Fix-me. + `(#:tests? #f ; XXX: Doc tests fail. #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))))) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-1)))))) (define-public rust-pin-project-lite-0.2 (package -- cgit v1.2.3 From af1eb5d4100d7f0074c5a19e54da1c9998e83544 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 22 Jan 2023 11:18:04 +0200 Subject: gnu: rust-ryu-1: Update to 1.0.12. * gnu/packages/crates-io.scm (rust-ryu-1): Update to 1.0.12. [cargo-development-inputs]: Replace rust-rand-0.7 with 0.8, rust-rand-xorshift-0.2 with 0.3. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 843d4429a5..69bc32f108 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -50169,7 +50169,7 @@ deserialization framework.") (define-public rust-ryu-1 (package (name "rust-ryu") - (version "1.0.3") + (version "1.0.12") (source (origin (method url-fetch) @@ -50177,15 +50177,15 @@ deserialization framework.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0xlx9ybzncrb7d6r9533g8ydlg6mr252pfzl4g9cqaqkpvk24mjk")))) + "1ppcgnyfs12p545bl7762jp9b11rlzmgb7yzrr5lnzb8xm1rfjvv")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-no-panic" ,rust-no-panic-0.1)) #:cargo-development-inputs (("rust-num-cpus" ,rust-num-cpus-1) - ("rust-rand" ,rust-rand-0.7) - ("rust-rand-xorshift" ,rust-rand-xorshift-0.2)))) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)))) (home-page "https://github.com/dtolnay/ryu") (synopsis "Fast floating point to string conversion") (description -- cgit v1.2.3 From 9721235af4f1231067b3cda302194154b18981b5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 4 Feb 2023 00:22:58 -0500 Subject: gnu: fluidsynth: Remove lash input. * gnu/packages/audio.scm (fluidsynth) [inputs]: Remove lash. --- gnu/packages/audio.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index ca2b12f6fe..a177c5b876 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2092,7 +2092,6 @@ follower.") (list alsa-lib glib jack-1 - lash libsndfile readline)) (home-page "https://www.fluidsynth.org/") -- cgit v1.2.3 From 6757b46ddcb764e0be818a69f92668257df183dd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Feb 2023 22:58:18 -0500 Subject: gnu: fluidsynth: Update to 2.3.1. * gnu/packages/audio.scm (fluidsynth): Update to 2.3.1. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index a177c5b876..2a01eb4d55 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2062,7 +2062,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "2.2.4") + (version "2.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -2071,7 +2071,7 @@ follower.") (file-name (git-file-name name version)) (sha256 (base32 - "1061rdj69503spkd8vmfl3fqvyg4l41k5xcc4gw7niy31hnpnjmn")))) + "05lr9f0q4x1kvgfa3xrfmagpwvijv9m1s316aa9figqlkcc5vv4k")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From b8224f88062300d26744c65fc43510d34ea6cb92 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 4 Feb 2023 00:24:45 -0500 Subject: gnu: Remove lash. * gnu/packages/audio.scm (lash): Delete variable. --- gnu/packages/audio.scm | 54 -------------------------------------------------- 1 file changed, 54 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2a01eb4d55..220e0b8e86 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2746,60 +2746,6 @@ plugin function as a JACK application.") to be plugged into a wide range of audio synthesis and recording packages.") (license license:lgpl2.1+))) -(define-public lash - (package - (name "lash") - (version "0.6.0-rc2") - (source (origin - (method url-fetch) - ;; The tilde is not permitted in the builder name, but is used - ;; in the tarball. - (uri (string-append - "mirror://savannah/lash/lash-" - (string-join (string-split version #\-) "~") - ".tar.bz2")) - (file-name (string-append name "-" version ".tar.bz2")) - (sha256 - (base32 - "12z1vx3krrzsfccpah9xjs68900xvr7bw92wx8np5871i2yv47iw")))) - (build-system gnu-build-system) - (arguments - '(;; Glibc no longer includes Sun RPC support, so tell the build system - ;; to use libtirpc instead. - #:make-flags (list (string-append "CFLAGS=-I" - (assoc-ref %build-inputs "libtirpc") - "/include/tirpc -ltirpc")) - #:phases - (modify-phases %standard-phases - ;; lashd embeds an ancient version of sigsegv so we just skip it - (add-after 'unpack 'skip-lashd - (lambda _ - (substitute* '("Makefile.am" "Makefile.in") - (("lashd ") "")) - #t))) - #:configure-flags '("--disable-static"))) - (inputs - `(("bdb" ,bdb) - ("gtk" ,gtk+-2) - ("jack" ,jack-1) - ("libtirpc" ,libtirpc) - ("readline" ,readline) - ("python" ,python-2))) - ;; According to pkg-config, packages depending on lash also need to have - ;; at least the following packages declared as inputs. - (propagated-inputs - (list alsa-lib dbus libxml2)) - (native-inputs - (list pkg-config)) - (home-page "https://www.nongnu.org/lash/") - (synopsis "Audio application session manager") - (description - "LASH is a session management system for audio applications. It allows -you to save and restore audio sessions consisting of multiple interconneced -applications, restoring program state (i.e. loaded patches) and the -connections between them.") - (license license:gpl2+))) - (define-public libbs2b (package (name "libbs2b") -- cgit v1.2.3 From fcd80d3089370efd23484087c98260819d6fb437 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 09:13:58 -0500 Subject: gnu: speex: Update to 1.2.1. * gnu/packages/xiph.scm (speex): Update to 1.2.1. --- gnu/packages/xiph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index dffad299e9..5ee3620798 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -130,7 +130,7 @@ compressed video format.") (define-public speex (package (name "speex") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) @@ -138,7 +138,7 @@ compressed video format.") version ".tar.gz")) (sha256 (base32 - "150047wnllz4r94whb9r73l5qf0z5z3rlhy98bawfbblmkq8mbpa")))) + "1spy51kaxfhpj8171gn1s69wz82nzkz2k0x7k0nhldwangrd8i2b")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From 2d3a33589d123f3137cf10ad3635a80cc05776af Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 11:45:40 -0500 Subject: gnu: ibus-minimal: Move Python support to ibus. This reduces the size of ibus-minimal from 1446.7 MiB to 1222.3 MiB. * gnu/packages/ibus.scm (ibus-minimal): Remove "--enable-python-library" flag. [phases] {wrap-with-additional-paths}: Do not wrap GUIX_PYTHONPATH. [inputs]: Move python-pygobject, python and python-dbus to... (ibus) [inputs]: ... here. [arguments]: Add --enable-python-library configure flag and override wrap-with-additional-paths phase. --- gnu/packages/ibus.scm | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 7d52c5889e..0328103d19 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Songlin Jiang ;;; Copyright © 2021 Taiju HIGASHI -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2023 Luis Felipe López Acevedo ;;; ;;; This file is part of GNU Guix. @@ -91,8 +91,7 @@ (outputs '("out" "doc")) (arguments (list - #:configure-flags #~(list "--enable-python-library" - "--enable-gtk-doc" + #:configure-flags #~(list "--enable-gtk-doc" "--enable-memconf" (string-append "--with-unicode-emoji-dir=" @@ -186,10 +185,8 @@ (string-append #$output:doc "/share/gtk-doc")))) (add-after 'wrap-program 'wrap-with-additional-paths (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and - ;; GI_TYPELIB_PATH. + ;; Make sure 'ibus-setup' runs with the correct GI_TYPELIB_PATH. (wrap-program (search-input-file outputs "bin/ibus-setup") - `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH") ,(string-append #$output "/lib/girepository-1.0"))))))))) @@ -206,9 +203,6 @@ libx11 libxkbcommon libxtst - python-pygobject - python - python-dbus setxkbmap ucd unicode-cldr-common @@ -244,11 +238,29 @@ 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)))) + (arguments + (substitute-keyword-arguments (package-arguments ibus-minimal) + ((#:configure-flags flags) + #~(cons* "--enable-gtk4" + "--enable-python-library" + #$flags)) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (replace 'wrap-with-additional-paths + (lambda* (#:key outputs #:allow-other-keys) + ;; Make sure 'ibus-setup' runs with the correct + ;; GUIX_PYTHONPATH and GI_TYPELIB_PATH. + (wrap-program (search-input-file outputs "bin/ibus-setup") + `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH") + ,(string-append #$output "/lib/girepository-1.0")))))))))) (inputs (modify-inputs (package-inputs ibus-minimal) - (prepend gtk pango-next))) + (prepend gtk + pango-next + python + python-dbus + python-pygobject))) (properties (alist-delete 'hidden? (package-properties ibus-minimal))))) (define-public ibus-libpinyin -- cgit v1.2.3 From 30b6431441a4c0f46c853e503a53927dc143987b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 7 Feb 2023 11:57:15 -0500 Subject: gnu: ibus-minimal: Disable GTK 2 support. * gnu/packages/ibus.scm (ibus-minimal) [configure-flags]: Add '--disable-gtk2'. [inputs]: Remove gtk+-2. --- gnu/packages/ibus.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 0328103d19..dd15d65105 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -91,7 +91,8 @@ (outputs '("out" "doc")) (arguments (list - #:configure-flags #~(list "--enable-gtk-doc" + #:configure-flags #~(list "--disable-gtk2" + "--enable-gtk-doc" "--enable-memconf" (string-append "--with-unicode-emoji-dir=" @@ -195,7 +196,6 @@ dbus dconf glib - gtk+-2 gtk+ iso-codes json-glib -- cgit v1.2.3 From 864a7478e85d99f08122b0120ad695164ee55dbe Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Feb 2023 08:54:33 -0500 Subject: gnu: gstreamer: Do not reference Python. * gnu/packages/gstreamer.scm (gstreamer) [native-inputs]: Replace python-wrapper with python. [arguments]: List python in #:disallowed-references. Add a 'do-not-capture-python phase. --- gnu/packages/gstreamer.scm | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index f33a30a02b..7aa9500620 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -475,28 +475,40 @@ the GStreamer multimedia framework.") "0aisl8nazcfi4b5j6fz8zwpp0k9csb022zniz65b2pxxpdjayzb0")))) (build-system meson-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - #$@%common-gstreamer-phases - #$@(if (string-prefix? "i686" (or (%current-target-system) - (%current-system))) - ;; FIXME: These tests consistently fail in the Guix CI: - ;; https://issues.guix.gnu.org/57868 - '((add-after 'unpack 'disable-systemclock-test - (lambda _ - (substitute* "tests/check/gst/gstsystemclock.c" - (("tcase_add_test \\(tc_chain, \ + (list + #:disallowed-references (list python) + #:phases + #~(modify-phases %standard-phases + #$@%common-gstreamer-phases + #$@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) + ;; FIXME: These tests consistently fail in the Guix CI: + ;; https://issues.guix.gnu.org/57868 + '((add-after 'unpack 'disable-systemclock-test + (lambda _ + (substitute* "tests/check/gst/gstsystemclock.c" + (("tcase_add_test \\(tc_chain, \ test_stress_cleanup_unschedule.*") - "") - (("tcase_add_test \\(tc_chain, \ + "") + (("tcase_add_test \\(tc_chain, \ test_stress_reschedule.*") - ""))))) - '())))) + ""))))) + '()) + (add-after 'patch-shebangs 'do-not-capture-python + (lambda _ + ;; The patch-source-shebangs phase causes the following build + ;; script to reference Python in its shebang, which is + ;; unnecessary. + (substitute* (string-append #$output + "/libexec/gstreamer-1.0/" + "gst-plugins-doc-cache-generator") + (((which "python3")) + "/usr/bin/env python3"))))))) (propagated-inputs ;; In gstreamer-1.0.pc: ;; Requires: glib-2.0, gobject-2.0 ;; Requires.private: gmodule-no-export-2.0 libunwind libdw - (list elfutils ; libdw + (list elfutils ;libdw glib libunwind)) (native-inputs (list bash-completion @@ -506,7 +518,7 @@ test_stress_reschedule.*") gobject-introspection perl pkg-config - python-wrapper)) + python)) (inputs (list gmp libcap ;; For tests. -- cgit v1.2.3 From ebaff023520870444188317ffe5eb0712c67957d Mon Sep 17 00:00:00 2001 From: Paul Alesius Date: Wed, 8 Feb 2023 14:22:07 -0500 Subject: gnu: Add rust-cargo-util-0.1. * gnu/packages/crates-io.scm (rust-cargo-util-0.1): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 69bc32f108..8e05429d9f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2022 ( ;;; Copyright © 2022 Greg Hogan ;;; Copyright © 2022 Paul A. Patience +;;; Copyright © 2022 Paul Alesius ;;; ;;; This file is part of GNU Guix. ;;; @@ -9648,6 +9649,25 @@ optional dependency graph analysis.") supported by Cargo.") (license (list license:expat license:asl2.0)))) +(define-public rust-cargo-util-0.1 + (package + (name "rust-cargo-util") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "cargo-util" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1sz0gzcyp9ycb4zwj69qs9gd8kn9hv9nh2dq42c59x5xccqph755")))) + (build-system cargo-build-system) + (home-page "https://github.com/rust-lang/cargo") + (synopsis "Utilities for Cargo") + (description "Miscellaneous support code used by Cargo.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cassowary-0.3 (package (name "rust-cassowary") -- cgit v1.2.3 From 087e7b8172c8a06ccaffacc1bda165b0e629a0c7 Mon Sep 17 00:00:00 2001 From: Paul Alesius Date: Wed, 8 Feb 2023 14:22:15 -0500 Subject: gnu: Add rust-cargon-0.0. * gnu/packages/crates-io.scm (rust-cargon-0.0): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8e05429d9f..f4ff6852a9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9668,6 +9668,29 @@ supported by Cargo.") (description "Miscellaneous support code used by Cargo.") (license (list license:expat license:asl2.0)))) +(define-public rust-cargon-0.0 + (package + (name "rust-cargon") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cargon" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cszlab7jk736p0lb50ag4l9nv72m7j41bwrmygl0lr4iz0350w2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-gcc" ,rust-gcc-0.3)))) + (home-page "https://github.com/bryant/argon2rs") + (synopsis "Thin wrapper around the Argon2 C library") + (description + "This package provides a thin wrapper around the Argon2 C library. It is +used in argon2rs' bench suite.") + (license license:wtfpl2))) + (define-public rust-cassowary-0.3 (package (name "rust-cassowary") -- cgit v1.2.3 From 071782b4cd312028c1564bdafe1d182aeacfed52 Mon Sep 17 00:00:00 2001 From: Paul Alesius Date: Wed, 8 Feb 2023 14:22:49 -0500 Subject: gnu: rust-cargo-platform-0.1: Update to 0.1.2. * gnu/packages/crates-io.scm (rust-cargo-platform-0.1): Update to 0.1.2. Signed-off-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f4ff6852a9..8af7eba461 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9629,7 +9629,7 @@ optional dependency graph analysis.") (define-public rust-cargo-platform-0.1 (package (name "rust-cargo-platform") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) @@ -9638,7 +9638,7 @@ optional dependency graph analysis.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1mzi60pf0z83qkzqp7jwd61xnqz2b5ydsj7rnnikbgyicd5989h2")))) + "09zsf76b9yr02jh17xq925xp1w824w2bwvb78fd0gpx5m1fq5nyb")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From c2c4d5f52c7a673772e84352a2bb0e96dc4d3cca Mon Sep 17 00:00:00 2001 From: Paul Alesius Date: Wed, 8 Feb 2023 14:23:04 -0500 Subject: gnu: rust-crates-io-0.33: Update to 0.33.1. * gnu/packages/crates-io.scm (rust-crates-io-0.33): Update to 0.33.1. Signed-off-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8af7eba461..d6217a3436 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13423,7 +13423,7 @@ to the @code{is_x86_feature_detected!} macro.") (define-public rust-crates-io-0.33 (package (name "rust-crates-io") - (version "0.33.0") + (version "0.33.1") (source (origin (method url-fetch) @@ -13432,7 +13432,7 @@ to the @code{is_x86_feature_detected!} macro.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "147mggf85fz77vsrzsvsxxwid4f4fg30zwfyirx7sl1k7y33hw91")))) + "0nmpzr697a6v12ljwpmjrhqpmkf784nsm8m1g6jwadmkq96p3mxj")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From c3fbb98c98a33b507847f797106d081e62da0a0f Mon Sep 17 00:00:00 2001 From: Paul Alesius Date: Wed, 8 Feb 2023 14:23:20 -0500 Subject: gnu: rust-curl-0.4: Update to 0.4.43. * gnu/packages/crates-io.scm (rust-curl-0.4): Update to 0.4.43. Signed-off-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d6217a3436..2a1dc5f286 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15131,14 +15131,14 @@ use with bindgen.") (define-public rust-curl-0.4 (package (name "rust-curl") - (version "0.4.34") + (version "0.4.43") (source (origin (method url-fetch) (uri (crate-uri "curl" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0vkm6fyizf8m9yxpv3n5pm9ag3bwlyqa6nz2ga8qkzm5y4m1cs72")))) + (base32 "07v5s3qafyl9gnnlzbddgg5fzy41gncy00ahbbv46nr0xyp5bn1p")))) (build-system cargo-build-system) (arguments `(#:tests? #false ;require internet access -- cgit v1.2.3 From 30f31859ac04ed352f528daee9175962c4a1861f Mon Sep 17 00:00:00 2001 From: Paul Alesius Date: Wed, 8 Feb 2023 14:23:32 -0500 Subject: gnu: rust-curl-sys-0.4: Update to 0.4.53+curl-7.82.0. * gnu/packages/crates-io.scm (rust-curl-sys-0.4): Update to 0.4.53+curl-7.82.0. Signed-off-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2a1dc5f286..4b29a65425 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15168,7 +15168,7 @@ requests") (define-public rust-curl-sys-0.4 (package (name "rust-curl-sys") - (version "0.4.44+curl-7.77.0") + (version "0.4.53+curl-7.82.0") (source (origin (method url-fetch) @@ -15176,7 +15176,7 @@ requests") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1wds1gi15fja0i8gjfgk0a6c17ljsv17jvlngh8ky69b6blqavab")) + "0lh398vd34c55afyw5csbxqmnp7caxgpgci3y89c60lmb9d914l0")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "curl") #t)))) -- cgit v1.2.3 From bac6a2295130b71e5efe2628e128639c1b4eb5d8 Mon Sep 17 00:00:00 2001 From: Paul Alesius Date: Wed, 8 Feb 2023 14:23:48 -0500 Subject: gnu: rust-jobserver-0.1: Update to 0.1.24. * gnu/packages/crates-io.scm (rust-jobserver-0.1): Update to 0.1.24. Signed-off-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4b29a65425..aa6297721a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29246,7 +29246,7 @@ the jni-bindgen code generator for binding to JVM APIs from Rust.") (define-public rust-jobserver-0.1 (package (name "rust-jobserver") - (version "0.1.22") + (version "0.1.24") (source (origin (method url-fetch) @@ -29255,7 +29255,7 @@ the jni-bindgen code generator for binding to JVM APIs from Rust.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1zg7p4khibisbvd8b1lqvvni6lr00g49d4bq2zj6m76bs7jmlbwp")))) + "1yn1vxbbqv7dqir6qbfcj8h8ddjf89m5mhvm36h13xx7k5raf9dg")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 8ce4bb2f58ae7b91f10cd168103d5dadb60c130f Mon Sep 17 00:00:00 2001 From: Paul Alesius Date: Wed, 8 Feb 2023 14:24:00 -0500 Subject: gnu: rust-opener: Update to 0.5.0. * gnu/packages/crates-io.scm (rust-opener-0.4): Replace with... (rust-opener-0.5): ... this. Signed-off-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aa6297721a..c1f99c385e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38247,10 +38247,10 @@ the system.") (("rust-pathdiff" ,rust-pathdiff-0.2) ("rust-winapi" ,rust-winapi-0.3)))))) -(define-public rust-opener-0.4 +(define-public rust-opener-0.5 (package (name "rust-opener") - (version "0.4.1") + (version "0.5.0") (source (origin (method url-fetch) @@ -38259,7 +38259,7 @@ the system.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1bpknqvhqkalhmq8n2m97apc0r3y194ppybl1qxay34xr83p848k")))) + "0lkrn4fv1h4m8gmp7ll6x7vjvb6kls2ngwa5cgsh2ix5fb6yp8sf")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From c1ef157ff591a42e734c003f2bfc96652a3dc3fe Mon Sep 17 00:00:00 2001 From: Paul Alesius Date: Wed, 8 Feb 2023 14:25:10 -0500 Subject: gnu: rust-tar-0.4: Update to 0.4.36. * gnu/packages/crates-io.scm (rust-tar-0.4): Update to 0.4.36. Signed-off-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c1f99c385e..9711e40b9c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -58516,7 +58516,7 @@ without a mutable reference.") (define-public rust-tar-0.4 (package (name "rust-tar") - (version "0.4.26") + (version "0.4.36") (source (origin (method url-fetch) @@ -58524,7 +58524,7 @@ without a mutable reference.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lr6v3cpkfxd2lk5ll2jd8wr1xdskwj35smnh5sfb8xvzzxnn6dk")))) + "0iz40bd47xr69dsbckd6rv5ry2nqb2dp3z850q41pvpnmk6xk441")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Test tarballs not included in crate. -- cgit v1.2.3 From 5347378f8a99d5de08061e7db760c678f8571a2f Mon Sep 17 00:00:00 2001 From: Paul Alesius Date: Wed, 8 Feb 2023 14:27:48 -0500 Subject: gnu: Add rust-rustfix-0.6. * gnu/packages/crates-io.scm (rust-rustfix-0.6): New variable. (rust-rustfix-0.5): Inherit from rust-rustfix-0.6. Signed-off-by: Maxim Cournoyer Co-authored-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9711e40b9c..a4be5d5dbd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49272,8 +49272,28 @@ rustc compiler.") "This package provides a tool to manipulate rustdoc comments.") (license license:asl2.0))) +(define-public rust-rustfix-0.6 + (package + (name "rust-rustfix") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustfix" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0apkjxv3z70vhnyz2kpwsivvndk6qk7kkp0rf7sg8pk7q1gy02vg")))) + (build-system cargo-build-system) + (home-page "https://github.com/rust-lang/rustfix") + (synopsis "Automatically apply the suggestions made by rustc") + (description "Automatically apply the suggestions made by rustc.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustfix-0.5 (package + (inherit rust-rustfix-0.6) (name "rust-rustfix") (version "0.5.1") (source @@ -49299,12 +49319,7 @@ rustc compiler.") ("rust-env-logger" ,rust-env-logger-0.6) ("rust-log" ,rust-log-0.4) ("rust-proptest" ,rust-proptest-0.9) - ("rust-tempdir" ,rust-tempdir-0.3)))) - (home-page "https://github.com/rust-lang/rustfix") - (synopsis "Automatically apply the suggestions made by rustc") - (description - "Automatically apply the suggestions made by rustc.") - (license (list license:expat license:asl2.0)))) + ("rust-tempdir" ,rust-tempdir-0.3)))))) (define-public rust-rustfix-0.4 (package/inherit rust-rustfix-0.5 -- cgit v1.2.3 From 50efadea1e30253d613b5c5f74724b06548fa4e6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Feb 2023 14:43:02 -0500 Subject: gnu: Add rust-os-info-3. This reverts commit 3fdfffb5134cdd7858da2ece71a877f0f2af8509. Rationale: it is required by rust-cargo-0.60. * gnu/packages/crates-io.scm (rust-os-info-3): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a4be5d5dbd..3302baf231 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38667,6 +38667,33 @@ iteration. NOTE: This crate was renamed to @code{indexmap}. Please use it under its new name.") (license (list license:asl2.0 license:expat)))) +(define-public rust-os-info-3 + (package + (name "rust-os-info") + (version "3.0.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "os_info" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1pbcf2in8i9w6zjzk6jmrd89gm5h7qpyqi3hvkl0axpzp1m57lmk")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.7)) + #:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/stanislav-tkach/os_info") + (synopsis "Detect the operating system type and version") + (description + "This library detects the operating system type and version.") + (license license:expat))) + (define-public rust-os-pipe-1 (package (name "rust-os-pipe") -- cgit v1.2.3 From 07aca45a0516cb5a955d8ccf70d65296b66528a2 Mon Sep 17 00:00:00 2001 From: Paul Alesius Date: Wed, 8 Feb 2023 14:45:30 -0500 Subject: gnu: rust-os-info-3: Update to 3.0.7. * gnu/packages/crates-io.scm (rust-os-info-3): Update to 3.0.7. Signed-off-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3302baf231..00e32807b5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38670,14 +38670,14 @@ under its new name.") (define-public rust-os-info-3 (package (name "rust-os-info") - (version "3.0.6") + (version "3.0.7") (source (origin (method url-fetch) (uri (crate-uri "os_info" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1pbcf2in8i9w6zjzk6jmrd89gm5h7qpyqi3hvkl0axpzp1m57lmk")))) + (base32 "09x2sm4pgcpk14hakj4iq0zkglx1bwxlq3a5mbwc737dpwh11jba")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 6fa620a33e7be69f3406a7f6667fc09e39f34aa8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Feb 2023 15:36:57 -0500 Subject: gnu: Add rust-cbindgen-0.20. * gnu/packages/rust-apps.scm (rust-cbindgen-0.20): New variable. --- gnu/packages/rust-apps.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 73ed31c60c..ae8e469bed 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1075,6 +1075,19 @@ rebase.") (base32 "006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav")))))) +(define-public rust-cbindgen-0.20 + (package + (inherit rust-cbindgen-0.24) + (name "rust-cbindgen") + (version "0.20.0") + (source (origin + (method url-fetch) + (uri (crate-uri "cbindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1p67vvjkxh07yfizfkvm6bjlv2bywrnl57hshcsz9h2x2qxrgqsi")))))) + (define-public rust-cbindgen-0.19 (package (inherit rust-cbindgen) -- cgit v1.2.3 From 6d9597088dbc7795278309dddeaafbce761c98ca Mon Sep 17 00:00:00 2001 From: Paul Alesius Date: Wed, 8 Feb 2023 14:33:01 -0500 Subject: gnu: rust-cargo: Update to 0.60.0. * gnu/packages/crates-io.scm (rust-cargo-0.60): Update to 0.60.0. [cargo-inputs]: Add rust-cargo-util-0.1. Replace rust-env-logger-0.8 with rust-env-logger-0.9. Replace rust-opener-0.4 with rust-opener-0.5. Add rust-os-info-3. Replace rust-rustfix-0.5 with rust-rustfix-0.6. Add rust-socket2-0.4. Remove duplicate rust-tar-0.4. * gnu/packages/rust-apps.scm (rust-cargo-c): Update to 0.9.8+cargo-0.60. [cargo-inputs]: Replace rust-cbindgen-0.19 with rust-cbindgen-0.20. Replace rust-cargo-0.53 with rust-cargo-0.60. Signed-off-by: Maxim Cournoyer Co-authored-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 16 +++++++++------- gnu/packages/rust-apps.scm | 11 ++++++----- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 00e32807b5..9cfcb161ae 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9354,10 +9354,10 @@ capabilities.") ("rust-error-chain" ,rust-error-chain-0.12) ("rust-libc" ,rust-libc-0.2)))))) -(define-public rust-cargo-0.53 +(define-public rust-cargo-0.60 (package (name "rust-cargo") - (version "0.53.0") + (version "0.60.0") (source (origin (method url-fetch) @@ -9366,7 +9366,7 @@ capabilities.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12ns9v4dd8vnvsaqgd897h2zc19w00i5ii3slda653zbhfzm6zna")))) + "0xws4y7h4mmq8flnzsgf6fph2hx3rjgypyll4wzp15035ymly6dw")))) (build-system cargo-build-system) (arguments `(;; The test suite is disabled as the internal 'cargo-test-macro' and @@ -9377,6 +9377,7 @@ capabilities.") ("rust-atty" ,rust-atty-0.2) ("rust-bytesize" ,rust-bytesize-1) ("rust-cargo-platform" ,rust-cargo-platform-0.1) + ("rust-cargo-util" ,rust-cargo-util-0.1) ("rust-clap" ,rust-clap-2) ("rust-core-foundation" ,rust-core-foundation-0.9) ("rust-crates-io" ,rust-crates-io-0.33) @@ -9384,7 +9385,7 @@ capabilities.") ("rust-crypto-hash" ,rust-crypto-hash-0.3) ("rust-curl" ,rust-curl-0.4) ("rust-curl-sys" ,rust-curl-sys-0.4) - ("rust-env-logger" ,rust-env-logger-0.8) + ("rust-env-logger" ,rust-env-logger-0.9) ("rust-filetime" ,rust-filetime-0.2) ("rust-flate2" ,rust-flate2-1) ("rust-flate2" ,rust-flate2-1) @@ -9406,22 +9407,23 @@ capabilities.") ("rust-memchr" ,rust-memchr-2) ("rust-miow" ,rust-miow-0.3) ("rust-num-cpus" ,rust-num-cpus-1) - ("rust-opener" ,rust-opener-0.4) + ("rust-opener" ,rust-opener-0.5) ("rust-openssl" ,rust-openssl-0.10) + ("rust-os-info" ,rust-os-info-3) ("rust-percent-encoding" ,rust-percent-encoding-2) ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4) ("rust-rand" ,rust-rand-0.8) ("rust-rustc-workspace-hack" ,rust-rustc-workspace-hack-1) - ("rust-rustfix" ,rust-rustfix-0.5) + ("rust-rustfix" ,rust-rustfix-0.6) ("rust-same-file" ,rust-same-file-1) ("rust-semver" ,rust-semver-0.10) ("rust-serde" ,rust-serde-1) ("rust-serde-ignored" ,rust-serde-ignored-0.1) ("rust-serde-json" ,rust-serde-json-1) ("rust-shell-escape" ,rust-shell-escape-0.1) + ("rust-socket2" ,rust-socket2-0.4) ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1) ("rust-tar" ,rust-tar-0.4) - ("rust-tar" ,rust-tar-0.4) ("rust-tempfile" ,rust-tempfile-3) ("rust-termcolor" ,rust-termcolor-1) ("rust-toml" ,rust-toml-0.5) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index ae8e469bed..ba32757dd1 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Alexandru-Sergiu Marton -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2023 Maxim Cournoyer ;;; Copyright © 2021, 2022 Petr Hodina ;;; Copyright © 2021 jgart ;;; Copyright © 2021 Nicolas Graves @@ -1836,10 +1836,11 @@ language. It is a part of a larger rls-2.0 effort to create excellent IDE support for Rust.") (license (list license:expat license:asl2.0)))) +;;; Note: keep in sync with our current Rust/Cargo version. (define-public rust-cargo-c (package (name "rust-cargo-c") - (version "0.8.1+cargo-0.53") + (version "0.9.8+cargo-0.60") (source (origin (method url-fetch) @@ -1848,12 +1849,12 @@ support for Rust.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0fwdxhdj2963xr6xfqr56i7hikhsdv562vgxq2dj3h2mi3dil1k6")))) + "1zdzs3drjr9p6chg32inyi05rfv1c12nkk4bi7qpha12m6rsn26d")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-cbindgen" ,rust-cbindgen-0.19) - ("rust-cargo" ,rust-cargo-0.53) ; + (("rust-cbindgen" ,rust-cbindgen-0.20) + ("rust-cargo" ,rust-cargo-0.60) ("rust-anyhow" ,rust-anyhow-1) ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4) ("rust-structopt" ,rust-structopt-0.3) -- cgit v1.2.3 From aee59d5af7e5759fb8201e63624d438b4bd118f6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Feb 2023 12:43:52 +0200 Subject: gnu: rav1e: Fix building. * gnu/packages/video.scm (rav1e)[source]: Remove outdated snippet. [arguments]: Remove custom 'force-rust-edition-2018 phase. --- gnu/packages/video.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9f3aa998b2..8ecbaa2602 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5286,12 +5286,7 @@ result in several formats: (string-append name "-" version ".tar.gz")) (sha256 (base32 - "006bfcmjwg0phg8gc25b1sl2ngjrb2bh1b3fd0s5gbf9nlkr8qsn")) - (modules '((guix build utils))) - (snippet - '(substitute* "Cargo.toml" - (("\\[package\\]" m) - (string-append "cargo-features = [\"rust-version\"]\n" m)))))) + "006bfcmjwg0phg8gc25b1sl2ngjrb2bh1b3fd0s5gbf9nlkr8qsn")))) (build-system cargo-build-system) (arguments `(;; Strip the '--release' flag to work around the doctest failures with @@ -5354,14 +5349,8 @@ result in several formats: (add-after 'unpack 'relax-versions (lambda _ (substitute* "Cargo.toml" - ;; Allow using more recent versions of + ;; Allow using more recent versions of system-deps. (("~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 24f6855a67710354074696482cf86cf2b8bb43b8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Mar 2023 21:40:00 -0400 Subject: gnu: speexdsp: Update to 1.2.1. * gnu/packages/xiph.scm (speexdsp): Update to 1.2.1. --- gnu/packages/xiph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 5ee3620798..42bf5d5fb8 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -160,14 +160,14 @@ stereo encoding, and voice activity detection.") (define-public speexdsp (package (name "speexdsp") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "https://downloads.xiph.org/releases/speex/" "speexdsp-" version ".tar.gz")) (sha256 (base32 - "0wa7sqpk3x61zz99m7lwkgr6yv62ml6lfgs5xja65vlvdzy44838")))) + "0gadnnpg9994cindpnw35j45dnr4bflkig1aqxlrafd6wi1p6xwc")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static" -- cgit v1.2.3 From 91bb7147acb2e0e4e404d56277c7a049cb9ebcd8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 26 Mar 2023 22:53:42 -0400 Subject: NEWS: Mention new rpm format. * NEWS (Package management): Mention new rpm format. --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 47545f6bae..79c80cf949 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,9 @@ Copyright © 2022 Mathieu Othacehe Please send Guix bug reports to bug-guix@gnu.org. +* Changes in 1.5.0 (since 1.4.0) +** Package management +*** New ‘rpm’ format for the ‘guix pack’ command * Changes in 1.4.0 (since 1.3.0) ** Package management *** New ‘guix home’ command, for home environment management -- cgit v1.2.3 From 525c24ab2b05f27c6e0ebdad4fc22964a737d572 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 14:17:54 -0400 Subject: gnu: gstreamer: Update to 1.22.1. * gnu/packages/gstreamer.scm (gstreamer): Update to 1.22.1. [arguments]: Use meson-0.63. --- gnu/packages/gstreamer.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 7aa9500620..aa64ca2673 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages build-tools) #:use-module (gnu packages cdrom) #:use-module (gnu packages curl) #:use-module (gnu packages compression) @@ -463,7 +464,7 @@ the GStreamer multimedia framework.") (define-public gstreamer (package (name "gstreamer") - (version "1.20.3") + (version "1.22.1") (source (origin (method url-fetch) @@ -472,22 +473,22 @@ the GStreamer multimedia framework.") version ".tar.xz")) (sha256 (base32 - "0aisl8nazcfi4b5j6fz8zwpp0k9csb022zniz65b2pxxpdjayzb0")))) + "0wg7zlj2pqkkxk71a1mwi4lc960ifv4n7spwzlakcxi6z5csfg6d")))) (build-system meson-build-system) (arguments - (list - #:disallowed-references (list python) - #:phases - #~(modify-phases %standard-phases - #$@%common-gstreamer-phases - #$@(if (string-prefix? "i686" (or (%current-target-system) - (%current-system))) - ;; FIXME: These tests consistently fail in the Guix CI: - ;; https://issues.guix.gnu.org/57868 - '((add-after 'unpack 'disable-systemclock-test - (lambda _ - (substitute* "tests/check/gst/gstsystemclock.c" - (("tcase_add_test \\(tc_chain, \ + (list #:disallowed-references (list python) + #:meson meson-0.63 + #:phases + #~(modify-phases %standard-phases + #$@%common-gstreamer-phases + #$@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) + ;; FIXME: These tests consistently fail in the Guix CI: + ;; https://issues.guix.gnu.org/57868 + '((add-after 'unpack 'disable-systemclock-test + (lambda _ + (substitute* "tests/check/gst/gstsystemclock.c" + (("tcase_add_test \\(tc_chain, \ test_stress_cleanup_unschedule.*") "") (("tcase_add_test \\(tc_chain, \ -- cgit v1.2.3 From 8679c16f3a2646100d9dc952c2716617d0b0428c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 14:18:13 -0400 Subject: gnu: gstreamer-docs: Update to 1.22.1. * gnu/packages/gstreamer.scm (gstreamer-docs): Update to 1.22.1. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index aa64ca2673..10532113e5 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -404,7 +404,7 @@ arrays of data.") (define-public gstreamer-docs (package (name "gstreamer-docs") - (version "1.20.3") + (version "1.22.1") (source (origin (method url-fetch) (uri (string-append @@ -412,7 +412,7 @@ arrays of data.") "/gstreamer-docs-" version ".tar.xz")) (sha256 (base32 - "1gziccq5f4fy23q6dm8nwbmzh68gn9rfbqw0xcn4r8yn82545z3k")))) + "1w7zc2162pwmslxsql0gaqs18jls7q885d0y5mxpifbxwl9hkjpy")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 4adefb3febbc63c455bb2b1e067d23d158dfbd68 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 14:18:31 -0400 Subject: gnu: gst-plugins-base: Update to 1.22.1. * gnu/packages/gstreamer.scm (gst-plugins-base): Update to 1.22.1. [arguments]: Use meson-0.63. --- gnu/packages/gstreamer.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 10532113e5..d5670e0d1f 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -546,7 +546,7 @@ This package provides the core library and elements.") (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.20.3") + (version "1.22.1") (source (origin (method url-fetch) @@ -554,7 +554,7 @@ This package provides the core library and elements.") name "-" version ".tar.xz")) (sha256 (base32 - "17rw8wj1x1bg153m9z76pdvgz5k93m3riyalfpzq00x7h7fv6c3y")))) + "0s8wh2il395y3gp4ryqfj4sd53c1dv521vx4ryyqssv4qnnaxg2r")))) (build-system meson-build-system) (propagated-inputs (list glib ;required by gstreamer-sdp-1.0.pc @@ -593,6 +593,7 @@ This package provides the core library and elements.") xorg-server-for-tests)) (arguments (list + #:meson meson-0.63 #:phases #~(modify-phases %standard-phases #$@%common-gstreamer-phases -- cgit v1.2.3 From 458a9b6460e02e5d12d84a7c6388d07396edd294 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 14:18:48 -0400 Subject: gnu: gst-plugins-good: Update to 1.22.1. * gnu/packages/gstreamer.scm (gst-plugins-good): Update to 1.22.1. [arguments]: Use meson-0.63. --- gnu/packages/gstreamer.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index d5670e0d1f..4c53d06560 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -646,7 +646,7 @@ for the GStreamer multimedia library.") (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.20.3") + (version "1.22.1") (source (origin (method url-fetch) @@ -655,10 +655,11 @@ for the GStreamer multimedia library.") "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 - (base32 "1dv8b2md1xk6d45ir1wzbvqhxbvm6mxv881rjl0brnjwpw3c5wzq")))) + (base32 "1k3l17kzyzfqv8imph7vc227vzz7jamk42g9xcm09zdlai311ya4")))) (build-system meson-build-system) (arguments (list + #:meson meson-0.63 #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:phases #~(modify-phases %standard-phases -- cgit v1.2.3 From b01cb18287ab7ae1549a8c53328cc30bf6eab4a7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 14:19:12 -0400 Subject: gnu: gst-plugins-bad: Update to 1.22.1 and reinstate a few tests. * gnu/packages/gstreamer.scm (gst-plugins-bad): Update to 1.22.1. [arguments]: Use meson-0.63. Remove the disable-asfmux-test and reinstate the msdkh264enc, svthevcenc, dash_mpd and curlhttpsrc tests. --- gnu/packages/gstreamer.scm | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 4c53d06560..4b14d38339 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -761,14 +761,14 @@ model to base your own plug-in on, here it is.") (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.20.3") + (version "1.22.1") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "0kys6m5hg5bc30wfg8qa3s7dmkdz3kj1j8lhvn3267fxalxw24bs")) + "03lza1gq1j5gpz13fql47aaljs9k7qih02j2zzwnd1nr4brbcf9g")) (modules '((guix build utils))) (snippet '(begin @@ -777,21 +777,12 @@ model to base your own plug-in on, here it is.") (build-system meson-build-system) (arguments (list + #:meson meson-0.63 #:configure-flags #~(list "-Dsctp-internal-usrsctp=disabled") #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:phases #~(modify-phases %standard-phases #$@%common-gstreamer-phases - #$@(if (string-prefix? "arm" (or (%current-target-system) - (%current-system))) - ;; Disable test that fails on ARMv7. - ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/1188 - `((add-after 'unpack 'disable-asfmux-test - (lambda _ - (substitute* "tests/check/meson.build" - (("\\[\\['elements/asfmux\\.c'\\]\\],") - ""))))) - '()) (add-after 'unpack 'adjust-tests (lambda* (#:key native-inputs inputs #:allow-other-keys) (let ((gst-plugins-good (assoc-ref (or native-inputs inputs) @@ -803,18 +794,11 @@ model to base your own plug-in on, here it is.") (string-append "'GST_PLUGIN_SYSTEM_PATH_1_0', '" gst-plugins-good "/lib/gstreamer-1.0'")) - ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1136 - ((".*elements/msdkh264enc\\.c.*") "") - ((".*elements/svthevcenc\\.c.*") "") - ;; The 'elements_shm.test_shm_live' test sometimes times out ;; (see: ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790). ((".*'elements/shm\\.c'.*") "") - ;; FIXME: Why is this failing. - ((".*elements/dash_mpd\\.c.*") "") - ;; This test is flaky on at least some architectures. ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244 #$@(if (member (%current-system) @@ -823,9 +807,6 @@ model to base your own plug-in on, here it is.") "'elements/camerabin.c'], true, ],")) '()) - ;; These tests are flaky and occasionally time out: - ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/932 - ((".*elements/curlhttpsrc\\.c.*") "") ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412 ((".*elements/dtls\\.c.*") "")) (substitute* "tests/check/elements/zxing.c" -- cgit v1.2.3 From 981ce89ec0ff193147d86f95ccd664fded48338e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 14:20:37 -0400 Subject: gnu: gst-plugins-ugly: Update to 1.22.1. * gnu/packages/gstreamer.scm (gst-plugins-ugly): Update to 1.22.1. [arguments]: Use meson-0.63. --- gnu/packages/gstreamer.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 4b14d38339..b2a78a5556 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -945,7 +945,7 @@ par compared to the rest.") (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.20.3") + (version "1.22.1") (source (origin (method url-fetch) @@ -953,10 +953,11 @@ par compared to the rest.") (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 - (base32 "1zdfsq0zm1d3wj3w3z44bf3v28clr8yd6qzmkjs09hq9k9w21alc")))) + (base32 "1hhmi1jds1lcdr0w9jmi1ys0nkyfbpvb2jvw7k5f3g416khxkcsa")))) (build-system meson-build-system) (arguments - (list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + (list #:meson meson-0.63 + #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:phases #~(modify-phases %standard-phases #$@%common-gstreamer-phases -- cgit v1.2.3 From 96896e504be9a9f896de8ec5a7b37629c3073beb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 14:20:55 -0400 Subject: gnu: gst-libav: Update to 1.22.1. * gnu/packages/gstreamer.scm (gst-libav): Update to 1.22.1. [arguments]: Use meson-0.63. --- gnu/packages/gstreamer.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index b2a78a5556..42bbe3241b 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -1003,7 +1003,7 @@ think twice about shipping them.") (define-public gst-libav (package (name "gst-libav") - (version "1.20.3") + (version "1.22.1") (source (origin (method url-fetch) @@ -1012,8 +1012,9 @@ think twice about shipping them.") "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 - (base32 "1zkxybdzdkn07wwmj0rrgxyvbry472dggjv2chdsmpzwc02x3v9z")))) + (base32 "1yxmc3jchqyw0gcc5193640xf70s2dl55nzqh6jbghrsvhjyhn69")))) (build-system meson-build-system) + (arguments (list #:meson meson-0.63)) (native-inputs (list perl pkg-config python-wrapper ruby)) (inputs -- cgit v1.2.3 From 4737db6fdc9660fb501884d6b8cce220b83d1248 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 14:21:09 -0400 Subject: gnu: gst-editing-services: Update to 1.22.1. * gnu/packages/gstreamer.scm (gst-editing-services): Update to 1.22.1. [arguments]: Use meson-0.63. --- gnu/packages/gstreamer.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 42bbe3241b..9fb68a6cfb 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -1030,7 +1030,7 @@ decoders, muxers, and demuxers provided by FFmpeg.") (define-public gst-editing-services (package (name "gst-editing-services") - (version "1.20.3") + (version "1.22.1") (source (origin (method url-fetch) (uri (string-append @@ -1038,10 +1038,11 @@ decoders, muxers, and demuxers provided by FFmpeg.") "gst-editing-services-" version ".tar.xz")) (sha256 (base32 - "18msiadg6wi1636ylp02yfiwphxlz39gh3vbxchl9qpvd7g9dn2z")))) + "0f0l2qanwi8msv16aqi3xxpslw9wn4rg1ibix6hbk940xw45x7hg")))) (build-system meson-build-system) (arguments (list + #:meson meson-0.63 #:tests? #f ; FIXME: 16/23 failing tests. #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:phases #~(modify-phases %standard-phases -- cgit v1.2.3 From 0a6e9b54548ea27d5a2c63356720eca6e0d2c461 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 14:21:20 -0400 Subject: gnu: python-gst: Update to 1.22.1. * gnu/packages/gstreamer.scm (python-gst): Update to 1.22.1. [arguments]: Use meson-0.63. --- gnu/packages/gstreamer.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 9fb68a6cfb..74df3e69e2 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -1099,7 +1099,7 @@ binary, but none of the actual plugins."))) (define-public python-gst (package (name "python-gst") - (version "1.20.3") + (version "1.22.1") (source (origin (method url-fetch) (uri (string-append @@ -1107,10 +1107,11 @@ binary, but none of the actual plugins."))) "gst-python-" version ".tar.xz")) (sha256 (base32 - "1p6g05k88nbbv5x9madsvphxcdkfl1z0lmp39p6bhmg9x8h82d6v")))) + "1fryl7rifgjkcc3wsfn4c3as3znhr8y8jnsib8kn8nk83m28l04n")))) (build-system meson-build-system) (arguments (list + #:meson meson-0.63 #:modules `((guix build meson-build-system) (guix build utils) ((guix build python-build-system) #:prefix python:)) -- cgit v1.2.3 From de97f3fad9d8942cca3131b02f323da01378e7c9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 25 Mar 2023 09:19:30 -0400 Subject: gnu: webkitgtk: Update to 2.40.0. The version is re-integrated with the package to allow 'guix refresh -l' to work. * gnu/packages/patches/webkitgtk-libelogind.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/webkit.scm (%webkit-version): Delete variable. (webkitgtk): Update to 2.40.0. Apply new patch. [arguments]: Add a CMAKE_CXX_FLAGS configure flag. Delete help-cmake-find-elogind phase. [native-inputs]: Add unifdef. [inputs]: Remove gtk+-2. Add libavif. (wpewebkit): Update to 2.40.0. (webkitgtk-next) [inputs]: Remove now extraneous gtk+-2 deletion. --- gnu/local.mk | 1 + gnu/packages/patches/webkitgtk-libelogind.patch | 38 +++++++++++++++ gnu/packages/webkit.scm | 62 +++++++++++++------------ 3 files changed, 71 insertions(+), 30 deletions(-) create mode 100644 gnu/packages/patches/webkitgtk-libelogind.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1231d37234..e9c8ddf6a3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2005,6 +2005,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ + %D%/packages/patches/webkitgtk-libelogind.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ diff --git a/gnu/packages/patches/webkitgtk-libelogind.patch b/gnu/packages/patches/webkitgtk-libelogind.patch new file mode 100644 index 0000000000..fa1fbc8783 --- /dev/null +++ b/gnu/packages/patches/webkitgtk-libelogind.patch @@ -0,0 +1,38 @@ +From 8d46803c09edc2b6d4e35c778a3d2f90e5baad0b Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Sat, 25 Mar 2023 22:55:16 -0400 +Subject: [PATCH] Fallback to elogind when systemd is unavailable at build time + https://bugs.webkit.org/show_bug.cgi?id=254475 + +Reviewed by NOBODY (OOPS!). + +The build system supports elogind, but it only considers the +'libsystemd' library name for the pkg-config lookup and not +'libelogind'. This change makes the build system fallback to search +for libelogind when libsystemd was not found. + +* Source/cmake/FindJournald.cmake [!PC_SYSTEMD_FOUND]: Search for libelogind. +--- + Source/cmake/FindJournald.cmake | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Source/cmake/FindJournald.cmake b/Source/cmake/FindJournald.cmake +index 18dd6b50908c..e0dc9ce1d397 100644 +--- a/Source/cmake/FindJournald.cmake ++++ b/Source/cmake/FindJournald.cmake +@@ -55,6 +55,10 @@ find_package(PkgConfig QUIET) + + # libelogind provides compatible pc and header files + pkg_check_modules(PC_SYSTEMD QUIET libsystemd) ++if (NOT PC_SYSTEMD_FOUND) ++ pkg_check_modules(PC_SYSTEMD QUIET libelogind) ++endif () ++ + set(Journald_COMPILE_OPTIONS ${PC_SYSTEMD_CFLAGS_OTHER}) + set(Journald_VERSION ${PC_SYSTEMD_VERSION}) + + +base-commit: 43ea8744bc6065aad7ae5988e32d31d253905e5f +-- +2.39.2 + diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 0a51479985..e5eafcb142 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Marius Bakke -;;; Copyright © 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2022, 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -36,6 +36,7 @@ #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages c) #:use-module (gnu packages compression) #:use-module (gnu packages docbook) #:use-module (gnu packages enchant) @@ -123,20 +124,19 @@ the WPE-flavored port of WebKit.") engine that uses Wayland for graphics output.") (license license:bsd-2))) -(define %webkit-version "2.38.5") - (define-public webkitgtk (package (name "webkitgtk") ; webkit2gtk4 - (version %webkit-version) + (version "2.40.0") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "19y1n05mp370mq4bp2bk0pm3wk49z9a10azjjdcdyx12091hrhj0")) + (base32 "14xkgamqlshxqw6fcslvw0yzj4y5mvx66b6bn64rwrl9pyhpwq54")) (patches (search-patches - "webkitgtk-adjust-bubblewrap-paths.patch")))) + "webkitgtk-adjust-bubblewrap-paths.patch" + "webkitgtk-libelogind.patch")))) (build-system cmake-build-system) (outputs '("out" "doc" "debug")) (arguments @@ -148,18 +148,26 @@ engine that uses Wayland for graphics output.") ;; binaries require 20 GiB of memory to link (even with ld.gold or lld) ;; and produce 4.6 GiB of debug symbols. #:build-type "Release" - #:configure-flags #~(list - "-DPORT=GTK" - ;; GTKDOC will be removed upstream soon in favor of - ;; gi-docgen; it is normally disabled because the - ;; doc is rather expensive to build. - "-DENABLE_GTKDOC=ON" - ;; The minibrowser, not built by default, is a good - ;; tool to validate the good operation of - ;; webkitgtk. - "-DENABLE_MINIBROWSER=ON" - ;; The default lib installation prefix is lib64. - (string-append "-DLIB_INSTALL_DIR=" #$output "/lib")) + #:configure-flags + #~(list "-DPORT=GTK" + ;; GTKDOC will be removed upstream soon in favor of + ;; gi-docgen; it is normally disabled because the + ;; doc is rather expensive to build. + "-DENABLE_GTKDOC=ON" + ;; The minibrowser, not built by default, is a good + ;; tool to validate the good operation of + ;; webkitgtk. + "-DENABLE_MINIBROWSER=ON" + ;; The default lib installation prefix is lib64. + (string-append "-DLIB_INSTALL_DIR=" #$output "/lib") + ;; XXX: WebKitGTK makes use of elogind's systemd-compatible + ;; headers, which are under the include/elogind prefix. The WTF + ;; component doesn't propagate the Journald header correctly + ;; detected (stubs from elogind), hence the following hack (see: + ;; https://bugs.webkit.org/show_bug.cgi?id=254495). + (string-append "-DCMAKE_CXX_FLAGS=-I" + (search-input-directory + %build-inputs "include/elogind"))) ;; The build may fail with -j1 (see: ;; https://bugs.webkit.org/show_bug.cgi?id=195251). #:make-flags #~(list "-j" (number->string (max 2 (parallel-job-count)))) @@ -186,13 +194,6 @@ engine that uses Wayland for graphics output.") (substitute* "Source/cmake/OptionsCommon.cmake" (("if \\(LD_SUPPORTS_DISABLE_NEW_DTAGS\\)") "if (FALSE)")))) - (add-after 'unpack 'help-cmake-find-elogind - (lambda _ - (substitute* "Source/cmake/FindJournald.cmake" - ;; Otherwise, CMake would throw an error because it relies on - ;; the pkg-config search to locate headers. - (("pkg_check_modules\\(PC_SYSTEMD QUIET libsystemd") - "pkg_check_modules(PC_SYSTEMD QUIET libelogind")))) (add-after 'unpack 'embed-absolute-wpebackend-reference (lambda* (#:key inputs #:allow-other-keys) (let ((wpebackend-fdo (assoc-ref inputs "wpebackend-fdo"))) @@ -222,7 +223,8 @@ engine that uses Wayland for graphics output.") pkg-config python-wrapper gi-docgen - ruby)) + ruby + unifdef)) (propagated-inputs (list gtk+ libsoup)) (inputs @@ -233,11 +235,11 @@ engine that uses Wayland for graphics output.") geoclue gst-plugins-base gst-plugins-bad-minimal - gtk+-2 harfbuzz hyphen icu4c lcms + libavif libgcrypt libgudev libjpeg-turbo @@ -290,7 +292,7 @@ propagated by default) such as @code{gst-plugins-good} and (replace "gtk+" gtk))) (inputs (modify-inputs (package-inputs webkitgtk) - (delete "gtk+-2" "libnotify") + (delete "libnotify") (append pango-next))))) ;TODO: remove after it's the default ;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME @@ -310,13 +312,13 @@ propagated by default) such as @code{gst-plugins-good} and (package (inherit webkitgtk) (name "wpewebkit") - (version %webkit-version) + (version "2.40.0") (source (origin (inherit (package-source webkitgtk)) (uri (string-append "https://wpewebkit.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "0q8nmk9l6bqv2bhljm9wv7mvgdl393z7v2m7a0c5avac18yzs07z")))) + (base32 "1dl663nbm011sx099x9gdhk3aj119yn5rxp77jmnhdv1l77jpv58")))) (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) -- cgit v1.2.3 From f3b5201c86ea1b71ef4420c8ab4be7aedf1de6a5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Mar 2023 23:38:07 -0400 Subject: gnu: ffmpeg-5: Rename variable to ffmpeg. * gnu/packages/video.scm (ffmpeg-5): Rename to... (ffmpeg): ... this, replacing the old 'ffmpeg' alias. (ffmpeg-4): Adjust accordingly. * gnu/packages/jami.scm (ffmpeg-jami): Likewise. --- gnu/packages/jami.scm | 4 ++-- gnu/packages/video.scm | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 4e8d36ca96..65607249ba 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -349,7 +349,7 @@ (define-public ffmpeg-jami (package - (inherit ffmpeg-5) + (inherit ffmpeg) (name "ffmpeg-jami") ;; XXX: Use a slightly older version, otherwise the ;; 'libopusdec-enable-FEC' patch doesn't apply. @@ -363,7 +363,7 @@ "0yq0jcdc4qm5znrzylj3dsicrkk2n3n8bv28vr0a506fb7iglbpg")))) (outputs '("out" "debug")) (arguments - (substitute-keyword-arguments (package-arguments ffmpeg-5) + (substitute-keyword-arguments (package-arguments ffmpeg) ((#:configure-flags _ '()) #~(cons* "--disable-static" "--enable-shared" diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8ecbaa2602..bf9a7c8d03 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1576,7 +1576,7 @@ These tools require a supported graphics chip, driver, and VA-API back end to operate properly.") (license license:expat))) -(define-public ffmpeg-5 +(define-public ffmpeg (package (name "ffmpeg") (version "5.1.2") @@ -1772,7 +1772,7 @@ audio/video codec library.") (define-public ffmpeg-4 (package - (inherit ffmpeg-5) + (inherit ffmpeg) (version "4.4.2") (source (origin (method url-fetch) @@ -1781,10 +1781,10 @@ audio/video codec library.") (sha256 (base32 "14xadxm1yaamp216nq09xwasxg5g133v86dbb33mdg5di1zrlhdg")))) - (inputs (modify-inputs (package-inputs ffmpeg-5) + (inputs (modify-inputs (package-inputs ffmpeg) (replace "sdl2" sdl2-2.0))) (arguments - (substitute-keyword-arguments (package-arguments ffmpeg-5) + (substitute-keyword-arguments (package-arguments ffmpeg) ((#:configure-flags flags ''()) #~(cons "--enable-avresample" #$flags)))))) @@ -1863,8 +1863,6 @@ audio/video codec library.") (inputs (modify-inputs (package-inputs ffmpeg-3.4) (delete "libwebp"))))) -(define-public ffmpeg ffmpeg-5) - (define-public ffmpeg-for-stepmania (hidden-package (package -- cgit v1.2.3 From 7faa4c2aec3d7e9ece09bb27ae7ccc5a611c5d04 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Mar 2023 23:47:08 -0400 Subject: gnu: ffmpeg: Update to 6.0. * gnu/packages/video.scm (ffmpeg): Update to 6.0. (ffmpeg-5): New variable. * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Replace ffmpeg with ffmpeg-5. * gnu/packages/gnuzilla.scm (icedove-minimal): Likewise. --- gnu/packages/gnuzilla.scm | 11 +++++++---- gnu/packages/video.scm | 22 +++++++++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 932c0f9951..ace6662d48 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -704,9 +704,11 @@ variable defined below. It requires guile-json to be installed." libxcomposite libxt libffi - ffmpeg + ;; Support for FFmpeg 6 was only added in version 112 (see: + ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374). + ffmpeg-5 libvpx - icu4c-71 ; TODO: Change to 'icu4c' when its version is >= 71. + icu4c-71 ;TODO: Change to 'icu4c' when its version is >= 71. pixman pulseaudio mesa @@ -962,7 +964,7 @@ variable defined below. It requires guile-json to be installed." ;; complain that it's not able to change Cargo.lock. ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373 (substitute* "build/RunCbindgen.py" - (("\"--frozen\",") "")))) + (("\"--frozen\",") "")))) (delete 'bootstrap) (replace 'configure ;; configure does not work followed by both "SHELL=..." and @@ -1494,7 +1496,8 @@ ca495991b7852b855")) cairo cups dbus-glib - ffmpeg + ;; Support for FFmpeg 6 was only added in version 112 (see: + ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374). freetype gdk-pixbuf glib diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index bf9a7c8d03..0b06d3bcef 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1579,14 +1579,14 @@ operate properly.") (define-public ffmpeg (package (name "ffmpeg") - (version "5.1.2") + (version "6.0") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "1p7kxr0f9f9d0pyyxq9ciaj9ch2drmcw5p9jk22j111ccrnp17k1")))) + "10kh2f4y4isfqj4xpcqqnzk611jh89ywcjyjnq9c2jcv5p18ggjp")))) (build-system gnu-build-system) (inputs (append @@ -1728,8 +1728,8 @@ operate properly.") "--disable-static" #$@(if (target-riscv64?) - '("--extra-cflags=-fPIC") - '()) + '("--extra-cflags=-fPIC") + '()) ;; Runtime cpu detection is not implemented on ;; MIPS, so we disable some features. @@ -1770,9 +1770,21 @@ convert and stream audio and video. It includes the libavcodec audio/video codec library.") (license license:gpl2+))) -(define-public ffmpeg-4 +(define-public ffmpeg-5 (package (inherit ffmpeg) + (version "5.1.2") + (source (origin + (method url-fetch) + (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" + version ".tar.xz")) + (sha256 + (base32 + "1p7kxr0f9f9d0pyyxq9ciaj9ch2drmcw5p9jk22j111ccrnp17k1")))))) + +(define-public ffmpeg-4 + (package + (inherit ffmpeg-5) (version "4.4.2") (source (origin (method url-fetch) -- cgit v1.2.3 From ae3fb9c09f69bac84ad60374943a686a00c5d752 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 10:54:32 -0400 Subject: gnu: ffmpeg: Add a debug output. * gnu/packages/video.scm (ffmpeg) [outputs]: New field. [arguments]: Add --disable-stripping to configure flags. --- gnu/packages/video.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0b06d3bcef..8013d41fa0 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1587,6 +1587,7 @@ operate properly.") (sha256 (base32 "10kh2f4y4isfqj4xpcqqnzk611jh89ywcjyjnq9c2jcv5p18ggjp")))) + (outputs '("out" "debug")) (build-system gnu-build-system) (inputs (append @@ -1727,6 +1728,8 @@ operate properly.") ;; The static libraries are 23 MiB "--disable-static" + "--disable-stripping" + #$@(if (target-riscv64?) '("--extra-cflags=-fPIC") '()) -- cgit v1.2.3 From 5a7a1a9b3843c9b46d751d87281e405031c80fca Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Mar 2023 23:24:57 -0400 Subject: gnu: pjproject: Update to 2.13. * gnu/packages/telephony.scm (pjproject): Update to 2.13. [arguments]: Disable the resolver-related tests. --- gnu/packages/telephony.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 81621e9d4d..c921507fd3 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020, 2022 Michael Rohleder ;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 LibreMiami ;;; Copyright © 2021 Sarah Morgensen @@ -729,7 +729,7 @@ your calls and messages.") (define-public pjproject (package (name "pjproject") - (version "2.12.1") + (version "2.13") (source (origin (method git-fetch) @@ -739,7 +739,7 @@ your calls and messages.") (file-name (git-file-name name version)) (sha256 (base32 - "0xrj4sznbaip22y9hclff6y81l285bzkkj1smzifskpk3kiwp00w")) + "0ld0adp9y2ydnz2ldwdzig3hpk4ayx1va6aqc3nja8zfdnd36fyb")) (modules '((guix build utils))) (snippet '(begin @@ -820,7 +820,10 @@ your calls and messages.") "#define INCLUDE_TCP_TEST 0\n") ;; The TSX tests takes a very long time to run; skip them. (("#define INCLUDE_TSX_GROUP.*") - "#define INCLUDE_TSX_GROUP 0\n")) + "#define INCLUDE_TSX_GROUP 0\n") + ;; The resolve test requires a working domain name resolver. + (("#define INCLUDE_RESOLVE_TEST.*") + "#define INCLUDE_RESOLVE_TEST 0\n")) (substitute* "pjsip/src/test/dns_test.c" ;; The round_robin_test fails non-deterministically (depending ;; on load); skip it (see: -- cgit v1.2.3 From 48d1b90b19db0be3da90bac2994c6188b2a0cc91 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Mar 2023 21:25:08 -0400 Subject: gnu: jami: Update to 20230323.0. * gnu/packages/jami.scm (jami): Update to 20230323.0. (%ffmpeg-default-configure-flags): Update flags. (pjproject-jami): Update commit. (ffmpeg-jami) [version, source, outputs]: : Delete fields. [arguments]: Delete disable-problematic-tests phase. * gnu/packages/patches/jami-libjami-headers-search.patch: Rebase patch. --- gnu/packages/jami.scm | 57 ++++++---------------- .../patches/jami-libjami-headers-search.patch | 45 +++++------------ 2 files changed, 26 insertions(+), 76 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 65607249ba..7829f3db34 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -68,7 +68,7 @@ #:use-module (guix packages) #:use-module (guix utils)) -(define %jami-version "20230206.0") +(define %jami-version "20230323.0") (define %jami-sources ;; Return an origin object of the tarball release sources archive of the @@ -85,7 +85,7 @@ '(delete-file-recursively "daemon/contrib/tarballs")) (sha256 (base32 - "1fx7c6q8j0x3q8cgzzd4kpsw3npqggsi1n493cv1jg7v5d01d3jz")) + "0vjsjr37cb87j9hqbmipyxn4877k1wn3l0vzca3l3ldgknglz7v2")) (patches (search-patches "jami-disable-integration-tests.patch" "jami-libjami-headers-search.patch")))) @@ -107,8 +107,8 @@ patches)))) (define-public pjproject-jami - (let ((commit "20e00fcdd16459444bae2bae9c0611b63cf87297") - (revision "2")) + (let ((commit "e4b83585a0bdf1523e808a4fc1946ec82ac733d0") + (revision "3")) (package (inherit pjproject) (name "pjproject-jami") @@ -127,7 +127,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1g8nkb5ln5y208k2hhmlcddv2dzf6plfrsvi4x8sa7iwgb4prgb8")))) + "0gky5idyyqxhqk959lzys5l7x1i925db773lfdpvxxmkmfizdq21")))) (arguments (substitute-keyword-arguments (package-arguments pjproject) ((#:phases phases '%standard-phases) @@ -179,6 +179,7 @@ "--enable-muxer=h264" "--enable-muxer=hevc" "--enable-muxer=matroska" + "--enable-muxer=wav" "--enable-muxer=webm" "--enable-muxer=ogg" "--enable-muxer=pcm_s16be" @@ -257,40 +258,30 @@ "--enable-encoder=libopus" "--enable-decoder=libopus" - ;; Decoders for ringtones and audio streaming. + ;; Encoders/decoders for ringtones and audio streaming. "--enable-decoder=flac" "--enable-decoder=vorbis" "--enable-decoder=aac" "--enable-decoder=ac3" "--enable-decoder=eac3" "--enable-decoder=mp3" - "--enable-decoder=pcm_u24be" "--enable-decoder=pcm_u24le" - "--enable-decoder=pcm_u32be" "--enable-decoder=pcm_u32le" "--enable-decoder=pcm_u8" "--enable-decoder=pcm_f16le" - "--enable-decoder=pcm_f24le" - "--enable-decoder=pcm_f32be" "--enable-decoder=pcm_f32le" - "--enable-decoder=pcm_f64be" "--enable-decoder=pcm_f64le" - "--enable-decoder=pcm_s16be" - "--enable-decoder=pcm_s16be_planar" "--enable-decoder=pcm_s16le" - "--enable-decoder=pcm_s16le_planar" - "--enable-decoder=pcm_s24be" "--enable-decoder=pcm_s24le" - "--enable-decoder=pcm_s24le_planar" - "--enable-decoder=pcm_s32be" "--enable-decoder=pcm_s32le" - "--enable-decoder=pcm_s32le_planar" - "--enable-decoder=pcm_s64be" "--enable-decoder=pcm_s64le" - "--enable-decoder=pcm_s8" - "--enable-decoder=pcm_s8_planar" - "--enable-decoder=pcm_u16be" "--enable-decoder=pcm_u16le" + "--enable-encoder=pcm_u8" + "--enable-encoder=pcm_f32le" + "--enable-encoder=pcm_f64le" + "--enable-encoder=pcm_s16le" + "--enable-encoder=pcm_s32le" + "--enable-encoder=pcm_s64le" ;; Encoders/decoders for images. "--enable-encoder=gif" @@ -351,17 +342,6 @@ (package (inherit ffmpeg) (name "ffmpeg-jami") - ;; XXX: Use a slightly older version, otherwise the - ;; 'libopusdec-enable-FEC' patch doesn't apply. - (version "5.0.1") - (source (origin - (method url-fetch) - (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" - version ".tar.xz")) - (sha256 - (base32 - "0yq0jcdc4qm5znrzylj3dsicrkk2n3n8bv28vr0a506fb7iglbpg")))) - (outputs '("out" "debug")) (arguments (substitute-keyword-arguments (package-arguments ffmpeg) ((#:configure-flags _ '()) @@ -382,16 +362,7 @@ "rtp_ext_abs_send_time" "libopusdec-enable-FEC" "libopusenc-reload-packet-loss-at-encode" - "screen-sharing-x11-fix")))) - (add-after 'apply-patches 'disable-problematic-tests - (lambda _ - ;; The "rtp_ext_abs_send_time" patch causes the 'lavf-mov_rtphint' - ;; test to fail (see: - ;; https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/685). - (substitute* "tests/fate/lavf-container.mak" - (("mov mov_rtphint ismv") - "mov ismv") - (("fate-lavf-mov_rtphint:.*") "")))))))))) + "screen-sharing-x11-fix")))))))))) (define-public libjami (package diff --git a/gnu/packages/patches/jami-libjami-headers-search.patch b/gnu/packages/patches/jami-libjami-headers-search.patch index b3384ba563..92cc92a4a6 100644 --- a/gnu/packages/patches/jami-libjami-headers-search.patch +++ b/gnu/packages/patches/jami-libjami-headers-search.patch @@ -1,30 +1,10 @@ -From 1168aba6181e30ee4c322e5f437bde22bece5698 Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer -Date: Sat, 5 Nov 2022 23:18:13 -0400 -Subject: [PATCH 1/3] cmake: Simplify lookup logic for libjami headers. - -* extras/build/cmake/modules/FindLibJami.cmake: Rename -LIBJAMI_INCLUDE_DIRS to LIBJAMI_INCLUDE_DIR. Use find_path to search -for jami.h directory. -* CMakeLists.txt: Adjust accordingly. -* src/libclient/CMakeLists.txt: Likewise. -* src/libclient/qtwrapper/CMakeLists.txt: Likewise. - -Change-Id: I494358f9bfafb41f000daeec4196747b2c184401 ---- -Upstream status: https://review.jami.net/c/jami-client-qt/+/22973 - - CMakeLists.txt | 2 +- - extras/build/cmake/modules/FindLibJami.cmake | 21 ++++++-------------- - src/libclient/CMakeLists.txt | 2 +- - src/libclient/qtwrapper/CMakeLists.txt | 2 +- - 4 files changed, 9 insertions(+), 18 deletions(-) +Upstream status: https://review.jami.net/c/jami-client-qt/+/24273. diff --git a/CMakeLists.txt b/CMakeLists.txt -index d0a8fd70..94ac6074 100644 +index 8d71b84b..36729698 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -118,7 +118,7 @@ set(CMAKE_MODULE_PATH +@@ -136,7 +136,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules") find_package(LibJami REQUIRED) if(LIBJAMI_FOUND) @@ -34,15 +14,15 @@ index d0a8fd70..94ac6074 100644 include(FindPython3) diff --git a/extras/build/cmake/modules/FindLibJami.cmake b/extras/build/cmake/modules/FindLibJami.cmake -index ddb05319..9ad20d2b 100644 +index 5cce45fc..11746cd8 100644 --- a/extras/build/cmake/modules/FindLibJami.cmake +++ b/extras/build/cmake/modules/FindLibJami.cmake -@@ -20,28 +20,19 @@ +@@ -20,30 +20,19 @@ # Once done, this find module will set: # -# LIBJAMI_INCLUDE_DIRS - libjami include directories -+# LIBJAMI_INCLUDE_DIR - libjami include directories ++# LIBJAMI_INCLUDE_DIR - libjami include directory # LIBJAMI_FOUND - whether it was able to find the include directories # LIBJAMI_LIB - path to libjami or libring library @@ -62,16 +42,18 @@ index ddb05319..9ad20d2b 100644 - set(LIBJAMI_INCLUDE_DIRS ${RING_BUILD_DIR}/jami) - elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/include/jami/jami.h) - set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/jami) +- elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami/jami.h) +- set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami) - else() + find_path(LIBJAMI_INCLUDE_DIR jami.h PATH_SUFFIXES jami) + if(NOT LIBJAMI_INCLUDE_DIR) message(STATUS "Jami daemon headers not found! -Set -DLIBJAMI_BUILD_DIR or -DCMAKE_INSTALL_PREFIX") -+Set -DCMAKE_INSTALL_PREFIX or use -DWITH_DAEMON_SUBMODULE") ++To build using the daemon git submodule, set -DWITH_DAEMON_SUBMODULE") set(LIBJAMI_FOUND false) endif() endif() -@@ -102,5 +93,5 @@ endif() +@@ -115,5 +104,5 @@ endif() # Restore the original value of CMAKE_FIND_LIBRARY_SUFFIXES. set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_orig}) @@ -79,7 +61,7 @@ index ddb05319..9ad20d2b 100644 +message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIR}) message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB}) diff --git a/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt -index 2676c9c4..ac58ea2b 100644 +index 144efaf5..cb87fc2a 100644 --- a/src/libclient/CMakeLists.txt +++ b/src/libclient/CMakeLists.txt @@ -62,7 +62,7 @@ set(CMAKE_MODULE_PATH @@ -92,7 +74,7 @@ index 2676c9c4..ac58ea2b 100644 string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT) diff --git a/src/libclient/qtwrapper/CMakeLists.txt b/src/libclient/qtwrapper/CMakeLists.txt -index acee0d0c..ba68aac4 100644 +index 46887051..a20658ad 100644 --- a/src/libclient/qtwrapper/CMakeLists.txt +++ b/src/libclient/qtwrapper/CMakeLists.txt @@ -46,7 +46,7 @@ else() @@ -104,6 +86,3 @@ index acee0d0c..ba68aac4 100644 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../dbus) --- -2.37.3 - -- cgit v1.2.3 From 0b7dfbba953761b106dab0c4fa4cbde6bc5daee7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 12:59:18 -0400 Subject: gnu: jami-docs: Update to 0.0.0-1.ff466eb. * gnu/packages/jami.scm (jami-docs): Update to 0.0.0-1.ff466eb. --- gnu/packages/jami.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 7829f3db34..db120f223e 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -538,8 +538,8 @@ P2P-DHT.") (define-public jami-docs ;; There aren't any tags, so use the latest commit. - (let ((revision "0") - (commit "b00574bcc46538c4b405b5edb3b43bf5404ff511")) + (let ((revision "1") + (commit "ff466ebadb9b99a1672a814126793de670c3099b")) (package (name "jami-docs") (version (git-version "0.0.0" revision commit)) @@ -551,7 +551,7 @@ P2P-DHT.") (file-name (git-file-name name version)) (sha256 (base32 - "0iayi6yrb6djk0l2dwdxzlsga9c18ra8adplh8dad3zjdi75wnsq")))) + "1n8a9dk8mi617rk3ycz5jrzbwv9ybfynlci5faz1klckx0aqdf6q")))) (build-system copy-build-system) (arguments (list -- cgit v1.2.3 From 18e1325119ca791bc5b0bcc663a8b779ed1087e8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 14:44:28 -0400 Subject: gnu: Remove libcanberra/gtk+-2. * gnu/packages/libcanberra.scm (libcanberra/gtk+-2): Delete variable. --- gnu/packages/libcanberra.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index 86e77b0f22..c0ec47a445 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -104,12 +104,6 @@ GNOME. It comes with several backends (ALSA, PulseAudio, OSS, GStreamer, null) and is designed to be portable.") (license lgpl2.1+))) -(define-public libcanberra/gtk+-2 - (package/inherit libcanberra - (name "libcanberra-gtk2") - (inputs `(,@(alist-delete "gtk+" (package-inputs libcanberra)) - ("gtk+" ,gtk+-2))))) - (define-public sound-theme-freedesktop (package (name "sound-theme-freedesktop") -- cgit v1.2.3 From cc3dc58f2b84dd2d15ff67edef22ddd5a9e82580 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 15:07:03 -0400 Subject: build: qt-utils: Revert setting QT_PLUGIN_PATH exactly. Fixes . The documentation of Qt states that it is a supported use case to mix Qt 5 and Qt 6 plugins in QT_PLUGIN_PATH [0]. This reverts the change to QT_PLUGIN_PATH introduced in 1f466ed6be9 ("build: qt: Add qtbase argument and wrap Qt environment variables exactly."). [0] https://doc.qt.io/qt-6.2/deployment-plugins.html#loading-and-verifying-plugins-dynamically * guix/build/qt-utils.scm (variables-for-wrapping): Wrap QT_PLUGIN_PATH using the prefix method. --- guix/build/qt-utils.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index 2e47f1bc02..7f503320d2 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. @@ -87,9 +88,7 @@ "/applications" "/cursors" "/fonts" "/icons" "/glib-2.0/schemas" "/mime" "/sounds" "/themes" "/wallpapers") '("XDG_CONFIG_DIRS" suffix directory "/etc/xdg") - ;; We wrap exactly to avoid potentially mixing Qt5/Qt6 components, which - ;; would cause warnings, perhaps problems. - `("QT_PLUGIN_PATH" = directory + `("QT_PLUGIN_PATH" prefix directory ,(format #f "/lib/qt~a/plugins" qt-major-version)) `("QML2_IMPORT_PATH" = directory ,(format #f "/lib/qt~a/qml" qt-major-version)) -- cgit v1.2.3 From 169119b8aa78f83aa8a59c7051b48b728f335f7d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 15:11:38 -0400 Subject: gnu: qtbase-5: Update to 5.15.8. * gnu/packages/qt.scm (qtbase-5): Update to 5.15.8. [inputs]: Remove labels. --- gnu/packages/qt.scm | 92 ++++++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2e9cc3e1f5..dd3be03abd 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -337,13 +337,13 @@ system, and the core design of Django is reused in Grantlee.") (define-public qtbase-5 (package (name "qtbase") - (version "5.15.5") + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "1p2fa94m1y8qzhdfi2d7dck93qh1lgsinibwl1wy92bwmacwfhhc")) + "175ynjndpzsw69vnsq4swykn9f48568ww9b4z3yw7azkqwk13cdz")) ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch" "qtbase-moc-ignore-gcc-macro.patch" @@ -364,50 +364,50 @@ system, and the core design of Django is reused in Grantlee.") ;; Use which the package, not the function (@ (gnu packages base) which))) (inputs - `(("alsa-lib" ,alsa-lib) - ("cups" ,cups) - ("dbus" ,dbus) - ("double-conversion" ,double-conversion) - ("eudev" ,eudev) - ("expat" ,expat) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("gtk+" ,gtk+) ;for GTK theme support - ("harfbuzz" ,harfbuzz) - ("icu4c" ,icu4c) - ("libinput" ,libinput-minimal) - ("libjpeg" ,libjpeg-turbo) - ("libmng" ,libmng) - ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxcomposite" ,libxcomposite) - ("libxcursor" ,libxcursor) - ("libxfixes" ,libxfixes) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxkbcommon" ,libxkbcommon) - ("libxml2" ,libxml2) - ("libxrandr" ,libxrandr) - ("libxrender" ,libxrender) - ("libxslt" ,libxslt) - ("libxtst" ,libxtst) - ("mtdev" ,mtdev) - ("mariadb-dev" ,mariadb "dev") - ("nss" ,nss) - ("openssl" ,openssl) - ("pcre2" ,pcre2) - ("postgresql" ,postgresql) - ("pulseaudio" ,pulseaudio) - ("sqlite" ,sqlite) - ("unixodbc" ,unixodbc) - ("xcb-util" ,xcb-util) - ("xcb-util-image" ,xcb-util-image) - ("xcb-util-keysyms" ,xcb-util-keysyms) - ("xcb-util-renderutil" ,xcb-util-renderutil) - ("xcb-util-wm" ,xcb-util-wm) - ("xdg-utils" ,xdg-utils) - ("zlib" ,zlib))) + (list alsa-lib + cups + dbus + double-conversion + eudev + expat + fontconfig + freetype + glib + gtk+ ;for GTK theme support + harfbuzz + icu4c + libinput-minimal + libjpeg-turbo + libmng + libpng + libx11 + libxcomposite + libxcursor + libxfixes + libxi + libxinerama + libxkbcommon + libxml2 + libxrandr + libxrender + libxslt + libxtst + mtdev + `(,mariadb "dev") + nss + openssl + pcre2 + postgresql + pulseaudio + sqlite + unixodbc + xcb-util + xcb-util-image + xcb-util-keysyms + xcb-util-renderutil + xcb-util-wm + xdg-utils + zlib)) (native-inputs (list bison flex -- cgit v1.2.3 From ff7668cbc086a8050058bd9aef75ede803dc1386 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 15:27:07 -0400 Subject: gnu: qt3d-5: Update to 5.15.8. * gnu/packages/qt.scm (qt3d-5): Update to 5.15.8. --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index dd3be03abd..ec4364b8de 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -872,13 +872,13 @@ developers using C++ or QML, a CSS & JavaScript like language.") (package (inherit qtbase-5) (name "qt3d") - (version "5.15.5") + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "1m3y7d58crn0qgfwkimxcggssn2pbs8nj5b9diwns6rwqg4aqk20")))) + "18hbv4l9w0czaxcch6af9130fgs4sf400xp0pfzl81c78fwrkfsb")))) (propagated-inputs `()) (native-inputs (list perl)) (inputs (list mesa qtbase-5 vulkan-headers zlib)) -- cgit v1.2.3 From 69a4c39100066da7dfa0a1428afc356ae671c407 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 15:27:07 -0400 Subject: gnu: qtsvg-5: Update to 5.15.8. * gnu/packages/qt.scm (qtsvg-5): Update to 5.15.8. --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ec4364b8de..632f9cba0f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -964,13 +964,13 @@ came with the @{qtgraphicaleffects} Qt 5 package.") (package (inherit qtbase-5) (name "qtsvg") - (version "5.15.5") + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0cdhmhxngv4y7kl5vbcii4l4anbz0hj7dvhlddy1agyl19j9xky4")))) + "0qnmcvp5jap4qq9w7xak66g6fsb48q1lg02rn4lycvnhgwzblbww")))) (propagated-inputs `()) (native-inputs (list perl)) (inputs -- cgit v1.2.3 From 1871e4ec8b8f6c933f420c1180c26e4e907aa4f5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 15:27:08 -0400 Subject: gnu: qtimageformats: Update to 5.15.8. * gnu/packages/qt.scm (qtimageformats): Update to 5.15.8. --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 632f9cba0f..9df7eb705f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1063,13 +1063,13 @@ HostData=lib/qt5 (define-public qtimageformats (package (inherit qtsvg-5) (name "qtimageformats") - (version "5.15.5") + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "1xjb2z2h1ajw7z9cwq8djpdvjwalpnmirwcwrlbjqv5r4ghmi82a")) + "0c6fq9zcw5hbkiny56wx2fbm123x14l7habydv6zhvnhn3rhwi31")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From b3371b57c3fc753161066287ffd8c33f7a2155ef Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 15:27:08 -0400 Subject: gnu: qtx11extras: Update to 5.15.8. * gnu/packages/qt.scm (qtx11extras): Update to 5.15.8. --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9df7eb705f..56e4ac496c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1090,13 +1090,13 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (define-public qtx11extras (package (inherit qtsvg-5) (name "qtx11extras") - (version "5.15.5") + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0wxsrnnkkn68myy211rfz98brs7j3qmx3hmy097vh5avgsmw11bn")))) + "1gzmf0y2byzrgfbing7xk3cwlbk1cyjlhqjbfh8n37y09gg65maf")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests -- cgit v1.2.3 From cbd36c72bedfb60bda3af7fd84af5e994a5f04a5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 15:27:08 -0400 Subject: gnu: qtxmlpatterns: Update to 5.15.8. * gnu/packages/qt.scm (qtxmlpatterns): Update to 5.15.8. --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 56e4ac496c..ad43be4821 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1155,13 +1155,13 @@ XLSX document format.") (define-public qtxmlpatterns (package (inherit qtsvg-5) (name "qtxmlpatterns") - (version "5.15.5") + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "065vj1gk5i4cg0f9spksyb9ps4px0vssx262y77aakvw408vfmq5")))) + "1inf7ar32a557faqpwdsmafhz1p6k8hywpw3wbsdjlj74dkgdq35")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) -- cgit v1.2.3 From eb03caf7d7a8a9f0439ff7c5f99158170220c455 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 15:27:09 -0400 Subject: gnu: qtdeclarative-5: Update to 5.15.8. * gnu/packages/qt.scm (qtdeclarative-5): Update to 5.15.8. [arguments]: Use gexps. Address TODO. --- gnu/packages/qt.scm | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ad43be4821..6de6bbe599 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1181,38 +1181,35 @@ XML and custom data models. It contains programs such as xmlpatterns and xmlpatternsvalidator."))) (define-public qtdeclarative-5 - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtdeclarative") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0ji5131g7h2mrgxw1wxc5mcvmsn3fbw64j28gzpa25gv3vcnkhaw")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f) ;TODO: Enable the tests ((#:phases phases) - `(modify-phases ,phases - (add-after 'build 'fix-qt5core-install-prefix - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen - ;; is provided by qtdeclarative-5. - (substitute* - "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" - (("\\$\\{_qt5Core_install_prefix\\}") out))))) - ;; TODO: Add phase unconditionally. - ,@(if (target-riscv64?) - '((add-after 'unpack 'fix-linking-riscv64 - (lambda _ - (substitute* "src/qml/qml.pro" - (("DEFINES \\+= QT_NO_FOREACH") - (string-append - "isEqual(QT_ARCH, \"riscv64\"): QMAKE_LIBS += -latomic\n\n" - "DEFINES += QT_NO_FOREACH")))))) - '()))))) + #~(modify-phases #$phases + (add-after 'build 'fix-qt5core-install-prefix + (lambda _ + ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen + ;; is provided by qtdeclarative-5. + (substitute* + "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" + (("\\$\\{_qt5Core_install_prefix\\}") #$output)))) + (add-after 'unpack 'fix-linking-riscv64 + (lambda _ + (substitute* "src/qml/qml.pro" + (("DEFINES \\+= QT_NO_FOREACH") + (string-append + "isEqual(QT_ARCH, \"riscv64\"): QMAKE_LIBS += -latomic\n\n" + "DEFINES += QT_NO_FOREACH"))))))))) (native-inputs (list perl pkg-config -- cgit v1.2.3 From d212971661b2dcbfc25e6ad485485ba72b0a0d28 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:48 -0400 Subject: gnu: qtconnectivity: Update to 5.15.8. * gnu/packages/qt.scm (qtconnectivity): Update to 5.15.8. --- gnu/packages/qt.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6de6bbe599..9fc0119440 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1359,15 +1359,16 @@ integrate QML code with JavaScript and C++.") (license (package-license qtbase)))) (define-public qtconnectivity - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtconnectivity") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0b2dnxw1rjbp1srhgns148cwl99f50mx29588dal3avv0f73s597")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "1j6qgkg77ycwcjxnhh38i9np1z8pjsqrzvfk3zsyq07f6k563fnc")))) (native-inputs (list perl pkg-config qtdeclarative-5)) (inputs -- cgit v1.2.3 From d8ab018f89f9ad6d7c0cacf3c9ed3b009e2f12fd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:49 -0400 Subject: gnu: qtwebsockets-5: Update to 5.15.8. * gnu/packages/qt.scm (qtwebsockets-5): Update to 5.15.8. --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9fc0119440..e8cd4972f0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1380,13 +1380,13 @@ with Bluetooth and NFC."))) (define-public qtwebsockets-5 (package (inherit qtsvg-5) (name "qtwebsockets") - (version "5.15.5") + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0f120rfqnmlffjhrm5jbpipk1qsbzp1a2v3q8gz94hz6n9dqpav6")))) + "12h520lpj2pljgkyq36p1509mw4pxgb76n30d32kg52crjsk34pa")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests -- cgit v1.2.3 From e3be7765cbf15f686ef30f705520f491e386f7cd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:49 -0400 Subject: gnu: qtsensors: Update to 5.15.8. * gnu/packages/qt.scm (qtsensors): Update to 5.15.8. --- gnu/packages/qt.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e8cd4972f0..ed9413cb28 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1440,25 +1440,26 @@ consume data received from the server, or both.") (license (package-license qtbase)))) (define-public qtsensors - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtsensors") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0zlhm4js02niibb23rw87wf4ik0gy4ai08fwprnwy7zf4rm1ss3d")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "1fdpgbikvxjacyipcyac0czqhv96pvc75dl9cyafslws8m53fm56")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) - ((#:parallel-tests? _ #f) #f) ; can lead to race condition + ((#:parallel-tests? _ #f) #f) ; can lead to race condition ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'fix-tests (lambda _ (substitute* "tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp" - (("2000") "5000") ;lengthen test timeout - (("QTest::newRow(\"twist\") << \"twist\"") "")))))))) ;failing test + (("2000") "5000") ;lengthen test timeout + (("QTest::newRow(\"twist\") << \"twist\"") "")))))))) ;failing test (native-inputs (list perl qtdeclarative-5)) (inputs (list qtbase-5)) -- cgit v1.2.3 From 4f884cff29ac1480c4fa8123b6a229befbc6caa7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:49 -0400 Subject: gnu: qtmultimedia-5: Update to 5.15.8. * gnu/packages/qt.scm (qtmultimedia-5): Update to 5.15.8. --- gnu/packages/qt.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ed9413cb28..00e3bdbc3e 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1472,21 +1472,21 @@ recognition API for devices."))) (package (inherit qtsvg-5) (name "qtmultimedia") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0q76iy1frcgm85mid17lh4p6gnn04n19n6zklgpv4w3md1ng97xw")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "1fz0ffpckvbg6qfhab2rrzfnvh4mlalqxcn0kbkd21mi44apjirk")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "examples/multimedia/spectrum/3rdparty") - ;; We also prevent the spectrum example from being built. - (substitute* "examples/multimedia/multimedia.pro" - (("spectrum") "#")))))) + ;; We also prevent the spectrum example from being built. + (substitute* "examples/multimedia/multimedia.pro" + (("spectrum") "#")))))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) -- cgit v1.2.3 From b7f1104f0f14cf9f187cc8e8b05224d34914380b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:50 -0400 Subject: gnu: qtwayland-5: Update to 5.15.8. * gnu/packages/qt.scm (qtwayland-5): Update to 5.15.8. [arguments]: Use gexps. --- gnu/packages/qt.scm | 54 ++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 00e3bdbc3e..80317ef5ec 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1608,38 +1608,38 @@ set of plugins for interacting with pulseaudio and GStreamer.") (license (package-license qtbase)))) (define-public qtwayland-5 - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtwayland") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (patches (search-patches "qtwayland-gcc-11.patch" - "qtwayland-dont-recreate-callbacks.patch" - "qtwayland-cleanup-callbacks.patch")) - (sha256 - (base32 - "0yy8qf9kn15iqsxi2r7jbcsc0vsdyfz7bbxmfn4i9qmz1yvg0jgr")))) + (method url-fetch) + (uri (qt-urls name version)) + (patches (search-patches "qtwayland-gcc-11.patch" + "qtwayland-dont-recreate-callbacks.patch" + "qtwayland-cleanup-callbacks.patch")) + (sha256 + (base32 + "0aa5jcvvap6qca6imdkhs1mhv5bnaxn466mmpl7x78jx1za7n3ps")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'disable-failing-tests - (lambda _ - ;; FIXME: tst_seatv4::animatedCursor() fails for no good - ;; reason and breaks these two tests. - (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"))))))) - (native-inputs - (list glib perl pkg-config qtdeclarative-5)) + #~(modify-phases #$phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; FIXME: tst_seatv4::animatedCursor() fails for no good + ;; reason and breaks these two tests. + (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"))))))) + (native-inputs (list glib perl pkg-config qtdeclarative-5)) (inputs (list fontconfig freetype -- cgit v1.2.3 From 2e3c732141b4e9a9d6003f8124cad51e9bb85847 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:50 -0400 Subject: gnu: qtserialport: Update to 5.15.8. * gnu/packages/qt.scm (qtserialport): Update to 5.15.8. [arguments]: Use gexps. Simplify pattern in patch-dlopen-paths. --- gnu/packages/qt.scm | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 80317ef5ec..596a7a86d3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1708,30 +1708,32 @@ compositor libraries.") (license (package-license qtbase)))) (define-public qtserialport - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtserialport") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0xg2djwhrj5jqamawlp75g70nmwbp2ph2hh1pm45s36jkxm0k7al")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "04i8pdyml1sw4dkk9vyw2xy5bz3fp6f90fws7ag5y8iizfgs5v2v")))) (native-inputs (list perl)) - (inputs - (list qtbase-5 eudev)) + (inputs (list qtbase-5 eudev)) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'patch-dlopen-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/serialport/qtudev_p.h" - ;; Use the absolute paths for dynamically loaded libs, - ;; otherwise the lib will be searched in LD_LIBRARY_PATH which - ;; typically is not set in guix. - (("^\\s*(udevLibrary->setFileNameAndVersion\\(QStringLiteral\\(\")(udev\"\\),\\s*[0-9]+\\);)" _ a b) - (string-append a (assoc-ref inputs "eudev") "/lib/lib" b))))))))) + #~(modify-phases #$phases + (add-after 'unpack 'patch-dlopen-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/serialport/qtudev_p.h" + ;; Use the absolute paths for dynamically loaded libs, + ;; otherwise the lib will be searched in LD_LIBRARY_PATH which + ;; typically is not set in guix. + (("setFileNameAndVersion\\(QStringLiteral\\(\"udev\")") + (format #f "setFileNameAndVersion(QStringLiteral(~s))" + (string-append #$(this-package-input "eudev") + "/lib/libudev")))))))))) (synopsis "Qt Serial Port module") (description "The Qt Serial Port module provides the library for interacting with serial ports from within Qt."))) -- cgit v1.2.3 From 111f2582228cdc6abe9245a554d2efddf514b5ca Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:50 -0400 Subject: gnu: qtserialbus: Update to 5.15.8. * gnu/packages/qt.scm (qtserialbus): Update to 5.15.8. [arguments]: Use gexps. Use search-input-file in the patch-libsocketcan-reference phase. --- gnu/packages/qt.scm | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 596a7a86d3..c9fd99492f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1739,29 +1739,28 @@ compositor libraries.") interacting with serial ports from within Qt."))) (define-public qtserialbus - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtserialbus") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "180gm1jvqfn0h3251zafdd1wd3af00phwaa5qljsbrj6s6ywj79j")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "0ws3pjbp4g8f49k8q0qa5hgyisbyk3m7kl8pwzkfws048glvz570")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-after 'unpack 'patch-libsocketcan-reference - (lambda* (#:key inputs #:allow-other-keys) - (let* ((libcansocket (assoc-ref inputs "libsocketcan")) - (libcansocket.so (string-append libcansocket - "/lib/libsocketcan.so"))) - (substitute* "src/plugins/canbus/socketcan/libsocketcan.cpp" - (("QStringLiteral\\(\"socketcan\"\\)") - (format #f "QStringLiteral(~s)" libcansocket.so)))))))))) - (inputs - (list libsocketcan qtbase-5 qtserialport)) + #~(modify-phases #$phases + (add-after 'unpack 'patch-libsocketcan-reference + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/plugins/canbus/socketcan/libsocketcan.cpp" + (("QStringLiteral\\(\"socketcan\"\\)") + (format #f "QStringLiteral(~s)" + (search-input-file inputs + "lib/libsocketcan.so")))))))))) + (inputs (list libsocketcan qtbase-5 qtserialport)) (synopsis "Qt Serial Bus module") (description "The Qt Serial Bus API provides classes and functions to access the various industrial serial buses and protocols, such as CAN, ModBus, -- cgit v1.2.3 From fb27e0a460896997a934c17027d2143b11b112ac Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:51 -0400 Subject: gnu: qtwebchannel-5: Update to 5.15.8. * gnu/packages/qt.scm (qtwebchannel-5): Update to 5.15.8. --- gnu/packages/qt.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c9fd99492f..eaa60e1ace 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1769,15 +1769,14 @@ and others."))) (define-public qtwebchannel-5 (package (inherit qtsvg-5) (name "qtwebchannel") - (version "5.15.5") + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "1w8mcpdqlphgg3a6yfq18liwlj2nkwrafv0n80h242x5l2mk3ljf")))) - (native-inputs - (list perl qtdeclarative-5 qtwebsockets-5)) + "1pfmy6fqis47awjb590r63y13vvsfm0fq70an3ylsknhyq3firgn")))) + (native-inputs (list perl qtdeclarative-5 qtwebsockets-5)) (inputs (list qtbase-5)) (synopsis "Web communication library for Qt") (description "The Qt WebChannel module enables peer-to-peer communication -- cgit v1.2.3 From e31ebc638d8a3af154c9426850e2e69a4d5cbf9a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:51 -0400 Subject: gnu: qtwebglplugin: Update to 5.15.8. * gnu/packages/qt.scm (qtwebglplugin): Update to 5.15.8. [arguments]: Use gexps. --- gnu/packages/qt.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index eaa60e1ace..d0d303aeb8 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1822,25 +1822,26 @@ application).") (license (package-license qtbase)))) (define-public qtwebglplugin - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtwebglplugin") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "1m0p4ssykw07lbip2qyv6w34f8ng13bxb63j0w446f5w0492nn9f")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "1gvzhgfn55kdp5g11fg5yja5xb6wghx5sfc8vfp8zzpxnak7pbn1")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'disable-network-tests - (lambda _ (substitute* "tests/plugins/platforms/platforms.pro" - (("webgl") "# webgl")))))))) + #~(modify-phases #$phases + (add-after 'unpack 'disable-network-tests + (lambda _ + (substitute* "tests/plugins/platforms/platforms.pro" + (("webgl") "# webgl")))))))) (native-inputs '()) - (inputs - (list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib)) + (inputs (list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib)) (synopsis "QPA plugin for running applications via a browser using streamed WebGL commands") (description "Qt back end that uses WebGL for rendering. It allows Qt -- cgit v1.2.3 From 96a6aa51f1cd057a65fbde64228a6df3204fdf7c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:51 -0400 Subject: gnu: qtwebview: Update to 5.15.8. * gnu/packages/qt.scm (qtwebview): Update to 5.15.8. --- gnu/packages/qt.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d0d303aeb8..08b791f9bf 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1851,19 +1851,18 @@ compatible web browser without the use of plug-ins. The API is similar to OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (define-public qtwebview - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtwebview") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0arwaky3jy5ql3z4d8f7k7diidzb1kncdans7pn50hsa1bzacfal")))) - (native-inputs - (list perl)) - (inputs - (list qtbase-5 qtdeclarative-5)) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "1b03dzlff840n2i53r105c7sv91ivwzxn7ldpgnhiyrhr897i9kj")))) + (native-inputs (list perl)) + (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Display web content in a QML application") (description "Qt WebView provides a way to display web content in a QML application without necessarily including a full web browser stack by using -- cgit v1.2.3 From 675092b90b9c0712f224ed3e6735c178e8fc3bb8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:51 -0400 Subject: gnu: qtlocation: Update to 5.15.5. * gnu/packages/qt.scm (qtlocation): Update to 5.15.5. [arguments]: Use gexps. --- gnu/packages/qt.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 08b791f9bf..ca0614af4b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1869,27 +1869,26 @@ application without necessarily including a full web browser stack by using native APIs where it makes sense."))) (define-public qtlocation - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtlocation") (version "5.15.5") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0mlhhhcxx3gpr9kh04c6fljxcj50c2j21r0wb9f7d7nk4flip7b2")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "0mlhhhcxx3gpr9kh04c6fljxcj50c2j21r0wb9f7d7nk4flip7b2")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) - ((#:tests? _ #f) #f) ; TODO: Enable the tests + ((#:tests? _ #f) #f) ; TODO: Enable the tests ((#:phases phases) - `(modify-phases ,phases - (add-before 'check 'pre-check - (lambda _ - (setenv "HOME" "/tmp"))))))) - (native-inputs - (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport)) - (inputs - (list icu4c openssl qtbase-5 zlib)) + #~(modify-phases #$phases + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" "/tmp"))))))) + (native-inputs (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport)) + (inputs (list icu4c openssl qtbase-5 zlib)) (synopsis "Qt Location and Positioning modules") (description "The Qt Location module provides an interface for location, positioning and geolocation plugins."))) -- cgit v1.2.3 From bb70354eb7616907c50335bb5d408c7cb6413d74 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:52 -0400 Subject: gnu: qttools-5: Update to 5.15.8. * gnu/packages/qt.scm (qttools-5): Update to 5.15.8. --- gnu/packages/qt.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ca0614af4b..8bfdf1e732 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1926,22 +1926,21 @@ plugin for Adobe After Effects.") (license (package-license qtbase)))) (define-public qttools-5 - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qttools") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0v7wkzq9i8w3qrw0z8al7lb6clr57lfisyb1fm9cnhi73fvph1vd")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "1i79fwsn799x3n3jidp3f4gz9d5vi9gg6p8g8lbswb832gggigm3")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests - (native-inputs - (list perl qtdeclarative-5 vulkan-headers)) - (inputs - (list mesa qtbase-5)) + ((#:tests? _ #f) #f))) ; TODO: Enable the tests + (native-inputs (list perl qtdeclarative-5 vulkan-headers)) + (inputs (list mesa qtbase-5)) (synopsis "Qt Tools and Designer modules") (description "The Qt Tools module provides a set of applications to browse the documentation, translate applications, generate help files and other stuff -- cgit v1.2.3 From 5f44795806cb40891d0bbb68212910a24f843fa2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:52 -0400 Subject: gnu: qtscript: Update to 5.15.8. * gnu/packages/qt.scm (qtscript): Update to 5.15.8. --- gnu/packages/qt.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8bfdf1e732..ac15708150 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2008,20 +2008,19 @@ the Qt community.") (license (list license:gpl3)))) (define-public qtscript - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtscript") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "17yk0p8ci47xlfpllc17arlycng47wrnnskimskzz85bspabc8pm")) - (patches (search-patches "qtscript-disable-tests.patch")))) - (native-inputs - (list perl qttools-5)) - (inputs - (list qtbase-5)) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "0rjj1pn0fwdq0qz0nzisxza671ywfrq5cv6iplywfyflh7q4dmcs")) + (patches (search-patches "qtscript-disable-tests.patch")))) + (native-inputs (list perl qttools-5)) + (inputs (list qtbase-5)) (synopsis "Qt Script module") (description "Qt provides support for application scripting with ECMAScript. The following guides and references cover aspects of programming with -- cgit v1.2.3 From c8d2e9a7de1c60f024cb9347d5b12e6928dfd43d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:52 -0400 Subject: gnu: qtquickcontrols-5: Update to 5.15.8. * gnu/packages/qt.scm (qtquickcontrols-5): Update to 5.15.8. --- gnu/packages/qt.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ac15708150..5a13dd11a9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2027,20 +2027,20 @@ The following guides and references cover aspects of programming with ECMAScript and Qt."))) (define-public qtquickcontrols-5 - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtquickcontrols") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0mjw25wcgd2bvjz9rr4qjydb423c63615rcx1vws4jmydqdihssr")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "0yp47bpkfckms76vw0hrwnzchy8iak23ih6w9pnwrnjkmbc65drc")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests - (inputs - (list qtbase-5 qtdeclarative-5)) + ((#:tests? _ #f) #f))) ; TODO: Enable the tests + (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Quick Controls and other Quick modules") (description "The QtScript module provides classes for making Qt applications scriptable. This module provides a set of extra components that -- cgit v1.2.3 From d94bcd6b4382e103294ee8a2cb70e6f7c2171df8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:52 -0400 Subject: gnu: qtquickcontrols2-5: Update to 5.15.8. * gnu/packages/qt.scm (qtquickcontrols2-5): Update to 5.15.8. --- gnu/packages/qt.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 5a13dd11a9..b280f68313 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2047,20 +2047,20 @@ applications scriptable. This module provides a set of extra components that can be used to build complete interfaces in Qt Quick."))) (define-public qtquickcontrols2-5 - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtquickcontrols2") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "1cxg4ml07k1zcyi5m4lx06sz8f5l67isb5vhk7nakxm0wnn7p8y4")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "058dkj6272za47vnz3mxsmwsj85gxf6g0ski645fphk8s3jp2bk5")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests - (inputs - (list qtbase-5 qtdeclarative-5)) + ((#:tests? _ #f) #f))) ; TODO: Enable the tests + (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Quick Controls 2 and other Quick 2 modules") (description "The Qt Quick Controls 2 module contains the Qt Labs Platform module that provides platform integration: native dialogs, menus and menu bars, -- cgit v1.2.3 From 442040c85496c592b5efeb20dfe1324ff59977a7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:53 -0400 Subject: gnu: qtgraphicaleffects: Update to 5.15.8. * gnu/packages/qt.scm (qtgraphicaleffects): Update to 5.15.8. --- gnu/packages/qt.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b280f68313..6ced8fa9c8 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2074,20 +2074,20 @@ not available."))) (deprecated-package "qtquickcontrols2" qtdeclarative)) (define-public qtgraphicaleffects - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtgraphicaleffects") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0xznn5zqp6xrqfgl54l8cig9asqf9m2hz0p3ga514rh8spmdazr3")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "0wypji8i19kjq18qd92z8kkd3fj2n0d5hgh6xiza96833afvibj9")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests - (inputs - (list qtbase-5 qtdeclarative-5)) + ((#:tests? _ #f) #f))) ; TODO: Enable the tests + (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Graphical Effects module") (description "The Qt Graphical Effects module provides a set of QML types for adding visually impressive and configurable effects to user interfaces. -- cgit v1.2.3 From 63f5485616127d5d991c36f0594bf47100e36ef5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:53 -0400 Subject: gnu: qtgamepad: Update to 5.15.8. * gnu/packages/qt.scm (qtgamepad): Update to 5.15.8. --- gnu/packages/qt.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6ced8fa9c8..976829e643 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2097,17 +2097,17 @@ types. The effects cover functional areas such as blending, masking, blurring, coloring, and many more."))) (define-public qtgamepad - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtgamepad") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0wa4d8f025hlp4bmdzdy5wcahm9wjg6bkwig8dpw9nrsj3idz5b0")))) - (native-inputs - (list perl pkg-config)) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "0vgxprgk7lak209wsg2ljzfkpwgjzscpbxmj5fyvvwm2pbnpspvk")))) + (native-inputs (list perl pkg-config)) (inputs (list fontconfig freetype -- cgit v1.2.3 From a3041f53e78a345ae502c2bf64bbc4f579c40405 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:53 -0400 Subject: gnu: qtscxml: Update to 5.15.8. * gnu/packages/qt.scm (qtscxml): Update to 5.15.8. --- gnu/packages/qt.scm | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 976829e643..7e1864b55e 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2123,27 +2123,26 @@ primary target audience are embedded devices with fullscreen user interfaces, and mobile applications targeting TV-like form factors."))) (define-public qtscxml - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtscxml") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0xf5mqsrw16h8xjglymgfc8qg2qa5bi4fgdl4j3dkhvvpr7vrphp")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "tests/3rdparty") - ;; the scion test refers to the bundled 3rd party test code. - (substitute* "tests/auto/auto.pro" - (("scion") "#")))))) - (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests - (inputs - (list qtbase-5 qtdeclarative-5)) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "17j6npvgr8q3lyrqmvfh1n47mkhfzk18r998hcjm2w75xj46km1n")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "tests/3rdparty") + ;; the scion test refers to the bundled 3rd party test code. + (substitute* "tests/auto/auto.pro" + (("scion") "#")))))) + (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) + ((#:tests? _ #f) #f))) ; TODO: Enable the tests + (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Qt SCXML module") (description "The Qt SCXML module provides functionality to create state machines from SCXML files. This includes both dynamically creating state -- cgit v1.2.3 From ae9a26a5432cce9c65e112f4ddf9bc68471c5149 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:53 -0400 Subject: gnu: qtpurchasing: Update to 5.15.8. * gnu/packages/qt.scm (qtpurchasing): Update to 5.15.8. --- gnu/packages/qt.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 7e1864b55e..3be9d60861 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2181,17 +2181,17 @@ information and perform area based monitoring.") (license (package-license qtbase)))) (define-public qtpurchasing - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtpurchasing") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "04z6mwzn73gg56hgs7gividinfgndx4kmcnp7w6h3wamrdlkfdx7")))) - (inputs - (list qtbase-5 qtdeclarative-5)) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "0bjky5ncg9yhz4a63g3jl1r5pa6i09f6g8wgzs591mhybrbmhcw8")))) + (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Purchasing module") (description "The Qt Purchasing module provides and in-app API for purchasing goods and services."))) -- cgit v1.2.3 From f4f9357b4c1302a0b010d68581dfe3e362ac6b60 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:54 -0400 Subject: gnu: qtcharts: Update to 5.15.8. * gnu/packages/qt.scm (qtcharts): Update to 5.15.8. [arguments]: Use gexps. --- gnu/packages/qt.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 3be9d60861..90cc44cf2d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2197,26 +2197,26 @@ information and perform area based monitoring.") purchasing goods and services."))) (define-public qtcharts - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtcharts") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0y051i1837bfybkf8cm7cx8k5wjmbi47pxawaaz6wm0hd2z5b4qi")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "1q11ank69l9qw3iks2svr0g2g6pzng9v8p87dpsmjs988f4ysmll")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'remove-failing-test - (lambda _ - (substitute* "tests/auto/auto.pro" - (("qml") "# qml") - (("qml-qtquicktest") "# qml-qtquicktest")))))))) - (inputs - (list qtbase-5 qtdeclarative-5)) + #~(modify-phases #$phases + (add-after 'unpack 'remove-failing-test + (lambda _ + (substitute* "tests/auto/auto.pro" + (("qml") "# qml") + (("qml-qtquicktest") "# qml-qtquicktest")))))))) + (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Charts module") (description "The Qt Charts module provides a set of easy to use chart components. It uses the Qt Graphics View Framework, therefore charts can be -- cgit v1.2.3 From 772d97a138be4f06a3f71e18a8eaf8b3ad252c66 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:54 -0400 Subject: gnu: qtdatavis3d: Update to 5.15.8. * gnu/packages/qt.scm (qtdatavis3d): Update to 5.15.8. --- gnu/packages/qt.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 90cc44cf2d..da30068e19 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2226,20 +2226,19 @@ selecting one of the charts themes.") (license license:gpl3))) (define-public qtdatavis3d - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtdatavis3d") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0sczwqlc36jdywf7bqxz0hm6mr7fn8p1fsnc33jliiqzn9yrg77x")))) - (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests - (inputs - (list qtbase-5 qtdeclarative-5)) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "1mr2kdshahxrkjs9wlgpr59jbqvyvlax16rlnca4iq00w3v5hrdh")))) + (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) + ((#:tests? _ #f) #f))) ; TODO: Enable the tests + (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Data Visualization module") (description "The Qt Data Visualization module provides a way to visualize data in 3D as bar, scatter, and surface graphs. It is especially useful for -- cgit v1.2.3 From 627e1c3e2f2cde5d0e526f6e66e344a529bb69e1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:54 -0400 Subject: gnu: qtnetworkauth-5: Update to 5.15.8. * gnu/packages/qt.scm (qtnetworkauth-5): Update to 5.15.8. --- gnu/packages/qt.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index da30068e19..34c048eaa6 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2250,15 +2250,14 @@ customized by using themes or by adding custom items and labels to them.") (define-public qtnetworkauth-5 (package (inherit qtsvg-5) (name "qtnetworkauth") - (version "5.15.5") + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0c7mz715rlpg0cqgs6s0aszmslyamkhnpamc1iij6i571sj5j2f1")))) - (inputs - (list qtbase-5)) + "0fsmpjwkzzy3281shld7gs1gj217smb1f8ai63gdvnkp0jb2fhc5")))) + (inputs (list qtbase-5)) (synopsis "Qt Network Authorization module") (description "The Qt Network Authorization module provides an implementation of OAuth and OAuth2 authenticathon methods for Qt."))) -- cgit v1.2.3 From db365dac190b930d6605c53e7bd4397a5599fa6d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:55 -0400 Subject: gnu: qtremoteobjects: Update to 6.3.2. * gnu/packages/qt.scm (qtremoteobjects): No longer inherit from qtsvg-5. Update to 6.3.2. [arguments]: Use gexps. Delete remove-failing-test phase. Add set-display, prepare-for-tests and move check phase after install phase. [home-page, license]: New fields. --- gnu/packages/qt.scm | 51 ++++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 34c048eaa6..42c4ce1aef 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2283,36 +2283,41 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.") (license (package-license qtbase)))) (define-public qtremoteobjects - (package (inherit qtsvg-5) + (package (name "qtremoteobjects") - (version "5.15.5") + (version "6.3.2") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "1m0xcqlbxsfn0cd4ajin1h3i4l51dajmkw91v0r4a61xi14i0kks")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "099b3vchi458i4fci9kfwan871jplqlk5l8q78mfnh33g80qnasi")))) + (build-system cmake-build-system) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'remove-failing-test - (lambda _ - ;; This test can't find its imports. - (substitute* "tests/auto/qml/qml.pro" - (("integration") "# integration") - (("usertypes") "# usertypes")) - ;; disable failing tests: they need network - (substitute* "tests/auto/auto.pro" - (("integration_multiprocess proxy_multiprocess integration_external restart") - "integration_multiprocess")))))))) - (inputs - (list qtbase-5 qtdeclarative-5)) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-display + (lambda _ + ;; Make Qt render "offscreen", required for tests. + (setenv "QT_QPA_PLATFORM" "offscreen"))) + (delete 'check) ;move after the install phase + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'prepare-for-tests + (lambda _ + (setenv "QML2_IMPORT_PATH" + (string-append #$output "/lib/qt6/qml:" + (getenv "QML2_IMPORT_PATH")))))))) + (native-inputs (list perl vulkan-headers)) + (inputs (list libxkbcommon qtbase qtdeclarative)) (synopsis "Qt Remote Objects module") (description "The Qt Remote Objects module is an @dfn{inter-process communication} (IPC) module developed for Qt. The idea is to extend existing Qt's functionalities to enable an easy exchange of information between -processes or computers."))) +processes or computers.") + (home-page (package-home-page qtbase)) + (license (package-license qtbase)))) (define-public qtspeech (package (inherit qtsvg-5) -- cgit v1.2.3 From d1bafb1086a6d561b00d075a4850f3e662e8f541 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:55 -0400 Subject: gnu: qtspeech: Update to 5.15.8. * gnu/packages/qt.scm (qtspeech): Update to 5.15.8. --- gnu/packages/qt.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 42c4ce1aef..30b6a94391 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2320,22 +2320,20 @@ processes or computers.") (license (package-license qtbase)))) (define-public qtspeech - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtspeech") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0xskp9dzjy5nqszygk8gwvjyiylgynx5sq3nk2vi3zwgfdh5jpm4")))) - (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests - (inputs - (list qtbase-5)) - (native-inputs - (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns)) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "1q56lyj7s05sx52j5z6gcs000mni4c7mb7qyq4lfval7c06hw5p6")))) + (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) + ((#:tests? _ #f) #f))) ; TODO: Enable the tests + (inputs (list qtbase-5)) + (native-inputs (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns)) (synopsis "Qt Speech module") (description "The Qt Speech module enables a Qt application to support accessibility features such as text-to-speech, which is useful for end-users -- cgit v1.2.3 From 0f47e718407a4ace61b887eb0032889e12eced95 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 27 Mar 2023 16:09:55 -0400 Subject: gnu: qtwebengine-5: Update to 5.15.8. Fixes . * gnu/packages/qt.scm (qtwebengine-5): Update to 5.15.8. [source]: Fix indentation. [arguments]: Use gexps. --- gnu/packages/qt.scm | 434 ++++++++++++++++++++++++++-------------------------- 1 file changed, 218 insertions(+), 216 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 30b6a94391..80155d39e4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2430,14 +2430,14 @@ using the Enchant spell-checking library.") (package (inherit qtsvg-5) (name "qtwebengine") - (version "5.15.5") + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-urls name version)) (sha256 (base32 - "0zahr9w6rqdxwh2whsgk3fhcszs7wa9j95lq4sqi8xzin2wcgl17")) + "1qv15g5anhlfsdwnjxy21vc3zxxm8149vysi774l93iab6mxqmjg")) (modules '((ice-9 ftw) (ice-9 match) (srfi srfi-1) @@ -2445,180 +2445,181 @@ using the Enchant spell-checking library.") (guix build utils))) (snippet #~(begin - (let ((preserved-third-party-files - '("base/third_party/double_conversion" - "base/third_party/cityhash" - "base/third_party/cityhash_v103" - "base/third_party/dynamic_annotations" - "base/third_party/icu" - "base/third_party/libevent" - "base/third_party/nspr" - "base/third_party/superfasthash" - "base/third_party/symbolize" - "base/third_party/xdg_mime" - "base/third_party/xdg_user_dirs" - "net/third_party/mozilla_security_manager" - "net/third_party/nss" - "net/third_party/quiche" - "net/third_party/uri_template" - "third_party/abseil-cpp" - "third_party/angle" - "third_party/angle/src/common/third_party/base" - "third_party/angle/src/common/third_party/smhasher" - "third_party/angle/src/common/third_party/xxhash" - "third_party/angle/src/third_party/compiler" - "third_party/axe-core" - "third_party/blink" - "third_party/boringssl" - "third_party/boringssl/src/third_party/fiat" - "third_party/breakpad" - "third_party/brotli" - "third_party/catapult/common/py_vulcanize/py_vulcanize" - "third_party/catapult/common/py_vulcanize/third_party" - "third_party/catapult/third_party/beautifulsoup4" - "third_party/catapult/third_party/html5lib-python" - "third_party/catapult/third_party/polymer/components" - "third_party/catapult/tracing" - "third_party/catapult/tracing/third_party" - "third_party/ced" - "third_party/cld_3" - "third_party/closure_compiler" - "third_party/crashpad" - "third_party/crashpad/crashpad/third_party/lss" - "third_party/crashpad/crashpad/third_party/zlib" - "third_party/crc32c" - "third_party/dav1d" - "third_party/dawn" - "third_party/devtools-frontend" - "third_party/devtools-frontend/src/front_end/third_party" - "third_party/devtools-frontend/src/third_party/typescript" - "third_party/emoji-segmenter" - "third_party/ffmpeg" - "third_party/googletest" - "third_party/harfbuzz-ng/utils" - "third_party/hunspell" - "third_party/iccjpeg" - "third_party/icu" - "third_party/inspector_protocol" - "third_party/jinja2" - "third_party/jsoncpp" - "third_party/jstemplate" - "third_party/khronos" - "third_party/leveldatabase" - "third_party/libaddressinput" - "third_party/libavif" - "third_party/libgifcodec" - "third_party/libjingle_xmpp" - "third_party/libjpeg_turbo" - "third_party/libpng" - "third_party/libsrtp" - "third_party/libsync" - "third_party/libudev" - "third_party/libvpx" - "third_party/libwebm" - "third_party/libwebp" - "third_party/libxml" - "third_party/libxslt" - "third_party/libyuv" - "third_party/lottie" - "third_party/lss" - "third_party/mako" - "third_party/markupsafe" - "third_party/mesa_headers" - "third_party/metrics_proto" - "third_party/modp_b64" - "third_party/nasm" - "third_party/node" - "third_party/one_euro_filter" - "third_party/openh264/src/codec/api/svc" - "third_party/opus" - "third_party/ots" - "third_party/pdfium" - "third_party/pdfium/third_party/agg23" - "third_party/pdfium/third_party/base" - "third_party/pdfium/third_party/freetype" - "third_party/pdfium/third_party/lcms" - "third_party/pdfium/third_party/libopenjpeg20" - "third_party/pdfium/third_party/skia_shared" - "third_party/perfetto" - "third_party/pffft" - "third_party/ply" - "third_party/polymer" - "third_party/protobuf" - "third_party/protobuf/third_party/six" - "third_party/pyjson5" - "third_party/re2" - "third_party/rnnoise" - "third_party/skia" - "third_party/skia/include/third_party/skcms/skcms.h" - "third_party/skia/include/third_party/vulkan" - "third_party/skia/third_party/skcms" - "third_party/smhasher" - "third_party/snappy" - "third_party/sqlite" - "third_party/usb_ids" - "third_party/usrsctp" - "third_party/vulkan_memory_allocator" - "third_party/web-animations-js" - "third_party/webrtc" - "third_party/webrtc/common_audio/third_party/ooura/fft_size_128" - "third_party/webrtc/common_audio/third_party/ooura/fft_size_256" - "third_party/webrtc/common_audio/third_party/spl_sqrt_floor" - "third_party/webrtc/modules/third_party/fft" - "third_party/webrtc/modules/third_party/g711" - "third_party/webrtc/modules/third_party/g722" - "third_party/webrtc/rtc_base/third_party/base64" - "third_party/webrtc/rtc_base/third_party/sigslot" - "third_party/webrtc_overrides" - "third_party/widevine/cdm/widevine_cdm_common.h" - "third_party/widevine/cdm/widevine_cdm_version.h" - "third_party/woff2" - "third_party/xcbproto" - "third_party/zlib" - "url/third_party/mozilla" - "v8/src/third_party/utf8-decoder" - "v8/src/third_party/valgrind" - "v8/src/third_party/siphash" - "v8/third_party/v8/builtins" - "v8/third_party/inspector_protocol"))) + (let ((preserved-third-party-files + '("base/third_party/double_conversion" + "base/third_party/cityhash" + "base/third_party/cityhash_v103" + "base/third_party/dynamic_annotations" + "base/third_party/icu" + "base/third_party/libevent" + "base/third_party/nspr" + "base/third_party/superfasthash" + "base/third_party/symbolize" + "base/third_party/xdg_mime" + "base/third_party/xdg_user_dirs" + "net/third_party/mozilla_security_manager" + "net/third_party/nss" + "net/third_party/quiche" + "net/third_party/uri_template" + "third_party/abseil-cpp" + "third_party/angle" + "third_party/angle/src/common/third_party/base" + "third_party/angle/src/common/third_party/smhasher" + "third_party/angle/src/common/third_party/xxhash" + "third_party/angle/src/third_party/compiler" + "third_party/axe-core" + "third_party/blink" + "third_party/boringssl" + "third_party/boringssl/src/third_party/fiat" + "third_party/breakpad" + "third_party/brotli" + "third_party/catapult/common/py_vulcanize/py_vulcanize" + "third_party/catapult/common/py_vulcanize/third_party" + "third_party/catapult/third_party/beautifulsoup4" + "third_party/catapult/third_party/html5lib-python" + "third_party/catapult/third_party/polymer/components" + "third_party/catapult/tracing" + "third_party/catapult/tracing/third_party" + "third_party/ced" + "third_party/cld_3" + "third_party/closure_compiler" + "third_party/crashpad" + "third_party/crashpad/crashpad/third_party/lss" + "third_party/crashpad/crashpad/third_party/zlib" + "third_party/crc32c" + "third_party/dav1d" + "third_party/dawn" + "third_party/devtools-frontend" + "third_party/devtools-frontend/src/front_end/third_party" + "third_party/devtools-frontend/src/third_party/typescript" + "third_party/emoji-segmenter" + "third_party/ffmpeg" + "third_party/googletest" + "third_party/harfbuzz-ng/utils" + "third_party/hunspell" + "third_party/iccjpeg" + "third_party/icu" + "third_party/inspector_protocol" + "third_party/jinja2" + "third_party/jsoncpp" + "third_party/jstemplate" + "third_party/khronos" + "third_party/leveldatabase" + "third_party/libaddressinput" + "third_party/libavif" + "third_party/libgifcodec" + "third_party/libjingle_xmpp" + "third_party/libjpeg_turbo" + "third_party/libpng" + "third_party/libsrtp" + "third_party/libsync" + "third_party/libudev" + "third_party/libvpx" + "third_party/libwebm" + "third_party/libwebp" + "third_party/libxml" + "third_party/libxslt" + "third_party/libyuv" + "third_party/lottie" + "third_party/lss" + "third_party/mako" + "third_party/markupsafe" + "third_party/mesa_headers" + "third_party/metrics_proto" + "third_party/modp_b64" + "third_party/nasm" + "third_party/node" + "third_party/one_euro_filter" + "third_party/openh264/src/codec/api/svc" + "third_party/opus" + "third_party/ots" + "third_party/pdfium" + "third_party/pdfium/third_party/agg23" + "third_party/pdfium/third_party/base" + "third_party/pdfium/third_party/freetype" + "third_party/pdfium/third_party/lcms" + "third_party/pdfium/third_party/libopenjpeg20" + "third_party/pdfium/third_party/skia_shared" + "third_party/perfetto" + "third_party/pffft" + "third_party/ply" + "third_party/polymer" + "third_party/protobuf" + "third_party/protobuf/third_party/six" + "third_party/pyjson5" + "third_party/re2" + "third_party/rnnoise" + "third_party/skia" + "third_party/skia/include/third_party/skcms/skcms.h" + "third_party/skia/include/third_party/vulkan" + "third_party/skia/third_party/skcms" + "third_party/smhasher" + "third_party/snappy" + "third_party/sqlite" + "third_party/usb_ids" + "third_party/usrsctp" + "third_party/vulkan_memory_allocator" + "third_party/web-animations-js" + "third_party/webrtc" + "third_party/webrtc/common_audio/third_party/ooura/fft_size_128" + "third_party/webrtc/common_audio/third_party/ooura/fft_size_256" + "third_party/webrtc/common_audio/third_party/spl_sqrt_floor" + "third_party/webrtc/modules/third_party/fft" + "third_party/webrtc/modules/third_party/g711" + "third_party/webrtc/modules/third_party/g722" + "third_party/webrtc/rtc_base/third_party/base64" + "third_party/webrtc/rtc_base/third_party/sigslot" + "third_party/webrtc_overrides" + "third_party/widevine/cdm/widevine_cdm_common.h" + "third_party/widevine/cdm/widevine_cdm_version.h" + "third_party/woff2" + "third_party/xcbproto" + "third_party/zlib" + "url/third_party/mozilla" + "v8/src/third_party/utf8-decoder" + "v8/src/third_party/valgrind" + "v8/src/third_party/siphash" + "v8/third_party/v8/builtins" + "v8/third_party/inspector_protocol"))) - (with-directory-excursion "src/3rdparty" - ;; TODO: Try removing "gn" too for future versions of qtwebengine-5. - (delete-file-recursively "ninja") + (with-directory-excursion "src/3rdparty" + ;; TODO: Try removing "gn" too for future versions of qtwebengine-5. + (delete-file-recursively "ninja") - (with-directory-excursion "chromium" - ;; Delete bundled software and binaries that were not explicitly - ;; preserved above. - #$remove-third-party-files + (with-directory-excursion "chromium" + ;; Delete bundled software and binaries that were not explicitly + ;; preserved above. + #$remove-third-party-files - ;; Use relative header locations instead of hard coded ones. - (substitute* - "base/third_party/dynamic_annotations/dynamic_annotations.c" - (("base/third_party/valgrind") "valgrind")) - (substitute* - '("third_party/breakpad/breakpad/src/common/linux/http_upload.cc" - "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h") - (("third_party/curl") "curl")) - (substitute* - '("components/viz/common/gpu/vulkan_context_provider.h" - "components/viz/common/resources/resource_format_utils.h" - "gpu/config/gpu_info_collector_win.cc" - "gpu/config/gpu_util.cc" - "gpu/config/vulkan_info.h") - (("third_party/vulkan_headers/include/") - "")) + ;; Use relative header locations instead of hard coded ones. + (substitute* + "base/third_party/dynamic_annotations/dynamic_annotations.c" + (("base/third_party/valgrind") "valgrind")) + (substitute* '("third_party/breakpad/breakpad/src/common\ +/linux/http_upload.cc" + "third_party/breakpad/breakpad/src/common/\ +linux/libcurl_wrapper.h") + (("third_party/curl") "curl")) + (substitute* + '("components/viz/common/gpu/vulkan_context_provider.h" + "components/viz/common/resources/resource_format_utils.h" + "gpu/config/gpu_info_collector_win.cc" + "gpu/config/gpu_util.cc" + "gpu/config/vulkan_info.h") + (("third_party/vulkan_headers/include/") + "")) - ;; Replace Google Analytics bundle with an empty file and hope - ;; no one notices. - (mkdir-p "third_party/analytics") - (call-with-output-file - "third_party/analytics/google-analytics-bundle.js" - (lambda (port) - (const #t))))) - ;; Do not enable support for loading the Widevine DRM plugin. - (substitute* "src/buildtools/config/common.pri" - (("enable_widevine=true") - "enable_widevine=false"))))))) + ;; Replace Google Analytics bundle with an empty file and hope + ;; no one notices. + (mkdir-p "third_party/analytics") + (call-with-output-file + "third_party/analytics/google-analytics-bundle.js" + (lambda (port) + (const #t))))) + ;; Do not enable support for loading the Widevine DRM plugin. + (substitute* "src/buildtools/config/common.pri" + (("enable_widevine=true") + "enable_widevine=false"))))))) (build-system gnu-build-system) (native-inputs (list bison @@ -2689,53 +2690,54 @@ using the Enchant spell-checking library.") (guix build utils) (ice-9 textual-ports))) ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'substitute-source - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (with-atomic-file-replacement - "src/buildtools/config/linux.pri" - (lambda (in out) - (display (get-string-all in) out) - (display "\ngn_args += use_system_openh264=true\n" out) - (display "\ngn_args += link_pulseaudio = true\n" out))) - ;; Qtwebengine is not installed into the same prefix as - ;; qtbase. Some qtbase QTLibraryInfo constants will not - ;; work. Replace with the full path to the qtwebengine-5 - ;; translations and locales in the store. - (substitute* "src/core/web_engine_library_info.cpp" - (("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)") - (string-append "QLatin1String(\"" out "/share/qt5/translations\")")) - (("QLibraryInfo::location\\(QLibraryInfo::DataPath\\)") - (string-append "QLatin1String(\"" out "/share/qt5\")"))) - ;; Substitute full dynamic library path for nss. - (substitute* "src/3rdparty/chromium/crypto/nss_util.cc" - (("libnssckbi.so") - (search-input-file inputs "lib/nss/libnssckbi.so"))) - ;; Substitute full dynamic library path for udev. - (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc" - (("libudev.so.1") - (search-input-file inputs "lib/libudev.so.1")))))) - (add-before 'configure 'set-env - (lambda _ - ;; Avoids potential race conditions. - (setenv "PYTHONDONTWRITEBYTECODE" "1") - (setenv "NINJAFLAGS" - (string-append "-k1" ;less verbose build output - ;; Respect the '--cores' option of 'guix build'. - " -j" (number->string (parallel-job-count)))))) - (replace 'configure - (lambda _ - ;; Valid QT_BUILD_PARTS variables are: - ;; libs tools tests examples demos docs translations - (invoke "qmake" "QT_BUILD_PARTS = libs tools" "--" - "--webengine-printing-and-pdf=no" - "--webengine-ffmpeg=system" + #~(modify-phases #$phases + (add-before 'configure 'substitute-source + (lambda* (#:key inputs #:allow-other-keys) + (with-atomic-file-replacement + "src/buildtools/config/linux.pri" + (lambda (in out) + (display (get-string-all in) out) + (display "\ngn_args += use_system_openh264=true\n" out) + (display "\ngn_args += link_pulseaudio = true\n" out))) + ;; Qtwebengine is not installed into the same prefix as + ;; qtbase. Some qtbase QTLibraryInfo constants will not + ;; work. Replace with the full path to the qtwebengine-5 + ;; translations and locales in the store. + (substitute* "src/core/web_engine_library_info.cpp" + (("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)") + (string-append "QLatin1String(\"" #$output + "/share/qt5/translations\")")) + (("QLibraryInfo::location\\(QLibraryInfo::DataPath\\)") + (string-append "QLatin1String(\"" #$output + "/share/qt5\")"))) + ;; Substitute full dynamic library path for nss. + (substitute* "src/3rdparty/chromium/crypto/nss_util.cc" + (("libnssckbi.so") + (search-input-file inputs "lib/nss/libnssckbi.so"))) + ;; Substitute full dynamic library path for udev. + (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc" + (("libudev.so.1") + (search-input-file inputs "lib/libudev.so.1"))))) + (add-before 'configure 'set-env + (lambda _ + ;; Avoids potential race conditions. + (setenv "PYTHONDONTWRITEBYTECODE" "1") + (setenv "NINJAFLAGS" + (string-append "-k1" ;less verbose build output + ;; Respect the '--cores' option of 'guix build'. + " -j" (number->string (parallel-job-count)))))) + (replace 'configure + (lambda _ + ;; Valid QT_BUILD_PARTS variables are: + ;; libs tools tests examples demos docs translations + (invoke "qmake" "QT_BUILD_PARTS = libs tools" "--" + "--webengine-printing-and-pdf=no" + "--webengine-ffmpeg=system" ;; FIXME: Building qtwebengine-5 5.12.2 with ;; icu4c >= 68 fails. ;;"--webengine-icu=system" - "--webengine-pepper-plugins=no" - "-webengine-proprietary-codecs"))))) + "--webengine-pepper-plugins=no" + "-webengine-proprietary-codecs"))))) ;; Tests are disabled due to "Could not find QtWebEngineProcess error" ;; It's possible this can be fixed by setting QTWEBENGINEPROCESS_PATH ;; before running tests. -- cgit v1.2.3 From 3dadb42f5a1cc210829336d4240b428c2b595128 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 29 Mar 2023 13:30:04 -0400 Subject: gnu: extra-cmake-modules: Update to 5.104.0. * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.104.0. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 10b8ac0134..ad7bd484a5 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -97,7 +97,7 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.98.0") + (version "5.104.0") (source (origin (method url-fetch) (uri (string-append @@ -106,7 +106,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) + "1nc5ynfz903jc87xawnww3pf1y73x9jvmxnbrj24nqv6vcgv57p4")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too -- cgit v1.2.3 From 2a2f4aa37c9cd1a51d55ff69dedcb4e42d10a6cc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 29 Mar 2023 13:30:51 -0400 Subject: gnu: kcodecs: Update to 5.104.0. * gnu/packages/kde-frameworks.scm (kcodecs): Update to 5.104.0. --- gnu/packages/kde-frameworks.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index ad7bd484a5..3dbce00d36 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -523,7 +523,7 @@ and the older vCalendar.") (define-public kcodecs (package (name "kcodecs") - (version "5.98.0") + (version "5.104.0") (source (origin (method url-fetch) (uri (string-append @@ -532,12 +532,10 @@ and the older vCalendar.") name "-" version ".tar.xz")) (sha256 (base32 - "0n10r7s9r25xp7vlym41qi421kld00niig73yark7yghj0r41jcz")))) + "0swxj2kr37pnwdxsipfii8q02g58lvm9lsh4kflqgfjyhvv0kjby")))) (build-system cmake-build-system) - (native-inputs - (list extra-cmake-modules gperf qttools-5)) - (inputs - (list qtbase-5)) + (native-inputs (list extra-cmake-modules gperf qttools-5)) + (inputs (list qtbase-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "String encoding and manipulating library") (description "KCodecs provide a collection of methods to manipulate -- cgit v1.2.3 From d2f51f1c61f17a2a0591c4425a52552f342d584f Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Thu, 30 Mar 2023 15:48:59 +0100 Subject: gnu: perl-io-socket-ssl: Update to 2.081. * gnu/packages/web.scm (perl-io-socket-ssl): Update to 2.081. Signed-off-by: Maxim Cournoyer --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 467a91523f..d6648d401d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3848,14 +3848,14 @@ and IPv6 sockets, intended as a replacement for IO::Socket::INET.") (define-public perl-io-socket-ssl (package (name "perl-io-socket-ssl") - (version "2.075") + (version "2.081") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/S/SU/SULLR/" "IO-Socket-SSL-" version ".tar.gz")) (sha256 (base32 - "135fvlvqcnmf0m0s8xqk015k7pyas1hiij5visb1l60y1cif43n3")))) + "0hw4c62abq0cs3ixi0ws96i2y0fij3452514dlqn7d6nm0kgig87")))) (build-system perl-build-system) (propagated-inputs (list perl-net-ssleay -- cgit v1.2.3 From 00d84146f3f724337840cf7a55bade6b01119c54 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 30 Mar 2023 17:08:18 -0400 Subject: gnu: ruby-puma: Update to 6.2.0. * gnu/packages/ruby.scm (ruby-puma): Update to 6.2.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 6c212b9470..7ea88b4067 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -11526,7 +11526,7 @@ part of the Prawn PDF generator.") (define-public ruby-puma (package (name "ruby-puma") - (version "6.1.1") + (version "6.2.0") (source (origin (method git-fetch) ;for tests @@ -11536,7 +11536,7 @@ part of the Prawn PDF generator.") (file-name (git-file-name name version)) (sha256 (base32 - "0v4nn3z0bj0ry0gpx1hsf5mzkinsx9sv716j4jf2nb1x6hcwv993")))) + "0d71h5ggvfgnxq9msd1hmcz3s8mspzf7kqas1hzr0w9pfafddyv3")))) (build-system ruby-build-system) (arguments (list -- cgit v1.2.3 From 5c3727ff078aa345abfdd7c755a4255c2c8454bc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 30 Mar 2023 17:18:39 -0400 Subject: gnu: ruby-puma: Do not install mkmf.log file. * gnu/packages/ruby.scm (ruby-puma) [arguments]: Add delete-mkmf.log phase. --- gnu/packages/ruby.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7ea88b4067..1bf2db17cc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -11572,6 +11572,12 @@ part of the Prawn PDF generator.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "bundle" "exec" "rake" "test")))) + (add-after 'install 'delete-mkmf.log + (lambda _ + ;; Rubygems installs build log files that embed volatile file + ;; names (see: + ;; https://github.com/rubygems/rubygems/issues/6259). + (for-each delete-file (find-files #$output "^mkmf\\.log$")))) (add-before 'check 'disable-problematic-tests (lambda _ (let-syntax ((skip-tests -- cgit v1.2.3 From ea3832f4b1db8bc4cd99333cd27344e6189ee96b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 30 Mar 2023 17:19:27 -0400 Subject: ruby: ruby-nokogiri: Update issue URL in comment. * gnu/packages/ruby.scm (ruby-nokogiri) [arguments]: Update issue URL in delete-mkmf.log phase. --- gnu/packages/ruby.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1bf2db17cc..3d904918b3 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6243,8 +6243,9 @@ to reproduce user environments.") #~(modify-phases %standard-phases (add-after 'install 'delete-mkmf.log (lambda _ - ;; This build log captures non-deterministic file names (see: - ;; https://github.com/sparklemotion/nokogiri/issues/2755). + ;; Rubygems installs build log files that embed volatile file + ;; names (see: + ;; https://github.com/rubygems/rubygems/issues/6259). (for-each delete-file (find-files #$output "^mkmf\\.log$"))))))) (native-inputs (list ruby-hoe)) (inputs (list zlib libxml2 libxslt)) -- cgit v1.2.3 From ab9c6b6450e39071fe452b73a73ad00d75ef0b40 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 30 Mar 2023 17:36:00 -0400 Subject: gnu: ruby-puma: Disable a flaky test. * gnu/packages/ruby.scm (ruby-puma) [arguments]: Disable the hot_restart_does_not_drop_connections tests, which fail non-deterministically. --- gnu/packages/ruby.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3d904918b3..35917c6627 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -11601,6 +11601,7 @@ part of the Prawn PDF generator.") "test_off_tls1_2") (skip-tests "test/test_integration_cluster.rb" "test_fork_worker_on_refork" + "test_hot_restart_does_not_drop_connections" "test_culling_strategy_oldest_fork_worker" "test_usr1_fork_worker") (skip-tests "test/test_integration_pumactl.rb" -- cgit v1.2.3 From 841fdbf8fe12a4ccf8f5f5d8fbe1b9309e2f1e2a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 30 Mar 2023 21:49:51 -0400 Subject: gnu: ruby-pg: Update to 1.4.6. * gnu/packages/ruby.scm (ruby-pg): Update to 1.4.6. --- gnu/packages/ruby.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 35917c6627..834c0dfbd4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7819,10 +7819,8 @@ alternative to Marshal for Object serialization.") (string-append (getenv "GEM_PATH") ":" new-gem)) (when tests? (invoke "rspec")))))))) - (native-inputs - (list ruby-rake-compiler ruby-hoe ruby-rspec)) - (inputs - (list postgresql)) + (native-inputs (list ruby-rake-compiler ruby-hoe ruby-rspec)) + (inputs (list postgresql)) (synopsis "Ruby interface to PostgreSQL") (description "Pg is the Ruby interface to the PostgreSQL RDBMS. It works with PostgreSQL 9.3 and later.") -- cgit v1.2.3 From 7d4845e7544667de6276d05c262870424c0a7159 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 30 Mar 2023 22:56:01 -0400 Subject: Revert "gnu: subversion: Tentatively reinstate parallel tests." This reverts commit 54ee868cbed729c3789c6121193a823d68557daa. --- gnu/packages/version-control.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 844532c15f..302f7c90ad 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2020,6 +2020,10 @@ following features: (build-system gnu-build-system) (arguments (list + ;; Running the tests in parallel causes test failures on i686-linux. + ;; The issue was reported to users@subversion.apache.org, as suggested + ;; at https://subversion.apache.org/reporting-issues. + #:parallel-tests? #f #:configure-flags #~(list "--enable-static=no") #:phases #~(modify-phases %standard-phases -- cgit v1.2.3 From aae69407f5a8e42fcb949412cd59da45bcad9ce5 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 22 Mar 2023 13:57:08 +0000 Subject: gnu: hdf5@1.8: Update to 1.8.23. * gnu/packages/maths.scm (hdf5-1.8): Update to 1.8.23. Signed-off-by: Maxim Cournoyer --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c10fc8075c..dc0e4006d4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1387,7 +1387,7 @@ incompatible with HDF5.") (define-public hdf5-1.8 (package (name "hdf5") - (version "1.8.22") + (version "1.8.23") (source (origin (method url-fetch) @@ -1402,7 +1402,7 @@ incompatible with HDF5.") (string-append major minor))) "/src/hdf5-" version ".tar.bz2"))) (sha256 - (base32 "194ki2s5jrgl4czkvy5nc9nwjyapah0fj72l0gb0aysplp38i6v8")) + (base32 "0km65mr6dgk4ia2dqr1b9dzw9qg15j5z35ymbys9cnny51z1zb39")) (patches (search-patches "hdf5-config-date.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From d4b63d05d89c4af42880f92a47bc46b8ca2a149f Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 22 Mar 2023 13:57:09 +0000 Subject: gnu: hdf5@1.10: Update to 1.10.9. * gnu/packages/maths.scm (hdf5-1.10): Update to 1.10.9. Signed-off-by: Maxim Cournoyer --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index dc0e4006d4..9a82382b56 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1512,7 +1512,7 @@ extremely large and complex data collections.") (define-public hdf5-1.10 (package (inherit hdf5-1.8) - (version "1.10.7") + (version "1.10.9") (source (origin (method url-fetch) @@ -1526,7 +1526,7 @@ extremely large and complex data collections.") (take (string-split version #\.) 2)) "/src/hdf5-" version ".tar.bz2"))) (sha256 - (base32 "0pm5xxry55i0h7wmvc7svzdaa90rnk7h78rrjmnlkz2ygsn8y082")) + (base32 "14gih7kmjx4h3lc7pg4fwcl28hf1qqkf2x7rljpxqvzkjrqbxi00")) (patches (search-patches "hdf5-config-date.patch")))))) (define-public hdf5-1.12 -- cgit v1.2.3 From 4d2ef2893c75b9362013ed6ae402adcab43490c8 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 22 Mar 2023 13:57:10 +0000 Subject: gnu: hdf5@1.12: Update to 1.12.2. * gnu/packages/maths.scm (hdf5-1.12): Update to 1.12.2. Signed-off-by: Maxim Cournoyer --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9a82382b56..61d8e86391 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1532,7 +1532,7 @@ extremely large and complex data collections.") (define-public hdf5-1.12 (package (inherit hdf5-1.8) - (version "1.12.1") + (version "1.12.2") (source (origin (method url-fetch) @@ -1546,7 +1546,7 @@ extremely large and complex data collections.") (take (string-split version #\.) 2)) "/src/hdf5-" version ".tar.bz2"))) (sha256 - (base32 "074g3z504xf77ff38igs30i1aqxpm508p7yw78ykva7dncrgbyda")) + (base32 "1zlawdzb0gsvcxif14fwr5ap2gk4b6j02wirr2hcx8hkcbivp20s")) (patches (search-patches "hdf5-config-date.patch")))))) (define-public hdf5 -- cgit v1.2.3 From dd24d0735a908a2479658166ac471a01f333201a Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 22 Mar 2023 13:57:11 +0000 Subject: gnu: Add hdf5@1.14. * gnu/packages/maths.scm (hdf5-1.14): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/maths.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 61d8e86391..51629a31fd 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1549,6 +1549,26 @@ extremely large and complex data collections.") (base32 "1zlawdzb0gsvcxif14fwr5ap2gk4b6j02wirr2hcx8hkcbivp20s")) (patches (search-patches "hdf5-config-date.patch")))))) +(define-public hdf5-1.14 + (package + (inherit hdf5-1.8) + (version "1.14.0") + (source + (origin + (method url-fetch) + (uri (list (string-append "https://support.hdfgroup.org/ftp/HDF5/releases/" + "hdf5-" (version-major+minor version) + "/hdf5-" version "/src/hdf5-" + version ".tar.bz2") + (string-append "https://support.hdfgroup.org/ftp/HDF5/" + "current" + (apply string-append + (take (string-split version #\.) 2)) + "/src/hdf5-" version ".tar.bz2"))) + (sha256 + (base32 "181bdh8hp7v9xqwcby3lknr92lxlicc2hqscba3f5nhf8lrr9rz4")) + (patches (search-patches "hdf5-config-date.patch")))))) + (define-public hdf5 ;; Default version of HDF5. hdf5-1.10) -- cgit v1.2.3 From 260e68342be9cc25b6c45b71615bab75a70f72a1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 30 Mar 2023 23:20:21 -0400 Subject: gnu: hdf5-1.8: Delete trailing #t. * gnu/packages/maths.scm (hdf5-1.8) [arguments]: Delete trailing #t. --- gnu/packages/maths.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 51629a31fd..ff3f1cf007 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1442,8 +1442,7 @@ incompatible with HDF5.") (substitute* "hl/fortran/src/Makefile.in" (("libhdf5hl_fortran_la_LDFLAGS =") (string-append "libhdf5hl_fortran_la_LDFLAGS = -Wl,-rpath=" - (assoc-ref outputs "fortran") "/lib"))) - #t)) + (assoc-ref outputs "fortran") "/lib"))))) (add-after 'configure 'patch-settings (lambda _ ;; libhdf5.settings contains the full path of the @@ -1456,16 +1455,14 @@ incompatible with HDF5.") ;; Don't record the build-time kernel version to make the ;; settings file reproducible. (("Uname information:.*") - "Uname information: Linux\n")) - #t)) + "Uname information: Linux\n")))) (add-after 'install 'patch-references (lambda* (#:key inputs outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin")) (zlib (assoc-ref inputs "zlib"))) (substitute* (find-files bin "h5p?cc") (("-lz" lib) - (string-append "-L" zlib "/lib " lib))) - #t))) + (string-append "-L" zlib "/lib " lib)))))) (add-after 'install 'split (lambda* (#:key inputs outputs #:allow-other-keys) ;; Move all fortran-related files @@ -1500,8 +1497,7 @@ incompatible with HDF5.") (rename-file file (string-append fex "/" (basename file)))) (find-files ex ".*")) - (delete-file-recursively ex)) - #t))))) + (delete-file-recursively ex))))))) (home-page "https://www.hdfgroup.org") (synopsis "Management suite for extremely large and complex data") (description "HDF5 is a suite that makes possible the management of -- cgit v1.2.3 From 411e60db26bb22857e9e57f395d1d66656863f4b Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sun, 29 Jan 2023 13:38:47 +0800 Subject: gnu: go-1.17: Update to 1.17.13. * gnu/packages/golang.scm (go-1.17): Update to 1.17.13. Signed-off-by: Maxim Cournoyer --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7709053d34..da550f0bfd 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -631,7 +631,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (package (inherit go-1.16) (name "go") - (version "1.17.11") + (version "1.17.13") (source (origin (method git-fetch) @@ -641,7 +641,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (file-name (git-file-name name version)) (sha256 (base32 - "11wy6092qm7v0n10cjkyp49sbchqazi3vnij8k2sq7k7jaj63z5p")))) + "05m8gr050kagvn22lfnjrgms03l5iphd1m4v6z7yqlhn9gdp912d")))) (outputs '("out" "tests")) ; 'tests' contains distribution tests. (arguments `(#:modules ((ice-9 match) -- cgit v1.2.3 From 99e2d9595ab57c177f58f62085e56a0afd24d977 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 30 Mar 2023 23:29:47 -0400 Subject: gnu: Remove ucd-next. * gnu/packages/build-tools.scm (ucd-next): Delete variable. --- gnu/packages/build-tools.scm | 2 +- gnu/packages/unicode.scm | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 2bbf7ce4c9..8a6cfae692 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -993,7 +993,7 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.") (list bash-minimal python perl clisp ;; Unicode data: - ucd-next + ucd ;; Programs for the tests: cppi indent git-minimal/pinned autoconf)) (home-page "https://www.gnu.org/software/gnulib/") diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index afb9546966..3a6d0750bf 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -97,20 +97,6 @@ files listing Unicode character properties and related data. It also includes test data for conformance to several important Unicode algorithms.") (license unicode))) -(define-public ucd-next - (package - (inherit ucd) - (name "ucd") - (version "15.0.0") - (source - (origin - (method url-fetch/zipbomb) - (uri (string-append "https://www.unicode.org/Public/zipped/" version - "/UCD.zip")) - (sha256 - (base32 - "133inqn33hcfvylmps63yjr6rrqrfq6x7a5hr5fd51z6yc0f9gaz")))))) - (define (unicode-emoji-file name version hash) (origin (method url-fetch) -- cgit v1.2.3 From 87947c19396e44d2c1338813a33288547353bba2 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 30 Mar 2023 23:31:03 -0400 Subject: gnu: ucd: Update to 15.0.0. * gnu/packages/unicode.scm (ucd): Update to 15.0.0. --- gnu/packages/unicode.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 3a6d0750bf..23f08a2aab 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -77,14 +77,14 @@ renderer.") (define-public ucd (package (name "ucd") - (version "14.0.0") + (version "15.0.0") (source (origin (method url-fetch/zipbomb) (uri (string-append "https://www.unicode.org/Public/zipped/" version "/UCD.zip")) (sha256 - (base32 "001nq9w52ijma0vps40xwy2q6ylpyf1393lzb128ibypnmv54fh3")))) + (base32 "133inqn33hcfvylmps63yjr6rrqrfq6x7a5hr5fd51z6yc0f9gaz")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit v1.2.3 From db7d0c0cb9ca6f94d678c5083f38325b6dc1fc7c Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 29 Jan 2023 14:28:54 +0800 Subject: gnu: sdl2: Update to 2.26.2. * gnu/packages/sdl.scm (sdl2): Update to 2.26.2. Signed-off-by: Maxim Cournoyer --- gnu/packages/sdl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 4a964eca19..a373f20d69 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -115,7 +115,7 @@ joystick, and graphics hardware.") (package (inherit sdl) (name "sdl2") - (version "2.26.1") + (version "2.26.2") (source (origin (method url-fetch) (uri @@ -123,7 +123,7 @@ joystick, and graphics hardware.") version ".tar.gz")) (sha256 (base32 - "011y6x13z8sd8dlya6d01f1z9czv9gn3gciq21ip2h6pxg3pqlq2")))) + "1q4r1camsr17mnpv00d6h3qy93b481rp68r6fbxbszq3vv1rplwm")))) (arguments (substitute-keyword-arguments (package-arguments sdl) ((#:configure-flags flags) -- cgit v1.2.3 From dbce5cdf8e00bc08d3f6010ac3c1fbaf3b114085 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 10 Oct 2022 23:23:10 +0200 Subject: gnu: python-coverage: Update to 5.5. * gnu/packages/check.scm (python-coverage): Update to 5.5. Signed-off-by: Maxim Cournoyer --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 4985796165..990c6d52df 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2058,14 +2058,14 @@ have failed since the last commit or what tests are currently failing."))) (define-public python-coverage (package (name "python-coverage") - (version "5.2.1") + (version "5.5") (source (origin (method url-fetch) (uri (pypi-uri "coverage" version)) (sha256 (base32 - "16z8i18msgs8k74n73dj9x49wzkl0vk4vq8k5pl1bsj70y7b4k53")))) + "0b112ly7vvplvm9l411aqknxhr7fzfyp28xhflhkcx78l3lqzrzb")))) (build-system python-build-system) (arguments ;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors. -- cgit v1.2.3 From 826b222703ba8d1b6d06b942f64c5d09337a900f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 30 Mar 2023 23:50:31 -0400 Subject: gnu: go: Update home page URL. * gnu/packages/golang.scm (go-1.4) [home-page]: Update URL. --- gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index da550f0bfd..24dae34e20 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -244,7 +244,7 @@ (native-inputs (list pkg-config which net-base perl)) - (home-page "https://golang.org/") + (home-page "https://go.dev/") (synopsis "Compiler and libraries for Go, a statically-typed language") (description "Go, also commonly referred to as golang, is an imperative programming language designed primarily for systems programming. Go is a -- cgit v1.2.3 From 206982544bc1b14ca688ce08bca0be40f2426c26 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 31 Mar 2023 08:35:01 -0400 Subject: gnu: ruby-activesupport: Skip a failing test on i686-linux. * gnu/packages/rails.scm (ruby-activesupport) [arguments]: Skip the test_iso8601_output_and_reparsing test when building for i686-linux. --- gnu/packages/rails.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index c830620b82..b1abb65a6d 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -81,6 +81,12 @@ "") ((".*behaviors/encoded_key_cache_behavior.*") "")) + (when #$(target-x86-32?) + ;; This test fails on i686 (see: + ;; https://github.com/rails/rails/issues/47832). + (substitute* "test/core_ext/duration_test.rb" + (("def test_iso8601_output_and_reparsing.*" all) + (string-append all " skip('fails on i686')\n")))) (delete-file "test/evented_file_update_checker_test.rb") ;; These tests require cache_store_behavior, disabled above. (delete-file "test/cache/stores/file_store_test.rb") -- cgit v1.2.3 From 5cfb866484af160d03bacf09b2d9e733b50764f7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 31 Mar 2023 09:01:38 -0400 Subject: gnu: python-geventhttpclient: Update to 2.0.9. * gnu/packages/python-web.scm (python-geventhttpclient): Update to 2.0.9. [propagated-inputs]: Add python-urllib3. [home-page]: Update URL. --- gnu/packages/python-web.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 495e13acfe..d84b5efdf9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018, 2019, 2021 Nicolas Goaziou ;;; Copyright © 2018 Mathieu Othacehe -;;; Copyright © 2018, 2020, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2018, 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2019 Vagrant Cascadian ;;; Copyright © 2019 Brendan Tildesley ;;; Copyright © 2019 Pierre Langlois @@ -3765,13 +3765,13 @@ for the basic TCP/IP protocols.") (define-public python-geventhttpclient (package (name "python-geventhttpclient") - (version "1.5.3") + (version "2.0.9") (source (origin (method url-fetch) (uri (pypi-uri "geventhttpclient" version)) (sha256 (base32 - "104p14p67xa5gch8dy2zqmzmjra31fflk1c1alrry8dp8bzwj3nq")) + "04qmcc7qpnif70ph61339dcld4g107fkhpa0gdmbs8z98v9kkg4a")) (modules '((guix build utils))) (snippet '(begin @@ -3794,15 +3794,14 @@ for the basic TCP/IP protocols.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "pytest" "src/geventhttpclient/tests" "-v" + (invoke "pytest" "src/geventhttpclient/tests" "-v" ;; Append the test modules to sys.path to avoid ;; namespace conflict which breaks SSL tests. "--import-mode=append"))))))) - (native-inputs - (list python-dpkt python-pytest)) - (propagated-inputs - (list python-brotli python-certifi python-gevent python-six)) - (home-page "https://github.com/gwik/geventhttpclient") + (native-inputs (list python-dpkt python-pytest)) + (propagated-inputs (list python-brotli python-certifi python-gevent + python-six python-urllib3)) + (home-page "https://github.com/geventhttpclient/geventhttpclient") (synopsis "HTTP client library for gevent") (description "@code{python-geventhttpclient} is a high performance, concurrent HTTP client library for python using @code{gevent}.") -- cgit v1.2.3 From c0936d66086599a8a338c1c1f1ffb4b1fd00e740 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 31 Mar 2023 09:36:56 -0400 Subject: gnu: python-locust: Update to 2.15.1. * gnu/packages/benchmark.scm (python-locust): Update to 2.15.1. [arguments]: Delete relax-requirements phase. Add increase-resource-limits. Update check phase. [propagated-inputs]: Remove python-jinja2. --- gnu/packages/benchmark.scm | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index fd8513f41d..0cc8def918 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2019, 2021 Ludovic Courtès ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 malte Frank Gerdes -;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020 Greg Hogan ;;; Copyright © 2021 Arun Isaac ;;; Copyright © 2022 Tomasz Jeneralczyk @@ -382,39 +382,55 @@ setup against another one.") (define-public python-locust (package (name "python-locust") - (version "2.8.6") + (version "2.15.1") (source (origin (method url-fetch) (uri (pypi-uri "locust" version)) (sha256 (base32 - "1gn13j758j36knlcdyyyggn60rpw98iqdkvl3kjsz34brysic6q1")))) + "05cznfqda0yq2j351jjdssayvj5qc11xkbkwdvv81hcmz4xpyc56")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'relax-requirements + (add-before 'check 'increase-resource-limits (lambda _ - (substitute* "setup.py" - (("setuptools_scm<=6.0.1") - "setuptools_scm") - (("Jinja2<3.1.0") - "Jinja2")))) + ;; XXX: Copied from ungoogled-chromium. + ;; Try increasing the soft resource limit of max open files to 2048, + ;; or equal to the hard limit, whichever is lower. + (call-with-values (lambda () (getrlimit 'nofile)) + (lambda (soft hard) + (when (and soft (< soft 2048)) + (if hard + (setrlimit 'nofile (min hard 2048) hard) + (setrlimit 'nofile 2048 #f)) + (format #t + "increased maximum number of open files from ~d to ~d~%" + soft (if hard (min hard 2048) 2048))))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "python" "-m" "pytest" "locust" "-k" (string-join - '(;; These tests return "non-zero exit status 1". + '( ;; These tests return "non-zero exit status 1". "not test_default_headless_spawn_options" "not test_default_headless_spawn_options_with_shape" "not test_headless_spawn_options_wo_run_time" + ;; These tests fail with a HTTP return code of + ;; 500 instead of 200, for unknown reasons. + "not test_autostart_mutliple_locustfiles_with_shape" + "not test_autostart_w_load_shape" + "not test_autostart_wo_run_time" + "not test_percentile_parameter" ;; These tests depend on networking. "not test_html_report_option" + "not test_json_schema" "not test_web_options" - ;; This test fails because of the warning "System open - ;; file limit '1024' is below minimum setting '10000'". + ;; These tests fail because of the warning + ;; "System open file limit '1024' is below + ;; minimum setting '10000'". + "not test_autostart_w_run_time" "not test_skip_logging" ;; On some (slow?) machines, the following tests ;; fail, with the processes returning exit code @@ -433,7 +449,6 @@ setup against another one.") python-flask-cors python-gevent python-geventhttpclient - python-jinja2 python-msgpack python-psutil python-pyzmq -- cgit v1.2.3 From 865dcef75e74dcf0b0f384b55f19ea798c20ddef Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 31 Mar 2023 11:39:21 -0400 Subject: gnu: gnunet: Fix indentation and use gexps. * gnu/packages/gnunet.scm (gnunet): Fix indentation. [arguments]: Use gexps and delete trailing #t. --- gnu/packages/gnunet.scm | 140 ++++++++++++++++++++++++------------------------ 1 file changed, 71 insertions(+), 69 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 4d662d75fb..2b494862ad 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2023 Adam Faiz +;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ (define-module (gnu packages gnunet) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages file) #:use-module (gnu packages aidc) #:use-module (gnu packages autotools) @@ -259,82 +261,82 @@ supports HTTP, HTTPS and GnuTLS.") (define-public gnunet (package - (name "gnunet") - (version "0.19.3") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gnunet/gnunet-" version - ".tar.gz")) - (sha256 - (base32 - "09bspbjl6cll8wcrl1vnb56jwp30pcrg1yyj6xy3i0fl2bzdbdw2")) - (modules '((guix build utils))) - (snippet - #~(begin - ;; This is fixed in the upstream repository but the fix - ;; has not been released. - (substitute* "src/gns/test_proxy.sh" - (("test_gnunet_proxy.conf") "test_gns_proxy.conf")))))) - (build-system gnu-build-system) - (inputs - (list bluez - glpk - curl - gnutls/dane - gstreamer - jansson - libextractor - libidn2 - libgcrypt - libjpeg-turbo - libltdl - libmicrohttpd - libogg - libsodium - libunistring - miniupnpc - opus - pulseaudio - sqlite - zbar - zlib)) - (native-inputs - (list curl - openssl - pkg-config - python - python-sphinx - python-sphinx-rtd-theme - xxd - (@ (gnu packages base) which))) - (arguments - '(#:parallel-tests? #f ; Parallel tests aren't supported. + (name "gnunet") + (version "0.19.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gnunet/gnunet-" version + ".tar.gz")) + (sha256 + (base32 + "09bspbjl6cll8wcrl1vnb56jwp30pcrg1yyj6xy3i0fl2bzdbdw2")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; This is fixed in the upstream repository but the fix + ;; has not been released. + (substitute* "src/gns/test_proxy.sh" + (("test_gnunet_proxy.conf") "test_gns_proxy.conf")))))) + (build-system gnu-build-system) + (inputs + (list bluez + glpk + curl + gnutls/dane + gstreamer + jansson + libextractor + libidn2 + libgcrypt + libjpeg-turbo + libltdl + libmicrohttpd + libogg + libsodium + libunistring + miniupnpc + opus + pulseaudio + sqlite + zbar + zlib)) + (native-inputs + (list curl + openssl + pkg-config + python + python-sphinx + python-sphinx-rtd-theme + xxd + which)) + (arguments + (list + #:parallel-tests? #f ;parallel tests aren't supported #:phases - (modify-phases %standard-phases - (add-before 'check 'set-env-var-for-tests - (lambda _ - (setenv "LANG" "en_US.UTF-8"))) - ;; Swap 'check and 'install phases and add installed binaries to $PATH. - (add-before 'check 'set-path-for-check - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (setenv "GNUNET_PREFIX" (string-append out "/lib")) - (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))) - #t)) - (delete 'check) - (add-after 'install 'check - (assoc-ref %standard-phases 'check))))) - (synopsis "Secure, decentralized, peer-to-peer networking framework") - (description + #~(modify-phases %standard-phases + (add-before 'check 'set-env-var-for-tests + (lambda _ + (setenv "LANG" "en_US.UTF-8"))) + ;; Swap 'check and 'install phases and add installed binaries to $PATH. + (add-before 'check 'set-path-for-check + (lambda _ + (setenv "GNUNET_PREFIX" (string-append #$output "/lib")) + (setenv "PATH" (string-append (getenv "PATH") ":" + #$output "/bin")))) + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check))))) + (synopsis "Secure, decentralized, peer-to-peer networking framework") + (description "GNUnet is a framework for secure peer-to-peer networking. The high-level goal is to provide a strong foundation of free software for a global, distributed network that provides security and privacy. GNUnet in that sense aims to replace the current internet protocol stack. Along with an application for secure publication of files, it has grown to include all kinds of basic applications for the foundation of a GNU internet.") - (license license:agpl3+) - (home-page "https://gnunet.org/en/"))) + (license license:agpl3+) + (home-page "https://gnunet.org/en/"))) (define-public guile-gnunet ;GSoC 2015! (let ((commit "d12167ab3c8d7d6caffd9c606e389ef043760602") -- cgit v1.2.3 From ccbb4f15924d06d73dc311164d6b592d7c89f875 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 31 Mar 2023 11:48:30 -0400 Subject: gnu: gnunet: Disable flaky tests. * gnu/packages/gnunet.scm (gnunet) [arguments]: Add a disable-problematic-tests phase. --- gnu/packages/gnunet.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 2b494862ad..cb4a90298f 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -315,6 +315,17 @@ supports HTTP, HTTPS and GnuTLS.") #:parallel-tests? #f ;parallel tests aren't supported #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'disable-problematic-tests + (lambda _ + (substitute* "src/cadet/Makefile.in" + ;; The speed_reliable tests appear to be unreliable (see: + ;; https://bugs.gnunet.org/view.php?id=7787). + (("test_cadet_[0-9]+_speed_reliable\\$\\(EXEEXT)") + "")) + (substitute* "src/core/Makefile.in" + ;; The 'test_core_api' test fails non-deterministically (see: + ;; https://bugs.gnunet.org/view.php?id=7784). + (("test_core_api\\$\\(EXEEXT) ") "")))) (add-before 'check 'set-env-var-for-tests (lambda _ (setenv "LANG" "en_US.UTF-8"))) -- cgit v1.2.3 From 17e36697db27be640bdf657987b6599246935381 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 31 Mar 2023 12:11:24 -0400 Subject: gnu: blender: Use gexps and remove labels. * gnu/packages/graphics.scm (blender) [arguments]: Use gexps. Replace the add-ilmbase-include-path phase by an added -I directive to the CMAKE_CXX_FLAGS configure flag. [inputs]: Remove labels. --- gnu/packages/graphics.scm | 159 ++++++++++++++++++++++------------------------ 1 file changed, 77 insertions(+), 82 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index bcc27cc3bf..ecdbe6840b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -490,90 +490,85 @@ typically encountered in feature film production.") "1jlc26axbhh97d2j6kfg9brgiq8j412mgmw7p41ah34apzq4inia")))) (build-system cmake-build-system) (arguments + (list + ;; Test files are very large and not included in the release tarball. + #:tests? #f + #:configure-flags (let ((python-version (version-major+minor (package-version python)))) - `(;; Test files are very large and not included in the release tarball. - #:tests? #f - #:configure-flags - (list "-DWITH_CODEC_FFMPEG=ON" - "-DWITH_CODEC_SNDFILE=ON" - "-DWITH_CYCLES=ON" - "-DWITH_DOC_MANPAGE=ON" - "-DWITH_FFTW3=ON" - "-DWITH_IMAGE_OPENJPEG=ON" - "-DWITH_INPUT_NDOF=ON" - "-DWITH_INSTALL_PORTABLE=OFF" - "-DWITH_JACK=ON" - "-DWITH_MOD_OCEANSIM=ON" - "-DWITH_OPENVDB=ON" - "-DWITH_OPENSUBDIV=ON" - "-DWITH_PYTHON_INSTALL=OFF" - (string-append "-DPYTHON_LIBRARY=python" ,python-version) - (string-append "-DPYTHON_LIBPATH=" (assoc-ref %build-inputs "python") - "/lib") - (string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python") - "/include/python" ,python-version) - (string-append "-DPYTHON_VERSION=" ,python-version) - (string-append "-DPYTHON_NUMPY_INCLUDE_DIRS=" - (assoc-ref %build-inputs "python-numpy") - "/lib/python" ,python-version "/site-packages/numpy/core/include/") - (string-append "-DPYTHON_NUMPY_PATH=" - (assoc-ref %build-inputs "python-numpy") - "/lib/python" ,python-version "/site-packages/")) - #:phases - (modify-phases %standard-phases - ;; XXX This file doesn't exist in the Git sources but will probably - ;; exist in the eventual 2.80 source tarball. - (add-after 'unpack 'fix-broken-import - (lambda _ - (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py" - (("import encode_bin") "from . import encode_bin")) - #t)) - (add-after 'set-paths 'add-ilmbase-include-path - (lambda* (#:key inputs #:allow-other-keys) - ;; OpenEXR propagates ilmbase, but its include files do not - ;; appear in the C_INCLUDE_PATH, so we need to add - ;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to satisfy - ;; the dependency on "half.h" and "Iex.h". - (let ((headers (string-append - (assoc-ref inputs "ilmbase") - "/include/OpenEXR"))) - (setenv "C_INCLUDE_PATH" - (string-append headers ":" - (or (getenv "C_INCLUDE_PATH") ""))) - (setenv "CPLUS_INCLUDE_PATH" - (string-append headers ":" - (or (getenv "CPLUS_INCLUDE_PATH") "")))))))))) + #~(list "-DWITH_CODEC_FFMPEG=ON" + "-DWITH_CODEC_SNDFILE=ON" + "-DWITH_CYCLES=ON" + "-DWITH_DOC_MANPAGE=ON" + "-DWITH_FFTW3=ON" + "-DWITH_IMAGE_OPENJPEG=ON" + "-DWITH_INPUT_NDOF=ON" + "-DWITH_INSTALL_PORTABLE=OFF" + "-DWITH_JACK=ON" + "-DWITH_MOD_OCEANSIM=ON" + "-DWITH_OPENVDB=ON" + "-DWITH_OPENSUBDIV=ON" + "-DWITH_PYTHON_INSTALL=OFF" + (string-append "-DPYTHON_LIBRARY=python" #$python-version) + (string-append "-DPYTHON_LIBPATH=" + (assoc-ref %build-inputs "python") + "/lib") + (string-append "-DPYTHON_INCLUDE_DIR=" + (assoc-ref %build-inputs "python") + "/include/python" #$python-version) + (string-append "-DPYTHON_VERSION=" #$python-version) + (string-append "-DPYTHON_NUMPY_INCLUDE_DIRS=" + (assoc-ref %build-inputs "python-numpy") + "/lib/python" #$python-version + "/site-packages/numpy/core/include/") + (string-append "-DPYTHON_NUMPY_PATH=" + (assoc-ref %build-inputs "python-numpy") + "/lib/python" #$python-version + "/site-packages/") + ;; OpenEXR propagates ilmbase, but its include files do not + ;; appear in the C_INCLUDE_PATH, so we need to add + ;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to + ;; satisfy the dependency on "half.h" and "Iex.h". + (string-append "-DCMAKE_CXX_FLAGS=-I" + (search-input-directory %build-inputs + "include/OpenEXR")))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-broken-import + (lambda _ + (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py" + (("import encode_bin") + "from . import encode_bin"))))))) (inputs - `(("boost" ,boost) - ("jemalloc" ,jemalloc) - ("libx11" ,libx11) - ("libxi" ,libxi) - ("libxrender" ,libxrender) - ("opencolorio" ,opencolorio) - ("openimageio" ,openimageio) - ("openexr" ,openexr-2) - ("opensubdiv" ,opensubdiv) - ("ilmbase" ,ilmbase) - ("openjpeg" ,openjpeg) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("ffmpeg" ,ffmpeg) - ("fftw" ,fftw) - ("gmp" ,gmp) ;; needed for boolean operations on meshes - ("jack" ,jack-1) - ("libsndfile" ,libsndfile) - ("freetype" ,freetype) - ("glew" ,glew) - ("openal" ,openal) - ("pugixml" ,pugixml) - ("python" ,python) - ("python-numpy" ,python-numpy) - ("openvdb" ,openvdb) - ("tbb" ,tbb) - ("zlib" ,zlib) - ("zstd" ,zstd "lib") - ("embree" ,embree))) + (list boost + embree + ffmpeg + fftw + freetype + glew + gmp ;needed for boolean operations on meshes + ilmbase + jack-1 + jemalloc + libjpeg-turbo + libpng + libsndfile + libtiff + libx11 + libxi + libxrender + openal + opencolorio + openexr-2 + openimageio + openjpeg + opensubdiv + openvdb + pugixml + python + python-numpy + tbb + zlib + `(,zstd "lib"))) (home-page "https://blender.org/") (synopsis "3D graphics creation suite") (description -- cgit v1.2.3 From b1c4c249ab4d823ab0a928bd95a6513c652d66e4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 31 Mar 2023 13:04:56 -0400 Subject: gnu: blender: Use ffmpeg 5. * gnu/packages/graphics.scm (blender) [inputs]: Replace ffmpeg with ffmpeg-5. --- gnu/packages/graphics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index ecdbe6840b..befc09b6df 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -541,7 +541,7 @@ typically encountered in feature film production.") (inputs (list boost embree - ffmpeg + ffmpeg-5 fftw freetype glew -- cgit v1.2.3 From e8d163b49ad7bf4912ee5fbfdc2f043e19c68b88 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 31 Mar 2023 13:05:27 -0400 Subject: gnu: blender: Update to 3.3.5. * gnu/packages/graphics.scm (blender): Update to 3.3.5. --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index befc09b6df..12b6c94932 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -480,14 +480,14 @@ typically encountered in feature film production.") (define-public blender (package (name "blender") - (version "3.3.1") + (version "3.3.5") ;3.3.x is the current LTS version (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "1jlc26axbhh97d2j6kfg9brgiq8j412mgmw7p41ah34apzq4inia")))) + "1pwl4lbc00g0bj97rd8l9fnrv3w1gny9ci6mrma3pp2acgs56502")))) (build-system cmake-build-system) (arguments (list -- cgit v1.2.3 From 0d5746ee7ca337dcc82553ca6dd794b04bb6563d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 10:47:12 -0400 Subject: gnu: imgui: Use unsigned int vertex indexes. * gnu/packages/toolkits.scm (imgui) [arguments]: Add the "-DImDrawIdx=unsigned int" compiler option to the build phase. --- gnu/packages/toolkits.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/toolkits.scm b/gnu/packages/toolkits.scm index 3030e3aa49..82b9490e62 100644 --- a/gnu/packages/toolkits.scm +++ b/gnu/packages/toolkits.scm @@ -66,7 +66,12 @@ (replace 'build (lambda* (#:key inputs #:allow-other-keys) ;; Build main library. - (apply invoke #$(cc-for-target) "-I" (getcwd) + (apply invoke #$(cc-for-target) + ;; This option is necessary at least for OpenBoardView, + ;; otherwise it would fail with the "Too many vertices in + ;; ImDrawList using 16-bit indices". + "-DImDrawIdx=unsigned int" + "-I" (getcwd) "-I" (search-input-directory inputs "include/freetype2") "-g" "-O2" "-fPIC" "-shared" "-lGL" "-lSDL2" "-lglfw" -- cgit v1.2.3 From 46e56eb001751d127c38a7a4f5a23dc4cc214453 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 31 Mar 2023 15:07:00 -0400 Subject: gnu: Add orangeduck-mpc. * gnu/packages/c.scm (orangeduck-mpc): New variable. * gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/c.scm | 50 +++++++++++++++++++++- .../patches/orangeduck-mpc-fix-pkg-config.patch | 25 +++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch diff --git a/gnu/local.mk b/gnu/local.mk index e9c8ddf6a3..3c188cf1f7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1632,6 +1632,7 @@ dist_patch_DATA = \ %D%/packages/patches/openssl-3.0-c-rehash-in.patch \ %D%/packages/patches/opentaxsolver-file-browser-fix.patch \ %D%/packages/patches/open-zwave-hidapi.patch \ + %D%/packages/patches/orangeduck-mpc-fix-pkg-config.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/osip-CVE-2017-7853.patch \ %D%/packages/patches/ots-no-include-missing-file.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index b2f16613dd..96b4e904f7 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 Katherine Cox-Buday -;;; Copyright © 2020, 2022 Maxim Cournoyer +;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020, 2021 Greg Hogan ;;; Copyright © 2021 David Dashyan ;;; Copyright © 2021 Foo Chuan Wei @@ -1145,6 +1145,54 @@ Telemetry Transport (MQTT) publish-subscribe messaging protocol.") (home-page "https://microsoft.github.io/mimalloc/") (license license:expat))) +;;; The package is named orangeduck-mpc to differentiate it from GNU mpc. +(define-public orangeduck-mpc + ;; The last release lacks an 'install' target. + (let ((commit "7c910e9303833c349f7432188ff77f2745254df2") + (revision "0")) + (package + (name "orangeduck-mpc") + (version (git-version "0.9.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/orangeduck/mpc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01a4vcxdnz0fbn90c9zc3jzklyqqvp9sfjpjwpq0f5r0l2pp37ad")) + (patches + (search-patches "orangeduck-mpc-fix-pkg-config.patch")))) + (build-system gnu-build-system) + (arguments + (list #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-Makefile + (lambda _ + (substitute* "Makefile" + ;; Do not attempt to alter the permissions, + ;; otherwise 'install' would error with + ;; "cannot stat [...] Permission denied" + ;; errors. + (("\\s\\-m[0-9]{3}\\s") + " ")))) + (delete 'configure)))) + (home-page "https://github.com/orangeduck/mpc") + (synopsis "Parser Combinator library for C ") + (description "@code{mpc} is a lightweight Parser Combinator library for C. +@code{mpc} can help with tasks such as: +@itemize +@item Building a new programming language +@item Building a new data format +@item Parsing an existing programming language +@item Parsing an existing data format +@item Embedding a Domain Specific Language +@item Implementing Greenspun's Tenth Rule. +@end itemize") + (license license:bsd-2)))) + ;;; Factored out of the ck package so that it can be adjusted and called on ;;; the host side easily, without impacting the package definition. (define (gnu-triplet->ck-machine target) diff --git a/gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch b/gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch new file mode 100644 index 0000000000..f6155517d1 --- /dev/null +++ b/gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch @@ -0,0 +1,25 @@ +Upstream status: https://github.com/orangeduck/mpc/pull/160 + +diff --git a/Makefile b/Makefile +index 7719acc..fe798c5 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,7 +15,7 @@ EXAMPLESEXE = $(EXAMPLES:.c=) + + .PHONY: all check clean libs $(DIST)/$(PROJ).pc + +-all: $(EXAMPLESEXE) check ++all: $(EXAMPLESEXE) check libs $(DIST)/$(PROJ).pc + + $(DIST): + $(MKDIR) $(DIST) +@@ -65,7 +65,8 @@ install: all + install -m755 -t $(DESTDIR)$(PREFIX)/lib $(DIST)/lib* + install -m644 -t $(DESTDIR)$(PREFIX)/share/$(PROJ) $(PROJ).c $(PROJ).h + install -m644 $(PROJ).h $(DESTDIR)$(PREFIX)/include/$(PROJ).h +- install -m644 $(PROJ).pc $(DESTDIR)$(PREFIX)/lib/pkgconfig/$(PROJ).pc ++ install -m644 $(DIST)/$(PROJ).pc \ ++ $(DESTDIR)$(PREFIX)/lib/pkgconfig/$(PROJ).pc + + uninstall: + rm -rf -- \ -- cgit v1.2.3 From 49b5e7e93c0295f5edbac93ed5f5a904f9842ad6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 31 Mar 2023 16:21:38 -0400 Subject: gnu: openboardview: Update to 9.95.0. * gnu/packages/electronics.scm (openboardview): Update to 9.95.0. [source]: Apply patch. [arguments]: Update fix-utf8-include-directive phase. [inputs]: Add orangeduck-mpc. * gnu/packages/patches/openboardview-use-system-mpc.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/electronics.scm | 11 +++--- .../patches/openboardview-use-system-mpc.patch | 42 ++++++++++++++++++++++ 3 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/openboardview-use-system-mpc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3c188cf1f7..436b6b9e81 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1618,6 +1618,7 @@ dist_patch_DATA = \ %D%/packages/patches/onnx-skip-model-downloads.patch \ %D%/packages/patches/openbios-aarch64-riscv64-support.patch \ %D%/packages/patches/openboardview-use-system-imgui.patch \ + %D%/packages/patches/openboardview-use-system-mpc.patch \ %D%/packages/patches/openbox-python3.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 4d7f4d2e05..5ab9662551 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2019 Clément Lassieur ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2021 Leo Famulari -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -252,7 +252,7 @@ supported devices, as well as input/output file format support.") (define-public openboardview (package (name "openboardview") - (version "9.0.3") + (version "9.95.0") (source (origin (method git-fetch) (uri (git-reference @@ -270,10 +270,11 @@ supported devices, as well as input/output file format support.") (delete-file-recursively f))) (scandir "." (negate (cut member <> keep)))))) (patches - (search-patches "openboardview-use-system-imgui.patch")) + (search-patches "openboardview-use-system-imgui.patch" + "openboardview-use-system-mpc.patch")) (sha256 (base32 - "0wmplzgi3rpkcajdrnkxvqhgxrn6qdxa6vwgd24bm10ryyhiqw54")))) + "1safjd729a7591rigkiy3c678bivrj5q1qwg1f18sijhlsfkf5b3")))) (build-system cmake-build-system) (arguments (list @@ -302,6 +303,7 @@ supported devices, as well as input/output file format support.") ;; directly rather than "utf8/utf8.h". (lambda _ (substitute* '("src/openboardview/FileFormats/BRDFile.cpp" + "src/openboardview/FileFormats/BRDFileBase.cpp" "src/openboardview/BoardView.cpp") (("utf8/utf8.h") "utf8.h")))) (add-before 'configure 'dynamically-load-gtk-via-absolute-path @@ -327,6 +329,7 @@ supported devices, as well as input/output file format support.") (list fontconfig gtk+ imgui + orangeduck-mpc sdl2 sqlite zlib)) diff --git a/gnu/packages/patches/openboardview-use-system-mpc.patch b/gnu/packages/patches/openboardview-use-system-mpc.patch new file mode 100644 index 0000000000..7726c55fe8 --- /dev/null +++ b/gnu/packages/patches/openboardview-use-system-mpc.patch @@ -0,0 +1,42 @@ +Upstream status: https://github.com/OpenBoardView/OpenBoardView/pull/281 + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 452dfa9..e30c3cf 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -206,13 +206,15 @@ endif() + add_definitions(-DSTBI_FAILURE_USERMSG) + + ## mpc - Micro Parser Combinators ## +-execute_process( +- COMMAND git submodule update --init src/mpc +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} +-) +- +-add_library(mpc STATIC "mpc/mpc.c") +- ++pkg_check_modules(MPC QUIET mpc) ++if(NOT MPC_FOUND) ++ execute_process( ++ COMMAND git submodule update --init src/mpc ++ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} ++ ) ++ add_library(mpc STATIC "mpc/mpc.c") ++ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mpc) ++endif() + + ## OpenBoardView ## + add_subdirectory(openboardview) +diff --git a/src/openboardview/FileFormats/GenCADFile.h b/src/openboardview/FileFormats/GenCADFile.h +index 1ccf8df..c57f7ff 100644 +--- a/src/openboardview/FileFormats/GenCADFile.h ++++ b/src/openboardview/FileFormats/GenCADFile.h +@@ -5,7 +5,7 @@ + + #include "build-generated/GenCADFileGrammar.h" + +-#include "mpc/mpc.h" ++#include "mpc.h" + + #include + #include -- cgit v1.2.3 From d7a024a98e5e311cfb2cde48ec735a0a9b6a1973 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 31 Mar 2023 16:31:16 -0400 Subject: gnu: openboardview: Update home page. * gnu/packages/electronics.scm (openboardview) [home-page]: Update URL. --- gnu/packages/electronics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 5ab9662551..8ca956df26 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -333,7 +333,7 @@ supported devices, as well as input/output file format support.") sdl2 sqlite zlib)) - (home-page "https://openboardview.org/") + (home-page "https://github.com/OpenBoardView/OpenBoardView") (synopsis "Viewer for BoardView files") (description "OpenBoardView is a viewer for BoardView files, which present the details of a printed circuit board (PCB). It comes with features -- cgit v1.2.3 From 4ce042a7627caf921346edaac8251ee1846d6713 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 31 Mar 2023 16:32:14 -0400 Subject: gnu: gnunet: Update home page. * gnu/packages/gnunet.scm (gnunet) [home-page]: Update URL. --- gnu/packages/gnunet.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index cb4a90298f..04a11c01d0 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -347,7 +347,7 @@ that sense aims to replace the current internet protocol stack. Along with an application for secure publication of files, it has grown to include all kinds of basic applications for the foundation of a GNU internet.") (license license:agpl3+) - (home-page "https://gnunet.org/en/"))) + (home-page "https://www.gnunet.org/en/"))) (define-public guile-gnunet ;GSoC 2015! (let ((commit "d12167ab3c8d7d6caffd9c606e389ef043760602") -- cgit v1.2.3 From 216312482f3e845b343829ec72ca94aec7ce488d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 17:05:20 -0400 Subject: gnu: utf8-h: Install header under include/utf8 prefix. This is to standardize with the usage of the library in the package's only current user, OpenBoardView. It also matches the installation layout of the Arch package, which is made by its author. * gnu/packages/c.scm (utf8-h) [arguments]: Use gexps. Adjust installation prefix to 'include/utf8' in install phase. * gnu/packages/electronics.scm (openboardview) [arguments]: Delete fix-utf8-include-directive phase. --- gnu/packages/c.scm | 29 +++++++++++++++-------------- gnu/packages/electronics.scm | 8 -------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 96b4e904f7..b12aaf184a 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -1365,20 +1365,21 @@ will take care of dispatching tasks to available cores.") "0x9f7ivww8c7cigf4ck0hfx2bm79qgx6q4ccwzqbzkrmcrl9shfb")))) (build-system cmake-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'build) - (delete 'configure) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (with-directory-excursion "test" - (invoke "cmake" ".") - (invoke "make"))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "utf8.h" (string-append out "/include")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (delete 'build) + (delete 'configure) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "test" + (invoke "cmake" ".") + (invoke "make"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "utf8.h" + (string-append #$output "/include/utf8"))))))) (home-page "https://github.com/sheredom/utf8.h") (synopsis "Single header UTF-8 string functions for C and C++") (description "A simple one header solution to supporting UTF-8 strings in diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 8ca956df26..f0c65c53c7 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -298,14 +298,6 @@ supported devices, as well as input/output file format support.") "add_subdirectory(" (search-input-directory inputs "share/glad") ;source_dir " src/glad)\n"))))) ;binary dir - (add-before 'configure 'fix-utf8-include-directive - ;; Our utf8-h package makes the header available as "utf8.h" - ;; directly rather than "utf8/utf8.h". - (lambda _ - (substitute* '("src/openboardview/FileFormats/BRDFile.cpp" - "src/openboardview/FileFormats/BRDFileBase.cpp" - "src/openboardview/BoardView.cpp") - (("utf8/utf8.h") "utf8.h")))) (add-before 'configure 'dynamically-load-gtk-via-absolute-path ;; The GTK library is not linked thus not present in the RUNPATH of ;; the produced binary; the absolute path of the libraries must to -- cgit v1.2.3 From b8b7622d2b02e3bbe56e5d52ae10517815cbfc23 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 17:28:09 -0400 Subject: gnu: imgui: Use gexp output variables. * gnu/packages/toolkits.scm (imgui) [arguments]: Use gexp variables in install phase. --- gnu/packages/toolkits.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/toolkits.scm b/gnu/packages/toolkits.scm index 82b9490e62..a29ab01154 100644 --- a/gnu/packages/toolkits.scm +++ b/gnu/packages/toolkits.scm @@ -89,32 +89,33 @@ ;; fontconfig. (find-files "misc" "\\.cpp$")))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (header? (cut string-suffix? ".h" <>)) + (lambda _ + (let* ((header? (cut string-suffix? ".h" <>)) (imgui-headers (scandir "." header?)) (backend-headers (find-files "backends" "(glfw|opengl|sdl|vulkan).*\\.h$")) (misc-headers (find-files "misc" "\\.h$"))) - (install-file "libimgui.so" (string-append out "/lib")) + (install-file "libimgui.so" (string-append #$output "/lib")) ;; Install headers. (for-each (lambda (f) - (install-file f (string-append out "/include/imgui"))) + (install-file f (string-append #$output + "/include/imgui"))) imgui-headers) (for-each (lambda (f) (install-file f (string-append - out "/include/imgui/backends"))) + #$output + "/include/imgui/backends"))) backend-headers) (for-each (lambda (f) - (install-file f (string-append - out "/include/imgui/" (dirname f)))) + (install-file f (string-append #$output + "/include/imgui/" + (dirname f)))) misc-headers) ;; Install examples. - (copy-recursively - "examples" (string-append - doc "/share/imgui/examples")))))))) + (copy-recursively "examples" + (string-append #$output:doc + "/share/imgui/examples")))))))) (inputs (list fontconfig glfw mesa sdl2)) (home-page "https://github.com/ocornut/imgui") (synopsis "Immediate-mode C++ GUI library with minimal dependencies") -- cgit v1.2.3 From f770be590d9aaeb8308dddfb20490beca1a15990 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 17:35:23 -0400 Subject: gnu: Add imgui-1.87. * gnu/packages/toolkits.scm (imgui-1.87): New variable. --- gnu/packages/toolkits.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/toolkits.scm b/gnu/packages/toolkits.scm index a29ab01154..23c1877edd 100644 --- a/gnu/packages/toolkits.scm +++ b/gnu/packages/toolkits.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice ;;; Copyright © 2022 John Kehayias ;;; @@ -132,6 +132,22 @@ applications, full-screen applications, and embedded platforms without standard operating system features.") (license license:expat))) +(define-public imgui-1.87 + (package + (inherit imgui) + (name "imgui") + (version "1.87") + (source (origin + (inherit (package-source imgui)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocornut/imgui") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10qil22s5qak3as41787iz273sibpq1bq66bakgn7yvhj5fym6hz")))))) + (define-public imgui-1.86 (package (inherit imgui) -- cgit v1.2.3 From 1a7014b1c9a1a8f839f55bea43c14c811651fac2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 17:36:41 -0400 Subject: gnu: openboardview: Use imgui-1.87. * gnu/packages/electronics.scm (openboardview) [inputs]: Downgrade imgui to version 1.87. --- gnu/packages/electronics.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index f0c65c53c7..e1ab054bc7 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -320,7 +320,9 @@ supported devices, as well as input/output file format support.") (inputs (list fontconfig gtk+ - imgui + ;; OpenBoardView can build with Dear ImGui 1.88, but there are some + ;; usability problems such as the difficulty to register clicks. + imgui-1.87 orangeduck-mpc sdl2 sqlite -- cgit v1.2.3 From 4896040147f72ffc76dbaa797f29dc10bd9573b4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 17:37:14 -0400 Subject: gnu: imgui: Update to 1.89.4. * gnu/packages/toolkits.scm (imgui): Update to 1.89.4. --- gnu/packages/toolkits.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/toolkits.scm b/gnu/packages/toolkits.scm index 23c1877edd..aee6c22e2d 100644 --- a/gnu/packages/toolkits.scm +++ b/gnu/packages/toolkits.scm @@ -32,7 +32,7 @@ (define-public imgui (package (name "imgui") - (version "1.88") + (version "1.89.4") (source (origin (method git-fetch) (uri (git-reference @@ -41,7 +41,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "13cw4hx55y5z678r558hv7znfz666wh0w849c5padnj4nkpbihdi")) + "1j79gsg9i969slygrwm0dp5mkzagglawxxagjpi3009wyp6lj6l8")) (modules '((guix build utils))) (snippet ;; Remove bundled fonts. @@ -82,7 +82,9 @@ "imgui_widgets.cpp" ;; Include the supported backends. "backends/imgui_impl_glfw.cpp" - "backends/imgui_impl_sdl.cpp" + (if (file-exists? "backends/imgui_impl_sdl2.cpp") + "backends/imgui_impl_sdl2.cpp" + "backends/imgui_impl_sdl.cpp") "backends/imgui_impl_opengl2.cpp" "backends/imgui_impl_opengl3.cpp" ;; Include wrappers for C++ standard library (STL) and -- cgit v1.2.3 From 76e016958d09095c17806ed28e25817efacc8c8f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 17:46:18 -0400 Subject: gnu: gnunet: Update to 0.19.4. * gnu/packages/gnunet.scm (gnunet): Update to 0.19.4. --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 04a11c01d0..f080d72ccd 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -262,7 +262,7 @@ supports HTTP, HTTPS and GnuTLS.") (define-public gnunet (package (name "gnunet") - (version "0.19.3") + (version "0.19.4") (source (origin (method url-fetch) @@ -270,7 +270,7 @@ supports HTTP, HTTPS and GnuTLS.") ".tar.gz")) (sha256 (base32 - "09bspbjl6cll8wcrl1vnb56jwp30pcrg1yyj6xy3i0fl2bzdbdw2")) + "16q0mkkr9b33wlm307ignfgvv0kilzr42155m5dpz66m13s3v9h0")) (modules '((guix build utils))) (snippet #~(begin -- cgit v1.2.3 From 04e1103edf2288eadc88f9cbe09259d9c8115afc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 21:16:18 -0400 Subject: gnu: farstream: Disable a failing test. * gnu/packages/freedesktop.scm (farstream) [arguments]: Delete trailing #t. Rename the disable-timeout-tests phase to disable-problematic-tests, and disable an extra rtp/recvcodecs test. Standardize match pattern and update comment. [native-inputs]: Update the common input. --- gnu/packages/freedesktop.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b6cf45b728..bbac2ea064 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2021 Robby Zambito ;;; Copyright © 2021, 2022 Maxime Devos ;;; Copyright © 2021, 2022 John Kehayias -;;; Copyright © 2021, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2022 Daniel Meißner ;;; Copyright © 2022 muradm ;;; Copyright © 2022 Petr Hodina @@ -245,17 +245,18 @@ application-centers for distributions.") (delete-file "autogen.sh") (copy-recursively (assoc-ref %build-inputs "common") - "common") - #t)) - (add-after 'unpack 'disable-timeout-tests + "common"))) + (add-after 'unpack 'disable-problematic-tests (lambda _ (substitute* "tests/check/Makefile.am" - ;; This test timeouts despite changing - ;; the value of 'CK_DEFAULT_TIMEOUT' to 600, - ;; as per %common-gstreamer-phases. - ;; Reported to upstream: - ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20 - (("[ \t]*transmitter/nice.*$") "")))) + ;; This test fails since updating gstreamer to version 1.22.1 + ;; (see: + ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/25). + (("^\trtp/recvcodecs.*") "") + ;; This test timeouts despite changing the value of + ;; 'CK_DEFAULT_TIMEOUT' to 600 (see: + ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20). + (("^\ttransmitter/nice.*") "")))) (add-after 'unpack 'patch-docbook-xml (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "docs" @@ -263,8 +264,7 @@ application-centers for distributions.") "plugins/farstream-plugins-docs.sgml") (("http://www.oasis-open.org/docbook/xml/4.1.2/") (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/")))) - #t))))) + "/xml/dtd/docbook/"))))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -274,11 +274,10 @@ application-centers for distributions.") (uri (git-reference (url "https://gitlab.freedesktop.org/gstreamer/common.git") - (commit "88e512ca7197a45c4114f7fa993108f23245bf50"))) - (file-name - (git-file-name "common" "latest.88e512c")) + (commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e"))) + (file-name (git-file-name "common" "latest.52adcdb")) (sha256 - (base32 "1nk94pnskjyngqcfb9p32g4yvf4nzpjszisw24r9azl0pawqpsn6")))) + (base32 "1zlm1q1lgcb76gi82rial5bwy2j9sz1x6x48ijhiz89cml7xxd1r")))) ("docbook-xml" ,docbook-xml-4.1.2) ("docbook-xsl" ,docbook-xsl) ("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From c1eb1342aaf6e67da3e41e2734ea8587fdb96790 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 21:21:02 -0400 Subject: gnu: farstream: Use gexps. * gnu/packages/freedesktop.scm (farstream) [arguments]: Use gexps. Ungexp 'common' origin in-place. Use search-input-directory in patch-docbook-xml phase. [native-inputs]: Remove labels. [inputs, propagated-inputs]: Re-indent. --- gnu/packages/freedesktop.scm | 123 ++++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 60 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index bbac2ea064..a0ce0c2b25 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -225,72 +225,75 @@ application-centers for distributions.") (sha256 (base32 "1sd8syldyq6bphfdm129s3gq554vfv7vh1vcwzk48gjryf101awk")) (patches - (search-patches - "farstream-gupnp.patch" ;for test 'transmitter/rawudp' - "farstream-make.patch")))) + (search-patches "farstream-gupnp.patch" ;for test 'transmitter/rawudp' + "farstream-make.patch")))) (build-system glib-or-gtk-build-system) (outputs '("out" "doc")) (arguments - `(#:configure-flags - (list - "--enable-gtk-doc" - "--enable-glib-asserts" - (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'copy-common - (lambda _ - (delete-file "autogen.sh") - (copy-recursively - (assoc-ref %build-inputs "common") - "common"))) - (add-after 'unpack 'disable-problematic-tests - (lambda _ - (substitute* "tests/check/Makefile.am" - ;; This test fails since updating gstreamer to version 1.22.1 - ;; (see: - ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/25). - (("^\trtp/recvcodecs.*") "") - ;; This test timeouts despite changing the value of - ;; 'CK_DEFAULT_TIMEOUT' to 600 (see: - ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20). - (("^\ttransmitter/nice.*") "")))) - (add-after 'unpack 'patch-docbook-xml - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "docs" - (substitute* '("libs/farstream-libs-docs.sgml" - "plugins/farstream-plugins-docs.sgml") - (("http://www.oasis-open.org/docbook/xml/4.1.2/") - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/"))))))))) + (list + #:configure-flags + #~(list "--enable-gtk-doc" + "--enable-glib-asserts" + (string-append "--with-html-dir=" #$output + "/share/gtk-doc/html")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-common + (lambda _ + (delete-file "autogen.sh") + (copy-recursively + #$(origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.freedesktop.org/gstreamer/common.git") + (commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e"))) + (file-name (git-file-name "common" "latest.52adcdb")) + (sha256 + (base32 + "1zlm1q1lgcb76gi82rial5bwy2j9sz1x6x48ijhiz89cml7xxd1r"))) + "common"))) + (add-after 'unpack 'disable-problematic-tests + (lambda _ + (substitute* "tests/check/Makefile.am" + ;; This test fails since updating gstreamer to version 1.22.1 + ;; (see: + ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/25). + (("^\trtp/recvcodecs.*") "") + ;; This test timeouts despite changing the value of + ;; 'CK_DEFAULT_TIMEOUT' to 600 (see: + ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20). + (("^\ttransmitter/nice.*") "")))) + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* '("libs/farstream-libs-docs.sgml" + "plugins/farstream-plugins-docs.sgml") + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (search-input-directory (or native-inputs inputs) + "xml/dtd/docbook/"))))))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("common" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://gitlab.freedesktop.org/gstreamer/common.git") - (commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e"))) - (file-name (git-file-name "common" "latest.52adcdb")) - (sha256 - (base32 "1zlm1q1lgcb76gi82rial5bwy2j9sz1x6x48ijhiz89cml7xxd1r")))) - ("docbook-xml" ,docbook-xml-4.1.2) - ("docbook-xsl" ,docbook-xsl) - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) - ("libtool" ,libtool) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("xsltproc" ,libxslt))) + (list autoconf + automake + docbook-xml-4.1.2 + docbook-xsl + gobject-introspection + gtk-doc/stable + libtool + libxslt + perl + pkg-config + python-wrapper)) (inputs - (list glib gtk+ gupnp-igd libnice)) + (list glib + gtk+ + gupnp-igd + libnice)) (propagated-inputs - (list gstreamer gst-plugins-bad gst-plugins-base gst-plugins-good)) + (list gstreamer + gst-plugins-bad + gst-plugins-base + gst-plugins-good)) (synopsis "The Farstream VVoIP framework") (description "Farstream is a collection of GStreamer modules and libraries for videoconferencing.") -- cgit v1.2.3 From f0205b476f391d0c521fc0f2f45576e831f164af Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Mar 2023 16:41:59 +0200 Subject: gnu: rust-ucd-trie-0.1: Update to 0.1.5. * gnu/packages/crates-io.scm (rust-ucd-trie-0.1): Update to 0.1.5. [cargo-inputs]: Remove rust-lazy-static-1. Add rust-once-cell-1. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9cfcb161ae..6e67a44df1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -64838,19 +64838,18 @@ Unicode character database.") (define-public rust-ucd-trie-0.1 (package (name "rust-ucd-trie") - (version "0.1.2") + (version "0.1.5") (source (origin (method url-fetch) (uri (crate-uri "ucd-trie" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1hh6kyzh5xygwy96wfmsf8v8czlzhps2lgbcyhj1xzy1w1xys04g")))) + (base32 "10ggllapxq99cxxy179wbklmabj5fikm02233v4idf7djvcw8ycy")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1)))) + (("rust-once-cell" ,rust-once-cell-1)))) (home-page "https://github.com/BurntSushi/ucd-generate") (synopsis "Trie for storing Unicode codepoint sets and maps") (description -- cgit v1.2.3 From 9703715db8707ffddd4c2637626c4765ed8f7189 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 22:41:39 -0400 Subject: gnu: python-exceptiongroup: Update to 1.1.1. * gnu/packages/python-xyz.scm (python-exceptiongroup): Update to 1.1.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cf2af55284..ca82e0c73e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3542,7 +3542,7 @@ and is not compatible with JSON.") (define-public python-exceptiongroup (package (name "python-exceptiongroup") - (version "1.0.0rc8") + (version "1.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -3551,7 +3551,7 @@ and is not compatible with JSON.") (file-name (git-file-name name version)) (sha256 (base32 - "0xsbpv22n51p6yvyvz231mf8zhbi1i88b4zmacaxxx31zrq5ifv4")))) + "0wcvzwgjs0xmggs6dh92jxdqi988gafzh10hrzvw10kasy0xakfj")))) (build-system python-build-system) (arguments (list -- cgit v1.2.3 From 5b42a71571ef59b1e339fd2a66fc7ee32b44bc60 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 21:48:26 -0400 Subject: gnu: python-trio: Update to 0.22.0. * gnu/packages/python-xyz.scm (python-trio): Update to 0.22.0. [arguments]: Break long line in check phase. [propagated-inputs]: Add python-cffi and python-exceptiongroup. --- gnu/packages/python-xyz.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ca82e0c73e..05920bdf72 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24826,13 +24826,13 @@ project.") (define-public python-trio (package (name "python-trio") - (version "0.20.0") + (version "0.22.0") (source (origin (method url-fetch) (uri (pypi-uri "trio" version)) (sha256 - (base32 "0w30cwmdwfa8zq2agqv3h62jzwwsk7ms8f683ag8f3jx279m42k7")))) + (base32 "1kxa9v0cds0xnklvzppv4ix4xg81r73p5pm4qlvv2iqa832z2s6f")))) (build-system python-build-system) (arguments `(#:phases @@ -24858,7 +24858,8 @@ project.") ;; Assertion errors. " and not test_guest_mode_ki" " and not test_run_in_trio_thread_ki" - " and not test_simple_cancel_scope_usage_doesnt_create_cyclic_garbage" + " and not test_simple_cancel_scope_usage_doesnt_create\ +_cyclic_garbage" " and not test_nursery_cancel_doesnt_create_cyclic_garbage" " and not test_cancel_scope_exit_doesnt_create_cyclic_garbage" " and not test_locals_destroyed_promptly_on_cancel" @@ -24888,6 +24889,8 @@ project.") (propagated-inputs (list python-async-generator python-attrs + python-cffi + python-exceptiongroup python-idna python-outcome python-sniffio -- cgit v1.2.3 From 59f1a1d3a0a8893eefdc0deefb84d5df7ee7ec55 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 21:55:06 -0400 Subject: gnu: python-trio-typing: Update to 0.8.0. * gnu/packages/python-xyz.scm (python-trio-typing): Update to 0.8.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 05920bdf72..a8b3a85572 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24907,13 +24907,13 @@ programs that do multiple things at the same time with parallelized I/O.") (define-public python-trio-typing (package (name "python-trio-typing") - (version "0.5.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (pypi-uri "trio-typing" version)) (sha256 - (base32 "1yvlj4vf3wyvp16dw6vyfm4i2idm8lvdc3fvjhi6mhm62zv7s07j")))) + (base32 "15wa66cs165wawh4pi808ac43n67b8jqddi5ppdcbkj5gfi68hpi")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 5f64f7abca4d59130616e87263b8a8c2a3769c3a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 22:11:19 -0400 Subject: gnu: gstreamer: Fix indentation. * gnu/packages/gstreamer.scm (gstreamer): Fix indentation. --- gnu/packages/gstreamer.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 74df3e69e2..38845b83af 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -490,21 +490,21 @@ the GStreamer multimedia framework.") (substitute* "tests/check/gst/gstsystemclock.c" (("tcase_add_test \\(tc_chain, \ test_stress_cleanup_unschedule.*") - "") - (("tcase_add_test \\(tc_chain, \ + "") + (("tcase_add_test \\(tc_chain, \ test_stress_reschedule.*") - ""))))) - '()) - (add-after 'patch-shebangs 'do-not-capture-python - (lambda _ - ;; The patch-source-shebangs phase causes the following build - ;; script to reference Python in its shebang, which is - ;; unnecessary. - (substitute* (string-append #$output - "/libexec/gstreamer-1.0/" - "gst-plugins-doc-cache-generator") - (((which "python3")) - "/usr/bin/env python3"))))))) + ""))))) + '()) + (add-after 'patch-shebangs 'do-not-capture-python + (lambda _ + ;; The patch-source-shebangs phase causes the following build + ;; script to reference Python in its shebang, which is + ;; unnecessary. + (substitute* (string-append + #$output "/libexec/gstreamer-1.0/" + "gst-plugins-doc-cache-generator") + (((which "python3")) + "/usr/bin/env python3"))))))) (propagated-inputs ;; In gstreamer-1.0.pc: ;; Requires: glib-2.0, gobject-2.0 -- cgit v1.2.3 From f346327172051b28e78e66f0ea5fd07d5b9ba490 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 22:13:18 -0400 Subject: gnu: gst-plugins-good: Skip the test_video_caps_late test. * gnu/packages/gstreamer.scm (gst-plugins-good) [arguments]: Skip the test_video_caps_late test in the skip-failing-tests phase. --- gnu/packages/gstreamer.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 38845b83af..a89233bbac 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -674,6 +674,11 @@ for the GStreamer multimedia library.") (string-append prefix "\"" libsoup "\"\n"))))) (add-after 'unpack 'skip-failing-tests (lambda _ + (substitute* "tests/check/elements/flvmux.c" + ;; This test randomly times out (see: + ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/786). + ((".*tcase_add_test.*test_video_caps_late.*") + "")) (substitute* "tests/check/meson.build" ;; Reported as shaky upstream, see ;; -- cgit v1.2.3 From a735385bfa4f0c82a45307b868a930785b927bf8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 22:21:30 -0400 Subject: gnu: gi-docgen: Update to 2023.1. * gnu/packages/gnome.scm (gi-docgen): Update to 2023.1. [propagated-inputs]: Remove python-toml; add python-tomli. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d3c3916777..f651459631 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5433,19 +5433,19 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") (define-public gi-docgen (package (name "gi-docgen") - (version "2022.1") + (version "2023.1") (source (origin (method url-fetch) (uri (pypi-uri "gi-docgen" version)) (sha256 (base32 - "1v2wspm2ld27lq1n5v5pzrmkhchfa7p7ahp8rmjm4zcdyagqf7gr")))) + "18vzbw1k531qxi9qcwlxl97xk9dg16has7khg6a5d0pqrflyvbc8")))) (build-system python-build-system) (propagated-inputs (list python-jinja2 python-markdown python-markupsafe python-pygments - python-toml + python-tomli python-typogrify)) (home-page "https://gitlab.gnome.org/GNOME/gi-docgen") (synopsis "Documentation tool for GObject-based libraries") -- cgit v1.2.3 From 41519fceaa18d82475f0d64b0e93d992b470bf75 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 22:42:48 -0400 Subject: gnu: qtbase: Disable the "tst_qobjectrace" test. * gnu/packages/qt.scm (qtbase) [arguments]: Skip the "tst_qobjectrace" in the check phase. --- gnu/packages/qt.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 80155d39e4..8cda634cef 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -772,6 +772,9 @@ developers using C++ or QML, a CSS & JavaScript like language.") ;; Actual (dt5.offsetFromUtc()): 0 ;; Expected (46800) : 46800 "tst_qdatetime" + ;; The tst_QObjectRace::destroyRace is flaky (see: + ;; https://bugreports.qt.io/browse/QTBUG-103489). + "tst_qobjectrace" ;; The 'tst_QSettings::fromFile' assumes the data ;; location to be relative to the root directory and ;; fails. -- cgit v1.2.3 From c2c48868f3fd9de14327c98eefb557764cff18ed Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 23:30:01 -0400 Subject: gnu: python-h5py: Update to 3.8.0. * gnu/packages/python-xyz.scm (python-h5py): Update to 3.8.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a8b3a85572..dc3bb88463 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1863,14 +1863,14 @@ library.") (define-public python-h5py (package (name "python-h5py") - (version "3.6.0") + (version "3.8.0") (source (origin (method url-fetch) (uri (pypi-uri "h5py" version)) (sha256 (base32 - "0afv805vqrm5071g7alwv41920nhh8kjv4m5nbia9awj9a0x4ll7")))) + "0pyr6z4h2xqbp49yx2i1401gl6yqh03h771zslwcy0201hpxiskg")))) (build-system python-build-system) (arguments `(#:tests? #f ; no test target -- cgit v1.2.3 From c3b07c41c0d6d5f1b4e0588ba6f04cef68370bb5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Mar 2023 12:16:45 +0200 Subject: gnu: rust-pyo3-macros-backend-0.15: Update to 0.15.2. * gnu/packages/crates-io.scm (rust-pyo3-macros-backend-0.15): Update to 0.15.2. [arguments]: Don't skip build. [native-inputs]: Add python. --- gnu/packages/crates-io.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6e67a44df1..53c90c4e85 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44269,22 +44269,21 @@ ecosystem.") (package (inherit rust-pyo3-macros-backend-0.16) (name "rust-pyo3-macros-backend") - (version "0.15.1") + (version "0.15.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-macros-backend" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "12i1n1j8l4q4lzalsvvlw2pak1h8wnz3xcn7y82s2jgf4pl0jkzl")))) - (build-system cargo-build-system) + (base32 "15bhc1xib9yz4l1sd2lk3nc7scbqsjfvgvlr3mj0xq0jqh92i32s")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.15) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))))) + ("rust-syn" ,rust-syn-1)))) + (native-inputs (list python)))) (define-public rust-pyo3-macros-0.16 (package -- cgit v1.2.3 From d61ceef5879e38051bb92010127f33f147c9a277 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Mar 2023 12:17:33 +0200 Subject: gnu: rust-pyo3-macros-0.15: Update to 0.15.2. * gnu/packages/crates-io.scm (rust-pyo3-macros-0.15): Update to 0.15.2. [arguments]: Don't skip build. [native-inputs]: Add python. --- gnu/packages/crates-io.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 53c90c4e85..d4d9c4dcf3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44332,21 +44332,20 @@ ecosystem.") (package (inherit rust-pyo3-macros-0.16) (name "rust-pyo3-macros") - (version "0.15.1") + (version "0.15.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0mfp3yz6743vrsp2vh8is3gbyzlxzx4bam5wnhi9g6hz5friww37")))) - (build-system cargo-build-system) + (base32 "0fmrzl185i00c6kdvy7icmhhc99c51pyha46incqggk4qvl4gch0")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.15) - ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))))) + `(#:cargo-inputs + (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.15) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (native-inputs (list python)))) (define-public rust-pyo3-0.16 (package -- cgit v1.2.3 From a0e6864d4ed32293f4ede086dc493336cb6f6104 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Mar 2023 12:18:28 +0200 Subject: gnu: rust-pyo3-0.15: Update to 0.15.2. * gnu/packages/crates-io.scm (rust-pyo3-0.15): Update to 0.15.2. [source]: Adjust snippet to substitute more version strings. [cargo-inputs]: Replace rust-indexmap-1 with 1.6. [cargo-development-inputs]: Add rust-clap-2. Replace rust-bitflags-1.2 with 1. --- gnu/packages/crates-io.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d4d9c4dcf3..553303eb57 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44423,29 +44423,26 @@ Python code from a Rust binary is also supported.") (package (inherit rust-pyo3-0.16) (name "rust-pyo3") - (version "0.15.1") + (version "0.15.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "082p014xd8ipwnfsq1ln871wkslxmbrxd7kpqwa0mbq53jzivw3w")) + (base32 "0ljp3m1frg8y50al4cbadwxfwwrgsvslmljclp4cf20y4ykm07fl")) (modules '((guix build utils))) (snippet - ;; XXX: Relax "dev-dependencies.criterion"; this must match the - ;; version of RUST-CRITERION-0.3. - '(substitute* "Cargo.toml" - (("\"=0\\.3\\.4\"") - "\"^0.3.4\""))))) - (build-system cargo-build-system) + '(begin (substitute* "Cargo.toml" + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (arguments `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-eyre" ,rust-eyre-0.6) ("rust-hashbrown" ,rust-hashbrown-0.11) - ("rust-indexmap" ,rust-indexmap-1) + ("rust-indexmap" ,rust-indexmap-1.6) ("rust-indoc" ,rust-indoc-0.3) ("rust-inventory" ,rust-inventory-0.1) ("rust-libc" ,rust-libc-0.2) @@ -44459,7 +44456,8 @@ Python code from a Rust binary is also supported.") ("rust-unindent" ,rust-unindent-0.1)) #:cargo-development-inputs (("rust-assert-approx-eq" ,rust-assert-approx-eq-1) - ("rust-bitflags" ,rust-bitflags-1.2) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-clap" ,rust-clap-2) ("rust-criterion" ,rust-criterion-0.3) ("rust-half" ,rust-half-1) ("rust-proptest" ,rust-proptest-0.10) -- cgit v1.2.3 From 2e2ea7609913f702ad52cc0e73fea6578bada743 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 15 Mar 2023 12:15:46 +0200 Subject: gnu: rust-pyo3-build-config-0.15: Update to 0.15.2. * gnu/packages/crates-io.scm (rust-pyo3-build-config-0.15): Update to 0.15.2. [arguments]: Don't skip build. [native-inputs]: Inherit from rust-pyo3-build-config-0.16. --- gnu/packages/crates-io.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 553303eb57..0ff3349026 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44203,19 +44203,17 @@ ecosystem.") (package (inherit rust-pyo3-build-config-0.16) (name "rust-pyo3-build-config") - (version "0.15.1") + (version "0.15.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-build-config" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0aw5zfqwzj5rzfxjyqvrqfam138d1009jh6kia4xrgdz538y9yfv")))) + (base32 "0414biclhrxv6y0bjm6s9fq9z6yah393ffkd8748pqdq83y3k4kp")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-once-cell" ,rust-once-cell-1)))) - (native-inputs '()))) + `(#:cargo-inputs + (("rust-once-cell" ,rust-once-cell-1)))))) (define-public rust-pyo3-ffi-0.16 (package -- cgit v1.2.3 From 11212a2faa10c58a6fea909162514c22779d64f5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Apr 2023 21:10:58 -0400 Subject: gnu: Add rust-indexmap-1.7. * gnu/packages/crates-io.scm (rust-indexmap-1.7): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0ff3349026..7de3a70d88 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12,12 +12,11 @@ ;;; Copyright © 2020 André Batista ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Antoine Côté -;;; Copyright © 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 aecepoglu ;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; Copyright © 2021 Antero Mejr -;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2021 muradm ;;; Copyright © 2021, 2022 Petr Hodina @@ -27721,6 +27720,33 @@ removals, and it allows lookup of its elements by either hash table key or numerical index. A corresponding hash set type is also provided.") (license (list license:asl2.0 license:expat)))) +(define-public rust-indexmap-1.7 + (package + (inherit rust-indexmap-1) + (name "rust-indexmap") + (version "1.7.0") + (source (origin + (method url-fetch) + (uri (crate-uri "indexmap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "19b2zwfajhsfcgny0clv8y4jppy704znfhv8nv2dw9a18l2kcqxw")))) + (arguments + `(#:cargo-inputs + (("rust-autocfg" ,rust-autocfg-1) + ("rust-hashbrown" ,rust-hashbrown-0.11) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-fnv" ,rust-fnv-1) + ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-itertools" ,rust-itertools-0.9) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-rand" ,rust-rand-0.7) + ("rust-serde-derive" ,rust-serde-derive-1)))))) + (define-public rust-indicatif-0.16 (package (name "rust-indicatif") -- cgit v1.2.3 From b11e5c82800ccf63212c2c961a24f9d46a8fed3a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Apr 2023 21:11:19 -0400 Subject: gnu: rust-pyo3-0.15: Fix build. * gnu/packages/crates-io.scm (rust-pyo3-0.15) [arguments]: Replace rust-indexmap-1.6 with rust-indexmap-1.7. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7de3a70d88..b45bba91b6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44466,7 +44466,7 @@ Python code from a Rust binary is also supported.") ("rust-cfg-if" ,rust-cfg-if-1) ("rust-eyre" ,rust-eyre-0.6) ("rust-hashbrown" ,rust-hashbrown-0.11) - ("rust-indexmap" ,rust-indexmap-1.6) + ("rust-indexmap" ,rust-indexmap-1.7) ("rust-indoc" ,rust-indoc-0.3) ("rust-inventory" ,rust-inventory-0.1) ("rust-libc" ,rust-libc-0.2) -- cgit v1.2.3 From 1586d17f4ef08a823dffb0b537b681087ca86cd7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Apr 2023 21:44:26 -0400 Subject: gnu: rust-pyo3-0.16: Fix build. * gnu/packages/crates-io.scm (rust-pyo3-0.16) [arguments]: Replace rust-indexmap-1.6 with rust-indexmap-1.7. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b45bba91b6..244eeae904 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44389,7 +44389,7 @@ ecosystem.") ("rust-cfg-if" ,rust-cfg-if-1) ("rust-eyre" ,rust-eyre-0.6) ("rust-hashbrown" ,rust-hashbrown-0.11) - ("rust-indexmap" ,rust-indexmap-1) + ("rust-indexmap" ,rust-indexmap-1.7) ("rust-indoc" ,rust-indoc-1) ("rust-inventory" ,rust-inventory-0.2) ("rust-libc" ,rust-libc-0.2) -- cgit v1.2.3 From 0fc638ca7a0c3eb1c54b197ed479524b4ac01ca6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 12:19:08 +0200 Subject: gnu: rust-core-foundation-sys-0.8: Update to 0.8.3. * gnu/packages/crates-io.scm (rust-core-foundation-sys-0.8): Update to 0.8.3. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 244eeae904..3a2b0e66b5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13102,14 +13102,14 @@ intrinsics.") (define-public rust-core-foundation-sys-0.8 (package (name "rust-core-foundation-sys") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (crate-uri "core-foundation-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06wq7yb7mlkc4h2kbc0yjfi0xv44z4snzdpr7c1l0zm4hi91n8pa")))) + (base32 "1p5r2wckarkpkyc4z83q08dwpvcafrb1h6fxfa3qnikh8szww9sq")))) (build-system cargo-build-system) (home-page "https://github.com/servo/core-foundation-rs") (synopsis "Bindings to Core Foundation for macOS") -- cgit v1.2.3 From 6420439ce93e4464dcf47a947fb9f2e9d5e8e730 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 11:02:55 +0200 Subject: gnu: Add rust-iana-time-zone-haiku-0.1. * gnu/packages/crates-io.scm (rust-iana-time-zone-haiku-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3a2b0e66b5..08663f2eed 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27284,6 +27284,27 @@ with hyper.") "This package provides a Knuth-Liang hyphenation for a variety of languages.") (license (list license:asl2.0 license:expat)))) +(define-public rust-iana-time-zone-haiku-0.1 + (package + (name "rust-iana-time-zone-haiku") + (version "0.1.1") + (source (origin + (method url-fetch) + (uri (crate-uri "iana-time-zone-haiku" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jix9qrqxclj9r4wkg7d3fr987d77vdg3qy2c5hl4ry19wlaw0q7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cxx" ,rust-cxx-1) + ("rust-cxx-build" ,rust-cxx-build-1)))) + (home-page "https://github.com/strawlab/iana-time-zone") + (synopsis "IANA-time-zone support crate for Haiku OS") + (description + "This package provides iana-time-zone support crate for Haiku OS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ident-case-1 (package (name "rust-ident-case") -- cgit v1.2.3 From a61dfd7428e9fee55a706ae5ec27cc2333fa48cd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 12:17:28 +0200 Subject: gnu: Add rust-iana-time-zone-0.1. * gnu/packages/crates-io.scm (rust-iana-time-zone-0.1): New variable. --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 08663f2eed..58f9472c84 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27305,6 +27305,35 @@ with hyper.") "This package provides iana-time-zone support crate for Haiku OS.") (license (list license:expat license:asl2.0)))) +(define-public rust-iana-time-zone-0.1 + (package + (name "rust-iana-time-zone") + (version "0.1.53") + (source (origin + (method url-fetch) + (uri (crate-uri "iana-time-zone" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ra7nvai8n3alvljswacjbnhfcpivpi7xqbc5n048w18gdk25hb4")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-inputs + (("rust-android-system-properties" ,rust-android-system-properties-0.1) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8) + ("rust-iana-time-zone-haiku" ,rust-iana-time-zone-haiku-0.1) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) + (home-page "https://github.com/strawlab/iana-time-zone") + (synopsis "IANA time zone") + (description + "This package provides the IANA time zone for the current system.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ident-case-1 (package (name "rust-ident-case") -- cgit v1.2.3 From 02598fb90bf44b99d9e741951be3194ecf5e7874 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 10:31:45 +0200 Subject: gnu: rust-chrono-0.4: Update to 0.4.24. * gnu/packages/crates-io.scm (rust-chrono-0.4): Update to 0.4.24. [cargo-inputs]: Add rust-arbitrary-1, rust-criterion-0.4, rust-iana-time-zone-0.1, rust-rkyv-0.7, rust-winapi-0.3. Remove rust-libc-0.2. [cargo-development-inputs]: Remove rust-criterion-0.3. Replace rust-bincode-0.8 with 1. Modified-by: Maxim Cournoyer --- gnu/packages/crates-io.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 58f9472c84..ffdca35607 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10245,7 +10245,7 @@ Encoding Standard.") (define-public rust-chrono-0.4 (package (name "rust-chrono") - (version "0.4.19") + (version "0.4.24") (source (origin (method url-fetch) @@ -10254,22 +10254,25 @@ Encoding Standard.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0wyfl6c00vhfl562spnfcna3zkw8jqvcp652m9iskhl8j26dc2k7")))) + "0fv7idr8c7vdb0xi32w45a7pafnyzk7m0bknfggj5pva0qcmjg2f")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-js-sys" ,rust-js-sys-0.3) - ("rust-libc" ,rust-libc-0.2) + (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-criterion" ,rust-criterion-0.4) + ("rust-iana-time-zone" ,rust-iana-time-zone-0.1) + ("rust-js-sys" ,rust-js-sys-0.3) ("rust-num-integer" ,rust-num-integer-0.1) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-pure-rust-locales" ,rust-pure-rust-locales-0.5) + ("rust-rkyv" ,rust-rkyv-0.7) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) ("rust-serde" ,rust-serde-1) ("rust-time" ,rust-time-0.1) - ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-0.8) - ("rust-criterion" ,rust-criterion-0.3) + (("rust-bincode" ,rust-bincode-1) ("rust-doc-comment" ,rust-doc-comment-0.3) ("rust-num-iter" ,rust-num-iter-0.1) ("rust-serde-derive" ,rust-serde-derive-1) -- cgit v1.2.3 From 6d86e9e723d3f90305f7d6b19f4633faa10ab6f0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 12:17:31 +0200 Subject: gnu: Add rust-android-system-properties-0.1. * gnu/packages/crates-io.scm (rust-android-system-properties-0.1): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ffdca35607..ad0ef40fcf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2680,6 +2680,25 @@ it outputs messages to Android's logcat.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4)))))) +(define-public rust-android-system-properties-0.1 + (package + (name "rust-android-system-properties") + (version "0.1.5") + (source (origin + (method url-fetch) + (uri (crate-uri "android-system-properties" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04b3wrz12837j7mdczqd95b732gw5q7q66cv4yn4646lvccp57l1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/nical/android_system_properties") + (synopsis "Minimal Android system properties wrapper") + (description + "This package provides a minimal Android system properties wrapper.") + (license (list license:expat license:asl2.0)))) + (define-public rust-anes-0.1 (package (name "rust-anes") -- cgit v1.2.3 From b08e220dce14cbda0a9504341b873068c1b21e77 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Apr 2023 22:10:58 -0400 Subject: gnu: Add rust-asn1-derive-0.13. * gnu/packages/crates-io.scm (rust-asn1-derive-0.13): New variable. --- gnu/packages/crates-io.scm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ad0ef40fcf..2396a01693 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3758,17 +3758,17 @@ library for Rust.") ("rust-mime" ,rust-mime-0.3) ("rust-mime-guess" ,rust-mime-guess-2)))))) -(define-public rust-asn1-derive-0.8 +(define-public rust-asn1-derive-0.13 (package (name "rust-asn1-derive") - (version "0.8.7") - (source - (origin - (method url-fetch) - (uri (crate-uri "asn1_derive" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "098w0mxz4bx9w7v72gsl5wva6f0qbvzyc52m0s0n8svqbyh4z2dw")))) + (version "0.13.0") + (source (origin + (method url-fetch) + (uri (crate-uri "asn1-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bvqriazb23gysygpzng1dhzjgnlv274q2yj5gpmlpl7jp0pkaxz")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -3782,17 +3782,19 @@ library for Rust.") "This package provides #[derive] support for @code{asn1}.") (license license:bsd-3))) -(define-public rust-asn1-0.8 +(define-public rust-asn1-derive-0.8 (package - (name "rust-asn1") + (inherit rust-asn1-derive-0.13) + (name "rust-asn1-derive") (version "0.8.7") (source (origin (method url-fetch) - (uri (crate-uri "asn1" version)) + (uri (crate-uri "asn1_derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1caacmvgn463n1yc4ac6vl9phrh56ij7l3xgf6qgzbpyjm8v7zyg")))) + (base32 "098w0mxz4bx9w7v72gsl5wva6f0qbvzyc52m0s0n8svqbyh4z2dw")))))) + (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 513f64a162fae643e4c546e5278dc080a6f5dc43 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Apr 2023 22:11:19 -0400 Subject: gnu: Add rust-asn1-0.13. * gnu/packages/crates-io.scm (rust-asn1-0.13): New variable. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2396a01693..5dfb6dd8be 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3795,10 +3795,21 @@ library for Rust.") (sha256 (base32 "098w0mxz4bx9w7v72gsl5wva6f0qbvzyc52m0s0n8svqbyh4z2dw")))))) +(define-public rust-asn1-0.13 + (package + (name "rust-asn1") + (version "0.13.0") + (source (origin + (method url-fetch) + (uri (crate-uri "asn1" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1idxxw14h3dvrj72k4g0hx1aqigd986a00cg0yxfw2gfc9gbmzra")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-asn1-derive" ,rust-asn1-derive-0.8) + (("rust-asn1-derive" ,rust-asn1-derive-0.13) ("rust-chrono" ,rust-chrono-0.4)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2)))) @@ -3808,6 +3819,26 @@ library for Rust.") "This is a Rust library for parsing and generating ASN.1 data (DER only).") (license license:bsd-3))) +(define-public rust-asn1-0.8 + (package + (inherit rust-asn1-0.13) + (name "rust-asn1") + (version "0.8.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "asn1" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1caacmvgn463n1yc4ac6vl9phrh56ij7l3xgf6qgzbpyjm8v7zyg")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-asn1-derive" ,rust-asn1-derive-0.8) + ("rust-chrono" ,rust-chrono-0.4)) + #:cargo-development-inputs + (("rust-libc" ,rust-libc-0.2)))))) + (define-public rust-as-slice-0.1 (package (name "rust-as-slice") -- cgit v1.2.3 From e17c9500b0bca59c988782cd949f5b3822a575bb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Apr 2023 23:13:29 -0400 Subject: gnu: rust-openssl-0.10: Update to 0.10.49. * gnu/packages/crates-io.scm (rust-openssl-0.10): Update to 0.10.49. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5dfb6dd8be..03d6e1f0fa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38430,14 +38430,14 @@ crate.") (define-public rust-openssl-0.10 (package (name "rust-openssl") - (version "0.10.41") + (version "0.10.49") (source (origin (method url-fetch) (uri (crate-uri "openssl" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1l2vpxq5ln326s64lbacqs4hq6k5yn2zhwqbyby0sj9nagvfp3v1")))) + "0cssygqbgdim10y7qrgz0rj5k839jqiv2n9ccw1lx8ipp1m10bsd")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 885060912fbb041069ad744ad9e2f09e678ec770 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 3 Apr 2023 09:13:19 -0400 Subject: gnu: rust-bindgen-0.64: Add package. * gnu/packages/crates-io.scm (rust-bindgen-0.64): New package. (rust-bindgen-0.58): Inherit from it. --- gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 03d6e1f0fa..b6abf7e40b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6147,17 +6147,17 @@ that uses Serde for transforming structs into bytes and vice versa!") (("rust-serde-bytes" ,rust-serde-bytes-0.10) ("rust-serde-derive" ,rust-serde-derive-1)))))) -(define-public rust-bindgen-0.59 +(define-public rust-bindgen-0.64 (package (name "rust-bindgen") - (version "0.59.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "bindgen" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1f4fpycxmbrqk8r2x9brhfgjh86mzc6bngn4a9631x78b2jaklib")))) + (version "0.64.0") + (source (origin + (method url-fetch) + (uri (crate-uri "bindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1d0zmfc5swjgaydbamxb4xm687ahgv18dbcpvrzbf39665h3w964")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -6165,8 +6165,6 @@ that uses Serde for transforming structs into bytes and vice versa!") (("rust-bitflags" ,rust-bitflags-1) ("rust-cexpr" ,rust-cexpr-0.6) ("rust-clang-sys" ,rust-clang-sys-1) - ("rust-clap" ,rust-clap-2) - ("rust-env-logger" ,rust-env-logger-0.9) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-lazycell" ,rust-lazycell-1) ("rust-log" ,rust-log-0.4) @@ -6176,6 +6174,7 @@ that uses Serde for transforming structs into bytes and vice versa!") ("rust-regex" ,rust-regex-1) ("rust-rustc-hash" ,rust-rustc-hash-1) ("rust-shlex" ,rust-shlex-1) + ("rust-syn" ,rust-syn-1) ("rust-which" ,rust-which-4)))) (home-page "https://rust-lang.github.io/rust-bindgen/") (synopsis "Generate Rust FFI bindings to C and C++ libraries") @@ -6183,6 +6182,19 @@ that uses Serde for transforming structs into bytes and vice versa!") bindings to C and C++ libraries.") (license license:bsd-3))) +(define-public rust-bindgen-0.59 + (package + (inherit rust-bindgen-0.64) + (name "rust-bindgen") + (version "0.59.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "bindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1f4fpycxmbrqk8r2x9brhfgjh86mzc6bngn4a9631x78b2jaklib")))))) + (define-public rust-bindgen-0.58 (package (inherit rust-bindgen-0.59) -- cgit v1.2.3 From 3ad295d65d08d9bc3b89fc2edab8496d859faeae Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 3 Apr 2023 09:13:57 -0400 Subject: gnu: rust-cc-1: Update to 1.0.79. * gnu/packages/crates-io.scm (rust-cc-1): Update to 1.0.79. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b6abf7e40b..182e82a6d7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9850,7 +9850,7 @@ box''.") (define-public rust-cc-1 (package (name "rust-cc") - (version "1.0.73") + (version "1.0.79") (source (origin (method url-fetch) @@ -9858,7 +9858,7 @@ box''.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "04ccylrjq94jssh8f7d7hxv64gs9f1m1jrsxb7wqgfxk4xljmzrg")))) + "07x93b8zbf3xc2dggdd460xlk1wg8lxm6yflwddxj8b15030klsh")))) (build-system cargo-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 9a1b031938a717f4ff006249ffc1af98073b0165 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 3 Apr 2023 09:20:03 -0400 Subject: gnu: rust-openssl-sys-0.9: Update to 0.9.84. * gnu/packages/crates-io.scm (rust-openssl-sys-0.9): Update to 0.9.84. [arguments]: Replace rust-bindgen-0.59 cargo-input with rust-bindgen-0.64. * gnu/packages/patches/rust-openssl-sys-no-vendor.patch: Update patch. --- gnu/packages/crates-io.scm | 6 ++--- .../patches/rust-openssl-sys-no-vendor.patch | 30 +++++++++++++--------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 182e82a6d7..4754b097fd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38552,14 +38552,14 @@ system for OpenSSL.") (define-public rust-openssl-sys-0.9 (package (name "rust-openssl-sys") - (version "0.9.75") + (version "0.9.84") (source (origin (method url-fetch) (uri (crate-uri "openssl-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0bxlrsfkvryv179na416mvj0s90v9yngkmkkv8y1lm0h4w6bvyg5")) + (base32 "1ym0vcfnyp8bf8lidz8w0yx0n6pva37nvdww0c22kn62kp7fl81s")) (patches (search-patches "rust-openssl-sys-no-vendor.patch")))) (build-system cargo-build-system) (arguments @@ -38567,7 +38567,7 @@ system for OpenSSL.") (("rust-libc" ,rust-libc-0.2) ;; Build dependencies: ("rust-autocfg" ,rust-autocfg-1) - ("rust-bindgen" ,rust-bindgen-0.59) + ("rust-bindgen" ,rust-bindgen-0.64) ("rust-cc" ,rust-cc-1) ("rust-pkg-config" ,rust-pkg-config-0.3) ("rust-vcpkg" ,rust-vcpkg-0.2)))) diff --git a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch index 3e300ea69e..5872d4cf22 100644 --- a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch +++ b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch @@ -1,12 +1,17 @@ -https://sources.debian.org/data/main/r/rust-openssl-sys/0.9.53-1/debian/patches/disable-vendor.patch -"MIT" licensed according to debian/copyright file -slightly modified to only change the vendored openssl-src dependency - -Starting from rust-openssl-sys@0.9.69 Cargo.toml starts searching for openssl-3.0. - ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -31,15 +31,12 @@ +--- openssl-sys-0.9.84/Cargo.toml.orig 2023-04-03 09:10:11.979197979 -0400 ++++ openssl-sys-0.9.84/Cargo.toml 2023-04-03 12:07:30.285315609 -0400 +@@ -31,10 +31,6 @@ + [package.metadata.pkg-config] + openssl = "1.0.1" + +-[dependencies.bssl-sys] +-version = "0.1.0" +-optional = true +- + [dependencies.libc] + version = "0.2" + +@@ -46,16 +42,12 @@ [build-dependencies.cc] version = "1.0" @@ -18,9 +23,10 @@ Starting from rust-openssl-sys@0.9.69 Cargo.toml starts searching for openssl-3. version = "0.3.9" [features] - vendored = ["openssl-src"] -+openssl-src = [] +-unstable_boringssl = ["bssl-sys"] +-vendored = ["openssl-src"] ++unstable_boringssl = [] ++vendored = [] [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] version = "0.2.8" - -- cgit v1.2.3 From 31b74d0ad186f68a8410d353df4da43a3e378c0c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 12:17:22 +0200 Subject: gnu: Add rust-sptr-0.3. * gnu/packages/crates-io.scm (rust-sptr-0.3): New variable. --- gnu/packages/crates-io.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4754b097fd..9908b90bfa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56020,6 +56020,22 @@ service.") "This package provides a single-producer single-consumer lock-free buffer.") (license license:expat))) +(define-public rust-sptr-0.3 + (package + (name "rust-sptr") + (version "0.3.2") + (source (origin + (method url-fetch) + (uri (crate-uri "sptr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0shddkys046nnrng929mrnjjrh31mlxl95ky7dgxd6i4kclkk6rv")))) + (build-system cargo-build-system) + (home-page "https://github.com/Gankra/sptr") + (synopsis "The Strict Provenance Polyfill") + (description "This package provides sptr, The Strict Provenance Polyfill.") + (license (list license:expat license:asl2.0)))) + (define-public rust-sqlite-0.26 (package (name "rust-sqlite") -- cgit v1.2.3 From 9a7525dd1886a8d0422599ebc154b0efa446b596 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 12:17:25 +0200 Subject: gnu: Add rust-portable-atomic-1. * gnu/packages/crates-io.scm (rust-portable-atomic-1): New variable. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9908b90bfa..75619276a4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42550,6 +42550,40 @@ for constructing a Message Authentication Code (MAC).") overloading without macros in Rust.") (license license:expat))) +(define-public rust-portable-atomic-1 + (package + (name "rust-portable-atomic") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (crate-uri "portable-atomic" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06p5dglnqj43m4fj70dwcqhv9rmy9amn9pdpgpzd8fx0hf30rh1r")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all test dependencies declared. + #:cargo-inputs + (("rust-critical-section" ,rust-critical-section-1) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-critical-section" ,rust-critical-section-1) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) + ("rust-fastrand" ,rust-fastrand-1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-paste" ,rust-paste-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-test" ,rust-serde-test-1) + ("rust-sptr" ,rust-sptr-0.3) + ("rust-static-assertions" ,rust-static-assertions-1)))) + (home-page "https://github.com/taiki-e/portable-atomic") + (synopsis "Portable atomic types") + (description + "This package provides portable atomic types, including support for +128-bit atomics, atomic float, etc.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-postgres-0.19 (package (name "rust-postgres") -- cgit v1.2.3 From 4aeded053b9c5456eeca78f0f1c869de60a1fe49 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 12:17:24 +0200 Subject: gnu: Add rust-prettyplease-0.1. * gnu/packages/crates-io.scm (rust-prettyplease-0.1): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 75619276a4..855bdc5739 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43234,6 +43234,29 @@ replacements, adding colorful diffs.") ("rust-chrono" ,rust-chrono-0.4) ("rust-env-logger" ,rust-env-logger-0.6)))))) +(define-public rust-prettyplease-0.1 + (package + (name "rust-prettyplease") + (version "0.1.23") + (source (origin + (method url-fetch) + (uri (crate-uri "prettyplease" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0y2wbmflbkgp13ywd7qyq7hyi59x5zazmljnw8gg09wnfwak4zp9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/dtolnay/prettyplease") + (synopsis "Minimal `syn` syntax tree pretty-printer") + (description + "This package provides a minimal `syn` syntax tree pretty-printer.") + (license (list license:expat license:asl2.0)))) + (define-public rust-prettytable-rs-0.8 (package (name "rust-prettytable-rs") -- cgit v1.2.3 From 21d6550869b921898b33bcc4ffeffeda96bc3a0e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 11:10:15 +0200 Subject: gnu: rust-macrotest-1: Update to 1.0.9. * gnu/packages/crates-io.scm (rust-macrotest-1): Update to 1.0.9. [cargo-inputs]: Remove rust-rand-0.7. Add rust-prettyplease-0.1, rust-syn-1. --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 855bdc5739..28c650a692 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32391,22 +32391,23 @@ library") (define-public rust-macrotest-1 (package (name "rust-macrotest") - (version "1.0.8") + (version "1.0.9") (source (origin (method url-fetch) (uri (crate-uri "macrotest" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06xk9i9amh325vr6w9dmnlxfp6zamrq57zfl031zd0fscqm3vjx2")))) + (base32 "043gc53ch1szw7ihdclnygn464v62viw48iigd5l2iffhq4sx2bl")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-diff" ,rust-diff-0.1) ("rust-glob" ,rust-glob-0.3) - ("rust-rand" ,rust-rand-0.7) + ("rust-prettyplease" ,rust-prettyplease-0.1) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) + ("rust-syn" ,rust-syn-1) ("rust-toml" ,rust-toml-0.5)))) (home-page "https://github.com/eupn/macrotest") (synopsis "Test harness for macro expansion") -- cgit v1.2.3 From 3eab639ba072ca9a446c213817da0b2ec67bb057 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 11:15:11 +0200 Subject: gnu: rust-pin-project-1: Update to 1.0.12. * gnu/packages/crates-io.scm (rust-pin-project-1): Update to 1.0.12. [cargo-development-inputs]: Remove rust-pin-project-auxiliary-macro-0.0. Add rust-macrotest-1. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 28c650a692..0c32d96c14 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41447,21 +41447,20 @@ function data structures.") (define-public rust-pin-project-1 (package (name "rust-pin-project") - (version "1.0.2") + (version "1.0.12") (source (origin (method url-fetch) (uri (crate-uri "pin-project" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19qw2nm2kk38v9j16nsm8j3fkh0g8pjq0k4cplx7i2f4q8vj5k4w")))) + (base32 "1k3f9jkia3idxl2pqxamszwnl89dk52fa4jqj3p7zmmwnq4scadd")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-pin-project-internal" ,rust-pin-project-internal-1)) #:cargo-development-inputs - (("rust-pin-project-auxiliary-macro" - ,rust-pin-project-auxiliary-macro-0.0) + (("rust-macrotest" ,rust-macrotest-1) ("rust-rustversion" ,rust-rustversion-1) ("rust-static-assertions" ,rust-static-assertions-1) ("rust-trybuild" ,rust-trybuild-1)))) -- cgit v1.2.3 From 7386df3c47be4b8948a325c2d7bc70b69e15ef96 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 12:24:41 +0200 Subject: gnu: rust-pin-project-internal-1: Update to 1.0.12. * gnu/packages/crates-io.scm (rust-pin-project-internal-1): Update to 1.0.12. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0c32d96c14..da815cee48 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41518,14 +41518,14 @@ function data structures.") (define-public rust-pin-project-internal-1 (package (name "rust-pin-project-internal") - (version "1.0.2") + (version "1.0.12") (source (origin (method url-fetch) (uri (crate-uri "pin-project-internal" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0pwy3m32scf3ypjb9ai151lmaa27vyj06lc64i28l0r31fzx5s7q")))) + (base32 "0maa6icn7rdfy4xvgfaq7m7bwpw9f19wg76f1ncsiixd0lgdp6q6")))) (build-system cargo-build-system) (arguments `(#:tests? #false -- cgit v1.2.3 From f7650dc6b188fc5adf489b07347b9bdf6654c7c1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 11:40:41 +0200 Subject: gnu: rust-slab-0.4: Update to 0.4.8. * gnu/packages/crates-io.scm (rust-slab-0.4): Update to 0.4.8. [cargo-inputs]: Add rust-autocfg-1. [cargo-development-inputs]: Add rust-serde-1. --- gnu/packages/crates-io.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index da815cee48..ec7d7919da 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -54545,7 +54545,7 @@ designed for @code{immutable.rs}.") (define-public rust-slab-0.4 (package (name "rust-slab") - (version "0.4.7") + (version "0.4.8") (source (origin (method url-fetch) @@ -54553,13 +54553,15 @@ designed for @code{immutable.rs}.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vyw3rkdfdfkzfa1mh83s237sll8v5kazfwxma60bq4b59msf526")))) + "0bgwxig8gkqp6gz8rvrpdj6qwa10karnsxwx7wsj5ay8kcf3aa35")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs (("rust-rustversion" ,rust-rustversion-1) + ("rust-serde" ,rust-serde-1) ("rust-serde-test" ,rust-serde-test-1)) - #:cargo-inputs (("rust-serde" ,rust-serde-1)))) + #:cargo-inputs (("rust-autocfg" ,rust-autocfg-1) + ("rust-serde" ,rust-serde-1)))) (native-inputs (list rust-autocfg-1)) (home-page "https://github.com/carllerche/slab") -- cgit v1.2.3 From 1f3efa0dcbae73774421b1ec494b44f40c0af8bc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 12:20:02 +0200 Subject: gnu: rust-futures-0.3: Update to 0.3.26. * gnu/packages/crates-io.scm (rust-futures-0.3): Update to 0.3.26. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ec7d7919da..c110d42c7d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22433,7 +22433,7 @@ stabilized, and eventually removed. This library reïnstates these traits.") (define-public rust-futures-0.3 (package (name "rust-futures") - (version "0.3.12") + (version "0.3.26") (source (origin (method url-fetch) @@ -22442,7 +22442,7 @@ stabilized, and eventually removed. This library reïnstates these traits.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0l7i1hcag46k5v34cbn5dk45gwxn5yy5rxcvmbaxhi02lnhm546s")))) + "115z5bqihd2jq75s8n7jxy4k83kpv67vhic4snch6d7h1wmpkqhk")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 528f02ffb1109ef227e196e8b98ac621a2747126 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 12:20:18 +0200 Subject: gnu: rust-futures-channel-0.3: Update to 0.3.26. * gnu/packages/crates-io.scm (rust-futures-channel-0.3): Update to 0.3.26. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c110d42c7d..7817fbfd5b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22485,7 +22485,7 @@ featuring zero allocations, composability, and iterator-like interfaces.") (define-public rust-futures-channel-0.3 (package (name "rust-futures-channel") - (version "0.3.12") + (version "0.3.26") (source (origin (method url-fetch) @@ -22494,7 +22494,7 @@ featuring zero allocations, composability, and iterator-like interfaces.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ihq3a3yc6ial3sw536q75hrhixq22xk6wn5qzpnxazgqxz1plzj")))) + "1xadcvj4hi6278hq6i0vnrsa231fyiylh2n03rx7d2ch79k1flrf")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 4f8b4926b0274907550463faad4d9f40148de228 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 12:16:15 +0200 Subject: gnu: rust-futures-core-0.3: Update to 0.3.26. * gnu/packages/crates-io.scm (rust-futures-core-0.3): Update to 0.3.26. [cargo-inputs]: Add rust-portable-atomic-1. --- gnu/packages/crates-io.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7817fbfd5b..4d50f6f467 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22536,7 +22536,7 @@ featuring zero allocations, composability, and iterator-like interfaces.") (define-public rust-futures-core-0.3 (package (name "rust-futures-core") - (version "0.3.12") + (version "0.3.26") (source (origin (method url-fetch) @@ -22545,9 +22545,12 @@ featuring zero allocations, composability, and iterator-like interfaces.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0r8ag0mkxx9cd74yrccjk31lph4gr6lhgb9di6rx39wdvrfi9rbr")))) + "02467z5mv0219hkrgmpvsb3h7vb8pg31s1j901h7vxg11x6zz47c")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-portable-atomic" ,rust-portable-atomic-1)))) (home-page "https://rust-lang.github.io/futures-rs") (synopsis "Core traits and types in for the @code{futures} library") (description "This package provides the core traits and types in for the -- cgit v1.2.3 From a40477ec688ed66cc3e37a1125c27e509fb47e95 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 12:20:36 +0200 Subject: gnu: rust-futures-executor-0.3: Update to 0.3.26. * gnu/packages/crates-io.scm (rust-futures-executor-0.3): Update to 0.3.26. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4d50f6f467..36178dab6a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22606,7 +22606,7 @@ the computation on the threads themselves.") (define-public rust-futures-executor-0.3 (package (name "rust-futures-executor") - (version "0.3.12") + (version "0.3.26") (source (origin (method url-fetch) @@ -22615,7 +22615,7 @@ the computation on the threads themselves.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ffr1zclhz60ql49n2pj44jhhk22yah41xwlpyb30jws03f9zrg9")))) + "03mm37yv235i2ifjfaacw5cl8cmiyirj8ap3d64fr5xblqshmpp8")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 7420c151a8a4ecd7f72c6ca7215421c6a95b0125 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 12:20:47 +0200 Subject: gnu: rust-futures-io-0.3: Update to 0.3.26. * gnu/packages/crates-io.scm (rust-futures-io-0.3): Update to 0.3.26. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 36178dab6a..70ece10dfe 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22691,7 +22691,7 @@ intrusive collections.") (define-public rust-futures-io-0.3 (package (name "rust-futures-io") - (version "0.3.12") + (version "0.3.26") (source (origin (method url-fetch) @@ -22700,7 +22700,7 @@ intrusive collections.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0005hz30pdxlbdamhd0imixmxcjpwrfxxr27kljxh6i84lshbgi8")))) + "0cc5s3qdgls25rlm3zpdf9fdk6gwmfp0fiiph39b5bmjdwdkgf5z")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t)) (home-page "https://rust-lang.github.io/futures-rs") -- cgit v1.2.3 From e870feda1ddc03ec209bc1ac74b028c68ad936e7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 10:49:15 +0200 Subject: gnu: rust-futures-macro-0.3: Update to 0.3.26. * gnu/packages/crates-io.scm (rust-futures-macro-0.3): Update to 0.3.26. [cargo-inputs]: Remove rust-proc-macro-hack-0.5. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 70ece10dfe..8810a67e85 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22813,20 +22813,19 @@ and removes almost all unsafe code from it.") (define-public rust-futures-macro-0.3 (package (name "rust-futures-macro") - (version "0.3.12") + (version "0.3.26") (source (origin (method url-fetch) (uri (crate-uri "futures-macro" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1pgyb219ybh3fj3ig0h1c2b7k4cqldy95ifdpnd9yb9jvmdd51y2")))) + (base32 "0w3ahy69varlfw57rb2pag7jwngy771vvzmcag7mlfx3gpw3m9wm")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) - ("rust-proc-macro2" ,rust-proc-macro2-1) + (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))) (home-page "https://rust-lang.github.io/futures-rs") -- cgit v1.2.3 From b21ac1b88587426fd5e8d4127782cb5e2199982d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 10:50:19 +0200 Subject: gnu: rust-futures-task-0.3: Update to 0.3.26. * gnu/packages/crates-io.scm (rust-futures-task-0.3): Update to 0.3.26. [cargo-inputs]: Remove rust-once-cell-1. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8810a67e85..092e1f8496 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22944,18 +22944,17 @@ futures-rs library.") (define-public rust-futures-task-0.3 (package (name "rust-futures-task") - (version "0.3.12") + (version "0.3.26") (source (origin (method url-fetch) (uri (crate-uri "futures-task" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "11ldlpl7mis5crys731dj7s7npgigdgrzdm7mi2y86m8ivmhgphk")))) + (base32 "0rk3jg6lri1rrn03ns89cmw8lircbaf2i2d4mr10zc8hyqdrmxyw")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)))) + `(#:skip-build? #t)) (home-page "https://rust-lang.github.io/futures-rs") (synopsis "Tools for working with tasks") (description "This package provides tools for working with tasks.") -- cgit v1.2.3 From 8dde227a62394d6b6ec89662676f34780c8aa533 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 10:51:06 +0200 Subject: gnu: rust-futures-test-0.3: Update to 0.3.26. * gnu/packages/crates-io.scm (rust-futures-test-0.3): Update to 0.3.26. [arguments]: Skip tests. [cargo-inputs]: Add rust-futures-macro-0.3, rust-futures-sink-0.3, rust-pin-project-1. Remove rust-once-cell-1. --- gnu/packages/crates-io.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 092e1f8496..baf7e3696d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22963,7 +22963,7 @@ futures-rs library.") (define-public rust-futures-test-0.3 (package (name "rust-futures-test") - (version "0.3.5") + (version "0.3.26") (source (origin (method url-fetch) @@ -22971,16 +22971,19 @@ futures-rs library.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0v9r2mmgdbm0x4gppd5jzf4rss7439ivkqwi604m0r2il3zap6ci")))) + "0pbdzvbmzrnc67bpp7hbh7l5mavqifpgk2vhaprr0vlr6qrpcyi4")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? #f ; Doc tests fail. + #:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3) ("rust-futures-executor" ,rust-futures-executor-0.3) ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-macro" ,rust-futures-macro-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3) ("rust-futures-task" ,rust-futures-task-0.3) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-once-cell" ,rust-once-cell-1) + ("rust-pin-project" ,rust-pin-project-1) ("rust-pin-utils" ,rust-pin-utils-0.1)))) (home-page "https://rust-lang.github.io/futures-rs") (synopsis "Test components built off futures-rs") -- cgit v1.2.3 From c90455bfab62aeb5a0f8298ab0c10d1e8cb62fc1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 10:52:36 +0200 Subject: gnu: rust-futures-util-0.3: Update to 0.3.26. * gnu/packages/crates-io.scm (rust-futures-util-0.3): Update to 0.3.26. [cargo-inputs]: Remove rust-proc-macro-hack-0.5, rust-proc-macro-nested-0.1. --- gnu/packages/crates-io.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index baf7e3696d..07022d2a86 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23070,7 +23070,7 @@ timeouts and delays with futures.") (define-public rust-futures-util-0.3 (package (name "rust-futures-util") - (version "0.3.12") + (version "0.3.26") (source (origin (method url-fetch) @@ -23078,7 +23078,7 @@ timeouts and delays with futures.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0jv25s07igmqavigdfzr02yw6j1q0vg8pw2p2vmgvcx4yb88qak3")))) + (base32 "1lbvdf6hq62yczd87glm6ih8h5qkagsl7xdiwhmqvwzymkins7cw")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -23093,8 +23093,6 @@ timeouts and delays with futures.") ("rust-memchr" ,rust-memchr-2) ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) ("rust-pin-utils" ,rust-pin-utils-0.1) - ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) - ("rust-proc-macro-nested" ,rust-proc-macro-nested-0.1) ("rust-slab" ,rust-slab-0.4) ("rust-tokio-io" ,rust-tokio-io-0.1)))) (home-page "https://rust-lang.github.io/futures-rs") -- cgit v1.2.3 From f26dd44e5b163e95453b48160c2c5fe33e8cf07f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Feb 2023 12:21:02 +0200 Subject: gnu: rust-futures-sink-0.3: Update to 0.3.26. * gnu/packages/crates-io.scm (rust-futures-sink-0.3): Update to 0.3.26. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 07022d2a86..7bdd024ab3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22899,7 +22899,7 @@ different @code{Future}s at once and handling the first one to complete.") (define-public rust-futures-sink-0.3 (package (name "rust-futures-sink") - (version "0.3.12") + (version "0.3.26") (source (origin (method url-fetch) @@ -22908,7 +22908,7 @@ different @code{Future}s at once and handling the first one to complete.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1mj22d4w6digh7wfp6jkr5fdcl9r138q41fxzm1yg8mx568cdxfa")))) + "0r43djzf0caz89c724ishpzxy59y6nw7ykfvh1nd9kz8nc5q447k")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t)) (home-page "https://rust-lang.github.io/futures-rs") -- cgit v1.2.3 From c23d10751c99798d83c7252e027f702b2551efad Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 3 Apr 2023 14:51:47 -0400 Subject: gnu: Add rust-base64-0.21. * gnu/packages/crates-io.scm (rust-base64-0.21): New variable. (rust-base64-0.13): Inherit from it. --- gnu/packages/crates-io.scm | 50 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7bdd024ab3..ef99a71de7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5733,8 +5733,42 @@ RFC4648 Base32 or in Crockford Base32.") c6e7d37. However, this package works only up to 128 bytes.") (license license:expat))) +(define-public rust-base64-0.21 + (package + (name "rust-base64") + (version "0.21.0") + (source (origin + (method url-fetch) + (uri (crate-uri "base64" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0sidjip5b33sr6w7kasfj9qxpbda41nw0x4gjjk55g55a6mdv954")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-rand" ,rust-rand-0.8) + ("rust-rstest" ,rust-rstest-0.15) + ("rust-rstest-reuse" ,rust-rstest-reuse-0.4) + ("rust-structopt" ,rust-structopt-0.3)) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "Cargo.toml" + (("0.12.0") + ,(package-version rust-rstest-0.15)) + (("0.3.0") + ,(package-version rust-rstest-reuse-0.4)))))))) + (home-page "https://github.com/marshallpierce/rust-base64") + (synopsis "Encodes and decodes base64 as bytes or utf8") + (description + "This package encodes and decodes base64 as bytes or utf8.") + (license (list license:expat license:asl2.0)))) + (define-public rust-base64-0.13 (package + (inherit rust-base64-0.21) (name "rust-base64") (version "0.13.0") (source @@ -5745,7 +5779,6 @@ c6e7d37. However, this package works only up to 128 bytes.") (string-append name "-" version ".tar.gz")) (sha256 (base32 "1z82g23mbzjgijkpcrilc7nljpxpvpf7zxf6iyiapkgka2ngwkch")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-development-inputs @@ -5753,17 +5786,12 @@ c6e7d37. However, this package works only up to 128 bytes.") ("rust-rand" ,rust-rand-0.6) ("rust-structopt" ,rust-structopt-0.3)) #:phases - (modify-phases %standard-phases + (modify-phases %standard-phases (add-after 'unpack 'fix-criterion-minor-version - (lambda* _ - (substitute* "Cargo.toml" - (("0\\.3\\.2") - ,(package-version rust-criterion-0.3)))))))) - (home-page "https://github.com/marshallpierce/rust-base64") - (synopsis "Encodes and decodes base64 as bytes or utf8") - (description - "This package encodes and decodes base64 as bytes or utf8.") - (license (list license:expat license:asl2.0)))) + (lambda* _ + (substitute* "Cargo.toml" + (("0\\.3\\.2") + ,(package-version rust-criterion-0.3)))))))))) (define-public rust-base64-0.12 (package -- cgit v1.2.3 From 4f260381def0bc08d930340034c472147d0ff55e Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Sun, 2 Apr 2023 18:55:08 +0100 Subject: gnu: libexif: Update to 0.6.24. [fixes CVE-2020-0198, CVE-2020-0452] * gnu/packages/photo.scm (libexif): Update to 0.6.24. [source]: Switch to git checkout. [native-inputs]: Add autoconf, automake, gettext-minimal and libtool. Signed-off-by: Maxim Cournoyer Modified-by: Maxim Cournoyer --- gnu/packages/photo.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 89a942b5c0..8ed5d9d827 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -207,7 +207,6 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).") ;; both two licensing modes for your changes/additions." (license (list license:lgpl2.1 license:cddl1.0)))) - (define-public libexif (package (name "libexif") @@ -222,8 +221,7 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).") (base32 "0zi5vvb0khlzc6xyfayk6mjx5lgkrj8r7s8lfv4j7wkcgndjga0j")))) (build-system gnu-build-system) - (native-inputs - (list autoconf automake gettext-minimal libtool)) + (native-inputs (list autoconf automake gettext-minimal libtool)) (home-page "https://libexif.github.io/") (synopsis "Read and manipulate EXIF data in digital photographs") (description -- cgit v1.2.3 From 74f1ebf7769b0a441d46bfd23d5e2bdcf0924a6f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 3 Apr 2023 15:29:38 -0400 Subject: gnu: rust-pem-1: Update to 1.1.1. * gnu/packages/crates-io.scm (rust-pem-1): Update to 1.1.1. [arguments] Add rust-serde-1 to #:cargo-inputs. Add rust-serde-json-1 to #:cargo-development-inputs. --- gnu/packages/crates-io.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ef99a71de7..26ea0b4315 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40750,20 +40750,22 @@ runtime support for rust-peg grammars. To use rust-peg, see the peg crate.") (define-public rust-pem-1 (package (name "rust-pem") - (version "1.0.2") + (version "1.1.1") (source (origin (method url-fetch) (uri (crate-uri "pem" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0iqrvfnm71x9pvff39d5ajwn3gc9glxlv4d4h22max7342db18z9")))) + (base32 "1f184b7vs5kgwglfsy9adqqy7625jsq8jj1lsxah9abn78kmr0x8")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-base64" ,rust-base64-0.13)) + (("rust-base64" ,rust-base64-0.13) + ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.3)))) + (("rust-criterion" ,rust-criterion-0.3) + ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/jcreekmore/pem-rs") (synopsis "Parse and encode PEM-encoded data") (description -- cgit v1.2.3 From ded8f448741856b02a7e979931cef92c9dfeb7f6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 3 Apr 2023 19:46:00 -0400 Subject: gnu: rust-eyre-0.6: Update to 0.6.8. * gnu/packages/crates-io.scm (rust-eyre-0.6): Update to 0.6.8. [arguments]: Remove #:skip-build? argument. Add rust-pyo3-0.13 to #:cargo-inputs. Add #:cargo-development-inputs. [native-inputs]: Add python. --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 26ea0b4315..bff663a84f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20470,20 +20470,28 @@ traits but without the boilerplate.") (define-public rust-eyre-0.6 (package (name "rust-eyre") - (version "0.6.6") - (source - (origin - (method url-fetch) - (uri (crate-uri "eyre" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1f0fbmrcykp84av1yb1d4cqj28jwf0zg1z49a1cgw8vrcf7ms8mw")))) + (version "0.6.8") + (source (origin + (method url-fetch) + (uri (crate-uri "eyre" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1sy7x8p74jfx1mvj4ifl0lxkxaqvmswdgdr84y1dqb6055d6nasc")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-indenter" ,rust-indenter-0.3) - ("rust-once-cell" ,rust-once-cell-1)))) + `(#:cargo-inputs (("rust-indenter" ,rust-indenter-0.3) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pyo3" ,rust-pyo3-0.13)) + #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-backtrace" ,rust-backtrace-0.3) + ("rust-futures" ,rust-futures-0.3) + ("rust-pyo3" ,rust-pyo3-0.13) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-syn" ,rust-syn-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-trybuild" ,rust-trybuild-1)))) + (native-inputs (list python)) (home-page "https://github.com/yaahc/eyre") (synopsis "Trait object based error handling type") (description -- cgit v1.2.3 From 972d55e42c251973d6cc63bb6df5ea8754c19f55 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 7 Apr 2023 23:01:03 -0400 Subject: gnu: rust-openssl-sys-0.9: Propagate openssl. It appears that OpenSSL is expected to be available when building a package using this library. * gnu/packages/crates-io.scm (rust-openssl-sys-0.9) [inputs]: Turn into... [propagated-inputs]. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bff663a84f..9d06fc8561 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38612,7 +38612,7 @@ system for OpenSSL.") ("rust-vcpkg" ,rust-vcpkg-0.2)))) (native-inputs (list pkg-config)) - (inputs + (propagated-inputs (list openssl)) (home-page "https://github.com/sfackler/rust-openssl") (synopsis "FFI bindings to OpenSSL") -- cgit v1.2.3 From f60e76cd5938b1789d3ddc1ceb72b3462f93e507 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 10 Apr 2023 23:42:55 -0400 Subject: gnu: Add python-cryptography-rust. * gnu/packages/python-crypto.scm (python-cryptography-rust): New variable. --- gnu/packages/python-crypto.scm | 61 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index c3e36ff2e4..3a3993b532 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Justus Winter ;;; Copyright © 2020, 2021 Vinicius Monego -;;; Copyright © 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 Antero Mejr ;;; @@ -60,6 +60,7 @@ #:use-module (gnu packages libffi) #:use-module (gnu packages multiprecision) #:use-module (gnu packages password-utils) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-build) @@ -703,6 +704,64 @@ message digests and key derivation functions.") python-pytest python-setuptools-rust)))) +;;; This is the Rust component of the python-cryptography library, extracted +;;; as a separate package to ease the Rust build. +(define-public python-cryptography-rust + (package + (inherit python-cryptography) + (name "python-cryptography-rust") + (build-system cargo-build-system) + (arguments + (list + #:modules '((guix build cargo-build-system) + (guix build utils) + (srfi srfi-1) + (ice-9 match)) + ;; XXX: Building the test objects appear to fail due to a missing link + ;; directive to Python's shared library (e.g.: "ld: + ;; cryptography_rust.c950d742-cgu.11:(.text._ZN3...+0x57): undefined + ;; reference to `PyLong_FromLong'"). + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "src/rust"))) + (replace 'unpack-rust-crates + ;; This is to avoid the non-crate source from being erroneously + ;; unpacked by this phase, causing an error. + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (apply (assoc-ref %standard-phases 'unpack-rust-crates) + (append args + (list #:inputs (alist-delete "source" inputs)))))) + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (apply (assoc-ref %standard-phases 'configure) + (append args + (list #:inputs (alist-delete "source" inputs)))))) + (add-after 'install 'install-shared-library + (lambda _ + (install-file "target/release/libcryptography_rust.so" + (string-append #$output "/lib"))))) + #:cargo-inputs + `(("rust-asn1-0.13" ,rust-asn1-0.13) + ("rust-chrono-0.4" ,rust-chrono-0.4) + ("rust-foreign-types-shared-0.1" ,rust-foreign-types-shared-0.1) + ("rust-once-cell-1" ,rust-once-cell-1) + ("rust-openssl-0.10" ,rust-openssl-0.10) + ("rust-openssl-sys-0.9" ,rust-openssl-sys-0.9) + ("rust-ouroboros-0.15" ,rust-ouroboros-0.15) + ("rust-pem-1" ,rust-pem-1) + ("rust-pyo3-0.15" ,rust-pyo3-0.15)) + #:cargo-development-inputs + `(("rust-cc" ,rust-cc-1)))) + (native-inputs (list pkg-config python python-cffi)) + ;; XXX: Adding rust-openssl-sys-0.9 is needed because #:cargo-inputs + ;; doesn't honor propagated-inputs. + (inputs (list python rust-openssl-sys-0.9)) + (propagated-inputs '()) + (synopsis "Core implementation of the Cryptography Python library"))) + ;; This is the last version which is compatable with python-cryptography < 35. (define-public python-pyopenssl (package -- cgit v1.2.3 From 9b2c1ff7f9be5db1cd8c99e60d99442a8586ad64 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 08:44:57 -0400 Subject: gnu: python-pytest-subtests: Update to 0.10.0. * gnu/packages/python-check.scm (python-pytest-subtests): Update to 0.10.0. [native-inputs]: Replace python-pytest with python-pytest-7.1. --- gnu/packages/python-check.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 41a6997190..1046602800 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2019, 2021, 2022 Ricardo Wurmus ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2019, 2021 Hartmut Goebel ;;; Copyright © 2020, 2022 Julien Lepiller ;;; Copyright © 2020, 2022 Marius Bakke @@ -941,13 +941,13 @@ in Pytest.") (define-public python-pytest-subtests (package (name "python-pytest-subtests") - (version "0.5.0") + (version "0.10.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest-subtests" version)) (sha256 - (base32 "087i03nmkmfnrpc7mmizvr40ijnjw4lfxc22rnk8jk6s1szy9lav")))) + (base32 "05zvnxx0hdrd9w4z51qhchg3nkz5s47agryw68g8q7krq5kim5nr")))) (build-system python-build-system) (arguments `(#:phases @@ -957,8 +957,7 @@ in Pytest.") (when tests? (add-installed-pythonpath inputs outputs) (invoke "python" "-m" "pytest"))))))) - (native-inputs - (list python-pytest python-setuptools-scm)) + (native-inputs (list python-pytest-7.1 python-setuptools-scm)) (home-page "https://github.com/pytest-dev/pytest-subtests") (synopsis "Unittest subTest() support and subtests fixture") (description "This Pytest plugin provides unittest @code{subTest()} -- cgit v1.2.3 From 2fd1e063f0960b8a92b94d54bc9468fb97fb4455 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 11:53:04 -0400 Subject: gnu: python-pint: Use python-pytest-7.1. * gnu/packages/python-xyz.scm (python-pint) [native-inputs]: Replace python-pytest with python-pytest-7.1. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dc3bb88463..ffe39d258e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -968,7 +968,7 @@ Markdown. All extensions are found under the module namespace of pymdownx.") "0rv0cbala7ibjbaf6kkcn0mdhqdbajnvlcw0f15gwzfwg10g0z1q")))) (build-system python-build-system) (native-inputs - (list python-pytest + (list python-pytest-7.1 ;for pytest-subtests python-pytest-cov python-pytest-mpl python-pytest-subtests -- cgit v1.2.3 From 5a65dcf6533287a5e90b99e8b1e4f4ec8ae82951 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 14:08:50 -0400 Subject: gnu: python-celery: Use python-pytest-7.1. * gnu/packages/python-xyz.scm (python-celery) [native-inputs]: Replace python-pytest with python-pytest-7.1. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ffe39d258e..4e41e6ee87 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16423,7 +16423,7 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.") python-iniconfig python-moto python-msgpack - python-pytest + python-pytest-7.1 ;for pytest-subtests python-pytest-celery python-pytest-subtests python-pytest-timeout -- cgit v1.2.3 From f204e8028ae5412f4fac3190fbd19dc93c90c0cf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 08:57:03 -0400 Subject: gnu: python-cryptography: Update to 40.0.1 [fixes CVE-2023-23931]. * gnu/packages/python-crypto.scm (python-cryptography-vectors): Delete variable. (python-cryptography-vectors-next): Rename to... (python-cryptography-vectors): ... this. Update to 40.0.1. (python-cryptography): Delete variable. (python-cryptography-next): Rename to... (python-cryptography): ... this. Update to 40.0.1. [build-system]: Use pyproject-build-system. [arguments]: Remove #:imported-modules and #:modules arguments. Remove check phase override. Remove adjust-pyo3-requirement and configure-cargo phases. Add disable-rust-extension-build and symlink-rust-library phases. [native-inputs]: Replace python-cryptography-vectors-next with python-cryptography-vectors. Add python-iso8601. Remove python-pytz. Replace python-pytest with python-pytest-7.1. Remove rust, rust:cargo and python-setuptools-rust. [inputs]: Remove all inputs. Add python-cryptography-rust. [propagated-inputs]: Remove python-asn1crypto, python-six, python-idna and python-iso8601. [description]: Start description with @code to avoid a lint warning. --- gnu/packages/python-crypto.scm | 178 ++++++++--------------------------------- 1 file changed, 35 insertions(+), 143 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 3a3993b532..a9355d134f 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -525,17 +525,17 @@ for example, for recording or replaying web content.") is used by the Requests library to verify HTTPS requests.") (license license:asl2.0))) -(define-public python-cryptography-vectors-next +(define-public python-cryptography-vectors (package (name "python-cryptography-vectors") - (version "37.0.4") + (version "40.0.1") (source (origin (method url-fetch) (uri (pypi-uri "cryptography_vectors" version)) (sha256 (base32 - "1a1yi37ygw0jp72q280cmxd3qn9y9vmcch2bcnjkg2g2202l0qas")))) + "0hd0ppss5xg0kzf36q8cdaxh1xw8ry4k7jkianlf832xbdmp0q44")))) (build-system python-build-system) (home-page "https://github.com/pyca/cryptography") (synopsis "Test vectors for the cryptography package") @@ -544,166 +544,58 @@ is used by the Requests library to verify HTTPS requests.") ;; Distributed under either BSD-3 or ASL2.0 (license (list license:bsd-3 license:asl2.0)))) -(define-public python-cryptography-vectors - (package - (inherit python-cryptography-vectors-next) - (version "3.4.8") - (source (origin - (method url-fetch) - (uri (pypi-uri "cryptography_vectors" version)) - (sha256 - (base32 "1wl0ynh3lzhc6q59g8mybvijmnp195x7fjxlb3h3sgcraw14312c")))))) - -(define-public python-cryptography-next +(define-public python-cryptography (package (name "python-cryptography") - (version "37.0.4") + (version "40.0.1") (source (origin (method url-fetch) (uri (pypi-uri "cryptography" version)) (sha256 (base32 - "10haq7sn8mrdlhcfs791rczknnxm0wpww0lkpjzcqx141ryc3yb3")))) - (build-system python-build-system) + "0wilrilfcyl78caxcpna2k3aya6qamppwv4j35262pz9n7wg40r8")))) + (build-system pyproject-build-system) (arguments (list - #:imported-modules (append %cargo-build-system-modules - %python-build-system-modules) - #:modules `(((guix build cargo-build-system) #:prefix cargo:) - ,@%python-build-system-modules - (srfi srfi-1) - (ice-9 match)) - #:phases - #~(modify-phases (@ (guix build python-build-system) %standard-phases) - (add-after 'unpack 'adjust-pyo3-requirement - (lambda _ - ;; The package depends on 0.15.2, which is not on crates.io(!?). - ;; Downgrade to 0.15.1... - (substitute* "src/rust/Cargo.toml" - (("pyo3 = \\{ version = \"0\\.15\\.2\"") - "pyo3 = { version = \"0.15.1\"")))) - (add-before 'build 'configure-cargo - (lambda* (#:key inputs #:allow-other-keys) - ;; Hide irrelevant inputs from cargo-build-system so it does - ;; not try to unpack sanity-check.py, etc. - (let ((cargo-inputs (filter (match-lambda - ((name . path) - (or (string-prefix? "rust-" name) - (string=? "gcc" name)))) - inputs))) - (with-directory-excursion "src/rust" - ((assoc-ref cargo:%standard-phases 'unpack-rust-crates) - #:inputs cargo-inputs - #:vendor-dir "guix-vendor") - ((assoc-ref cargo:%standard-phases 'configure) - #:inputs cargo-inputs) - ((assoc-ref cargo:%standard-phases 'patch-cargo-checksums) - #:vendor-dir "guix-vendor")) - (rename-file "src/rust/.cargo" ".cargo")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv" "tests"))))))) - (inputs - (list openssl - ;; TODO: Most of these inputs are transitive dependencies of - ;; the Rust requirements (see src/rust/cargo.toml). Surely - ;; there is a better way than manually listing everything..? - rust-aliasable-0.1 - rust-asn1-0.8 - rust-asn1-derive-0.8 - rust-autocfg-1 - rust-base64-0.13 - rust-bitflags-1 - rust-cfg-if-0.1 - rust-cfg-if-1 - rust-chrono-0.4 - rust-cloudabi-0.1 - rust-lazy-static-1 - rust-libc-0.2 - rust-indoc-0.3 - rust-indoc-impl-0.3 - rust-inflector-0.11 - rust-instant-0.1 - rust-lock-api-0.4 - rust-num-integer-0.1 - rust-num-traits-0.2 - rust-once-cell-1 - rust-ouroboros-0.15 - rust-ouroboros-macro-0.15 - rust-parking-lot-0.11 - rust-parking-lot-core-0.8 - rust-paste-0.1 - rust-paste-impl-0.1 - rust-pem-1 - rust-proc-macro-error-1 - rust-proc-macro-error-attr-1 - rust-proc-macro-hack-0.5 - rust-proc-macro2-1 - rust-pyo3-0.15 - rust-pyo3-build-config-0.15 - rust-pyo3-macros-0.15 - rust-pyo3-macros-backend-0.15 - rust-quote-1 - rust-redox-syscall-0.2 - rust-scopeguard-1 - rust-smallvec-1 - rust-stable-deref-trait-1 - rust-syn-1 - rust-unicode-xid-0.2 - rust-unindent-0.1 - rust-version-check-0.9 - rust-winapi-0.3)) - (propagated-inputs - (list python-asn1crypto python-cffi python-six python-idna - python-iso8601)) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'disable-rust-extension-build + (lambda _ + ;; The Rust extension is built separately as + ;; 'python-cryptography-rust', so there's no need + ;; to build it here. + (substitute* "pyproject.toml" + ((".*setuptools-rust.*") "")) + (delete-file "setup.py"))) + (add-before 'check 'symlink-rust-library + (lambda* (#:key inputs outputs #:allow-other-keys) + (symlink (search-input-file + inputs "lib/libcryptography_rust.so") + (string-append (site-packages inputs outputs) + "/cryptography/hazmat/bindings/" + "_rust.abi3.so"))))))) + (native-inputs - (list python-cryptography-vectors-next + (list python-cryptography-vectors python-hypothesis + python-iso8601 python-pretend - python-pytz - python-pytest + python-pytest-7.1 ;for subtests python-pytest-benchmark - python-pytest-subtests - python-setuptools-rust - rust - `(,rust "cargo"))) + python-pytest-subtests)) + (inputs (list python-cryptography-rust)) + (propagated-inputs (list python-cffi)) (home-page "https://github.com/pyca/cryptography") (synopsis "Cryptographic recipes and primitives for Python") (description - "cryptography is a package which provides cryptographic recipes and -primitives to Python developers. It aims to be the “cryptographic standard -library” for Python. The package includes both high level recipes, and low -level interfaces to common cryptographic algorithms such as symmetric ciphers, -message digests and key derivation functions.") + "@code{cryptography} is a package which provides cryptographic recipes +and primitives to Python developers. It aims to be the “cryptographic +standard library” for Python. The package includes both high level recipes, +and low level interfaces to common cryptographic algorithms such as symmetric +ciphers, message digests and key derivation functions.") ;; Distributed under either BSD-3 or ASL2.0 (license (list license:bsd-3 license:asl2.0)))) -(define-public python-cryptography - (package - (inherit python-cryptography-next) - (version "3.4.8") - (source (origin - (method url-fetch) - (uri (pypi-uri "cryptography" version)) - (sha256 - (base32 "072awar70cwfd2hnx0pvp1dkc7gw45mbm3wcyddvxz5frva5xk4l")))) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'set-no-rust - (lambda _ - (setenv "CRYPTOGRAPHY_DONT_BUILD_RUST" "1")))))) - (inputs (list openssl-1.1)) - (native-inputs - (list python-cryptography-vectors - python-hypothesis - python-pretend - python-pytz - python-pytest - python-setuptools-rust)))) - ;;; This is the Rust component of the python-cryptography library, extracted ;;; as a separate package to ease the Rust build. (define-public python-cryptography-rust -- cgit v1.2.3 From bf7ac629114846121818ad14e1c55db3347d2bd7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Apr 2023 23:36:02 -0400 Subject: gnu: python-pyopenssl: Update to 23.1.1. * gnu/packages/python-crypto.scm (python-pyopenssl): Update to 23.1.1. [source]: Remove patches. [arguments]: Update faketime date in check phase. Normalize pytest invocation in check phase override. [propagated-inputs]: Remove python-six. --- gnu/local.mk | 1 - .../patches/python2-pyopenssl-openssl-compat.patch | 51 ---------------------- gnu/packages/python-crypto.scm | 22 ++++------ 3 files changed, 8 insertions(+), 66 deletions(-) delete mode 100644 gnu/packages/patches/python2-pyopenssl-openssl-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 436b6b9e81..eeb26d34d0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1756,7 +1756,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pillow-CVE-2022-45199.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-pyflakes-test-location.patch \ - %D%/packages/patches/python2-pyopenssl-openssl-compat.patch \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-magic-python-bytecode.patch \ diff --git a/gnu/packages/patches/python2-pyopenssl-openssl-compat.patch b/gnu/packages/patches/python2-pyopenssl-openssl-compat.patch deleted file mode 100644 index a185f4172d..0000000000 --- a/gnu/packages/patches/python2-pyopenssl-openssl-compat.patch +++ /dev/null @@ -1,51 +0,0 @@ -Adjust for OpenSSL 1.1.1: - - https://github.com/pyca/pyopenssl/issues/1043 - -Taken from upstream: - - https://github.com/pyca/pyopenssl/commit/cc5c00ae5fd3c19d07fff79b5c4a08f5e58697ad - -diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py -index 59f21cec..fcdee047 100644 ---- a/src/OpenSSL/SSL.py -+++ b/src/OpenSSL/SSL.py -@@ -1421,6 +1421,12 @@ def set_alpn_protos(self, protos): - This list should be a Python list of bytestrings representing the - protocols to offer, e.g. ``[b'http/1.1', b'spdy/2']``. - """ -+ # Different versions of OpenSSL are inconsistent about how they handle empty -+ # proto lists (see #1043), so we avoid the problem entirely by rejecting them -+ # ourselves. -+ if not protos: -+ raise ValueError("at least one protocol must be specified") -+ - # Take the list of protocols and join them together, prefixing them - # with their lengths. - protostr = b"".join( -@@ -2449,6 +2455,12 @@ def set_alpn_protos(self, protos): - This list should be a Python list of bytestrings representing the - protocols to offer, e.g. ``[b'http/1.1', b'spdy/2']``. - """ -+ # Different versions of OpenSSL are inconsistent about how they handle empty -+ # proto lists (see #1043), so we avoid the problem entirely by rejecting them -+ # ourselves. -+ if not protos: -+ raise ValueError("at least one protocol must be specified") -+ - # Take the list of protocols and join them together, prefixing them - # with their lengths. - protostr = b"".join( -diff --git a/tests/test_ssl.py b/tests/test_ssl.py -index ffc505d8..ca363b45 100644 ---- a/tests/test_ssl.py -+++ b/tests/test_ssl.py -@@ -1928,7 +1928,7 @@ def test_alpn_call_failure(self): - protocols list. Ensure that we produce a user-visible error. - """ - context = Context(SSLv23_METHOD) -- with pytest.raises(Error): -+ with pytest.raises(ValueError): - context.set_alpn_protos([]) - - def test_alpn_set_on_connection(self): diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index a9355d134f..b3c9e57d70 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -654,19 +654,17 @@ ciphers, message digests and key derivation functions.") (propagated-inputs '()) (synopsis "Core implementation of the Cryptography Python library"))) -;; This is the last version which is compatable with python-cryptography < 35. (define-public python-pyopenssl (package (name "python-pyopenssl") - (version "21.0.0") + (version "23.1.1") (source (origin (method url-fetch) (uri (pypi-uri "pyOpenSSL" version)) (sha256 (base32 - "1cqcc20fwl521z3fxsc1c98gbnhb14q55vrvjfp6bn6h8rg8qbay")) - (patches (search-patches "python2-pyopenssl-openssl-compat.patch")))) + "1dxhip610zw1j2bz35g1w1h7vh374g0bnzn4nsqj65n6pswrh544")))) (build-system python-build-system) (arguments (list @@ -678,7 +676,7 @@ ciphers, message digests and key derivation functions.") ;; PyOpenSSL runs tests against a certificate with a fixed ;; expiry time. To ensure successful builds in the future, ;; set the time to roughly the release date. - (invoke "faketime" "2022-02-01" "py.test" "-v" "-k" + (invoke "faketime" "2023-03-25" "pytest" "-vv" "-k" (string-append ;; This test tries to look up certificates from ;; the compiled-in default path in OpenSSL, which @@ -690,17 +688,13 @@ ciphers, message digests and key derivation functions.") ;; Fails on i686-linux and possibly other 32-bit platforms ;; https://github.com/pyca/pyopenssl/issues/974 "and not test_verify_with_time")))))))) - (propagated-inputs - (list python-cryptography python-six)) - (inputs - (list openssl)) - (native-inputs - (list libfaketime python-flaky python-pretend python-pytest)) + (propagated-inputs (list python-cryptography)) + (inputs (list openssl)) + (native-inputs (list libfaketime python-flaky python-pretend python-pytest)) (home-page "https://github.com/pyca/pyopenssl") (synopsis "Python wrapper module around the OpenSSL library") - (description - "PyOpenSSL is a high-level wrapper around a subset of the OpenSSL -library.") + (description "PyOpenSSL is a high-level wrapper around a subset of the +OpenSSL library.") (license license:asl2.0))) (define-public python-ed25519 -- cgit v1.2.3 From 94d1992d9ed1e3f3c0cd005a1c54fec7382e3622 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 15:04:56 -0400 Subject: gnu: python-service-identity: Update to 21.1.0. * gnu/packages/python-crypto.scm (python-service-identity): Update to 21.1.0. [build-system]: Use pyproject-build-system. [native-inputs]: New field. [propagated-inputs]: Remove python-pyopenssl. Add python-cryptography and python-six. --- gnu/packages/python-crypto.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index b3c9e57d70..220f2b9bcd 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1236,18 +1236,17 @@ derivation function.") (define-public python-service-identity (package (name "python-service-identity") - (version "18.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "service_identity" version)) - (sha256 - (base32 - "0b9f5qiqjy8ralzgwjgkhx82h6h8sa7532psmb8mkd65md5aan08")))) - (build-system python-build-system) - (propagated-inputs - (list python-attrs python-pyasn1 python-pyasn1-modules - python-pyopenssl)) + (version "21.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "service-identity" version)) + (sha256 + (base32 + "0d4x84crbz0a17d8gi90z6zlxwm9pslc65rx0cdw2797ra360v3f")))) + (build-system pyproject-build-system) + (native-inputs (list python-idna python-pytest)) + (propagated-inputs (list python-attrs python-cryptography python-pyasn1 + python-pyasn1-modules python-six)) (home-page "https://service-identity.readthedocs.io/") (synopsis "Service identity verification for PyOpenSSL") (description -- cgit v1.2.3 From 45507a4e096cb8518c5b7afa05356800afb7aa5a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 20:28:56 -0400 Subject: gnu: xpra: Remove input labels and use gexps. * gnu/packages/xorg.scm (xpra) [inputs]: Remove labels. [arguments]: Use gexps. Remove trailing #t in phases. Use search-input-file and this-package-input in the fix-paths phase. Use search-input-file in wrap-program. --- gnu/packages/xorg.scm | 212 +++++++++++++++++++++++++------------------------- 1 file changed, 106 insertions(+), 106 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 1a8ae7295b..203d6d8d2e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020, 2021 Michael Rohleder -;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020 Jean-Baptiste Note ;;; Copyright © 2021 Matthew James Kraai ;;; Copyright © 2021 Nicolò Balzarotti @@ -6041,114 +6041,114 @@ basic eye-candy effects.") (patches (search-patches "xpra-4.2-systemd-run.patch" "xpra-4.2-install_libs.patch")))) (build-system python-build-system) - ;; see also http://xpra.org/trac/wiki/Dependencies - (inputs `(("bash-minimal" ,bash-minimal) ; for wrap-program - ;; Essential dependencies. - ("libjpeg" ,libjpeg-turbo) - ("libwebp" ,libwebp) - ("ffmpeg" ,ffmpeg) - ("libx11" ,libx11) - ("libxrandr" ,libxrandr) - ("libxtst" ,libxtst) - ("libxfixes" ,libxfixes) - ("libxkbfile" ,libxkbfile) - ("libxcomposite" ,libxcomposite) - ("libxdamage" ,libxdamage) - ("libxext" ,libxext) - ("libxres" ,libxres) - ("lz4" ,lz4) - ("gtk+" ,gtk+) - ("python-pycairo" ,python-pycairo) - ("python-pygobject" ,python-pygobject) - ("xauth" ,xauth) - ("xorg-server" ,xorg-server) - ("xf86-video-dummy" ,xf86-video-dummy) - ("xf86-input-mouse" ,xf86-input-mouse) - ("xf86-input-keyboard" ,xf86-input-keyboard) - ("python-pillow" ,python-pillow) - ;; Optional dependencies. - ("libx264" ,libx264) - ("x265" ,x265) - ("libvpx" ,libvpx) - ("python-rencode" ,python-rencode) ; For speed. - ("python-numpy" ,python-numpy) - ("python-pyopengl" ,python-pyopengl) ; Drawing acceleration. - ("python-pyopengl-accelerate" ,python-pyopengl-accelerate) ; Same. - ("python-paramiko" ,python-paramiko) ; Tunneling over SSH. - ("python-dbus" ,python-dbus) ; For desktop notifications. - ("dbus" ,dbus) ; For dbus-launch command. - ("python-lz4" ,python-lz4) ; Faster compression than zlib. - ("python-netifaces" ,python-netifaces))) + (inputs + (list bash-minimal ; for wrap-program + ;; Essential dependencies. + libjpeg-turbo + libwebp + ffmpeg + libx11 + libxrandr + libxtst + libxfixes + libxkbfile + libxcomposite + libxdamage + libxext + libxres + lz4 + gtk+ + python-pycairo + python-pygobject + xauth + xorg-server + xf86-video-dummy + xf86-input-mouse + xf86-input-keyboard + python-pillow + ;; Optional dependencies. + libx264 + x265 + libvpx + python-rencode ; For speed. + python-numpy + python-pyopengl ; Drawing acceleration. + python-pyopengl-accelerate ; Same. + python-paramiko ; Tunneling over SSH. + python-dbus ; For desktop notifications. + dbus ; For dbus-launch command. + python-lz4 ; Faster compression than zlib. + python-netifaces)) (native-inputs (list pkg-config pandoc python-cython)) (arguments - `(#:configure-flags '("--without-Xdummy" - "--without-Xdummy_wrapper" - "--with-opengl" - "--without-debug" - "--without-strict") ; Ignore compiler warnings. - #:modules ((guix build python-build-system) + (list + #:configure-flags #~(list "--without-Xdummy" + "--without-Xdummy_wrapper" + "--with-opengl" + "--without-debug" + "--without-strict") ; Ignore compiler warnings. + #:modules '((guix build python-build-system) (guix build utils)) - #:tests? #f ; Do not run test-cases. This would rebuild all modules and - ; they seem to require python2. - #:phases - (modify-phases %standard-phases - ;; Must pass the same flags as 'install, otherwise enabled modules may - ;; not be built. - (replace 'build - (lambda* (#:key configure-flags #:allow-other-keys) - (apply invoke (append (list "python" "setup.py" "build") - configure-flags)))) - (add-before 'install 'fix-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Fix binary paths. - (substitute* '("xpra/scripts/config.py" "xpra/x11/vfb_util.py") - (("\"Xvfb\"") - (string-append "\"" (assoc-ref inputs "xorg-server") "/bin/Xvfb\"")) - (("\"Xorg\"") - (string-append "\"" (assoc-ref inputs "xorg-server") "/bin/Xorg\"")) - (("\"xauth\"") - (string-append "\"" (assoc-ref inputs "xauth") "/bin/xauth\""))) - ;; Fix directory of config files. - (substitute* '("xpra/scripts/config.py" "xpra/platform/xposix/paths.py") - (("\"/etc/xpra/?\"") - (string-append "\"" (assoc-ref outputs "out") "/etc/xpra/\""))) - ;; XXX: Stolen from (gnu packages linux) - (define (append-to-file name body) - (let ((file (open-file name "a"))) - (display body file) - (close-port file))) - ;; Add Xorg module paths. - (append-to-file - "fs/etc/xpra/xorg.conf" - (string-append "\nSection \"Files\"\nModulePath \"" - (assoc-ref inputs "xf86-video-dummy") "/lib/xorg/modules," - (assoc-ref inputs "xf86-input-mouse") "/lib/xorg/modules," - (assoc-ref inputs "xf86-input-keyboard") "/lib/xorg/modules," - (assoc-ref inputs "xorg-server") "/lib/xorg/modules\"\n" - "EndSection\n\n")) - (substitute* '("xpra/scripts/config.py" - "fs/etc/xpra/conf.d/60_server.conf.in" - "tests/unittests/unit/server/mixins/notification_test.py") - ;; The trailing -- is intentional, so we only replace it inside - ;; a command line. - (("dbus-launch --") - (string-append (search-input-file inputs "/bin/dbus-launch") - " --"))) - ;; /run/user does not exist on guix system - (substitute* "./xpra/scripts/config.py" - (("socket-dir.*: \"\",") - "socket-dir\" : \"~/.xpra\",")) - #t)) - ;; GTK3 will not be found, if GI can’t find its typelibs. - (add-after - 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((prog (string-append (assoc-ref outputs "out") - "/bin/xpra"))) - ;; XXX: only export typelibs in inputs - (wrap-program prog - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) - #t)))))) + ;; Do not run test-cases. This would rebuild all modules and they seem + ;; to require python2. + #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; Must pass the same flags as 'install, otherwise enabled modules may + ;; not be built. + (replace 'build + (lambda* (#:key configure-flags #:allow-other-keys) + (apply invoke (append (list "python" "setup.py" "build") + configure-flags)))) + (add-before 'install 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix binary paths. + (substitute* '("xpra/scripts/config.py" + "xpra/x11/vfb_util.py") + (("\"Xvfb\"") + (format #f "~s" (search-input-file inputs "bin/Xvfb"))) + (("\"Xorg\"") + (format #f "~s" (search-input-file inputs "bin/Xorg"))) + (("\"xauth\"") + (format #f "~s" (search-input-file inputs "bin/xauth")))) + ;; Fix directory of config files. + (substitute* '("xpra/scripts/config.py" + "xpra/platform/xposix/paths.py") + (("\"/etc/xpra/?\"") + (string-append "\"" #$output "/etc/xpra/\""))) + ;; XXX: Stolen from (gnu packages linux) + (define (append-to-file name body) + (let ((file (open-file name "a"))) + (display body file) + (close-port file))) + ;; Add Xorg module paths. + (append-to-file + "fs/etc/xpra/xorg.conf" + (string-append + "\nSection \"Files\"\nModulePath \"" + #$(this-package-input "xf86-video-dummy") "/lib/xorg/modules," + #$(this-package-input "xf86-input-mouse") "/lib/xorg/modules," + #$(this-package-input "xf86-input-keyboard") "/lib/xorg/modules," + #$(this-package-input "xorg-server") "/lib/xorg/modules\"\n" + "EndSection\n\n")) + (substitute* '("xpra/scripts/config.py" + "fs/etc/xpra/conf.d/60_server.conf.in" + "tests/unittests/unit/server/mixins/notification_test.py") + ;; The trailing -- is intentional, so we only replace it inside + ;; a command line. + (("dbus-launch --") + (string-append (search-input-file inputs "/bin/dbus-launch") + " --"))) + ;; /run/user does not exist on guix system. + (substitute* "./xpra/scripts/config.py" + (("socket-dir.*: \"\",") + "socket-dir\" : \"~/.xpra\",")))) + ;; GTK3 will not be found, if GI can’t find its typelibs. + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + ;; XXX: only export typelibs in inputs + (wrap-program (search-input-file outputs "bin/xpra") + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) (home-page "https://www.xpra.org/") (synopsis "Remote access to individual applications or full desktops") (description "Xpra is a persistent remote display server and client for -- cgit v1.2.3 From 7d5a3298316693bb4cd2c49d98c4818725288017 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 20:35:49 -0400 Subject: gnu: python-trio-typing: Switch to pyproject-build-system. * gnu/packages/python-xyz.scm (python-trio-typing) [source]: Fix indentation. [build-system]: Use pyproject-build-system. [arguments]: Delete field. --- gnu/packages/python-xyz.scm | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4e41e6ee87..d1c76226c2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24910,19 +24910,12 @@ programs that do multiple things at the same time with parallelized I/O.") (version "0.8.0") (source (origin - (method url-fetch) - (uri (pypi-uri "trio-typing" version)) - (sha256 - (base32 "15wa66cs165wawh4pi808ac43n67b8jqddi5ppdcbkj5gfi68hpi")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "pytest" "-vv")))))) - (native-inputs - (list python-attrs python-pytest)) + (method url-fetch) + (uri (pypi-uri "trio-typing" version)) + (sha256 + (base32 "15wa66cs165wawh4pi808ac43n67b8jqddi5ppdcbkj5gfi68hpi")))) + (build-system pyproject-build-system) + (native-inputs (list python-attrs python-pytest)) (propagated-inputs (list python-mypy python-mypy-extensions python-trio python-typing-extensions)) -- cgit v1.2.3 From 22707f55abc1fc5ee105dfc59f589d333ff0eee9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 21:00:17 -0400 Subject: gnu: gstreamer-docs: Update to 1.22.2. * gnu/packages/gstreamer.scm (gstreamer-docs): Update to 1.22.2. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index a89233bbac..b6e268884d 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -404,7 +404,7 @@ arrays of data.") (define-public gstreamer-docs (package (name "gstreamer-docs") - (version "1.22.1") + (version "1.22.2") (source (origin (method url-fetch) (uri (string-append @@ -412,7 +412,7 @@ arrays of data.") "/gstreamer-docs-" version ".tar.xz")) (sha256 (base32 - "1w7zc2162pwmslxsql0gaqs18jls7q885d0y5mxpifbxwl9hkjpy")))) + "1fljaydlinzw9jf5nkhwf7ihfzd5250k2cv220mi8dxxf7rgn18y")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 3f409cff3a063570aa46edfe0f424735649e884e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 21:00:27 -0400 Subject: gnu: gstreamer: Update to 1.22.2. * gnu/packages/gstreamer.scm (gstreamer): Update to 1.22.2. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index b6e268884d..1c8e93ffb1 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -464,7 +464,7 @@ the GStreamer multimedia framework.") (define-public gstreamer (package (name "gstreamer") - (version "1.22.1") + (version "1.22.2") (source (origin (method url-fetch) @@ -473,7 +473,7 @@ the GStreamer multimedia framework.") version ".tar.xz")) (sha256 (base32 - "0wg7zlj2pqkkxk71a1mwi4lc960ifv4n7spwzlakcxi6z5csfg6d")))) + "08cfz2vkf494rsg0bn75px26fxs3syvxnsc9lj5n074j0cvfgbxj")))) (build-system meson-build-system) (arguments (list #:disallowed-references (list python) -- cgit v1.2.3 From c53f8afa4f2b085af8582fbcacf4d4aa8d023721 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 21:00:41 -0400 Subject: gnu: gst-plugins-base: Update to 1.22.2. * gnu/packages/gstreamer.scm (gst-plugins-base): Update to 1.22.2. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 1c8e93ffb1..307f71793a 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -546,7 +546,7 @@ This package provides the core library and elements.") (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.22.1") + (version "1.22.2") (source (origin (method url-fetch) @@ -554,7 +554,7 @@ This package provides the core library and elements.") name "-" version ".tar.xz")) (sha256 (base32 - "0s8wh2il395y3gp4ryqfj4sd53c1dv521vx4ryyqssv4qnnaxg2r")))) + "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb")))) (build-system meson-build-system) (propagated-inputs (list glib ;required by gstreamer-sdp-1.0.pc -- cgit v1.2.3 From 7bd4e43ec0b14f65e26e68b2a95e7abaa72a2d8e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 21:00:42 -0400 Subject: gnu: gst-plugins-good: Update to 1.22.2. * gnu/packages/gstreamer.scm (gst-plugins-good): Update to 1.22.2. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 307f71793a..a84630bda2 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -646,7 +646,7 @@ for the GStreamer multimedia library.") (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.22.1") + (version "1.22.2") (source (origin (method url-fetch) @@ -655,7 +655,7 @@ for the GStreamer multimedia library.") "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 - (base32 "1k3l17kzyzfqv8imph7vc227vzz7jamk42g9xcm09zdlai311ya4")))) + (base32 "1p8cpkk4dynglw0xswqyf57xl5fnxmb3xld71kv35cpj4nacb33w")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From e1e6ccf8e366ca713498712199165953c6b74d99 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 21:00:42 -0400 Subject: gnu: gst-plugins-bad: Update to 1.22.2. * gnu/packages/gstreamer.scm (gst-plugins-bad): Update to 1.22.2. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index a84630bda2..a24ed55e22 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -766,14 +766,14 @@ model to base your own plug-in on, here it is.") (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.22.1") + (version "1.22.2") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "03lza1gq1j5gpz13fql47aaljs9k7qih02j2zzwnd1nr4brbcf9g")) + "03rd09wsrf9xjianpnnvamb4n3lndhd4x31srqsqab20wcfaz3rx")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 8480a784f2f57e57f03fe3afc8043bcb76097db9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 21:00:42 -0400 Subject: gnu: gst-plugins-ugly: Update to 1.22.2. * gnu/packages/gstreamer.scm (gst-plugins-ugly): Update to 1.22.2. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index a24ed55e22..bf0ba11c1f 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -950,7 +950,7 @@ par compared to the rest.") (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.22.1") + (version "1.22.2") (source (origin (method url-fetch) @@ -958,7 +958,7 @@ par compared to the rest.") (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 - (base32 "1hhmi1jds1lcdr0w9jmi1ys0nkyfbpvb2jvw7k5f3g416khxkcsa")))) + (base32 "1486x08bwasq6l7kc75nph5az61siq9mbgkgpw4kf1mxn16z8c4g")))) (build-system meson-build-system) (arguments (list #:meson meson-0.63 -- cgit v1.2.3 From 4f1b5cd3efbb0dac60c8318a65af851ff50395d5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 21:00:42 -0400 Subject: gnu: gst-libav: Update to 1.22.2. * gnu/packages/gstreamer.scm (gst-libav): Update to 1.22.2. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index bf0ba11c1f..4b5ccf33c0 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -1008,7 +1008,7 @@ think twice about shipping them.") (define-public gst-libav (package (name "gst-libav") - (version "1.22.1") + (version "1.22.2") (source (origin (method url-fetch) @@ -1017,7 +1017,7 @@ think twice about shipping them.") "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 - (base32 "1yxmc3jchqyw0gcc5193640xf70s2dl55nzqh6jbghrsvhjyhn69")))) + (base32 "1zfg7giwampmjxkqr5pqy66vck42b0akmwby661brwz8iy3zkapw")))) (build-system meson-build-system) (arguments (list #:meson meson-0.63)) (native-inputs -- cgit v1.2.3 From 02d95dea187953f1a417da942446fe82a8ed7932 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 21:00:43 -0400 Subject: gnu: gst-editing-services: Update to 1.22.2. * gnu/packages/gstreamer.scm (gst-editing-services): Update to 1.22.2. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 4b5ccf33c0..20ca2b2e3f 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -1035,7 +1035,7 @@ decoders, muxers, and demuxers provided by FFmpeg.") (define-public gst-editing-services (package (name "gst-editing-services") - (version "1.22.1") + (version "1.22.2") (source (origin (method url-fetch) (uri (string-append @@ -1043,7 +1043,7 @@ decoders, muxers, and demuxers provided by FFmpeg.") "gst-editing-services-" version ".tar.xz")) (sha256 (base32 - "0f0l2qanwi8msv16aqi3xxpslw9wn4rg1ibix6hbk940xw45x7hg")))) + "1gyfw11ns2la1cm6gvvvv5qj3q5gcvcypc3wk8kdwmrqzij18fs5")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 2273cb602d3a03cce0940de713075c71ba77b2fc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 21:00:43 -0400 Subject: gnu: python-gst: Update to 1.22.2. * gnu/packages/gstreamer.scm (python-gst): Update to 1.22.2. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 20ca2b2e3f..0d051438e3 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -1104,7 +1104,7 @@ binary, but none of the actual plugins."))) (define-public python-gst (package (name "python-gst") - (version "1.22.1") + (version "1.22.2") (source (origin (method url-fetch) (uri (string-append @@ -1112,7 +1112,7 @@ binary, but none of the actual plugins."))) "gst-python-" version ".tar.xz")) (sha256 (base32 - "1fryl7rifgjkcc3wsfn4c3as3znhr8y8jnsib8kn8nk83m28l04n")))) + "1bak46bj92gyz613m99mnl0yw0qhbhq5dfxifnvldgp45kcb7wmy")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 15c7b48333d068a7240f667430830e95fae3556b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Apr 2023 21:50:34 -0400 Subject: gnu: libexif: Update home page. * gnu/packages/photo.scm (libexif) [home-page]: Update URL. --- gnu/packages/photo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 8ed5d9d827..c498703205 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -222,7 +222,7 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).") "0zi5vvb0khlzc6xyfayk6mjx5lgkrj8r7s8lfv4j7wkcgndjga0j")))) (build-system gnu-build-system) (native-inputs (list autoconf automake gettext-minimal libtool)) - (home-page "https://libexif.github.io/") + (home-page "https://github.com/libexif/libexif") (synopsis "Read and manipulate EXIF data in digital photographs") (description "The libexif C library allows applications to read, edit, and save EXIF -- cgit v1.2.3 From d06bcd603117c26b41267ba59220b8564504b749 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 1 Apr 2023 16:13:13 +0200 Subject: gnu: Add mecab. * gnu/packages/language.scm (mecab): New variable. * gnu/packages/patches/mecab-variable-param.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/packages/language.scm | 52 ----------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 208fab4f5b..88fb43b9bc 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -979,55 +979,3 @@ fi"))))))) collaboration between the Kyoto university and Nippon Telegraph and Telephone Corporation. The engine is independent of any language, dictionary or corpus.") (license (list license:gpl2+ license:lgpl2.1+ license:bsd-3)))) - -(define-public mecab-ipadic - (package - (name "mecab-ipadic") - (version "2.7.0") - (source (package-source mecab)) - (build-system gnu-build-system) - (arguments - `(#:configure-flags - (list (string-append "--with-dicdir=" (assoc-ref %outputs "out") - "/lib/mecab/dic") - "--with-charset=utf8") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "mecab-ipadic"))) - (add-before 'configure 'set-mecab-dir - (lambda* (#:key outputs #:allow-other-keys) - (setenv "MECAB_DICDIR" (string-append (assoc-ref outputs "out") - "/lib/mecab/dic"))))))) - (native-inputs (list mecab)); for mecab-config - (home-page "https://taku910.github.io/mecab") - (synopsis "Dictionary data for MeCab") - (description "This package contains dictionnary data derived from -ipadic for use with MeCab.") - (license (license:non-copyleft "mecab-ipadic/COPYING")))) - -(define-public mecab-unidic - (package - (name "mecab-unidic") - (version "3.1.0") - (source (origin - (method url-fetch) - (uri (string-append "https://clrd.ninjal.ac.jp/unidic_archive/cwj/" - version "/unidic-cwj-" version ".zip")) - (sha256 - (base32 - "1z132p2q3bgchiw529j2d7dari21kn0fhkgrj3vcl0ncg2m521il")))) - (build-system copy-build-system) - (arguments - `(#:install-plan - '(("." "lib/mecab/dic" - #:include-regexp ("\\.bin$" "\\.def$" "\\.dic$" "dicrc"))))) - (native-inputs (list unzip)) - (home-page "https://clrd.ninjal.ac.jp/unidic/en/") - (synopsis "Dictionary data for MeCab") - (description "UniDic for morphological analysis is a dictionary for -analysis with the morphological analyser MeCab, where the short units exported -from the database are used as entries (heading terms).") - ;; triple-licensed (at the user’s choice) - (license (list license:gpl2+ license:lgpl2.1 license:bsd-3)))) -- cgit v1.2.3 From 04688c56e1817fc036273f2bd13fa9fad4371d51 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 4 Jul 2022 21:42:01 +0200 Subject: gnu: Add mecab-ipadic. * gnu/packages/language.scm (mecab-ipadic): New variable. --- gnu/packages/language.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 88fb43b9bc..f643136873 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -979,3 +979,30 @@ fi"))))))) collaboration between the Kyoto university and Nippon Telegraph and Telephone Corporation. The engine is independent of any language, dictionary or corpus.") (license (list license:gpl2+ license:lgpl2.1+ license:bsd-3)))) + +(define-public mecab-ipadic + (package + (name "mecab-ipadic") + (version "2.7.0") + (source (package-source mecab)) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "--with-dicdir=" (assoc-ref %outputs "out") + "/lib/mecab/dic") + "--with-charset=utf8") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "mecab-ipadic"))) + (add-before 'configure 'set-mecab-dir + (lambda* (#:key outputs #:allow-other-keys) + (setenv "MECAB_DICDIR" (string-append (assoc-ref outputs "out") + "/lib/mecab/dic"))))))) + (native-inputs (list mecab)); for mecab-config + (home-page "https://taku910.github.io/mecab") + (synopsis "Dictionary data for MeCab") + (description "This package contains dictionnary data derived from +ipadic for use with MeCab.") + (license (license:non-copyleft "mecab-ipadic/COPYING")))) -- cgit v1.2.3 From c16251be058c221100a6acfd46e41929b613df9d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 4 Jul 2022 21:42:02 +0200 Subject: gnu: Add mecab-unidic. * gnu/packages/language.scm (mecab-unidic): New variable. --- gnu/packages/language.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index f643136873..208fab4f5b 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -1006,3 +1006,28 @@ Corporation. The engine is independent of any language, dictionary or corpus.") (description "This package contains dictionnary data derived from ipadic for use with MeCab.") (license (license:non-copyleft "mecab-ipadic/COPYING")))) + +(define-public mecab-unidic + (package + (name "mecab-unidic") + (version "3.1.0") + (source (origin + (method url-fetch) + (uri (string-append "https://clrd.ninjal.ac.jp/unidic_archive/cwj/" + version "/unidic-cwj-" version ".zip")) + (sha256 + (base32 + "1z132p2q3bgchiw529j2d7dari21kn0fhkgrj3vcl0ncg2m521il")))) + (build-system copy-build-system) + (arguments + `(#:install-plan + '(("." "lib/mecab/dic" + #:include-regexp ("\\.bin$" "\\.def$" "\\.dic$" "dicrc"))))) + (native-inputs (list unzip)) + (home-page "https://clrd.ninjal.ac.jp/unidic/en/") + (synopsis "Dictionary data for MeCab") + (description "UniDic for morphological analysis is a dictionary for +analysis with the morphological analyser MeCab, where the short units exported +from the database are used as entries (heading terms).") + ;; triple-licensed (at the user’s choice) + (license (list license:gpl2+ license:lgpl2.1 license:bsd-3)))) -- cgit v1.2.3 From 4642f3f3c546fcddf4d435d09a86a20a160f070b Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 18 Mar 2023 08:23:00 +0100 Subject: gnu: Separate potassco packages into their own module. * gnu/packages/potassco.scm: New file. * gnu/packages/maths.scm (libpotassco, clasp, clingo, python-clingo) (python-telingo): Move to potassco module. Adjust imports accordingly. * gnu/packages/emacs-xyz.scm (emacs-pasp-mode): Move to potassco module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add %D%/packages/potassco.scm. --- gnu/packages/potassco.scm | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index 0e6973d980..22f70eba7f 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -31,7 +31,6 @@ #:use-module (guix build-system python) #:use-module (guix build-system pyproject) #:use-module (gnu packages check) - #:use-module (gnu packages graphviz) #:use-module (gnu packages libffi) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -344,33 +343,3 @@ into Python programs easier.") (description "This package provides a system to solve dynamic temporal logic programs based on clingo.") (license license:expat))) - -(define-public python-clingraph - (package - (name "python-clingraph") - (version "1.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/potassco/clingraph") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0bdhli20nw9qnyxmpisgz7m97d7bwx6lbmxy9bgqvm6mipprnv3n")))) - (build-system pyproject-build-system) - (inputs (list dot2tex graphviz)) - (propagated-inputs (list python-clingo - python-clorm - python-graphviz - python-imageio - python-jinja2 - python-jsonschema - python-networkx)) - (native-inputs (list dot2tex graphviz python-pylint python-pytest)) - (home-page "https://github.com/potassco/clingraph") - (synopsis "Visualizer for graphs defined as logic programs") - (description - "This package provides a clingo-based visualizer for graphs defined -as logic programs.") - (license license:expat))) -- cgit v1.2.3 From 7eefd64a3726c2e1bf52f56d0bedaee2f0ff8382 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 18 Mar 2023 08:34:03 +0100 Subject: gnu: Add python-clingraph. * gnu/packages/potassco.scm (python-clingraph): New variable. --- gnu/packages/potassco.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index 22f70eba7f..0e6973d980 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -31,6 +31,7 @@ #:use-module (guix build-system python) #:use-module (guix build-system pyproject) #:use-module (gnu packages check) + #:use-module (gnu packages graphviz) #:use-module (gnu packages libffi) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -343,3 +344,33 @@ into Python programs easier.") (description "This package provides a system to solve dynamic temporal logic programs based on clingo.") (license license:expat))) + +(define-public python-clingraph + (package + (name "python-clingraph") + (version "1.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/potassco/clingraph") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bdhli20nw9qnyxmpisgz7m97d7bwx6lbmxy9bgqvm6mipprnv3n")))) + (build-system pyproject-build-system) + (inputs (list dot2tex graphviz)) + (propagated-inputs (list python-clingo + python-clorm + python-graphviz + python-imageio + python-jinja2 + python-jsonschema + python-networkx)) + (native-inputs (list dot2tex graphviz python-pylint python-pytest)) + (home-page "https://github.com/potassco/clingraph") + (synopsis "Visualizer for graphs defined as logic programs") + (description + "This package provides a clingo-based visualizer for graphs defined +as logic programs.") + (license license:expat))) -- cgit v1.2.3 From 420adff18efd767f4848c79529c9929563bae21d Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Sun, 26 Mar 2023 19:41:31 +0100 Subject: services: mpd: Fix unintentional API breakage for mixer-type field. * gnu/services/audio.scm (mpd-output)[mixer-type]: Use sanitizer to accept both strings and symbols as values. Signed-off-by: Liliana Marie Prikler --- gnu/services/audio.scm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index 690409b7a1..9ad63328c6 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -140,14 +140,6 @@ (define list-of-symbol? (list-of symbol?)) -;; Helpers for deprecated field types, to be removed later. -(define %lazy-group (make-symbol "%lazy-group")) - -(define (%set-user-group user group) - (user-account - (inherit user) - (group (user-group-name group)))) - ;;; ;;; MPD -- cgit v1.2.3 From 865df7f080c64960f349fff79088427889e6c492 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Sun, 26 Mar 2023 19:41:32 +0100 Subject: services: mpd: Use proper records for user and group fields. Deprecate using strings for these fields and prefer user-account (resp. user-group) instead to avoid duplication within account-service-type. Fixes #61570 . * gnu/services/audio.scm (%mpd-user, %mpd-group) (mpd-serialize-user-account, mpd-serialize-user-group) (mpd-user-sanitizer, mpd-group-sanitizer): New variables. (mpd-configuration)[user]: Use user-account as value type. Sanitize via mpd-user-sanitizer. [group]: Use user-group as value type. Sanitize via mpd-group-sanitizer. (mpd-shepherd-service): Adjust accordingly. (mpd-accounts): Likewise. * doc/guix.texi (Audio Services)[Music Player Daemon]: Likewise. Signed-off-by: Liliana Marie Prikler --- gnu/services/audio.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index 9ad63328c6..690409b7a1 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -140,6 +140,14 @@ (define list-of-symbol? (list-of symbol?)) +;; Helpers for deprecated field types, to be removed later. +(define %lazy-group (make-symbol "%lazy-group")) + +(define (%set-user-group user group) + (user-account + (inherit user) + (group (user-group-name group)))) + ;;; ;;; MPD -- cgit v1.2.3 From 269f8dce259fc65bc2dec30f58ebb6f0db129b61 Mon Sep 17 00:00:00 2001 From: gemmaro Date: Mon, 13 Mar 2023 22:53:02 +0900 Subject: gnu: Add ruby-unicode-plot. * gnu/packages/plotutils.scm (ruby-unicode-plot): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/plotutils.scm | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index fdda6d4871..34f507e825 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -456,29 +456,3 @@ characters. Supported charts are: barplot, boxplot, densityplot, histogram, lineplot, and scatterplot.") (home-page "https://github.com/red-data-tools/unicode_plot.rb") (license license:expat))) - -(define-public youplot - (package - (name "youplot") - (version "0.4.5") - ;; Source at RubyGems.org doesn't have tests. - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/red-data-tools/YouPlot") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1y54apw7hx9mhjnf277w9wayvq954mdnip4dpajhc0qjg2464c2b")))) - (build-system ruby-build-system) - (native-inputs (list ruby-rake ruby-simplecov ruby-test-unit)) - (propagated-inputs (list ruby-unicode-plot)) - (synopsis "Command line tool that draw plots on the terminal") - (description - "YouPlot is a command line tool that draws plots on the terminal, -powered by UnicodePlot gem. It provides commands @command{youplot} -and @command{uplot} (shorthand) are provided, and supports chart types -of barplot, histogram, lineplot, scatter, density, boxplot, and count.") - (home-page "https://github.com/red-data-tools/YouPlot") - (license license:expat))) -- cgit v1.2.3 From 99438cf1190b7fab3d2030d92de0cb8443fd2dd8 Mon Sep 17 00:00:00 2001 From: gemmaro Date: Mon, 13 Mar 2023 22:53:03 +0900 Subject: gnu: Add youplot. * gnu/packages/plotutils.scm (youplot): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/plotutils.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 34f507e825..fdda6d4871 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -456,3 +456,29 @@ characters. Supported charts are: barplot, boxplot, densityplot, histogram, lineplot, and scatterplot.") (home-page "https://github.com/red-data-tools/unicode_plot.rb") (license license:expat))) + +(define-public youplot + (package + (name "youplot") + (version "0.4.5") + ;; Source at RubyGems.org doesn't have tests. + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/red-data-tools/YouPlot") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y54apw7hx9mhjnf277w9wayvq954mdnip4dpajhc0qjg2464c2b")))) + (build-system ruby-build-system) + (native-inputs (list ruby-rake ruby-simplecov ruby-test-unit)) + (propagated-inputs (list ruby-unicode-plot)) + (synopsis "Command line tool that draw plots on the terminal") + (description + "YouPlot is a command line tool that draws plots on the terminal, +powered by UnicodePlot gem. It provides commands @command{youplot} +and @command{uplot} (shorthand) are provided, and supports chart types +of barplot, histogram, lineplot, scatter, density, boxplot, and count.") + (home-page "https://github.com/red-data-tools/YouPlot") + (license license:expat))) -- cgit v1.2.3 From b4f5ec676005a01e47ace652ba722f8f1d5d2ec5 Mon Sep 17 00:00:00 2001 From: Kyle Andrews Date: Sat, 1 Apr 2023 04:57:00 +0000 Subject: gnu: Add r-targets. * gnu/packages/cran.scm (r-targets): New variable., Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8c631bdccd..6eb5a99343 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14457,43 +14457,6 @@ equations, and Cox proportional hazards models. Functions are available to handle data from simple random samples as well as complex surveys.") (license license:gpl3+))) -(define-public r-tarchetypes - (package - (name "r-tarchetypes") - (version "0.7.5") - (source (origin - (method url-fetch) - (uri (cran-uri "tarchetypes" version)) - (sha256 - (base32 - "05yhq8xnrpk37x7fq0yjw4m527ji28s16dskfmljrbrzb064nw2g")))) - (properties `((upstream-name . "tarchetypes"))) - (build-system r-build-system) - (propagated-inputs (list r-digest - r-dplyr - r-fs - r-furrr - r-future - r-future-callr - r-rlang - r-targets - r-tibble - r-tidyselect - r-vctrs - r-withr)) - (home-page "https://docs.ropensci.org/tarchetypes/") - (synopsis "Archetypes for Targets") - (description - "Function-oriented Make-like declarative pipelines for statistics and -data science are supported in the targets R package. As an extension to -targets, the tarchetypes package provides convenient user-side functions to -make targets easier to use. By establishing reusable archetypes for common -kinds of targets and pipelines, these functions help express complicated -reproducible pipelines concisely and compactly. The methods in this package -were influenced by the drake R package by Will Landau (2018) -.") - (license license:expat))) - (define-public r-targets (package (name "r-targets") -- cgit v1.2.3 From 4e9c9a63cc6e51b9755dbe2845bdb6fb8d3abce0 Mon Sep 17 00:00:00 2001 From: Kyle Andrews Date: Sat, 1 Apr 2023 04:57:02 +0000 Subject: gnu: Add r-tarchetypes. * gnu/packages/cran.scm (r-tarchetypes): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6eb5a99343..8c631bdccd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14457,6 +14457,43 @@ equations, and Cox proportional hazards models. Functions are available to handle data from simple random samples as well as complex surveys.") (license license:gpl3+))) +(define-public r-tarchetypes + (package + (name "r-tarchetypes") + (version "0.7.5") + (source (origin + (method url-fetch) + (uri (cran-uri "tarchetypes" version)) + (sha256 + (base32 + "05yhq8xnrpk37x7fq0yjw4m527ji28s16dskfmljrbrzb064nw2g")))) + (properties `((upstream-name . "tarchetypes"))) + (build-system r-build-system) + (propagated-inputs (list r-digest + r-dplyr + r-fs + r-furrr + r-future + r-future-callr + r-rlang + r-targets + r-tibble + r-tidyselect + r-vctrs + r-withr)) + (home-page "https://docs.ropensci.org/tarchetypes/") + (synopsis "Archetypes for Targets") + (description + "Function-oriented Make-like declarative pipelines for statistics and +data science are supported in the targets R package. As an extension to +targets, the tarchetypes package provides convenient user-side functions to +make targets easier to use. By establishing reusable archetypes for common +kinds of targets and pipelines, these functions help express complicated +reproducible pipelines concisely and compactly. The methods in this package +were influenced by the drake R package by Will Landau (2018) +.") + (license license:expat))) + (define-public r-targets (package (name "r-targets") -- cgit v1.2.3 From 8a17609dd02ff1d54bb32a158cead6bcba06a145 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Apr 2023 15:36:21 +0300 Subject: gnu: go-1.18: Adjust patch-gcclib phase. * gnu/packages/golang.scm (go-1.18)[arguments]: Adjust the custom 'patch-gcc:lib phase for changes in the source code. --- gnu/packages/golang.scm | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 24dae34e20..2b75730dcd 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -864,29 +864,27 @@ in the style of communicating sequential processes (@dfn{CSP}).") (substitute-keyword-arguments (package-arguments go-1.17) ((#:phases phases) `(modify-phases ,phases - (delete 'adjust-test-suite) - ,@(if (or (target-arm?) (target-ppc64le?)) - '((replace 'patch-gcc:lib - (lambda* (#:key inputs #:allow-other-keys) - (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib"))) - ;; Add libgcc to runpath - (substitute* "src/cmd/link/internal/ld/lib.go" - (("!rpath.set") "true")) - (substitute* "src/cmd/go/internal/work/gccgo.go" - (("cgoldflags := \\[\\]string\\{\\}") - (string-append "cgoldflags := []string{" - "\"-Wl,-rpath=" gcclib "\"" - "}")) - (("\"-lgcc_s\", ") - (string-append - "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", "))) - (substitute* "src/cmd/go/internal/work/gc.go" - (("ldflags, err := setextld\\(ldflags, compiler\\)") - (string-append - "ldflags, err := setextld(ldflags, compiler)\n" - "ldflags = append(ldflags, \"-r\")\n" - "ldflags = append(ldflags, \"" gcclib "\")\n"))))))) - '()))))))) + ;; See the platforms using this phase in go-1.17. + (replace 'patch-gcc:lib + (lambda* (#:key inputs #:allow-other-keys) + (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib"))) + ;; Add libgcc to runpath + (substitute* "src/cmd/link/internal/ld/lib.go" + (("!rpath.set") "true")) + (substitute* "src/cmd/go/internal/work/gccgo.go" + (("cgoldflags := \\[\\]string\\{\\}") + (string-append "cgoldflags := []string{" + "\"-Wl,-rpath=" gcclib "\"" + "}")) + (("\"-lgcc_s\", ") + (string-append + "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", "))) + (substitute* "src/cmd/go/internal/work/gc.go" + (("ldflags, err := setextld\\(ldflags, compiler\\)") + (string-append + "ldflags, err := setextld(ldflags, compiler)\n" + "ldflags = append(ldflags, \"-r\")\n" + "ldflags = append(ldflags, \"" gcclib "\")\n")))))))))))) (define-public go-1.19 (package -- cgit v1.2.3 From 34e5ba942ec28096298b471a011144155e2720da Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Apr 2023 15:53:38 +0300 Subject: gnu: go-1.17: Fix test suite on powerpc64le-linux. * gnu/packages/golang.scm (go-1.17)[arguments]: Use custom 'patch-gcc:lib phase on powerpc64le-linux. Add a phase to adjust the allowed size of an executable in the test suite. [inputs]: Keep gcc:lib as an input on powerpc64le-linux. (go-1.18)[arguments]: Delete custom 'adjust-test-suite phase. --- gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2b75730dcd..9c8decda61 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -700,7 +700,6 @@ in the style of communicating sequential processes (@dfn{CSP}).") (substitute* "src/time/zoneinfo_unix.go" (("/usr/share/zoneinfo/") tzdata-path))))) ;; Keep this synchronized with the package inputs. - ;; Also keep syncthonized with later versions of go. ,@(if (or (target-arm?) (target-ppc64le?)) '((add-after 'unpack 'patch-gcc:lib (lambda* (#:key inputs #:allow-other-keys) @@ -864,6 +863,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (substitute-keyword-arguments (package-arguments go-1.17) ((#:phases phases) `(modify-phases ,phases + (delete 'adjust-test-suite) ;; See the platforms using this phase in go-1.17. (replace 'patch-gcc:lib (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From da26ab72957aa92da45f9ddaa0fe4613b8fa6408 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 5 Apr 2023 22:16:52 +0300 Subject: gnu: go-1.18: Fix packaging logic. * gnu/packages/golang.scm (go-1.18)[arguments]: Only replace the custom 'patch-gcc:lib phase on certain architectures. --- gnu/packages/golang.scm | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9c8decda61..24dae34e20 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -700,6 +700,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (substitute* "src/time/zoneinfo_unix.go" (("/usr/share/zoneinfo/") tzdata-path))))) ;; Keep this synchronized with the package inputs. + ;; Also keep syncthonized with later versions of go. ,@(if (or (target-arm?) (target-ppc64le?)) '((add-after 'unpack 'patch-gcc:lib (lambda* (#:key inputs #:allow-other-keys) @@ -864,27 +865,28 @@ in the style of communicating sequential processes (@dfn{CSP}).") ((#:phases phases) `(modify-phases ,phases (delete 'adjust-test-suite) - ;; See the platforms using this phase in go-1.17. - (replace 'patch-gcc:lib - (lambda* (#:key inputs #:allow-other-keys) - (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib"))) - ;; Add libgcc to runpath - (substitute* "src/cmd/link/internal/ld/lib.go" - (("!rpath.set") "true")) - (substitute* "src/cmd/go/internal/work/gccgo.go" - (("cgoldflags := \\[\\]string\\{\\}") - (string-append "cgoldflags := []string{" - "\"-Wl,-rpath=" gcclib "\"" - "}")) - (("\"-lgcc_s\", ") - (string-append - "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", "))) - (substitute* "src/cmd/go/internal/work/gc.go" - (("ldflags, err := setextld\\(ldflags, compiler\\)") - (string-append - "ldflags, err := setextld(ldflags, compiler)\n" - "ldflags = append(ldflags, \"-r\")\n" - "ldflags = append(ldflags, \"" gcclib "\")\n")))))))))))) + ,@(if (or (target-arm?) (target-ppc64le?)) + '((replace 'patch-gcc:lib + (lambda* (#:key inputs #:allow-other-keys) + (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib"))) + ;; Add libgcc to runpath + (substitute* "src/cmd/link/internal/ld/lib.go" + (("!rpath.set") "true")) + (substitute* "src/cmd/go/internal/work/gccgo.go" + (("cgoldflags := \\[\\]string\\{\\}") + (string-append "cgoldflags := []string{" + "\"-Wl,-rpath=" gcclib "\"" + "}")) + (("\"-lgcc_s\", ") + (string-append + "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", "))) + (substitute* "src/cmd/go/internal/work/gc.go" + (("ldflags, err := setextld\\(ldflags, compiler\\)") + (string-append + "ldflags, err := setextld(ldflags, compiler)\n" + "ldflags = append(ldflags, \"-r\")\n" + "ldflags = append(ldflags, \"" gcclib "\")\n"))))))) + '()))))))) (define-public go-1.19 (package -- cgit v1.2.3 From 62a14c552f2e6f808bff2b91492ac3f1a2517e83 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Apr 2023 18:33:33 +0200 Subject: news: Add entry for 'guix shell --container --nesting'. * etc/news.scm: Add entry. --- etc/news.scm | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/etc/news.scm b/etc/news.scm index 7f38f8f294..77d1efb555 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -26,20 +26,9 @@ (channel-news (version 0) - (entry (commit "21564fada141bfba25d471518b293b6004244c3a") - (title - (en "Linux-libre LTS kernel updated to 6.1") - (de "Linux-libre LTS Kernel wird auf 6.1 aktualisiert")) - (body - (en "The default version of the @code{linux-libre-lts} kernel has been - updated to the 6.1 longterm release series.") - (de "Der standardmäßig verwendete @code{linux-libre-lts}-Kernel basiert - jetzt auf der 6.1-Versionsreihe (Langzeitunterstützung)."))) - (entry (commit "57db09aae73e3713a10c5253758d84e1046f80dc") (title (en "Using Guix within @command{guix shell --container}") - (de "Guix innerhalb @command{guix shell --container} nutzen") (fr "Utilisation de Guix dans @command{guix shell --container}")) (body (en "The @option{--container} (or @option{-C}) option lets you spawn @@ -60,26 +49,6 @@ guix shell -CW -- guix build -f guix.scm @end example Run @command{info \"(guix) Invoking guix shell\"} for more information.") - (de "Mit der Befehlszeilenoption @option{--container} (oder -@option{-C}) können Sie Container anlegen, also isolierte -Software-Umgebungen. Allerdings will man manchmal Guix innerhalb eines -Containers nutzen, was unmöglich ist, wenn Sie es normal aufrufen. - -Die neue Befehlszeilenoption @option{--nesting} (oder @option{-W}) ergänzt -genau das: In einem damit angelegten Container lassen sich -@command{guix}-Befehle, einschließlich @command{guix shell -C}, @emph{im -Container} benutzen. - -Folgendes Beispiel zeigt, wie Sie eine Datei @file{guix.scm} auswerten lassen, -um ein Paket aus dem isolierten Container heraus erstellen zu lassen. Das -können Sie gebrauchen, wenn Sie @file{guix.scm} @emph{nicht} vertrauen: - -@example -guix shell -CW -- guix build -f guix.scm -@end example - -Führen Sie @command{info \"(guix.de) Aufruf von guix shell\"} aus, um mehr -zu erfahren.") (fr "L'option @option{--container} (ou @option{-C}) permet de démarrer un conteneur---un environnement logiciel isolé. Dans certains cas, il peut être utile d'utiliser Guix à l'intérieur du conteneur, ce qui n'est -- cgit v1.2.3 From 985dab8e73e83d2f25f6777fea1ebea9a03d04d5 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Fri, 7 Apr 2023 11:59:42 +0200 Subject: news: Add 'de' translation. * etc/news.scm: Add German translation of 'guix shell -CW' entry. --- etc/news.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index 77d1efb555..ed9454e581 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -29,6 +29,7 @@ (entry (commit "57db09aae73e3713a10c5253758d84e1046f80dc") (title (en "Using Guix within @command{guix shell --container}") + (de "Guix innerhalb @command{guix shell --container} nutzen") (fr "Utilisation de Guix dans @command{guix shell --container}")) (body (en "The @option{--container} (or @option{-C}) option lets you spawn @@ -49,6 +50,26 @@ guix shell -CW -- guix build -f guix.scm @end example Run @command{info \"(guix) Invoking guix shell\"} for more information.") + (de "Mit der Befehlszeilenoption @option{--container} (oder +@option{-C}) können Sie Container anlegen, also isolierte +Software-Umgebungen. Allerdings will man manchmal Guix innerhalb eines +Containers nutzen, was unmöglich ist, wenn Sie es normal aufrufen. + +Die neue Befehlszeilenoption @option{--nesting} (oder @option{-W}) ergänzt +genau das: In einem damit angelegten Container lassen sich +@command{guix}-Befehle, einschließlich @command{guix shell -C}, @emph{im +Container} benutzen. + +Folgendes Beispiel zeigt, wie Sie eine Datei @file{guix.scm} auswerten lassen, +um ein Paket aus dem isolierten Container heraus erstellen zu lassen. Das +können Sie gebrauchen, wenn Sie @file{guix.scm} @emph{nicht} vertrauen: + +@example +guix shell -CW -- guix build -f guix.scm +@end example + +Führen Sie @command{info \"(guix.de) Aufruf von guix shell\"} aus, um mehr +zu erfahren.") (fr "L'option @option{--container} (ou @option{-C}) permet de démarrer un conteneur---un environnement logiciel isolé. Dans certains cas, il peut être utile d'utiliser Guix à l'intérieur du conteneur, ce qui n'est -- cgit v1.2.3 From 48a1ed92f620aa343b44ad2b00bac67f341cbab8 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Fri, 7 Apr 2023 17:18:18 +0200 Subject: news: Add entry for the linux-libre-lts 6.1 update. * etc/news.scm: Add entry. --- etc/news.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index ed9454e581..7f38f8f294 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -26,6 +26,16 @@ (channel-news (version 0) + (entry (commit "21564fada141bfba25d471518b293b6004244c3a") + (title + (en "Linux-libre LTS kernel updated to 6.1") + (de "Linux-libre LTS Kernel wird auf 6.1 aktualisiert")) + (body + (en "The default version of the @code{linux-libre-lts} kernel has been + updated to the 6.1 longterm release series.") + (de "Der standardmäßig verwendete @code{linux-libre-lts}-Kernel basiert + jetzt auf der 6.1-Versionsreihe (Langzeitunterstützung)."))) + (entry (commit "57db09aae73e3713a10c5253758d84e1046f80dc") (title (en "Using Guix within @command{guix shell --container}") -- cgit v1.2.3 From 8403c593285ea99cc3482ab68ba9525864803388 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 25 Mar 2023 16:32:18 +0100 Subject: gnu: Add sentencepiece. * gnu/packages/machine-learning.scm (sentencepiece): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/machine-learning.scm | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 70319238d9..f7f5bcd954 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -675,25 +675,6 @@ SentencePiece allows us to make a purely end-to-end system that does not depend on language-specific pre- or post-processing.") (license license:asl2.0))) -(define-public python-sentencepiece - (package - (name "python-sentencepiece") - (version "0.1.97") - (source - (origin - (method url-fetch) - (uri (pypi-uri "sentencepiece" version)) - (sha256 - (base32 "0v0z9ryl66432zajp099bcbnwkkldzlpjvgnjv9bq2vi19g300f9")))) - (build-system python-build-system) - (native-inputs (list pkg-config)) - (propagated-inputs (list sentencepiece)) - (home-page "https://github.com/google/sentencepiece") - (synopsis "SentencePiece python wrapper") - (description "This package provides a Python wrapper for the SentencePiece -unsupervised text tokenizer.") - (license license:asl2.0))) - (define-public shogun (package (name "shogun") -- cgit v1.2.3 From 0c00fea3c2b74991102e59f748285ac21b1de16e Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 25 Mar 2023 16:32:19 +0100 Subject: gnu: Add python-sentencepiece. * gnu/packages/machine-learning.scm (python-sentencepiece): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/machine-learning.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index f7f5bcd954..70319238d9 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -675,6 +675,25 @@ SentencePiece allows us to make a purely end-to-end system that does not depend on language-specific pre- or post-processing.") (license license:asl2.0))) +(define-public python-sentencepiece + (package + (name "python-sentencepiece") + (version "0.1.97") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sentencepiece" version)) + (sha256 + (base32 "0v0z9ryl66432zajp099bcbnwkkldzlpjvgnjv9bq2vi19g300f9")))) + (build-system python-build-system) + (native-inputs (list pkg-config)) + (propagated-inputs (list sentencepiece)) + (home-page "https://github.com/google/sentencepiece") + (synopsis "SentencePiece python wrapper") + (description "This package provides a Python wrapper for the SentencePiece +unsupervised text tokenizer.") + (license license:asl2.0))) + (define-public shogun (package (name "shogun") -- cgit v1.2.3 From c694f618974fa6c9f8aecf4a4c6c52e70adacb53 Mon Sep 17 00:00:00 2001 From: Rostislav Svoboda Date: Wed, 29 Mar 2023 14:42:17 +0200 Subject: gnu: Add emacs-gptel. * gnu/packages/emacs-xyz.scm (emacs-gptel): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6264d4deea..4be9170beb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -421,7 +421,7 @@ e.g. emacs-geiser-guile for Guile.") (define-public emacs-gptel (package (name "emacs-gptel") - (version "0.3.2") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -430,7 +430,7 @@ e.g. emacs-geiser-guile for Guile.") (file-name (git-file-name name version)) (sha256 (base32 - "0g4p0y7bk14ixiz841am2v36fdbwigz77q4zz745m4hviaq3s30y")))) + "1fg3dms7d05zpvkf8kxxh9726qvdfpmfsrgpc9fzm557ai13yhi5")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From e3089dc0ee2d3ab54333a5e67ede2f4cf0d23525 Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Tue, 28 Mar 2023 22:45:26 -0400 Subject: gnu: gerbil: Update to 0.17.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/package/scheme.scm (gerbil): Update to 0.17.0. Signed-off-by: Ludovic Courtès --- gnu/packages/scheme.scm | 179 ++++++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 88 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 8a510d840b..7c39071e82 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1115,95 +1115,98 @@ a Common Lisp environment.") (package (name "gerbil") (version "0.17.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/vyzo/gerbil") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0c0nspm659ybgmqlppdv7sxzll4hwkvcp9qmcsip6d0kz0p8r9c3")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vyzo/gerbil") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0c0nspm659ybgmqlppdv7sxzll4hwkvcp9qmcsip6d0kz0p8r9c3")))) (arguments - (list #:phases - #~(modify-phases %standard-phases - (delete 'bootstrap) - (add-before 'configure 'chdir - (lambda _ - (chdir "src"))) - (replace 'configure - (lambda _ - (invoke "chmod" "755" "-R" ".") - ;; Otherwise fails when editing an r--r--r-- file. - (invoke "gsi-script" - "configure" - "--prefix" - #$output - "--with-gambit" - #$gambit-c))) - (add-before 'patch-generated-file-shebangs 'fix-gxi-shebangs - (lambda _ - ;; Some .ss files refer to gxi using /usr/bin/env gxi - ;; and 'patch-generated-file-shebangs can't fix that - ;; because gxi has not been compiled yet. - ;; We know where gxi is going to end up so we - ;; Doctor Who our fix here before the problem - ;; happens towards the end of the build.sh script. - (let ((abs-srcdir (getcwd))) - (for-each (lambda (f) - (substitute* f - (("#!/usr/bin/env gxi") - (string-append "#!" abs-srcdir - "/../bin/gxi")))) - '("./gerbil/gxc" "./lang/build.ss" - "./misc/http-perf/build.ss" - "./misc/rpc-perf/build.ss" - "./misc/scripts/docsnarf.ss" - "./misc/scripts/docstub.ss" - "./misc/scripts/docsyms.ss" - "./r7rs-large/build.ss" - "./release.ss" - "./std/build.ss" - "./std/run-tests.ss" - "./std/web/fastcgi-test.ss" - "./std/web/rack-test.ss" - "./tools/build.ss" - "./tutorial/httpd/build.ss" - "./tutorial/kvstore/build.ss" - "./tutorial/lang/build.ss" - "./tutorial/proxy/build-static.ss" - "./tutorial/proxy/build.ss"))))) - (add-after 'configure 'create-gx-version.scm - (lambda _ - (with-output-to-file (string-append (getcwd) - "/gerbil/runtime/gx-version.scm") - (lambda _ - (write `(define (gerbil-version-string) - ,(string-append "v" - #$(version-major+minor - version)))))))) - (replace 'build - (lambda _ - (setenv "HOME" - (getcwd)) - (invoke - ;; The build script needs a tty or it'll crash on an ioctl - ;; trying to find the width of the terminal it's running on. - ;; Calling in script prevents that. - "script" - "-qefc" - "./build.sh"))) - (replace 'install - (lambda _ - (let* ((bin (string-append #$output "/bin")) - (lib (string-append #$output "/lib"))) - (mkdir-p bin) - (mkdir-p lib) - (copy-recursively "../bin" bin) - (copy-recursively "../lib" lib))))) - #:tests? #f)) - (native-inputs (list coreutils gambit-c util-linux)) - (propagated-inputs (list gambit-c openssl sqlite zlib)) + `(#:phases + (modify-phases %standard-phases + (delete 'bootstrap) + (add-before 'configure 'chdir + (lambda _ + (chdir "src") + #t)) + (replace 'configure + (lambda* (#:key outputs inputs #:allow-other-keys) + (invoke "chmod" "755" "-R" ".") + ;; Otherwise fails when editing an r--r--r-- file. + (invoke "gsi-script" "configure" + "--prefix" (assoc-ref outputs "out") + "--with-gambit" (assoc-ref inputs "gambit-c")))) + (add-before 'patch-generated-file-shebangs 'fix-gxi-shebangs + (lambda _ + ;; Some .ss files refer to gxi using /usr/bin/env gxi + ;; and 'patch-generated-file-shebangs can't fix that + ;; because gxi has not been compiled yet. + ;; We know where gxi is going to end up so we + ;; Doctor Who our fix here before the problem + ;; happens towards the end of the build.sh script. + (let ((abs-srcdir (getcwd))) + (for-each + (lambda (f) + (substitute* f + (("#!/usr/bin/env gxi") + (string-append "#!" abs-srcdir "/../bin/gxi")))) + '("./gerbil/gxc" + "./lang/build.ss" + "./misc/http-perf/build.ss" + "./misc/rpc-perf/build.ss" + "./misc/scripts/docsnarf.ss" + "./misc/scripts/docstub.ss" + "./misc/scripts/docsyms.ss" + "./r7rs-large/build.ss" + "./release.ss" + "./std/build.ss" + "./std/run-tests.ss" + "./std/web/fastcgi-test.ss" + "./std/web/rack-test.ss" + "./tools/build.ss" + "./tutorial/httpd/build.ss" + "./tutorial/kvstore/build.ss" + "./tutorial/lang/build.ss" + "./tutorial/proxy/build-static.ss" + "./tutorial/proxy/build.ss"))) + #t)) + (add-after 'configure 'create-gx-version.scm + (lambda _ + (with-output-to-file (string-append + (getcwd) + "/gerbil/runtime/gx-version.scm") + (lambda _ + (write `(define (gerbil-version-string) + ,(string-append "v" ,(version-major+minor version)))))))) + (replace + 'build + (lambda* + (#:key inputs #:allow-other-keys) + (setenv "HOME" (getcwd)) + (invoke + ;; The build script needs a tty or it'll crash on an ioctl + ;; trying to find the width of the terminal it's running on. + ;; Calling in script prevents that. + "script" + "-qefc" + "./build.sh"))) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib"))) + (mkdir-p bin) + (mkdir-p lib) + (copy-recursively "../bin" bin) + (copy-recursively "../lib" lib))))))) + (native-inputs + (list coreutils gambit-c util-linux)) + (propagated-inputs + (list gambit-c zlib openssl sqlite)) (build-system gnu-build-system) (synopsis "Meta-dialect of Scheme with post-modern features") (description -- cgit v1.2.3 From 592a8dffce3d3a5856af1b724aff39905bb3d100 Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Tue, 28 Mar 2023 23:05:15 -0400 Subject: gnu: gerbil: Use G-expressions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/scheme.scm (gerbil)[source, arguments]: Reindent. [arguments]: Rewrite using G-expressions. Do not return #t from custom phases. Use #:tests? instead of deleting the check phase. Signed-off-by: Ludovic Courtès --- gnu/packages/scheme.scm | 179 ++++++++++++++++++++++++------------------------ 1 file changed, 88 insertions(+), 91 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 7c39071e82..8a510d840b 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1115,98 +1115,95 @@ a Common Lisp environment.") (package (name "gerbil") (version "0.17.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/vyzo/gerbil") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0c0nspm659ybgmqlppdv7sxzll4hwkvcp9qmcsip6d0kz0p8r9c3")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vyzo/gerbil") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0c0nspm659ybgmqlppdv7sxzll4hwkvcp9qmcsip6d0kz0p8r9c3")))) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'bootstrap) - (add-before 'configure 'chdir - (lambda _ - (chdir "src") - #t)) - (replace 'configure - (lambda* (#:key outputs inputs #:allow-other-keys) - (invoke "chmod" "755" "-R" ".") - ;; Otherwise fails when editing an r--r--r-- file. - (invoke "gsi-script" "configure" - "--prefix" (assoc-ref outputs "out") - "--with-gambit" (assoc-ref inputs "gambit-c")))) - (add-before 'patch-generated-file-shebangs 'fix-gxi-shebangs - (lambda _ - ;; Some .ss files refer to gxi using /usr/bin/env gxi - ;; and 'patch-generated-file-shebangs can't fix that - ;; because gxi has not been compiled yet. - ;; We know where gxi is going to end up so we - ;; Doctor Who our fix here before the problem - ;; happens towards the end of the build.sh script. - (let ((abs-srcdir (getcwd))) - (for-each - (lambda (f) - (substitute* f - (("#!/usr/bin/env gxi") - (string-append "#!" abs-srcdir "/../bin/gxi")))) - '("./gerbil/gxc" - "./lang/build.ss" - "./misc/http-perf/build.ss" - "./misc/rpc-perf/build.ss" - "./misc/scripts/docsnarf.ss" - "./misc/scripts/docstub.ss" - "./misc/scripts/docsyms.ss" - "./r7rs-large/build.ss" - "./release.ss" - "./std/build.ss" - "./std/run-tests.ss" - "./std/web/fastcgi-test.ss" - "./std/web/rack-test.ss" - "./tools/build.ss" - "./tutorial/httpd/build.ss" - "./tutorial/kvstore/build.ss" - "./tutorial/lang/build.ss" - "./tutorial/proxy/build-static.ss" - "./tutorial/proxy/build.ss"))) - #t)) - (add-after 'configure 'create-gx-version.scm - (lambda _ - (with-output-to-file (string-append - (getcwd) - "/gerbil/runtime/gx-version.scm") - (lambda _ - (write `(define (gerbil-version-string) - ,(string-append "v" ,(version-major+minor version)))))))) - (replace - 'build - (lambda* - (#:key inputs #:allow-other-keys) - (setenv "HOME" (getcwd)) - (invoke - ;; The build script needs a tty or it'll crash on an ioctl - ;; trying to find the width of the terminal it's running on. - ;; Calling in script prevents that. - "script" - "-qefc" - "./build.sh"))) - (delete 'check) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (lib (string-append out "/lib"))) - (mkdir-p bin) - (mkdir-p lib) - (copy-recursively "../bin" bin) - (copy-recursively "../lib" lib))))))) - (native-inputs - (list coreutils gambit-c util-linux)) - (propagated-inputs - (list gambit-c zlib openssl sqlite)) + (list #:phases + #~(modify-phases %standard-phases + (delete 'bootstrap) + (add-before 'configure 'chdir + (lambda _ + (chdir "src"))) + (replace 'configure + (lambda _ + (invoke "chmod" "755" "-R" ".") + ;; Otherwise fails when editing an r--r--r-- file. + (invoke "gsi-script" + "configure" + "--prefix" + #$output + "--with-gambit" + #$gambit-c))) + (add-before 'patch-generated-file-shebangs 'fix-gxi-shebangs + (lambda _ + ;; Some .ss files refer to gxi using /usr/bin/env gxi + ;; and 'patch-generated-file-shebangs can't fix that + ;; because gxi has not been compiled yet. + ;; We know where gxi is going to end up so we + ;; Doctor Who our fix here before the problem + ;; happens towards the end of the build.sh script. + (let ((abs-srcdir (getcwd))) + (for-each (lambda (f) + (substitute* f + (("#!/usr/bin/env gxi") + (string-append "#!" abs-srcdir + "/../bin/gxi")))) + '("./gerbil/gxc" "./lang/build.ss" + "./misc/http-perf/build.ss" + "./misc/rpc-perf/build.ss" + "./misc/scripts/docsnarf.ss" + "./misc/scripts/docstub.ss" + "./misc/scripts/docsyms.ss" + "./r7rs-large/build.ss" + "./release.ss" + "./std/build.ss" + "./std/run-tests.ss" + "./std/web/fastcgi-test.ss" + "./std/web/rack-test.ss" + "./tools/build.ss" + "./tutorial/httpd/build.ss" + "./tutorial/kvstore/build.ss" + "./tutorial/lang/build.ss" + "./tutorial/proxy/build-static.ss" + "./tutorial/proxy/build.ss"))))) + (add-after 'configure 'create-gx-version.scm + (lambda _ + (with-output-to-file (string-append (getcwd) + "/gerbil/runtime/gx-version.scm") + (lambda _ + (write `(define (gerbil-version-string) + ,(string-append "v" + #$(version-major+minor + version)))))))) + (replace 'build + (lambda _ + (setenv "HOME" + (getcwd)) + (invoke + ;; The build script needs a tty or it'll crash on an ioctl + ;; trying to find the width of the terminal it's running on. + ;; Calling in script prevents that. + "script" + "-qefc" + "./build.sh"))) + (replace 'install + (lambda _ + (let* ((bin (string-append #$output "/bin")) + (lib (string-append #$output "/lib"))) + (mkdir-p bin) + (mkdir-p lib) + (copy-recursively "../bin" bin) + (copy-recursively "../lib" lib))))) + #:tests? #f)) + (native-inputs (list coreutils gambit-c util-linux)) + (propagated-inputs (list gambit-c openssl sqlite zlib)) (build-system gnu-build-system) (synopsis "Meta-dialect of Scheme with post-modern features") (description -- cgit v1.2.3 From 14e01c54c7eab42bf7ecc5a0d64cc2430d00135a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 9 Apr 2023 20:14:39 +0200 Subject: gnu: emacs-gptel: Update to 0.3.2. * gnu/packages/emacs-xyz.scm (emacs-gptel): Update to 0.3.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4be9170beb..6264d4deea 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -421,7 +421,7 @@ e.g. emacs-geiser-guile for Guile.") (define-public emacs-gptel (package (name "emacs-gptel") - (version "0.3.0") + (version "0.3.2") (source (origin (method git-fetch) (uri (git-reference @@ -430,7 +430,7 @@ e.g. emacs-geiser-guile for Guile.") (file-name (git-file-name name version)) (sha256 (base32 - "1fg3dms7d05zpvkf8kxxh9726qvdfpmfsrgpc9fzm557ai13yhi5")))) + "0g4p0y7bk14ixiz841am2v36fdbwigz77q4zz745m4hviaq3s30y")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 91675f22d3c33ac378eb71b37b27d4e421514d92 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 10 Apr 2023 23:34:11 -0400 Subject: gnu: opendht: Update to 2.5.2. * gnu/packages/networking.scm (opendht): Update to 2.5.2. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 1ba6c5300d..e78811c1e9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3763,7 +3763,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.4.12") + (version "2.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -3772,7 +3772,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (file-name (git-file-name name version)) (sha256 (base32 - "0yji5pziqxfvyfizk3fn9j59bqlfdwfa1a0y9jjfknb2mmlwwb9w")))) + "1lxiblwx3bah9rawarq41kb0c7z7lx4bsh7svkri306kyydd64kb")))) (outputs '("out" "python" "tools" "debug")) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 085a6928bd62c25905fa41be9e014bc5dfcd6377 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 10 Apr 2023 23:38:12 -0400 Subject: Revert "gnu: opendht: Update to 2.5.2." This reverts commit 31534f4e4dd95d65584b4334fae8b9444a369065. It broke libjami. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e78811c1e9..1ba6c5300d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3763,7 +3763,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.5.2") + (version "2.4.12") (source (origin (method git-fetch) (uri (git-reference @@ -3772,7 +3772,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (file-name (git-file-name name version)) (sha256 (base32 - "1lxiblwx3bah9rawarq41kb0c7z7lx4bsh7svkri306kyydd64kb")))) + "0yji5pziqxfvyfizk3fn9j59bqlfdwfa1a0y9jjfknb2mmlwwb9w")))) (outputs '("out" "python" "tools" "debug")) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From f508bc1491673142473970a3df1b251eb2a33e4e Mon Sep 17 00:00:00 2001 From: Felix Lechner Date: Mon, 10 Apr 2023 21:23:11 -0700 Subject: gnu: heimdal: Update to 7.8.0 [fixes CVE-2022-44640]. * gnu/packages/kerberos.scm (heimdal): Update to 7.8.0. [source]: Adjust date in snippet. [native-inputs]: Add python. Remove perl. Signed-off-by: Maxim Cournoyer Modified-by: Maxim Cournoyer --- gnu/packages/kerberos.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 9e2f6acd56..3380131218 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -179,8 +179,6 @@ After installation, the system administrator should generate keys using (sha256 (base32 "0f4dblav859p5hn7b2jdj1akw6d8p32as6bj6zym19kghh3s51zx")) - (patches - (search-patches "heimdal-CVE-2022-45142.patch")) (modules '((guix build utils))) (snippet '(begin @@ -256,8 +254,7 @@ After installation, the system administrator should generate keys using e2fsprogs ;for 'compile_et' flex texinfo - unzip ;for tests - pkg-config + unzip ;for tests python)) (inputs (list readline bash-minimal -- cgit v1.2.3 From 770112f2359eda621fcc32b47bfdd4f985d9c1c1 Mon Sep 17 00:00:00 2001 From: Felix Lechner Date: Mon, 10 Apr 2023 21:23:12 -0700 Subject: gnu: heimdal: Apply patch to fix CVE-2022-45142. Several recent Heimdal releases are affected by the serious vulnerability CVE-2022-45142, which NIST scored as "7.5 HIGH". [1] At the time of writing, the upstream developers had not yet cut any releases post-7.8.0, which is why the patch is being applied here. The patch was extracted from Helmut Grohne's public vulnerability disclosure. [2] [1] https://nvd.nist.gov/vuln/detail/CVE-2022-45142 [2] https://www.openwall.com/lists/oss-security/2023/02/08/1 * gnu/packages/patches/heimdal-CVE-2022-45142.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/kerberos.scm (heimdal)[source]: Apply it. Signed-off-by: Maxim Cournoyer --- gnu/packages/kerberos.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 3380131218..30fa3ca63c 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -179,6 +179,8 @@ After installation, the system administrator should generate keys using (sha256 (base32 "0f4dblav859p5hn7b2jdj1akw6d8p32as6bj6zym19kghh3s51zx")) + (patches + (search-patches "heimdal-CVE-2022-45142.patch")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 76f29dc72dd2a2a2003ea017abf9191daf88170c Mon Sep 17 00:00:00 2001 From: Felix Lechner Date: Mon, 10 Apr 2023 21:23:13 -0700 Subject: gnu: heimdal: Enable OpenLDAP support. * gnu/packages/kerberos.scm (heimdal) [native-inputs]: Add bison, flex and pkg-config. [inputs]: Remove mit-krb5. Add libcap-ng and openldap. Signed-off-by: Maxim Cournoyer Modified-by: Maxim Cournoyer --- gnu/packages/kerberos.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 30fa3ca63c..9e2f6acd56 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -256,7 +256,8 @@ After installation, the system administrator should generate keys using e2fsprogs ;for 'compile_et' flex texinfo - unzip ;for tests + unzip ;for tests + pkg-config python)) (inputs (list readline bash-minimal -- cgit v1.2.3 From e94dcbf3c28588eab25dfa1e017d792c09f68488 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 10 Apr 2023 21:33:41 -0400 Subject: gnu: icecat: Update to 102.10.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2023-1945, CVE-2023-29531, CVE-2023-29532, CVE-2023-29533, CVE-2023-29535, CVE-2023-29536, CVE-2023-29539, CVE-2023-29541, CVE-2023-29542, CVE-2023-29545, CVE-2023-29548, CVE-2023-29550, and MFSA-TMP-2023-0001. * gnu/packages/gnuzilla.scm (%icecat-base-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. Remove the vestigial RENAME_CMD environment variable setting. (icecat-102.9.0-source): New variable. (icedove-source): Use it. --- gnu/packages/gnuzilla.scm | 172 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 171 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ace6662d48..c17ce2719e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1118,6 +1118,176 @@ standards of the IceCat project.") "ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th" "tl" "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW")) +(define icecat-102.9.0-source + (let* ((base-version "102.9.0") + (version "102.9.0-guix0-preview1") + (major-version (first (string-split base-version #\.))) + (minor-version (second (string-split base-version #\.))) + (sub-version (third (string-split base-version #\.))) + + (upstream-firefox-version (string-append base-version "esr")) + (upstream-firefox-source + (origin + (method url-fetch) + (uri (string-append + "https://ftp.mozilla.org/pub/firefox/releases/" + upstream-firefox-version "/source/" + "firefox-" upstream-firefox-version ".source.tar.xz")) + (sha256 + (base32 + "1l8xlbba8sa9dg132k96ch8mz97i5lyhpvkxi8d85jh97xi79c1i")))) + + ;; The upstream-icecat-base-version may be older than the + ;; base-version. + (upstream-icecat-base-version base-version) + (gnuzilla-commit "f55ede39713d1533734f37e39927cbb78abe1604") + (gnuzilla-source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.savannah.gnu.org/gnuzilla.git") + (commit gnuzilla-commit))) + (file-name (git-file-name "gnuzilla" + ;;upstream-icecat-base-version + (string-take gnuzilla-commit 8))) + (sha256 + (base32 + "0z15h3lxfn9pmj5bj62qim3h320dcd2v69xrg1phb7lh5gq0bylf")))) + + ;; 'search-patch' returns either a valid file name or #f, so wrap it + ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. + (makeicecat-patch + (local-file (assume-valid-file-name + (search-patch "icecat-makeicecat.patch"))))) + + (origin + (method computed-origin-method) + (file-name (string-append "icecat-" version ".tar.xz")) + (sha256 #f) + (uri + (delay + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (let ((firefox-dir + (string-append "firefox-" #$base-version)) + (icecat-dir + (string-append "icecat-" #$version))) + + (set-path-environment-variable + "PATH" '("bin") + (list #+python + #+(canonical-package bash) + #+(canonical-package coreutils) + #+(canonical-package findutils) + #+(canonical-package patch) + #+(canonical-package xz) + #+(canonical-package sed) + #+(canonical-package grep) + #+(canonical-package bzip2) + #+(canonical-package gzip) + #+(canonical-package tar))) + + (set-path-environment-variable + "PYTHONPATH" + (list #+(format #f "lib/python~a/site-packages" + (version-major+minor + (package-version python)))) + '#+(cons python-jsonschema + (map second + (package-transitive-propagated-inputs + python-jsonschema)))) + + ;; Needed by the 'makeicecat' script. + (setenv "RENAME_CMD" "rename") + + ;; We copy the gnuzilla source directory because it is + ;; read-only in 'gnuzilla-source', and the makeicecat script + ;; uses "cp -a" to copy parts of it and assumes that the + ;; copies will be writable. + (copy-recursively #+gnuzilla-source "/tmp/gnuzilla" + #:log (%make-void-port "w")) + + (with-directory-excursion "/tmp/gnuzilla" + (make-file-writable "makeicecat") + (invoke "patch" "--force" "--no-backup-if-mismatch" + "-p1" "--input" #+makeicecat-patch) + (patch-shebang "makeicecat") + (substitute* "makeicecat" + (("^readonly FFMAJOR=(.*)" all ffmajor) + (unless (string=? #$major-version + (string-trim-both ffmajor)) + ;; The makeicecat script cannot be expected to work + ;; properly on a different version of Firefox, even if + ;; no errors occur during execution. + (error "makeicecat major version mismatch")) + (string-append "readonly FFMAJOR=" #$major-version "\n")) + (("^readonly FFMINOR=.*") + (string-append "readonly FFMINOR=" #$minor-version "\n")) + (("^readonly FFSUB=.*") + (string-append "readonly FFSUB=" #$sub-version "\n")) + (("^readonly DATADIR=.*") + "readonly DATADIR=/tmp/gnuzilla/data\n") + (("^readonly SOURCEDIR=.*") + (string-append "readonly SOURCEDIR=" icecat-dir "\n")) + (("/bin/sed") + #+(file-append (canonical-package sed) "/bin/sed")))) + + (format #t "Unpacking upstream firefox tarball...~%") + (force-output) + (invoke "tar" "xf" #+upstream-firefox-source) + (rename-file firefox-dir icecat-dir) + + (with-directory-excursion icecat-dir + (format #t "Populating l10n directory...~%") + (force-output) + (mkdir "l10n") + (with-directory-excursion "l10n" + (for-each + (lambda (locale-dir) + (let ((locale + (string-drop (basename locale-dir) + (+ 32 ; length of hash + (string-length "-mozilla-locale-"))))) + (format #t " ~a~%" locale) + (force-output) + (copy-recursively locale-dir locale + #:log (%make-void-port "w")) + (for-each make-file-writable (find-files locale)) + (with-directory-excursion locale + (when (file-exists? ".hgtags") + (delete-file ".hgtags")) + (mkdir-p "browser/chrome/browser/preferences") + (call-with-output-file + "browser/chrome/browser/preferences/advanced-scripts.dtd" + (lambda (port) #f))))) + '#+all-mozilla-locales) + (copy-recursively #+mozilla-compare-locales + "compare-locales" + #:log (%make-void-port "w")) + (delete-file "compare-locales/.gitignore") + (delete-file "compare-locales/.hgignore") + (delete-file "compare-locales/.hgtags"))) + + (format #t "Running makeicecat script...~%") + (force-output) + (invoke "bash" "/tmp/gnuzilla/makeicecat") + + (format #t "Packing IceCat source tarball...~%") + (force-output) + (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args))) + (invoke "tar" "cfa" #$output + ;; Avoid non-determinism in the archive. We set the + ;; mtime of files in the archive to early 1980 because + ;; the build process fails if the mtime of source + ;; files is pre-1980, due to the creation of zip + ;; archives. + "--mtime=@315619200" ; 1980-01-02 UTC + "--owner=root:0" + "--group=root:0" + "--sort=name" + icecat-dir))))))))) + (define %icedove-build-id "20230411000000") ;must be of the form YYYYMMDDhhmmss (define %icedove-version "102.10.0") @@ -1193,7 +1363,7 @@ list of languages supported as well as the currently used changeset." ;; Extract the base Icecat tarball, renaming its top-level ;; directory. (invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",") - "-xf" #$icecat-source) + "-xf" #$icecat-102.9.0-source) (chdir #$name) ;; Merge the Thunderdbird localization data. -- cgit v1.2.3 From 2dadc917bbe572008aec49d8762590b2221c477e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 09:12:54 -0400 Subject: gnu: python-pyftpdlib: Update to 1.5.7. * gnu/packages/python-xyz.scm (python-pyftpdlib): Update to 1.5.7. --- gnu/packages/python-xyz.scm | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d1c76226c2..622c44df5b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12164,36 +12164,17 @@ the @code{sendfile(2)} system call.") (define-public python-pyftpdlib (package (name "python-pyftpdlib") - (version "1.5.6") + (version "1.5.7") (source (origin (method url-fetch) (uri (pypi-uri "pyftpdlib" version)) (sha256 - (base32 "0pnv2byzmzg84q5nmmhn1xafvfil85qa5y52bj455br93zc5b9px")))) - (build-system python-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke - "pytest" - ;; Deselect failing tests. - "-k" (string-append - ;; Using Pytest instead of the Makefile causes the - ;; command line tests to fail on unknown Pytest - ;; arguments. - "not TestCommandLineParser " - ;; https://github.com/giampaolo/pyftpdlib/issues/478 - "and not test_use_gmt_times " - ;; https://github.com/giampaolo/pyftpdlib/issues/550 - "and not test_masquerade_address " - ;; https://github.com/giampaolo/pyftpdlib/issues/500 - "and not test_rest_on_stor " - "and not test_stor_ascii")))))))) + (base32 "0vk5gcx4svjrpm014ykwxmijqihgb4ha17kb3yphk0nv6x0wx8vy")))) + (build-system pyproject-build-system) + ;; Using Pytest instead of the Makefile causes the command line tests to + ;; fail on unknown Pytest arguments. + (arguments (list #:test-flags #~(list "-k" "not TestCommandLineParser"))) (native-inputs (list python-psutil python-pytest)) (propagated-inputs (list python-pyopenssl python-pysendfile)) (home-page "https://github.com/giampaolo/pyftpdlib/") -- cgit v1.2.3 From 40f42329dc792242df35e67e5b59d659a11243fa Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 09:59:27 -0400 Subject: gnu: python-fontmath: Update to 0.9.3. * gnu/packages/fontutils.scm (python-fontmath): Update to 0.9.3. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 5638560b9e..4118b1e8b5 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -482,13 +482,13 @@ to generate OpenType font binaries from Unified Font Objects (UFOs).") (define-public python-fontmath (package (name "python-fontmath") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) (uri (pypi-uri "fontMath" version ".zip")) (sha256 - (base32 "014407hpvqdx123g06i664qrfq86bf9l621x7jllpgqw3rqir2sc")))) + (base32 "070v1jz5f18g15if459ppwswq4w5hzffwp1gvdc5j47bgz5qflva")))) (build-system python-build-system) (propagated-inputs (list python-fonttools)) (native-inputs -- cgit v1.2.3 From 6b1f3247492d64f59cfbec4b5089b1e4ba6b6781 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 10:24:56 -0400 Subject: gnu: python-fonttools-next: Update to 4.39.3. * gnu/packages/python-xyz.scm (python-fonttools-next): Update to 4.39.3. (python-fonttools-full) [arguments]: Skip the MtiTest suite in the check phase override. --- gnu/packages/python-xyz.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 622c44df5b..e07922e1b6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12283,7 +12283,12 @@ from an XML-based format.") "test_read_fontdimens_mathex" "test_read_fontdimens_vanilla" "test_read_boundary_char" - "fontTools.tfmLib") + "fontTools.tfmLib" + ;; The MtiTest tests fail for unknown + ;; reasons (see: + ;; https://github.com/fonttools/ + ;; fonttools/issues/3078) + "MtiTest") " and not ")))))))))) (native-inputs (modify-inputs (package-native-inputs python-fonttools) @@ -12301,14 +12306,14 @@ from an XML-based format.") (define-public python-fonttools-next (package (inherit python-fonttools-full) - (version "4.37.1") + (version "4.39.3") (source (origin (inherit (package-source python-fonttools-full)) (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "1ryc1wca2v92wn24baryj5fr32lspl8rbsig32fnkxp1islf21j6")))))) + "1msibi5cmi5znykkg66dq7xshl07lkqjxhrz5hcipqvlggsvjd4j")))))) (define-public python-ly (package -- cgit v1.2.3 From 2e83aba8cd67bc43de4841f4e3a3644c759af04e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 09:55:49 -0400 Subject: gnu: python-afdko: Update to 3.9.4. * gnu/packages/fontutils.scm (python-afdko): Update to 3.9.4. [source]: Remove patch. [arguments]: Disable a few extra tests in the check phase override. Delete use-system-libxml2 phase. Update patch-problematic-requirements phase. * gnu/packages/patches/python-afdko-suppress-copyright-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - gnu/packages/fontutils.scm | 34 +++++++++------------- .../python-afdko-suppress-copyright-test.patch | 20 ------------- 3 files changed, 13 insertions(+), 42 deletions(-) delete mode 100644 gnu/packages/patches/python-afdko-suppress-copyright-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index eeb26d34d0..0849d32276 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1734,7 +1734,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-3-hurd-configure.patch \ %D%/packages/patches/python-3-no-static-lib.patch \ - %D%/packages/patches/python-afdko-suppress-copyright-test.patch \ %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-cross-compile.patch \ diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 4118b1e8b5..6ff8daa06f 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2019, 2020, 2022 Marius Bakke ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2020, 2021 Nicolas Goaziou -;;; Copyright © 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Felipe Balbi ;;; @@ -139,14 +139,13 @@ them as it goes.") (define-public python-afdko (package (name "python-afdko") - (version "3.9.1") + (version "3.9.4") (source (origin (method url-fetch) (uri (pypi-uri "afdko" version)) (sha256 - (base32 "0k1204vykgx32saa495s1lgmz1dixcp8bjiv486imx77killvm02")) - (patches (search-patches "python-afdko-suppress-copyright-test.patch")) + (base32 "1d3b1590gxlindh1sjhwvxnryn5zil98hgdwbgsr76fd657r3f99")) (modules '((guix build utils))) (snippet #~(begin @@ -172,27 +171,13 @@ them as it goes.") (substitute* "CMakeLists.txt" (("CMAKE_CXX_STANDARD 11") "CMAKE_CXX_STANDARD 17")))) - (add-after 'unpack 'use-system-libxml2 - (lambda _ - ;; XXX: These horrifying substitutions revert this upstream - ;; PR: . - ;; Hopefully it's only temporary..! - (substitute* (find-files "." "^CMakeLists.txt$") - (("\\(\\(NOT \\$\\{LibXml2_FOUND\\}\\) OR \ -\"\\$\\{CMAKE_SYSTEM\\}\" MATCHES \"Linux\"\\)") - "(NOT ${LibXml2_FOUND})") - (("\\(\\(\\$\\{LibXml2_FOUND\\}\\) AND \ -\\(NOT \"\\$\\{CMAKE_SYSTEM\\}\" MATCHES \"Linux\"\\)\\)") - "(${LibXml2_FOUND})")) - (substitute* "cmake/ExternalLibXML2.cmake" - (("set\\(LIBXML2_STATIC_INCLUDE_DIR") - "set(LIBXML2_INCLUDE_DIR)")))) (add-after 'unpack 'patch-problematic-requirements (lambda _ (substitute* "requirements.txt" ;; Remove lxml because the version requested here is different ;; than the one propagated by the python-fonttools package. - (("^lxml==.*") "")))) + (("^lxml==.*") "") + (("<=4.38.0") ">=4.38.0")))) (add-after 'unpack 'patch-setup.py (lambda _ ;; There is no use for Python-provided CMake nor Ninja binaries. @@ -232,7 +217,14 @@ them as it goes.") (number->string (parallel-job-count)) ;; This test is known to fail on multiple architectures. ;; https://github.com/adobe-type-tools/afdko/issues/1163 - "-k not test_type1mm_inputs")))) + "-k" + (string-append + "not test_type1mm_inputs " + ;; These tests fail for unknown reasons (see: + ;; https://github.com/adobe-type-tools/afdko/issues/1635). + "and not test_rvrn_vf " + "and not test_cjk_vf " + "and not test_sparse_cjk_vf"))))) (add-after 'check 'wrap (assoc-ref %standard-phases 'wrap)) (add-before 'wrap 'wrap-PATH diff --git a/gnu/packages/patches/python-afdko-suppress-copyright-test.patch b/gnu/packages/patches/python-afdko-suppress-copyright-test.patch deleted file mode 100644 index 94cd73d5f7..0000000000 --- a/gnu/packages/patches/python-afdko-suppress-copyright-test.patch +++ /dev/null @@ -1,20 +0,0 @@ -Supress copyright check in tests which can differ based on current year. - - https://github.com/adobe-type-tools/afdko/issues/1589 - -Adapted from upstream: - - https://github.com/adobe-type-tools/afdko/commit/feebd77d9b6507a0b32f837535511be3c94d9c6f - -diff --git a/tests/tx_test.py b/tests/tx_test.py ---- a/tests/tx_test.py -+++ b/tests/tx_test.py -@@ -1246,7 +1246,7 @@ def test_ufo_fontinfo_parsing(file, msg, ret_code): - if (ret_code == 0): - expected_path = generate_ps_dump(expected_path) - output_path = generate_ps_dump(output_path) -- assert differ([expected_path, output_path]) -+ assert differ([expected_path, output_path, '-s'] + PFA_SKIP) - else: - arg = [TOOL, '-t1', '-f', ufo_input_path] - assert subprocess.call(arg) == 6 -- cgit v1.2.3 From ec8df31ebf30228bb4324cdcdd2cc36f48949e58 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 09:50:58 -0400 Subject: gnu: python-statmake: Update to 0.6.0. * gnu/packages/fontutils.scm (python-statmake): Update to 0.6.0. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 6ff8daa06f..d55de1cbda 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -1546,7 +1546,7 @@ generate bitmaps.") (define-public python-statmake (package (name "python-statmake") - (version "0.5.1") + (version "0.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -1555,7 +1555,7 @@ generate bitmaps.") (file-name (git-file-name name version)) (sha256 (base32 - "0qavzspxhwnaayj5mxq6ncjjziggabxj157ls04h2rdrpq167706")))) + "1k6fkzyhsfkgi599sb017wzf4jzbnp5wjg1kla1b33vgjpa7n5nw")))) (build-system pyproject-build-system) (arguments (list -- cgit v1.2.3 From b64add6ff6e64f39bb79b8ce3715752ee0550ee1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 09:51:42 -0400 Subject: gnu: python-ufo2ft: Update to 2.31.0. * gnu/packages/fontutils.scm (python-ufo2ft): Update to 2.31.0. [build-system]: Use pyproject-build-system. [arguments]: Delete field. --- gnu/packages/fontutils.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index d55de1cbda..af9405f2e4 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -436,23 +436,15 @@ converts any cubic curves to quadratic. The most useful function is probably (define-public python-ufo2ft (package (name "python-ufo2ft") - (version "2.28.0") + (version "2.31.0") (source (origin (method url-fetch) (uri (pypi-uri "ufo2ft" version)) (sha256 - (base32 "068hm62s1iphyg66w96vgiif6ahpcsaf8fr44rk6jdf71f6fyqd5")))) - (build-system python-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv"))))))) - (native-inputs - (list python-pytest python-setuptools-scm)) + (base32 "1rg2997af8blvswlwif0kpz2vxrlh555gzqslz6yv9y7i7v8lphl")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-setuptools-scm)) (propagated-inputs (list python-booleanoperations python-cffsubr -- cgit v1.2.3 From 47eca058bc55a6bac289209321744928a2de502a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 10:53:52 -0400 Subject: gnu: python-lz4: Update to 4.3.2. * gnu/packages/python-compression.scm (python-lz4): Update to 4.3.2. --- gnu/packages/python-compression.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index c483d68b5f..ec96b6197e 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -342,20 +342,18 @@ Python strings.") (define-public python-lz4 (package (name "python-lz4") - (version "4.0.2") + (version "4.3.2") (source (origin (method url-fetch) (uri (pypi-uri "lz4" version)) (sha256 (base32 - "16vj2bnhhdkcz2a2ai2mx2kf9ngx1cjr18636yp1514kq9r72fq8")) + "1nmc36j5xnk7mvwwpm0nb1sddjk5iv77h877fdkkxcngm621shz1")) (modules '((guix build utils))) - (snippet - '(begin - ;; Remove bundled copy of lz4. - (delete-file-recursively "lz4libs") - #t)))) + (snippet '(begin + ;; Remove bundled copy of lz4. + (delete-file-recursively "lz4libs"))))) (build-system python-build-system) (arguments (list #:phases -- cgit v1.2.3 From 294ff50d643ed17ace4021f1c7ebd22b506751bc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 10:53:52 -0400 Subject: gnu: python-zopfli: Update to 0.2.2. * gnu/packages/python-compression.scm (python-zopfli): Update to 0.2.2. --- gnu/packages/python-compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index ec96b6197e..f3530e5230 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -508,13 +508,13 @@ wrapper. It provides a backport of the @code{Path} object.") (define-public python-zopfli (package (name "python-zopfli") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (pypi-uri "zopfli" version ".zip")) (sha256 - (base32 "1ipjkcgdbplsrhr31ypk48px8cax4cm9gcjj7yrcrhg20ql3s9p5")))) + (base32 "1z1akqx3fjnwa75insch9p08hafikqdvqkj6mxv1k6fr81sxnj9d")))) (build-system python-build-system) (arguments (list -- cgit v1.2.3 From b61b12c4c0efc51ad290f4f3675668e2dd371422 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 10:53:52 -0400 Subject: gnu: python-unicodedata2: Update to 15.0.0. * gnu/packages/python-xyz.scm (python-unicodedata2): Update to 15.0.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e07922e1b6..f39949b059 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15734,13 +15734,13 @@ expression.") (define-public python-unicodedata2 (package (name "python-unicodedata2") - (version "14.0.0") + (version "15.0.0") (source (origin (method url-fetch) (uri (pypi-uri "unicodedata2" version)) (sha256 - (base32 "110nnvh02ssp92xbmswy39aa186jrmb7m41x4220wigl8c0dzxs1")))) + (base32 "0bcgls7m2zndpd8whgznnd5908jbsa50si2bh88wsn0agcznhv7d")))) (build-system python-build-system) (home-page "https://github.com/fonttools/unicodedata2") (synopsis "Python unicodedata backport") -- cgit v1.2.3 From c4daf1acaff3abb3eb61cba45e4af2cde80b4e35 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 11:14:33 -0400 Subject: gnu: python-fontparts-bootstrap: Update to 0.11.0. * gnu/packages/fontutils.scm (python-fontparts-bootstrap): Update to 0.11.0. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index af9405f2e4..36e72e8439 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -539,13 +539,13 @@ implementing the pen protocol for manipulating glyphs.") (hidden-package (package (name "python-fontparts-bootstrap") - (version "0.10.8") + (version "0.11.0") (source (origin (method url-fetch) (uri (pypi-uri "fontParts" version ".zip")) (sha256 - (base32 "0i5ww6yl9m74wnjd7gyvjkdh7m56haql4gv7lasmppdipay2209g")))) + (base32 "0j4h8hszky639gmfy1avmw670y80ya49kca8yc635h5ihl0c3v8x")))) (build-system python-build-system) (propagated-inputs (list python-booleanoperations -- cgit v1.2.3 From efeb08a3a65dfbf847ee8233e960fdbf19598caf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 11:14:52 -0400 Subject: gnu: psautohint: Disable a failing test. * gnu/packages/fontutils.scm (psautohint) [build-system]: Use pyproject-build-system. [arguments]: Remove check phase override. Add #:test-flags, disabling a new test. --- gnu/packages/fontutils.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 36e72e8439..829da7c9d9 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -738,9 +738,12 @@ suite of the @code{psautohint} package.") (uri (pypi-uri "psautohint" version)) (sha256 (base32 "0zzz7hy1kkkjfrrm9ly2di3xv2x1ywdqhbyqy21k670jysldw3nm")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list + ;; The CJKSparseVar.subset.hinted.otf test fails with slightly different + ;; output caused by the newer fonttools version used in Guix. + #:test-flags #~(list "-k" "not CJKSparseVar.subset.hinted.otf") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-font-data @@ -750,11 +753,7 @@ suite of the @code{psautohint} package.") #$(this-package-native-input "psautohint-font-data") "tests/integration/data") (for-each make-file-writable - (find-files "tests/integration/data")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv"))))))) + (find-files "tests/integration/data"))))))) (propagated-inputs (list python-fonttools-next)) (native-inputs (list psautohint-font-data -- cgit v1.2.3 From f44b9511c7d0d2e12735d04fb822cf008f1798e9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 12:17:41 -0400 Subject: gnu: font-abattis-cantarell: Update to 0.303-0.e049149. * gnu/packages/fonts.scm (font-abattis-cantarell): Update to 0.303-0.e049149. [native-inputs]: Remove python-statmake. --- gnu/packages/fonts.scm | 60 +++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 6ef3cd8b07..4aa143a29d 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -260,37 +260,41 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.") (license license:cc0))) (define-public font-abattis-cantarell - (package - (name "font-abattis-cantarell") - (version "0.303") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.gnome.org/GNOME/cantarell-fonts") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1d1ay0fdqchk0wa5yqxis2c98imvzsbbd2kjv0x8sk4fm419847b")))) - (build-system meson-build-system) - (arguments - (list #:configure-flags #~(list "-Dbuildstatics=true"))) - (native-inputs - (list gettext-minimal - psautohint - python - python-cffsubr - python-fontmath - python-statmake - python-ufo2ft)) - (home-page "https://wiki.gnome.org/Projects/CantarellFonts") - (synopsis "Cantarell sans-serif typeface") - (description "The Cantarell font family is a contemporary Humanist + ;; Use the latest commit, as the last released version, 0.303, has problems + ;; with the newer statmake. The dependency has been removed in the latest + ;; code base. + (let ((commit "e049149faf0c15b0711e8d790e2333be923f0486") + (revision "0")) + (package + (name "font-abattis-cantarell") + (version (git-version "0.303" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/cantarell-fonts") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "032csq99bkmmgh9mmmbrgg4fzxgkcsvxv4wy595qms72mmlgmcc7")))) + (build-system meson-build-system) + (arguments + (list #:configure-flags #~(list "-Dbuildstatics=true"))) + (native-inputs + (list gettext-minimal + psautohint + python + python-cffsubr + python-fontmath + python-ufo2ft)) + (home-page "https://wiki.gnome.org/Projects/CantarellFonts") + (synopsis "Cantarell sans-serif typeface") + (description "The Cantarell font family is a contemporary Humanist sans-serif designed for on-screen reading. It is used by GNOME@tie{}3. This package contains both the non-variable as well as the variable versions of the font.") - (license license:silofl1.1))) + (license license:silofl1.1)))) (define-public font-lato (package -- cgit v1.2.3 From 6d00578e72e594eb6e744da76f41b3b3abccac68 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 12:52:00 -0400 Subject: gnu: python-afdko: Add bash-minimal to inputs. * gnu/packages/fontutils.scm (python-afdko) [inputs]: Add bash-minimal. --- gnu/packages/fontutils.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 829da7c9d9..579a4d4ba7 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -249,7 +249,8 @@ them as it goes.") python-setuptools-scm python-wheel)) (inputs - (list java-antlr4-runtime-cpp + (list bash-minimal + java-antlr4-runtime-cpp libxml2 `(,util-linux "lib"))) (propagated-inputs -- cgit v1.2.3 From 22a79d01377cc574590aa331a0871444f04a52d2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Apr 2023 14:19:24 -0400 Subject: gnu: Add missing import in (gnu packages fontutils). This was erroneously not committed as part of 83397434b1. * gnu/packages/fontutils.scm: Add missing import. --- gnu/packages/fontutils.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 579a4d4ba7..fd1784a7e9 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -34,6 +34,7 @@ (define-module (gnu packages fontutils) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages compression) -- cgit v1.2.3 From a8c283ce69ac07eea956c01676bade05f81f6cf1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 13 Apr 2023 15:34:17 -0400 Subject: gnu: xsettingsd: Use cmake-build-system. * gnu/packages/xdisorg.scm (xsettingsd) [build-system]: Use cmake-build-system. [arguments]: Remove #:scons and #:scons-flags arguments. Add #:configure-flags argument. Remove patch-sconstruct and install phases. Add disable-problematic-tests phase. [native-inputs]: Remove googletest-source; drop labels. --- gnu/packages/xdisorg.scm | 59 +++++++++++------------------------------------- 1 file changed, 13 insertions(+), 46 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 7af926f0fa..31770ac2ba 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -42,7 +42,7 @@ ;;; Copyright © 2020 James Smith ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021, 2022 Nicolas Goaziou ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Renzo Poddighe @@ -2814,52 +2814,19 @@ Xwrits hides itself until you should take another break.") (file-name (git-file-name name version)) (sha256 (base32 "14gnkz18dipsa2v24f4nm9syxaa7g21iqjm7y65jn849ka2jr1h8")))) - (build-system scons-build-system) - (inputs - (list libx11)) - (native-inputs - `(("pkg-config" ,pkg-config) - ("googletest" ,googletest) - ("googletest-source" ,(package-source googletest)))) + (build-system cmake-build-system) (arguments - `(#:scons ,scons-python2 - #:scons-flags - (list ,(string-append "CC=" (cc-for-target))) - #:phases - (modify-phases %standard-phases - (add-before 'build 'patch-sconstruct - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "SConstruct" - ;; scons doesn't pick up environment variables automatically - ;; so it needs help to find path variables - (("env = Environment\\(") - "env = Environment( - ENV = { - 'PATH': os.environ['PATH'], - 'CPATH': os.environ['C_INCLUDE_PATH'], - 'LIBRARY_PATH': os.environ['LIBRARY_PATH'], - 'PKG_CONFIG_PATH': os.environ['PKG_CONFIG_PATH'] - },") - ;; Update path to gtest source files used in tests - (("/usr/src/gtest") (string-append - (assoc-ref inputs "googletest-source") - "/googletest")) - ;; Exclude one warning that causes a build error - (("-Werror") "-Werror -Wno-error=sign-compare")) - #t)) - ;; The SConstruct script doesn't configure installation so - ;; binaries must be copied to the output path directly - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (man (string-append out "/share/man/man1"))) - (mkdir-p bin) - (install-file "xsettingsd" bin) - (install-file "dump_xsettings" bin) - (install-file "xsettingsd.1" man) - (install-file "dump_xsettings.1" man) - #t)))))) + (list #:configure-flags #~(list "-DBUILD_TESTING=ON") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'disable-problematic-tests + (lambda _ + (substitute* "config_parser_test.cc" + ;; This test fails for unknown reasons (see: + ;; https://github.com/derat/xsettingsd/issues/30). + (("TEST\\(CharStreamTest, Basic") + "TEST(CharStreamTest, DISABLED_Basic"))))))) + (inputs (list libx11)) + (native-inputs (list pkg-config googletest)) (home-page "https://github.com/derat/xsettingsd") (synopsis "Xorg settings daemon") (description "@command{xsettingsd} is a lightweight daemon that provides settings to -- cgit v1.2.3 From 4116b7a9f56014b2cf9c999df1188f82f21ef947 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 13 Apr 2023 15:41:55 -0400 Subject: gnu: telepathy-idle: Update to 0.2.2-0.b516eab. * gnu/packages/freedesktop.scm (telepathy-idle): Update to 0.2.2-0.b516eab. [inputs]: Replace python-2 with python-wrapper, python2-dbus with python-dbus. --- gnu/packages/freedesktop.scm | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a0ce0c2b25..362c6b308b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1933,32 +1933,32 @@ different sorts of messages in different formats.") (license license:lgpl2.1+))) (define-public telepathy-idle - (package - (name "telepathy-idle") - (version "0.2.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/TelepathyIM/telepathy-idle") - (commit (string-append "telepathy-idle-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1pfw4g2cicw3ykxhsy743r0fc1yqbdrqxh2c5ha6am19dajcr95l")))) - (build-system gnu-build-system) - (native-inputs - (list autoconf automake libtool pkg-config)) - (inputs - (list libxslt python-2 python2-dbus)) - (propagated-inputs - (list telepathy-glib)) - (home-page "https://telepathy.freedesktop.org/") - (synopsis "Telepathy IRC connection manager") - (description - "Idle is an IRC connection manager for the Telepathy framework. This + ;; Use the latest commit, as the latest release does not support Python 3. + (let ((commit "b516eab0f2b92e078e0f5cab4224214d215b2ea5") + (revision "0")) + (package + (name "telepathy-idle") + (version (git-version "0.2.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelepathyIM/telepathy-idle") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02wb61h2k3hhis5y2xi5rhc6pmikd13x722hk620sqb9b3m5pn3s")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake libtool pkg-config)) + (inputs (list libxslt python-wrapper python-dbus)) + (propagated-inputs (list telepathy-glib)) + (home-page "https://telepathy.freedesktop.org/") + (synopsis "Telepathy IRC connection manager") + (description + "Idle is an IRC connection manager for the Telepathy framework. This package enables usage of IRC channels and private messages in Telepathy instant messaging clients such as Empathy, GNOME Shell or KDE Telepathy.") - (license (list license:lgpl2.1 license:lgpl2.1+)))) + (license (list license:lgpl2.1 license:lgpl2.1+))))) (define-public telepathy-mission-control (package -- cgit v1.2.3 From fc5dd35b071a540478074dd326ec4143e1521073 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 13 Apr 2023 23:45:41 -0400 Subject: gnu: ansible-core: Update to 2.14.4. * gnu/packages/admin.scm (ansible-core): Update to 2.14.4. [arguments]: Add skip-controller-tests phase. Update preserve-pythonpath and check phases. Honor parallel-job-count in check phase. --- gnu/packages/admin.scm | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b06450216d..b8bb97c74a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -35,7 +35,7 @@ ;;; Copyright © 2020, 2021, 2022 Michael Rohleder ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Morgan Smith -;;; Copyright © 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 qblade @@ -2795,13 +2795,13 @@ specified directories.") (define-public ansible-core (package (name "ansible-core") - (version "2.11.6") + (version "2.14.4") (source (origin (method url-fetch) (uri (pypi-uri "ansible-core" version)) (sha256 - (base32 "0fih7nxszni8imi5sywsifd976v77ydhip43pzg7dd65qy1h5mck")))) + (base32 "057g87smxcn6zc558xk4zr6ga4q8clmkyxghn5gx60a94sy61clh")))) (build-system python-build-system) (arguments `(#:modules ((guix build python-build-system) @@ -2837,10 +2837,25 @@ sys.argv[0] = re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0]) (and (eq? 'symlink (stat:type (lstat x))) (string-prefix? "ansible-" x) (string=? "ansible" (readlink x))))))))) + (add-after 'unpack 'skip-controller-tests + (lambda _ + ;; XXX: This disables all the controller tests, which fail for + ;; unknown reasons, seemingly while attempting to set the + ;; locale to en_US.UTF-8. + (substitute* "test/lib/ansible_test/_internal/commands\ +/units/__init__.py" + (("^ if test_context == TestContext.controller:.*" + all) + (string-append all " continue\n"))))) (add-after 'unpack 'preserve-pythonpath (lambda _ (substitute* "test/lib/ansible_test/_internal/ansible_util.py" (("PYTHONPATH=get_ansible_python_path\\(args\\)" all) + (string-append all "+ ':' + os.environ['GUIX_PYTHONPATH']"))) + (substitute* "test/lib/ansible_test/_internal/commands\ +/units/__init__.py" + (("PYTHONPATH=get_units_ansible_python_path\\(args, \ +test_context)" all) (string-append all "+ ':' + os.environ['GUIX_PYTHONPATH']"))))) (add-after 'unpack 'patch-paths (lambda* (#:key inputs outputs #:allow-other-keys) @@ -2852,18 +2867,10 @@ sys.argv[0] = re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0]) (("/usr/bin/python") (which "python"))))) (replace 'check - ;; The environment for the test suite can be tricky to get right. - ;; The environment used for Ansible's CI defined in the following - ;; Dockerfile can be used as a reference: - ;; https://raw.githubusercontent.com/ansible/ - ;; default-test-container/master/Dockerfile. (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? ;; Otherwise Ansible fails to create its config directory. (setenv "HOME" "/tmp") - (setenv "PATH" (string-append (getenv "PATH") ":" - (assoc-ref outputs "out") "/bin")) - (add-installed-pythonpath inputs outputs) ;; This test module messes up with sys.path and causes many ;; test failures. (delete-file "test/units/_vendor/test_vendor.py") @@ -2872,11 +2879,23 @@ sys.argv[0] = re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0]) (delete-file "test/units/utils/test_display.py") ;; This test fail for reasons unknown. (delete-file "test/units/cli/test_adhoc.py") + ;; These tests fail in the container; it appears that the + ;; mocking of the absolute file names such as /usr/bin/svcs do + ;; not work as intended there. + (delete-file "test/units/modules/test_iptables.py") + (delete-file "test/units/modules/test_service.py") + ;; These tests fail with a "unsupported locale setting" error + ;; when invoking 'locale.setlocale(locale.LC_ALL, '')' + (delete-file "test/units/module_utils/basic/\ +test_command_nonexisting.py") + (delete-file "test/units/module_utils/basic/test_tmpdir.py") ;; The test suite needs to be run with 'ansible-test', which ;; does some extra environment setup. Taken from ;; https://raw.githubusercontent.com/ansible/ansible/\ ;; devel/test/utils/shippable/shippable.sh. - (invoke "ansible-test" "units" "-v"))))))) + (invoke "ansible-test" "units" "-v" + "--num-workers" (number->string + (parallel-job-count))))))))) (native-inputs (list openssh openssl @@ -2894,7 +2913,7 @@ sys.argv[0] = re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0]) (list python-cryptography python-jinja2 python-pyyaml - python-packaging ;for version number parsing + python-packaging ;for version number parsing python-resolvelib-0.5)) (home-page "https://www.ansible.com/") (synopsis "Radically simple IT automation") -- cgit v1.2.3 From 0ced35ce405c57bfc6b090f75ee1ea39e7546a37 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 13 Apr 2023 23:50:33 -0400 Subject: gnu: ansible: Update to 7.4.0. * gnu/packages/admin.scm (ansible): Update to 7.4.0. --- gnu/packages/admin.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b8bb97c74a..1c2b2122ce 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2941,16 +2941,15 @@ provides the following commands: (define-public ansible (package (name "ansible") - (version "4.7.0") + (version "7.4.0") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "0aab9id6dqfw2111r731c7y1p77dpzczynmgl4d989p3a7n54z0b")))) + (base32 "142barhwz0wx5kn74xi0bfl21iwq2yq3jp14kxajsg9nggndcr09")))) (build-system python-build-system) - (propagated-inputs - (list ansible-core)) + (propagated-inputs (list ansible-core)) ;; The Ansible collections are found by ansible-core via the Python search ;; path; the following search path ensures that they are found even when ;; Python is not present in the profile. -- cgit v1.2.3 From 4bbd0f8c7ad304c52308cf6387acfab2bd12425b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 14 Apr 2023 08:21:14 -0400 Subject: Revert "gnu: python-h5py: Update to 3.8.0." This reverts commit a1c60ae50ee1124bfd20922368d1c48a4a672cd5. It should use hdf5-1.14, but the default one is still at hdf5-1.10. It also broke diffoscope. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f39949b059..0147870b06 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1863,14 +1863,14 @@ library.") (define-public python-h5py (package (name "python-h5py") - (version "3.8.0") + (version "3.6.0") (source (origin (method url-fetch) (uri (pypi-uri "h5py" version)) (sha256 (base32 - "0pyr6z4h2xqbp49yx2i1401gl6yqh03h771zslwcy0201hpxiskg")))) + "0afv805vqrm5071g7alwv41920nhh8kjv4m5nbia9awj9a0x4ll7")))) (build-system python-build-system) (arguments `(#:tests? #f ; no test target -- cgit v1.2.3 From a4e80883bb9777d0f70ec2ddefb14c00b7a799a5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 13 Apr 2023 12:14:15 -0400 Subject: gnu: linux-libre: Update to 6.2.11. * gnu/packages/linux.scm (linux-libre-6.2-version): Update to 6.2.11. (linux-libre-6.2-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 80443fc43b..33f90a7bff 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -484,7 +484,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-6.2-version "6.2.10") +(define-public linux-libre-6.2-version "6.2.11") (define-public linux-libre-6.2-gnu-revision "gnu") (define deblob-scripts-6.2 (linux-libre-deblob-scripts @@ -494,7 +494,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0ir5vvbdh6dly5ld8mfp7285g8k88w5bb32hj4wmgyqsbfqc6rf2"))) (define-public linux-libre-6.2-pristine-source (let ((version linux-libre-6.2-version) - (hash (base32 "1zm4xvxdy6sqqwcich46mr4dh3kpmp40bawwahrg4lr7rp1n5iap"))) + (hash (base32 "0iyx03z58pv1d5nrryjx94k3nxwyvm4b3bim6nawg1qbws26f8qd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.2))) -- cgit v1.2.3 From be823fa8fb6bcb0aaff6b270d0219cda196a8cbb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 13 Apr 2023 12:14:37 -0400 Subject: gnu: linux-libre 6.1: Update to 6.1.24. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.24. (linux-libre-6.1-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 33f90a7bff..ef07e271ec 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -499,7 +499,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-6.2))) -(define-public linux-libre-6.1-version "6.1.23") +(define-public linux-libre-6.1-version "6.1.24") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts @@ -509,7 +509,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0cchdhjra74zanyk14brv2l2dvxpg8dn58rn477lgfb44mcnhq33"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "1szblfmm8gx0am017y30ywc60b1gqarplgmcs5zy7bshhwp3fn3l"))) + (hash (base32 "0135aj8asplpxqr48hwdmwynx8n8hzhdgh55yl8r0n1kivisgrma"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -- cgit v1.2.3 From 7c7853d269fe53271dd35d5bd941d18a2cb55120 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 13 Apr 2023 12:14:55 -0400 Subject: gnu: linux-libre 5.15: Update to 5.15.107. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.107. (linux-libre-5.15-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ef07e271ec..36b35448cc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -517,7 +517,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.106") +(define-public linux-libre-5.15-version "5.15.107") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -527,7 +527,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "03hwhwbcicwyx5i30d6m715kwgrxz4h21xhk55wnawlk8zhx3r35"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "1r4g7ipcmj7k9dpwd5p2kd0f3iidnzl6z9g2cq4mfcw0h97r7rl4"))) + (hash (base32 "1a5gqpxmzls5mp4a0cw10ldrps4pvbn19nzfri91ys25j1v0wdqr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit v1.2.3 From 2d25ea429c359d14955ee44baeeb5778cc56cc7d Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sun, 16 Apr 2023 11:16:56 +0200 Subject: Revert "gnu: icecat: Update to 102.10.0-guix0-preview1 [security fixes]." This reverts commit e94dcbf3c28588eab25dfa1e017d792c09f68488. "gnu: icecat: Update to 102.10.0-guix0-preview1 [security fixes]." was already pushed as 3ab983d630a95a29b9418b1ba8a26e5ca2836ec0. And the `icecat-102.9.0-source` was removed in "gnu: icedove: Update to 102.10.0 [security fixes]." a741b554cb66cd053a130b8b5b5926a30bec9d48. --- gnu/packages/gnuzilla.scm | 172 +--------------------------------------------- 1 file changed, 1 insertion(+), 171 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index c17ce2719e..ace6662d48 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1118,176 +1118,6 @@ standards of the IceCat project.") "ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th" "tl" "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW")) -(define icecat-102.9.0-source - (let* ((base-version "102.9.0") - (version "102.9.0-guix0-preview1") - (major-version (first (string-split base-version #\.))) - (minor-version (second (string-split base-version #\.))) - (sub-version (third (string-split base-version #\.))) - - (upstream-firefox-version (string-append base-version "esr")) - (upstream-firefox-source - (origin - (method url-fetch) - (uri (string-append - "https://ftp.mozilla.org/pub/firefox/releases/" - upstream-firefox-version "/source/" - "firefox-" upstream-firefox-version ".source.tar.xz")) - (sha256 - (base32 - "1l8xlbba8sa9dg132k96ch8mz97i5lyhpvkxi8d85jh97xi79c1i")))) - - ;; The upstream-icecat-base-version may be older than the - ;; base-version. - (upstream-icecat-base-version base-version) - (gnuzilla-commit "f55ede39713d1533734f37e39927cbb78abe1604") - (gnuzilla-source - (origin - (method git-fetch) - (uri (git-reference - (url "git://git.savannah.gnu.org/gnuzilla.git") - (commit gnuzilla-commit))) - (file-name (git-file-name "gnuzilla" - ;;upstream-icecat-base-version - (string-take gnuzilla-commit 8))) - (sha256 - (base32 - "0z15h3lxfn9pmj5bj62qim3h320dcd2v69xrg1phb7lh5gq0bylf")))) - - ;; 'search-patch' returns either a valid file name or #f, so wrap it - ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. - (makeicecat-patch - (local-file (assume-valid-file-name - (search-patch "icecat-makeicecat.patch"))))) - - (origin - (method computed-origin-method) - (file-name (string-append "icecat-" version ".tar.xz")) - (sha256 #f) - (uri - (delay - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - (let ((firefox-dir - (string-append "firefox-" #$base-version)) - (icecat-dir - (string-append "icecat-" #$version))) - - (set-path-environment-variable - "PATH" '("bin") - (list #+python - #+(canonical-package bash) - #+(canonical-package coreutils) - #+(canonical-package findutils) - #+(canonical-package patch) - #+(canonical-package xz) - #+(canonical-package sed) - #+(canonical-package grep) - #+(canonical-package bzip2) - #+(canonical-package gzip) - #+(canonical-package tar))) - - (set-path-environment-variable - "PYTHONPATH" - (list #+(format #f "lib/python~a/site-packages" - (version-major+minor - (package-version python)))) - '#+(cons python-jsonschema - (map second - (package-transitive-propagated-inputs - python-jsonschema)))) - - ;; Needed by the 'makeicecat' script. - (setenv "RENAME_CMD" "rename") - - ;; We copy the gnuzilla source directory because it is - ;; read-only in 'gnuzilla-source', and the makeicecat script - ;; uses "cp -a" to copy parts of it and assumes that the - ;; copies will be writable. - (copy-recursively #+gnuzilla-source "/tmp/gnuzilla" - #:log (%make-void-port "w")) - - (with-directory-excursion "/tmp/gnuzilla" - (make-file-writable "makeicecat") - (invoke "patch" "--force" "--no-backup-if-mismatch" - "-p1" "--input" #+makeicecat-patch) - (patch-shebang "makeicecat") - (substitute* "makeicecat" - (("^readonly FFMAJOR=(.*)" all ffmajor) - (unless (string=? #$major-version - (string-trim-both ffmajor)) - ;; The makeicecat script cannot be expected to work - ;; properly on a different version of Firefox, even if - ;; no errors occur during execution. - (error "makeicecat major version mismatch")) - (string-append "readonly FFMAJOR=" #$major-version "\n")) - (("^readonly FFMINOR=.*") - (string-append "readonly FFMINOR=" #$minor-version "\n")) - (("^readonly FFSUB=.*") - (string-append "readonly FFSUB=" #$sub-version "\n")) - (("^readonly DATADIR=.*") - "readonly DATADIR=/tmp/gnuzilla/data\n") - (("^readonly SOURCEDIR=.*") - (string-append "readonly SOURCEDIR=" icecat-dir "\n")) - (("/bin/sed") - #+(file-append (canonical-package sed) "/bin/sed")))) - - (format #t "Unpacking upstream firefox tarball...~%") - (force-output) - (invoke "tar" "xf" #+upstream-firefox-source) - (rename-file firefox-dir icecat-dir) - - (with-directory-excursion icecat-dir - (format #t "Populating l10n directory...~%") - (force-output) - (mkdir "l10n") - (with-directory-excursion "l10n" - (for-each - (lambda (locale-dir) - (let ((locale - (string-drop (basename locale-dir) - (+ 32 ; length of hash - (string-length "-mozilla-locale-"))))) - (format #t " ~a~%" locale) - (force-output) - (copy-recursively locale-dir locale - #:log (%make-void-port "w")) - (for-each make-file-writable (find-files locale)) - (with-directory-excursion locale - (when (file-exists? ".hgtags") - (delete-file ".hgtags")) - (mkdir-p "browser/chrome/browser/preferences") - (call-with-output-file - "browser/chrome/browser/preferences/advanced-scripts.dtd" - (lambda (port) #f))))) - '#+all-mozilla-locales) - (copy-recursively #+mozilla-compare-locales - "compare-locales" - #:log (%make-void-port "w")) - (delete-file "compare-locales/.gitignore") - (delete-file "compare-locales/.hgignore") - (delete-file "compare-locales/.hgtags"))) - - (format #t "Running makeicecat script...~%") - (force-output) - (invoke "bash" "/tmp/gnuzilla/makeicecat") - - (format #t "Packing IceCat source tarball...~%") - (force-output) - (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args))) - (invoke "tar" "cfa" #$output - ;; Avoid non-determinism in the archive. We set the - ;; mtime of files in the archive to early 1980 because - ;; the build process fails if the mtime of source - ;; files is pre-1980, due to the creation of zip - ;; archives. - "--mtime=@315619200" ; 1980-01-02 UTC - "--owner=root:0" - "--group=root:0" - "--sort=name" - icecat-dir))))))))) - (define %icedove-build-id "20230411000000") ;must be of the form YYYYMMDDhhmmss (define %icedove-version "102.10.0") @@ -1363,7 +1193,7 @@ list of languages supported as well as the currently used changeset." ;; Extract the base Icecat tarball, renaming its top-level ;; directory. (invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",") - "-xf" #$icecat-102.9.0-source) + "-xf" #$icecat-source) (chdir #$name) ;; Merge the Thunderdbird localization data. -- cgit v1.2.3 From 18657219ab2ac3fc904ab5e1a2231af234ccdb78 Mon Sep 17 00:00:00 2001 From: jgart Date: Tue, 11 Apr 2023 17:54:28 -0500 Subject: gnu: emacs-ement: Update to 0.8.3. * gnu/packages/emacs-xyz.scm (emacs-ement): Update to 0.8.3. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6264d4deea..d209f3c43c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19061,7 +19061,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.8.2") + (version "0.8.3") (source (origin (method git-fetch) @@ -19070,7 +19070,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 "0qzml4hrylvsd25vyyj1pf77kvv8kzjyzap00d4s182gvva4lvks")))) + (base32 "17s3sl0dijgmhnaryw08g6vn6za46xz6a709rsfrdis8v1knqd7z")))) (build-system emacs-build-system) (arguments (list #:emacs emacs)) ;need libxml support -- cgit v1.2.3 From 8b2d0654effbf3b0222e7b68c90aa3d714ca02c5 Mon Sep 17 00:00:00 2001 From: Antero Mejr Date: Mon, 10 Apr 2023 00:48:07 +0000 Subject: gnu: Add emacs-totp. * gnu/packages/emacs-xyz.scm (emacs-totp): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d209f3c43c..f1a0df877c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -36735,6 +36735,30 @@ categories and highlighting specific modes that many commands use to accomplish different tasks.") (license license:asl2.0)))) +(define-public emacs-totp + (let ((commit "a5e059b8475b32bc7f5ddadda248cf84449ed722") ;no releases + (revision "0")) + (package + (name "emacs-totp") + (home-page "https://github.com/juergenhoetzel/emacs-totp") + (version (git-version "0.1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b76fxk9r3n9zii75q1957ivb6ap5px5h87kagxz083nl77jky7a")))) + (build-system emacs-build-system) + (synopsis "Generate Time-based One-time Passwords (TOTP) in Emacs") + (description + "emacs-TOTP implements @acronym{TOTP, Time-based One-time Passwords} as +specified in RFC 6238. It supports reading secrets in HEX and multiple base32 +variations, including non-standard base32 encodings.") + (license license:gpl3+)))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit v1.2.3 From d785c840410a1584aaf9b585d75373763012b658 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 14:15:28 +0200 Subject: gnu: emacs-subed: Update to 1.2.2. * gnu/packages/emacs-xyz.scm (emacs-subed): Update to 1.2.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f1a0df877c..287ea24338 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7926,14 +7926,14 @@ user.") (define-public emacs-subed (package (name "emacs-subed") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.nongnu.org/nongnu/subed-" version ".tar")) (sha256 (base32 - "09a3ggnqsm4lxqhj0z9z3df6qzibvv9lpwqij2gpiifbb4lkvj4b")))) + "1xlh4kqa8516rvmzy67pzs0ghk9rc919nq5b2sywd5mvzi5spxnh")))) (arguments (list #:tests? #t -- cgit v1.2.3 From ffcc7e56c6705f05f235745aa3986f0b7aa9ba50 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 14:15:34 +0200 Subject: gnu: emacs-ivy: Update to 0.14.0. * gnu/packages/emacs-xyz.scm (emacs-ivy): Update to 0.14.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 287ea24338..7cd1a07fa9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11643,13 +11643,13 @@ hydras with one column per group of heads."))) (define-public emacs-ivy (package (name "emacs-ivy") - (version "0.13.4") + (version "0.14.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/ivy-" version ".tar")) (sha256 - (base32 "0qpza1c45mr8fcpnm32cck4v22fnzz1yb7kww05rzgq1k9iivx5v")))) + (base32 "1fzl7xcmxjg005g4676ac3jcshgmcmdr81ywmxvjcs8wj71v56jv")))) (build-system emacs-build-system) (propagated-inputs (list emacs-hydra)) -- cgit v1.2.3 From 8f643826cdb5e44ad0b87c6e4261bf3b47865f6f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 14:15:41 +0200 Subject: gnu: emacs-counsel: Update to 0.14.0. * gnu/packages/emacs-xyz.scm (emacs-counsel): Update to 0.14.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7cd1a07fa9..7d57083776 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11667,14 +11667,14 @@ expression.") (define-public emacs-counsel (package (name "emacs-counsel") - (version "0.13.4") + (version "0.14.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "counsel-" version ".tar")) (sha256 - (base32 "094zfapfn1l8wjf3djkipk0d9nks0g77sbk107pfsbr3skkzh031")))) + (base32 "03n1qk66dcbh9xlnlzpwkb441c2xdpfc7bzx4i2szw0xh4a6g5sj")))) (build-system emacs-build-system) (propagated-inputs (list emacs-swiper)) -- cgit v1.2.3 From d3ca759688dbf7c5a3baa8a3431b2b11edcbfea6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 14:15:48 +0200 Subject: gnu: emacs-swiper: Update to 0.14.0. * gnu/packages/emacs-xyz.scm (emacs-swiper): Update to 0.14.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7d57083776..321f1b1082 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11700,13 +11700,13 @@ The following completions are currently available: (define-public emacs-swiper (package (name "emacs-swiper") - (version "0.13.4") + (version "0.14.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/swiper-" version ".tar")) (sha256 - (base32 "197pq2cvvskib87aky907wv2am55vilr7y5dabmmm07a8vr9py0v")))) + (base32 "1p2qil6gj4y8y3ydqs8pbxn8j16q9r42nnc2f61c30hws504pkms")))) (build-system emacs-build-system) (propagated-inputs (list emacs-ivy)) -- cgit v1.2.3 From dd96432db794b0bb999f48887bac1fcd8753b8d0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 14:15:55 +0200 Subject: gnu: emacs-pyim: Update to 5.3.2. * gnu/packages/emacs-xyz.scm (emacs-pyim): Update to 5.3.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 321f1b1082..7d0f0cf307 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17522,13 +17522,13 @@ containing words from the Rime project.") (define-public emacs-pyim (package (name "emacs-pyim") - (version "5.3.1") + (version "5.3.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/pyim-" version ".tar")) (sha256 - (base32 "0lkshw52xdrcbdrgmjb665bpyga61qlk29rrzrrj7s82n09bq9kv")))) + (base32 "13irkmhlfq99glyy0vhj559si5672cqcysjxlxn7lvckxr298vzc")))) (build-system emacs-build-system) (propagated-inputs (list emacs-async emacs-popup emacs-posframe emacs-xr)) -- cgit v1.2.3 From 4851c170f9b8f9fdfda3aed1daad4933f222d8a0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 14:16:01 +0200 Subject: gnu: emacs-sml-mode: Update to 6.12. * gnu/packages/emacs-xyz.scm (emacs-sml-mode): Update to 6.12. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7d0f0cf307..6e35ab6fce 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24522,14 +24522,14 @@ modes of SLIME.") (define-public emacs-sml-mode (package (name "emacs-sml-mode") - (version "6.11") + (version "6.12") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/sml-mode-" version ".tar")) (sha256 - (base32 "05vga709kphbx6jacqh57cq5gyicwrxxf81gask5lbq7vzfzlbfc")))) + (base32 "19wyxsnw60lmjbb7ijislpv9vzk9996rh1b0iw7wyrqszfxy2p20")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/sml-mode.html") (synopsis "Major mode for editing (Standard) ML") -- cgit v1.2.3 From c2b885a6a14ead14f34704bdb904c34325ea720d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 14:16:13 +0200 Subject: gnu: emacs-ivy-avy: Update to 0.14.0. * gnu/packages/emacs-xyz.scm (emacs-ivy-avy): Update to 0.14.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6e35ab6fce..4be8936d77 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -35305,7 +35305,7 @@ and preferred services can easily be configured.") (define-public emacs-ivy-avy (package (name "emacs-ivy-avy") - (version "0.13.4") + (version "0.14.0") (source (origin (method url-fetch) @@ -35313,7 +35313,7 @@ and preferred services can easily be configured.") "https://elpa.gnu.org/packages/" "ivy-avy-" version ".tar")) (sha256 - (base32 "1q5caxm4rnh4jy5n88dhkdbx1afsshmfki5dl8xsqbdb3y0zq7yi")))) + (base32 "0gjpvjahhkxsakqrcni78v71fsrh3f0jrs55a4kqc5hv6qyn8hk9")))) (build-system emacs-build-system) (propagated-inputs (list emacs-ivy emacs-avy)) -- cgit v1.2.3 From fd3d957858d94087e0b42428b5ba043bfb56ec8e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 14:16:19 +0200 Subject: gnu: emacs-ivy-hydra: Update to 0.14.0. * gnu/packages/emacs-xyz.scm (emacs-ivy-hydra): Update to 0.14.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4be8936d77..d65a540d6a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -35397,7 +35397,7 @@ files, providing syntax highlighting and indentation rules.") (define-public emacs-ivy-hydra (package (name "emacs-ivy-hydra") - (version "0.13.5") + (version "0.14.0") (source (origin (method url-fetch) @@ -35405,7 +35405,7 @@ files, providing syntax highlighting and indentation rules.") "https://elpa.gnu.org/packages/" "ivy-hydra-" version ".tar")) (sha256 - (base32 "06rln9bnq5hli5rqlm47fb68b8llpqrmzwqqv4rn7mx3854i9a5x")))) + (base32 "1gsjr2yny9qcj56cb4xy47la11z0lszq0f2qws0yzyh02ng30k1n")))) (build-system emacs-build-system) (propagated-inputs (list emacs-ivy emacs-hydra)) -- cgit v1.2.3 From aa4977d26d78a252ff05185a6ebb914cfcd68235 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 14:17:52 +0200 Subject: gnu: emacs-cape: Update to 0.14. * gnu/packages/emacs-xyz.scm (emacs-cape): Update to 0.14. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d65a540d6a..0623257f6d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4026,7 +4026,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (define-public emacs-cape (package (name "emacs-cape") - (version "0.13") + (version "0.14") (source (origin (method git-fetch) @@ -4035,7 +4035,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0nvmqfp9rv2mrisyvwfr285yww22c6wb5by3s25c83ay2ivpi8ya")))) + (base32 "0xicfjf49fz8kbh7wqpj9fwhm5f6s6fcb3919icggjsf2465yqls")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 3efd10e36e034d48171cb3fd2e7f3b92a47cc805 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 14:18:40 +0200 Subject: gnu: emacs-cnfonts: Update to 1.1.1. * gnu/packages/emacs-xyz.scm (emacs-cnfonts): Update to 1.1.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0623257f6d..6a6acd4114 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17205,7 +17205,7 @@ constructs.") (define-public emacs-cnfonts (package (name "emacs-cnfonts") - (version "1.1.0") + (version "1.1.1") (source (origin (method git-fetch) @@ -17214,7 +17214,7 @@ constructs.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "156qj5dkipa5a3f3scldf1mcfvmp1g199ds2wyi6jk5gqfv73zsd")))) + (base32 "0k0mh653sjwhli6hxdyzvcqdmpxdsx1s0fwzsw69dfr6nxr7f1dv")))) (build-system emacs-build-system) (home-page "https://github.com/tumashu/cnfonts") (synopsis "Emacs Chinese fonts setup tool") -- cgit v1.2.3 From 9f23957e814c67cfff2dd7f213412fbfbc4d3251 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 14:19:27 +0200 Subject: gnu: emacs-gptel: Update to 0.3.5. * gnu/packages/emacs-xyz.scm (emacs-gptel): Update to 0.3.5. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6a6acd4114..18791e56e2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -421,7 +421,7 @@ e.g. emacs-geiser-guile for Guile.") (define-public emacs-gptel (package (name "emacs-gptel") - (version "0.3.2") + (version "0.3.5") (source (origin (method git-fetch) (uri (git-reference @@ -430,7 +430,7 @@ e.g. emacs-geiser-guile for Guile.") (file-name (git-file-name name version)) (sha256 (base32 - "0g4p0y7bk14ixiz841am2v36fdbwigz77q4zz745m4hviaq3s30y")))) + "1ymqx9m6ypxdqcc9y3d90ibs3d2n6lb9dg7fn7q30lz6qa5nsc94")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From b0961b42dd9d6460782260fca617783743445ba2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 14:23:16 +0200 Subject: gnu: emacs-org: Update to 9.6.4. * gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.6.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 18791e56e2..81dd445b3e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15288,7 +15288,7 @@ passive voice.") (define-public emacs-org (package (name "emacs-org") - (version "9.6.3") + (version "9.6.4") (source (origin (method git-fetch) @@ -15297,7 +15297,7 @@ passive voice.") (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0gsvhqn93mlgzhwhy5ynb03fbvl55zdfbbdgzh0y42ffyc643v8p")))) + (base32 "0n285p8az9386jdfixv8bzkjx5agdfyfg9a122nnk1km15j53xdj")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 6c8e719537cd74aab49bb5b32e70701347e7f3ff Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 14:28:17 +0200 Subject: gnu: emacs-plz: Update to 0.5.4. * gnu/packages/emacs-xyz.scm (emacs-plz): Update to 0.5.4. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 81dd445b3e..e8d1f1c08e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19030,16 +19030,16 @@ multiplexer.") (define-public emacs-plz (package (name "emacs-plz") - (version "0.4") + (version "0.5.4") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/alphapapa/plz.el") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0sfgbq6nn9prxqg5qs576rlpszbhp70yj3d8r7hqckrd5s0sbk13")))) + (base32 "1ccddvbhb3n02s2krgyqapll7kbzxjhldzn8g8gmnqfsmwpg9d2r")))) (build-system emacs-build-system) (inputs (list curl)) (arguments -- cgit v1.2.3 From 0d490b1e13c24cfda7d43c20d2f67776b99c947d Mon Sep 17 00:00:00 2001 From: Dominik Delgado Steuter Date: Wed, 12 Apr 2023 17:16:02 +0200 Subject: gnu: Add emacs-eradio. * gnu/packages/emacs-xyz.scm (emacs-eradio): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e8d1f1c08e..3ea06c9e36 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -124,6 +124,7 @@ ;;; Copyright © 2023 Ivan Vilata-i-Balaguer ;;; Copyright © 2022 Demis Balbach ;;; Copyright © 2020, 2021, 2022, 2023 Andrew Tropin +;;; Copyright © 2023 Dominik Delgado Steuter ;;; ;;; This file is part of GNU Guix. ;;; @@ -3101,6 +3102,30 @@ Selectrum.") playback status, artist name and title for Emprise using Marginalia.") (license license:gpl3+))) +(define-public emacs-eradio + (let ((commit "47769986c79def84307921f0277e9bb2714756c2") + (revision "0")) + (package + (name "emacs-eradio") + (version (git-version "0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/olavfosse/eradio") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lks2pph44qxc9l34nr55ha667974r8ckxdwmvcp6v9mnm05317s")))) + (build-system emacs-build-system) + (home-page "https://github.com/olavfosse/eradio") + (synopsis "Simple radio player for GNU Emacs") + (description + "Eradio is a simple internet radio player for Emacs. Start, stop or +toggle custom-defined channels. An external media player like mpv or VLC is +required.") + (license license:gpl3+)))) + ;;; ;;; Miscellaneous. -- cgit v1.2.3 From 3ea8e9cc1f94b5982c4d76f76ae7badd45c6cd7b Mon Sep 17 00:00:00 2001 From: jgart Date: Sat, 15 Apr 2023 13:16:39 -0500 Subject: gnu: emacs-eat: Update to 0.8. * gnu/packages/emacs-xyz.scm (emacs-eat): Update to 0.8. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3ea06c9e36..cc827fb9d5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28056,7 +28056,7 @@ tabulated-lists).") (define-public emacs-eat (package (name "emacs-eat") - (version "0.7") + (version "0.8") (source (origin (method git-fetch) @@ -28066,7 +28066,7 @@ tabulated-lists).") (file-name (git-file-name name version)) (sha256 (base32 - "05wpjqbj0jv1sax788rdj0myfi596rimvfwh4mg0w6kcza291xiq")) + "1fb66g7jjc7dhw61323d94mx7gqfp6ylf9a7v5qym1n92mv48bdr")) (modules '((guix build utils))) (snippet #~(begin -- cgit v1.2.3 From 4c90275e3374b1732da2330f4bbf95c4cd7d69b6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 10 Apr 2023 17:23:25 +0200 Subject: gnu: giac: Update to 1.9.0-43. * gnu/packages/algebra.scm (giac): Update to 1.9.0-43. [arguments]<#:phases>: Skip failing tests on i686. --- gnu/packages/algebra.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index c7df217d21..76b3da8084 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -329,7 +329,7 @@ precision.") (define-public giac (package (name "giac") - (version "1.9.0-37") + (version "1.9.0-43") (source (origin (method url-fetch) @@ -341,7 +341,7 @@ precision.") "~parisse/debian/dists/stable/main/source/" "giac_" version ".tar.gz")) (sha256 - (base32 "0ch18wp6b3nr0zg31961rxng2mbw5mj76s00jf5qz7jdxl65s27n")))) + (base32 "1fqs9nxjj0kimisfsfhscgzfmc470lyzm63hwla7ka2iqq3s7bp3")))) (build-system gnu-build-system) (arguments (list @@ -360,8 +360,8 @@ precision.") ;; FIXME: Tests failing. Not sure why. (lambda _ (substitute* "check/Makefile.in" - (("chk_fhan4") "") - (("chk_fhan11") "")))) + (("chk_fhan(4|11)") "") + (("chk_fhan(14|21)") "")))) ;fail specifically on i686 (add-after 'install 'fix-doc (lambda _ ;; Most French documentation has a non-commercial license, so we -- cgit v1.2.3 From 4f0b2c0c3db276e9019040c476c7a3994aef04b2 Mon Sep 17 00:00:00 2001 From: Ellis Kesterton Date: Wed, 12 Apr 2023 21:03:09 +0100 Subject: gnu: nerd-dictation: Update to 0-1.0eb44b7. * gnu/packages/machine-learning.scm (nerd-dictation): Update to 0-1.0eb44b7. Signed-off-by: Nicolas Goaziou --- gnu/packages/machine-learning.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 70319238d9..0d124dc0b2 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3844,8 +3844,8 @@ simple speech recognition.") "lib."))))))))) (define-public nerd-dictation - (let* ((commit "53ab129a5ee0f8b5df284e8cf2229219b732c59e") - (revision "0")) + (let* ((commit "0eb44b7fd0927d69c92de5566e5807ed2c2e20b7") + (revision "1")) (package (name "nerd-dictation") (version (git-version "0" revision commit)) @@ -3857,7 +3857,7 @@ simple speech recognition.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "184qijiva1h1x00dzicik0yzgh78pq2lqr5fkgicgp26mkarlyhc")))) + (base32 "0frdpswv6w3cwj3c7wd5w8gj3s1hvpdwd48qhfhfxf7imahz9bqf")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 9a5e1dc1f16f5f8c056e64f2077b035784003673 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 Apr 2023 15:42:14 +0200 Subject: gnu: nerd-dictation: Fix license. * gnu/packages/machine-learning.scm (nerd-dictation)[license]: Set to GPL2+. --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 0d124dc0b2..d8083f5de6 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3875,7 +3875,7 @@ The user configuration lets you manipulate text using Python string operations. It has zero overhead, as this relies on manual activation and there are no background processes. Dictation is accessed manually with @code{nerd-dictation begin} and @code{nerd-dictation end} commands.") - (license license:gpl3+)))) + (license license:gpl2+)))) (define-public nerd-dictation/wayland (package -- cgit v1.2.3 From 929995a542aa3e7dcc1b13e0a1f7822e61cb54a4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Apr 2023 11:12:45 +0300 Subject: gnu: python-secretstorage: Update to 3.3.3. * gnu/packages/python-crypto.scm (python-secretstorage): Update to 3.3.3. --- gnu/packages/python-crypto.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 220f2b9bcd..4532d49c3c 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Eric Dvorsak -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner +;;; Copyright © 2015-2021, 2023 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari ;;; Copyright © 2016, 2017, 2020, 2022 Marius Bakke ;;; Copyright © 2017 Ben Sturmfels @@ -1420,14 +1420,13 @@ and Backlog for a list of what is and is not currently supported.") (define-public python-secretstorage (package (name "python-secretstorage") - (version "3.3.1") + (version "3.3.3") (source (origin (method url-fetch) (uri (pypi-uri "SecretStorage" version)) (sha256 - (base32 - "15ginv4gzxrx77n7517xnvf2jcpqc6ran12s951hc85zlr8nqrpx")))) + (base32 "0xxxxr77sgmjm1rqzdd1rkan9xg0qmv8awc1pb9adv39ycz560r4")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; Tests require a running dbus service. -- cgit v1.2.3 From bd0b398b67bf2fc95620b79258748b8f7eafc2c8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Apr 2023 11:13:26 +0300 Subject: gnu: python-jeepney: Update to 0.8.0. * gnu/packages/python-crypto.scm (python-jeepney): Update to 0.8.0. [build-system]: Switch to pyproject-build-system. [native-inputs]: Add python-async-timeout, python-pytest-asyncio, python-flit-core. Remove python-tornado. --- gnu/packages/python-crypto.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 4532d49c3c..f434c90c73 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1501,17 +1501,23 @@ certificates, signing and building trust bundles.") (define-public python-jeepney (package (name "python-jeepney") - (version "0.6.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (pypi-uri "jeepney" version)) (sha256 - (base32 "0mw6ch5s4czpmsiwqwhcidgk27858pl8vlvb7acrxjkm4ribcnbx")))) - (build-system python-build-system) + (base32 "01jqrk7pn94i7bpmj834pjrw7id659gfag6wpbv04fcpap94izjy")))) + (build-system pyproject-build-system) (native-inputs - (list python-testpath python-tornado python-trio python-pytest - python-pytest-trio)) + (list python-async-timeout + python-testpath + python-trio + python-pytest + python-pytest-asyncio + python-pytest-trio + ;; For the build backend + python-flit-core)) (home-page "https://gitlab.com/takluyver/jeepney") (synopsis "Low-level, pure Python DBus protocol wrapper") (description -- cgit v1.2.3 From b2bc0ecb296ce41b22dfca7132a33dc164a4e572 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Apr 2023 11:15:58 +0300 Subject: gnu: python-outcome: Update to 1.2.0. * gnu/packages/python-xyz.scm (python-outcome): Update to 1.2.0. [propagated-inputs]: Remove python-async-generator. --- gnu/packages/python-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0147870b06..284f8019bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2015, 2016, 2017, 2019, 2022 Leo Famulari ;;; Copyright © 2015, 2017 Ben Woodcroft ;;; Copyright © 2015, 2016 Erik Edrosa -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2015-2023 Efraim Flashner ;;; Copyright © 2015, 2017, 2020 Kyle Meyer ;;; Copyright © 2015, 2016 Chris Marusich ;;; Copyright © 2016 Danny Milosavljevic @@ -24782,13 +24782,13 @@ make your work easier.") (define-public python-outcome (package (name "python-outcome") - (version "1.0.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (pypi-uri "outcome" version)) (sha256 - (base32 "0vxn04vspmlkkyijjkjnsc46f93ki8g62hr7ag10zpd7ic324y7w")))) + (base32 "0wi6bmsfn73aw1hbpa1nhhshlx9k2vxcl7kp3z7h78sxwhyvv0kg")))) (build-system python-build-system) (arguments `(#:phases @@ -24800,7 +24800,7 @@ make your work easier.") (native-inputs (list python-pytest python-pytest-cov python-pytest-asyncio)) (propagated-inputs - (list python-async-generator python-attrs)) + (list python-attrs)) (home-page "https://github.com/python-trio/outcome") (synopsis "Capture the outcome of Python function calls") (description -- cgit v1.2.3 From 96f3c7504a68ee0df1f7f4a74616dc0f0a7d9016 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 16 Apr 2023 18:20:40 +0200 Subject: gnu: Add r-writexls. * gnu/packages/cran.scm (r-writexls): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8c631bdccd..46b046c83b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12635,6 +12635,29 @@ documents.") libxlsxwriter.") (license license:bsd-2))) +(define-public r-writexls + (package + (name "r-writexls") + (version "6.4.0") + (source (origin + (method url-fetch) + (uri (cran-uri "WriteXLS" version)) + (sha256 + (base32 + "1dqr98kx930y6mcvb9b39xiwshhs250gkd2vw2v6iil34sl90jv4")))) + (properties `((upstream-name . "WriteXLS"))) + (build-system r-build-system) + (inputs (list perl)) + (home-page "https://github.com/marcschwartz/WriteXLS") + (synopsis "Create Excel 2003 (XLS) and Excel 2007 (XLSX) files") + (description + "This package provides a cross-platform Perl-based R function to create +Excel 2003 (XLS) and Excel 2007 (XLSX) files from one or more data frames. +Each data frame will be written to a separate named worksheet in the Excel +spreadsheet. The worksheet name will be the name of the data frame it +contains or can be specified by the user.") + (license license:gpl2+))) + (define-public r-biasedurn (package (name "r-biasedurn") -- cgit v1.2.3 From ea6d2582c891062304348775b18b69475f4016bf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 16 Apr 2023 21:10:28 +0200 Subject: gnu: cpuinfo: Update to 0.0-2.53298db. * gnu/packages/parallel.scm (cpuinfo): Update to 0.0-2.53298db. [arguments]: Disable one test. --- gnu/packages/parallel.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 3c638e4ff9..60bf8409ee 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015-2018, 2020-2023 Efraim Flashner ;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2016 Andreas Enge -;;; Copyright © 2016, 2020, 2021, 2022 Ricardo Wurmus +;;; Copyright © 2016, 2020, 2021, 2022, 2023 Ricardo Wurmus ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice @@ -465,8 +465,8 @@ features.") (define-public cpuinfo ;; There's currently no tag on this repo. (let ((version "0.0") - (revision "1") - (commit "866ae6e5ffe93a1f63be738078da94cf3005cce2")) + (revision "2") + (commit "53298db833c5c5a1598639e9b47cc1a602bbac26")) (package (name "cpuinfo") (version (git-version version revision commit)) @@ -477,10 +477,20 @@ features.") (file-name (git-file-name name version)) (sha256 (base32 - "1lmsf4bpkm19a31i40qwcjn46qf7prggziv4pbsi695bkx5as71p")) + "01kfgxya2w32dz9bd3qm3i2d6nffw0qfyql11rxl7d3g830brj5k")) (patches (search-patches "cpuinfo-system-libraries.patch")))) (build-system cmake-build-system) - (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) + (arguments + (list + #:configure-flags '(list "-DBUILD_SHARED_LIBS=ON") + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'skip-bad-test + (lambda _ + (substitute* "test/init.cc" + (("TEST\\(CORE, known_uarch\\) \\{" m) + (string-append m "\ +GTEST_SKIP() << \"See https://github.com/pytorch/cpuinfo/issues/132\";")))))))) (inputs (list googletest googlebenchmark)) (synopsis "C/C++ library to obtain information about the CPU") -- cgit v1.2.3 From 93825a326c79d5ed8d0dbd41bf8aeffa80ffa7c9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:00:02 +0200 Subject: gnu: liblantern: Update to 0.10.0. * gnu/packages/machine-learning.scm (liblantern): Update to 0.10.0. [arguments]: Adjust build phase. --- gnu/packages/machine-learning.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index d8083f5de6..752c6929bd 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3500,7 +3500,7 @@ of Hidden Markov Models.") (define-public liblantern (package (name "liblantern") - (version "0.9.1") + (version "0.10.0") (source (origin (method git-fetch) @@ -3509,7 +3509,7 @@ of Hidden Markov Models.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1rycs7fgm03fxp8lxj8ljrdwy5whxd4554xzklbcmn4mcwbxgg57")))) + (base32 "12480fac9xq7rgw0q5f2cnvmakhakjsnq1gvh2ncjfwxz34n8fl7")))) (build-system cmake-build-system) (arguments (list @@ -3518,7 +3518,7 @@ of Hidden Markov Models.") (let ((python-version (version-major+minor (package-version python)))) #~(modify-phases %standard-phases (add-after 'unpack 'chdir - (lambda _ (chdir "lantern"))) + (lambda _ (chdir "src/lantern"))) (add-after 'chdir 'do-not-download-binaries (lambda* (#:key inputs #:allow-other-keys) (substitute* "CMakeLists.txt" -- cgit v1.2.3 From 7b3c9cbb52b00b66c1299c76ecc507514da84ac9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:00:34 +0200 Subject: gnu: python-pytorch-for-r-torch: Update to 1.13.1. * gnu/packages/machine-learning.scm (python-pytorch-for-r-torch): Update to 1.13.1. [source]: Adjust RUNPATH in snippet. --- gnu/packages/machine-learning.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 752c6929bd..90a3e153ce 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3364,7 +3364,7 @@ Note: currently this package does not provide GPU support.") (package (inherit python-pytorch) (name "python-pytorch") - (version "1.12.1") + (version "1.13.1") (source (origin (method git-fetch) (uri (git-reference @@ -3374,7 +3374,7 @@ Note: currently this package does not provide GPU support.") (file-name (git-file-name name version)) (sha256 (base32 - "1wimgnmn8kfazc8vhf65b9psdwj80n3chzkd8ic28541ac2zqzpk")) + "17yxjzwp4zp75fz7czgz9acijzw7dpyqcza50v8y1x7hfg2gw369")) (patches (search-patches "python-pytorch-system-libraries.patch" "python-pytorch-runpath.patch")) (modules '((guix build utils))) @@ -3394,7 +3394,10 @@ Note: currently this package does not provide GPU support.") "gloo" "googletest" "ios-cmake" "NNPACK" "onnx" "protobuf" "pthreadpool" "pybind11" "python-enum" "python-peachpy" - "python-six" "tbb" "XNNPACK" "zstd")))))))) + "python-six" "tbb" "XNNPACK" "zstd")) + (substitute* "functorch/CMakeLists.txt" + (("\\$\\{_rpath_portable_origin\\}/../torch/lib") + "$ORIGIN/../torch/lib")))))))) ;; Keep this in sync with python-pytorch (define-public python-torchvision -- cgit v1.2.3 From 0ef30039bb4459ea0b0e7f4e9742178a37f1d7c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:09:45 +0200 Subject: gnu: r-torch: Update to 0.10.0. * gnu/packages/cran.scm (r-torch): Update to 0.10.0. [propagated-inputs]: Add r-desc. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 46b046c83b..540ae61894 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27812,13 +27812,13 @@ Visualizations are also available for most of these settings.") (define-public r-torch (package (name "r-torch") - (version "0.9.1") + (version "0.10.0") (source (origin (method url-fetch) (uri (cran-uri "torch" version)) (sha256 - (base32 "03qbdws6j5v2vmdgdnwfd0248s2qirnxpm9v4302vqlq3c0i83c2")))) + (base32 "1ydazl7v10vm69573y871rq1dvbgdvlvhcs6di7xw7i4z4kg2gxm")))) (properties `((upstream-name . "torch"))) (build-system r-build-system) (arguments @@ -27849,6 +27849,7 @@ Visualizations are also available for most of these settings.") r-callr r-cli r-coro + r-desc r-ellipsis r-glue r-magrittr -- cgit v1.2.3 From aa24b1c17cf7bfbc20aab5f75e43fd73714c5f76 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:32 +0200 Subject: gnu: r-v8: Update to 4.3.0. * gnu/packages/cran.scm (r-v8): Update to 4.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 540ae61894..44e5af838c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1409,14 +1409,14 @@ similar rank-based tests for equal probability distributions due to Neuhauser (define-public r-v8 (package (name "r-v8") - (version "4.2.2") + (version "4.3.0") (source (origin (method url-fetch) (uri (cran-uri "V8" version)) (sha256 (base32 - "0friwpw3cbg40hfsqnlp8g3a6l4zhfag6lh005ya6dw634kkarah")))) + "1l70vdqcagp9cdyxa231gk33z5blsg96j0l28zbaklnhmr7mqfby")))) (properties `((upstream-name . "V8"))) (build-system r-build-system) (arguments -- cgit v1.2.3 From 832d7a8908e7be5191200a20a94a71f124dffca5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:33 +0200 Subject: gnu: r-zoo: Update to 1.8-12. * gnu/packages/cran.scm (r-zoo): Update to 1.8-12. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 44e5af838c..fac42e9dc7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1712,13 +1712,13 @@ proposals for count data.") (define-public r-zoo (package (name "r-zoo") - (version "1.8-11") + (version "1.8-12") (source (origin (method url-fetch) (uri (cran-uri "zoo" version)) (sha256 (base32 - "19cw09bhwj2qyd72765ym1cm2wmhh801ccif889nzq5gfpw513l4")))) + "1f1g7f362sidh99n2pcgnj8iwsn7hnjgpdnkrqml5qzrd0k8dhz6")))) (build-system r-build-system) (propagated-inputs (list r-lattice)) -- cgit v1.2.3 From 5df24ec454825cb6369442ac82544a386e45fa7d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:33 +0200 Subject: gnu: r-partykit: Update to 1.2-20. * gnu/packages/cran.scm (r-partykit): Update to 1.2-20. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fac42e9dc7..3eec3876a3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5186,13 +5186,13 @@ initiative to bring PASSTEC 2000 functionalities to R.") (define-public r-partykit (package (name "r-partykit") - (version "1.2-19") + (version "1.2-20") (source (origin (method url-fetch) (uri (cran-uri "partykit" version)) (sha256 (base32 - "0ma3haanf5pkj8r8q3bd0ig3zq9ppfjhhfkh6v50m82z6fprm3p4")))) + "1np0sa7fx7wvwxbpk5lpgbdpz0xwcvppq0sc52nifx1dxnirll33")))) (build-system r-build-system) (propagated-inputs (list r-formula -- cgit v1.2.3 From 1127830d3a0a124dc77b554fc2788fc4ff5761cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:33 +0200 Subject: gnu: r-jomo: Update to 2.7-6. * gnu/packages/cran.scm (r-jomo): Update to 2.7-6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3eec3876a3..38809c6da2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7801,14 +7801,14 @@ Laplace approximation and adaptive Gauss-Hermite quadrature.") (define-public r-jomo (package (name "r-jomo") - (version "2.7-5") + (version "2.7-6") (source (origin (method url-fetch) (uri (cran-uri "jomo" version)) (sha256 (base32 - "05xfkj65nqd987pp5bhl4jy46qxwjll5mxnjii6qrmfmjld177q5")))) + "1np2sw0kq21kdhkv227pz2rqvpxg06r3mk93ggkrz5nl45ajmyiz")))) (build-system r-build-system) (propagated-inputs (list r-lme4 r-mass r-ordinal r-survival r-tibble)) -- cgit v1.2.3 From d9cef2c152d36e88142c0d5aecb8b7f59a982cbf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:33 +0200 Subject: gnu: r-quantmod: Update to 0.4.22. * gnu/packages/cran.scm (r-quantmod): Update to 0.4.22. [propagated-inputs]: Add r-jsonlite. --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 38809c6da2..101663aef7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9499,17 +9499,17 @@ Fisher's method), and Sidak correction.") (define-public r-quantmod (package (name "r-quantmod") - (version "0.4.21") + (version "0.4.22") (source (origin (method url-fetch) (uri (cran-uri "quantmod" version)) (sha256 (base32 - "1qmpdk91smiqg63h4jsrw4izl4pnbgwlzi16zjvin0fs29kx01jf")))) + "0pknwssha01hjsf3c7lgrabk2c3rzq5wa2m7mf8sz7wsrbqrd57j")))) (build-system r-build-system) (propagated-inputs - (list r-curl r-ttr r-xts r-zoo)) + (list r-curl r-jsonlite r-ttr r-xts r-zoo)) (home-page "https://cran.r-project.org/web/packages/quantmod/") (synopsis "Quantitative financial modelling framework") (description "This package provides a quantitative financial modelling -- cgit v1.2.3 From f31eb37d5b40b8150e0c82fa81357248fb3add49 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:33 +0200 Subject: gnu: r-renv: Update to 0.17.3. * gnu/packages/cran.scm (r-renv): Update to 0.17.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 101663aef7..f1bce6f546 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11401,14 +11401,14 @@ those searches and pull data into their R sessions.") (define-public r-renv (package (name "r-renv") - (version "0.17.2") + (version "0.17.3") (source (origin (method url-fetch) (uri (cran-uri "renv" version)) (sha256 (base32 - "1qar7s3zdnhqsi6am6f58wg3ygpwv73qmrcp36glz0galzigc0y2")))) + "1w7mwk3drf3bzfyhsy6mlnpbhgp8il8is7q95ad567ry4g6jhkqw")))) (properties `((upstream-name . "renv"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From b0d707eda62f204a66a9fc6f555c23a86d14c62b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:33 +0200 Subject: gnu: r-labelled: Update to 2.11.0. * gnu/packages/cran.scm (r-labelled): Update to 2.11.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f1bce6f546..4f66e4329c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13680,14 +13680,14 @@ subsequence} (LCS) using a dynamic programming algorithm.") (define-public r-labelled (package (name "r-labelled") - (version "2.10.0") + (version "2.11.0") (source (origin (method url-fetch) (uri (cran-uri "labelled" version)) (sha256 (base32 - "02n4r4bizsysnlmxpw86w7zkiqi6aill9dq2nmrn43xzrffy54sy")))) + "1pg5l2c3ai8gkrqryq5xzsal85pljmdzc2ln8k1ak3j4racm5p7d")))) (properties `((upstream-name . "labelled"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 367ea059e9e952b63cdcf8110c1dacc8543b8fcb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:33 +0200 Subject: gnu: r-ggformula: Update to 0.10.4. * gnu/packages/cran.scm (r-ggformula): Update to 0.10.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4f66e4329c..a5bda55790 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13711,13 +13711,13 @@ haven package.") (define-public r-ggformula (package (name "r-ggformula") - (version "0.10.2") + (version "0.10.4") (source (origin (method url-fetch) (uri (cran-uri "ggformula" version)) (sha256 - (base32 "0xb39gjn6q7va1d1fhvf2dw9428s1q13wasx4y3cz2f0lls1r2wl")))) + (base32 "07d9sq0dqi0g5x9h58icfk1f4hgg1xz4mhbp2z2rxg9qgs74fvdj")))) (build-system r-build-system) (propagated-inputs (list r-ggforce -- cgit v1.2.3 From 2a1de6dc139f82aac10c1aa4032d517034f03379 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:33 +0200 Subject: gnu: r-multcompview: Update to 0.1-9. * gnu/packages/cran.scm (r-multcompview): Update to 0.1-9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a5bda55790..0ad1f7005c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14894,13 +14894,13 @@ Hothorn, Westfall, 2010, CRC Press).") (define-public r-multcompview (package (name "r-multcompview") - (version "0.1-8") + (version "0.1-9") (source (origin (method url-fetch) (uri (cran-uri "multcompView" version)) (sha256 - (base32 "1rfq9wvvrghq0542ff40wy8vdmsyd8spzz6ihcywcvxdfa8m6g8j")))) + (base32 "15vki166n2k4ng72hy62c2mzz18s10h6l6w839qplg0zsplr6f8z")))) (properties `((upstream-name . "multcompView"))) (build-system r-build-system) (home-page "https://cran.r-project.org/package=multcompView") -- cgit v1.2.3 From 726b352cec68731d8b8360e6d18cef6eee724135 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:34 +0200 Subject: gnu: r-bayestestr: Update to 0.13.1. * gnu/packages/cran.scm (r-bayestestr): Update to 0.13.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0ad1f7005c..8a7de602cc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15148,14 +15148,14 @@ differentiation.") (define-public r-bayestestr (package (name "r-bayestestr") - (version "0.13.0") + (version "0.13.1") (source (origin (method url-fetch) (uri (cran-uri "bayestestR" version)) (sha256 (base32 - "1951zm88qlbmr4ragrzfzgw72awm7mqhh464s6kck0mcx7shas90")))) + "0mmnifi3j29qlsj917wbdqpgpk05x3cc7111k842gsv7y34h4ir7")))) (properties `((upstream-name . "bayestestR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 51ae3aabee6785450d1a815eeabbb857a1dab68d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:34 +0200 Subject: gnu: r-performance: Update to 0.10.3. * gnu/packages/cran.scm (r-performance): Update to 0.10.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8a7de602cc..c49bb5888e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15175,14 +15175,14 @@ ROPE percentage and pd).") (define-public r-performance (package (name "r-performance") - (version "0.10.2") + (version "0.10.3") (source (origin (method url-fetch) (uri (cran-uri "performance" version)) (sha256 (base32 - "0r9x5pqf1asf0sy0255jv0d4cki4xd5sfp5rl9mldclykpswf022")))) + "1l4sr6cgg8rkgs5w98a36n79b1lbg241p60grsnz12hskppa1a6q")))) (build-system r-build-system) (propagated-inputs (list r-bayestestr r-datawizard r-insight)) -- cgit v1.2.3 From 39d2ed401f72f5585ed0ce8131a53e5e5c6f4ebe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:34 +0200 Subject: gnu: r-gargle: Update to 1.4.0. * gnu/packages/cran.scm (r-gargle): Update to 1.4.0. [propagated-inputs]: Remove r-rstudioapi. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c49bb5888e..a5f349e81e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18037,14 +18037,14 @@ and manipulating sets of ontological terms.") (define-public r-gargle (package (name "r-gargle") - (version "1.3.0") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "gargle" version)) (sha256 (base32 - "02ldshm8phs1ls0djqfprv5yy8i50ijh16y7smkb61wrwd4zr3s2")))) + "12s980jfw98czzrxdn83b2blj4qcrkqqmycjplkzvm4mapgiw3wf")))) (build-system r-build-system) (propagated-inputs (list r-cli @@ -18056,7 +18056,6 @@ and manipulating sets of ontological terms.") r-openssl r-rappdirs r-rlang - r-rstudioapi r-withr)) (native-inputs (list r-knitr)) -- cgit v1.2.3 From b9d6b88a33d6dc602efa006b793d9501fd52608c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:34 +0200 Subject: gnu: r-compositions: Update to 2.0-6. * gnu/packages/cran.scm (r-compositions): Update to 2.0-6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a5f349e81e..200b1ae5ee 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19793,14 +19793,14 @@ users of rARPACK are advised to switch to the RSpectra package.") (define-public r-compositions (package (name "r-compositions") - (version "2.0-5") + (version "2.0-6") (source (origin (method url-fetch) (uri (cran-uri "compositions" version)) (sha256 (base32 - "0niccv8i3jrcjnjm7dygzhz6bfah9za6lswa669pfpgsycilpf51")))) + "0d0wlrwfpjvz02cwrqpg5bnrf8isz359dl9qqxn9yb6czpmp9ls5")))) (build-system r-build-system) (propagated-inputs (list r-bayesm r-mass r-robustbase r-tensora)) -- cgit v1.2.3 From 185bb03286bf6e87a676430a480c2bc3f146fb97 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:34 +0200 Subject: gnu: r-rms: Update to 6.6-0. * gnu/packages/cran.scm (r-rms): Update to 6.6-0. [propagated-inputs]: Remove r-lattice; add r-kableextra and r-knitr. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 200b1ae5ee..efbd03f694 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21271,13 +21271,13 @@ lspec, polyclass, and polymars.") (define-public r-rms (package (name "r-rms") - (version "6.5-0") + (version "6.6-0") (source (origin (method url-fetch) (uri (cran-uri "rms" version)) (sha256 - (base32 "11dibpjgbhlqzn97254hlp6p6wfld7bnw4j5rr0dqwynj6fq2vzx")))) + (base32 "0p32nqb4pj8dddi4dwjbr59wp6q6vvmarq97vpdaxwrr8fwsvazk")))) (build-system r-build-system) (propagated-inputs (list r-cluster @@ -21287,7 +21287,8 @@ lspec, polyclass, and polymars.") r-hmisc r-htmltable r-htmltools - r-lattice + r-kableextra + r-knitr r-mass r-multcomp r-nlme -- cgit v1.2.3 From 776154da00894138d171aeaa261103b68c7ec15f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:34 +0200 Subject: gnu: r-scs: Update to 3.2.4. * gnu/packages/cran.scm (r-scs): Update to 3.2.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index efbd03f694..3209097db4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23497,13 +23497,13 @@ the graph, and propagating graph labels.") (define-public r-scs (package (name "r-scs") - (version "3.0-1") + (version "3.2.4") (source (origin (method url-fetch) (uri (cran-uri "scs" version)) (sha256 (base32 - "04srf33zw4dxv22b1h5qwjch5yg7hrvk4iq8yvxqnbr8qzp1x26n")))) + "13r944b9ip078hqwdpzn3jv21zm47d9l2b1f5y6glcj5pxs9iwy3")))) (properties `((upstream-name . "scs"))) (build-system r-build-system) (home-page "https://github.com/FlorianSchwendinger/scs") -- cgit v1.2.3 From b039d0a7c4fcf8388054a443b7c2373bfecd4f91 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:34 +0200 Subject: gnu: r-enrichr: Update to 3.2. * gnu/packages/cran.scm (r-enrichr): Update to 3.2. [propagated-inputs]: Add r-writexls. --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3209097db4..3f48e74e7e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23901,18 +23901,18 @@ and model output.") (define-public r-enrichr (package (name "r-enrichr") - (version "3.1") + (version "3.2") (source (origin (method url-fetch) (uri (cran-uri "enrichR" version)) (sha256 (base32 - "0ad7jp398prvmm2fym07268qhv40mg67dx55ml4ayqkwxwffr1i9")))) + "1g97q6vqwvb2l02y61343sblarqi433gjl3qmlyxjxq2lnjrnak1")))) (properties `((upstream-name . "enrichR"))) (build-system r-build-system) (propagated-inputs - (list r-curl r-ggplot2 r-httr r-rjson)) + (list r-curl r-ggplot2 r-httr r-rjson r-writexls)) (native-inputs (list r-knitr)) (home-page "https://cran.r-project.org/web/packages/enrichR/") -- cgit v1.2.3 From 6655a2af0f274534e0b8a07f95ca12066ee2b3f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:35 +0200 Subject: gnu: r-terra: Update to 1.7-23. * gnu/packages/cran.scm (r-terra): Update to 1.7-23. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3f48e74e7e..8b1b4777f0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24831,14 +24831,14 @@ emphasize hidden group structures in networks or focus on specific nodes.") (define-public r-terra (package (name "r-terra") - (version "1.7-18") + (version "1.7-23") (source (origin (method url-fetch) (uri (cran-uri "terra" version)) (sha256 (base32 - "0ipavj170yzp88dvbka6a0y683qn78dj7chr1ym1ghncrqkmk0fn")))) + "1xri4cxvkpdyxvm1cv6dypyv0ww9al99vmrhzhscvwj7xycckabg")))) (properties `((upstream-name . "terra"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 374639c34ab35da5c3669dc47e4e2bb08a2ceb9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:35 +0200 Subject: gnu: r-qqconf: Update to 1.3.2. * gnu/packages/cran.scm (r-qqconf): Update to 1.3.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8b1b4777f0..8edab9a8bc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28244,13 +28244,13 @@ finding peaks in spectra, converting humidity measures.") (define-public r-qqconf (package (name "r-qqconf") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "qqconf" version)) (sha256 (base32 - "1vvw79l8nqpqvmfpff5khgdjbs1s2q5ylg72lvkihd2qfk0d8cf5")))) + "18wfvljd6gbf9am3hh14fgp06gpa04vw9nhl7q07li7rmlkxc1cl")))) (properties `((upstream-name . "qqconf"))) (build-system r-build-system) (inputs (list fftw)) -- cgit v1.2.3 From d8e3aa95a05ff4025f41d3dca15bb46aa95ce0a3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:35 +0200 Subject: gnu: r-quanteda: Update to 3.3.0. * gnu/packages/cran.scm (r-quanteda): Update to 3.3.0. [propagated-inputs]: Add r-jsonlite. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8edab9a8bc..34e557e274 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29004,18 +29004,19 @@ Norwegian, Portuguese, Romanian, Russian, Spanish, Swedish and Turkish.") (define-public r-quanteda (package (name "r-quanteda") - (version "3.2.4") + (version "3.3.0") (source (origin (method url-fetch) (uri (cran-uri "quanteda" version)) (sha256 (base32 - "1yg3lgckh6fncmw037p4gaa2bab59yh6izqix1cgyysjg4jpcw62")))) + "19b36r1fd493mfcjp58fd986kgyhd2q396il8gb1cpa5cfpny983")))) (properties `((upstream-name . "quanteda"))) (build-system r-build-system) (propagated-inputs (list r-fastmatch + r-jsonlite r-magrittr r-matrix r-rcpp -- cgit v1.2.3 From 3113ee8bbae7aa1cbf11cf68f221586b48a3f082 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:35 +0200 Subject: gnu: r-rstanarm: Update to 2.21.4. * gnu/packages/cran.scm (r-rstanarm): Update to 2.21.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 34e557e274..f6edf16eb7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30122,14 +30122,14 @@ need to derive the partial derivatives.") (define-public r-rstanarm (package (name "r-rstanarm") - (version "2.21.3") + (version "2.21.4") (source (origin (method url-fetch) (uri (cran-uri "rstanarm" version)) (sha256 (base32 - "19rj396q84maxnd9d2xcd5rblg3310xn7sqbd6k18kwf3dvd7wp9")))) + "11diz486ak31zx5402kra3s6nd76cvnla8frfn0kc7dzwhiwcspc")))) (properties `((upstream-name . "rstanarm"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 679c78ed51a918157a180e924b3ea209da833eb0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:35 +0200 Subject: gnu: r-spatstat-linnet: Update to 3.1-0. * gnu/packages/cran.scm (r-spatstat-linnet): Update to 3.1-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f6edf16eb7..9cc1492f23 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -32087,14 +32087,14 @@ user-level code from spatstat, except for the code for linear networks.") (define-public r-spatstat-linnet (package (name "r-spatstat-linnet") - (version "3.0-6") + (version "3.1-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat.linnet" version)) (sha256 (base32 - "0sk0zg4fhy3pryi06i0lvhkrgh47r3h4jxw231i8n5mzng1x828n")))) + "037hggsd9wmiwlxc8wjabzsiqlk5gf6mflm87pps370nmxkavc5r")))) (properties `((upstream-name . "spatstat.linnet"))) (build-system r-build-system) -- cgit v1.2.3 From 075a045b41195302ec44b273c21f1d7f6844a412 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:35 +0200 Subject: gnu: r-confintr: Update to 1.0.0. * gnu/packages/cran.scm (r-confintr): Update to 1.0.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9cc1492f23..56d72eb01b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -32897,13 +32897,13 @@ value.") (define-public r-confintr (package (name "r-confintr") - (version "0.2.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "confintr" version)) (sha256 (base32 - "1zpprv5ysmnqn83xdsixsm6jhsi1gck32z6x60gp0y8xs25mwcbg")))) + "15vsdbqj5w4qbk7kwp1jqyc3phmmy8s981xjj0n0yy48xhy37f8g")))) (properties `((upstream-name . "confintr"))) (build-system r-build-system) (propagated-inputs (list r-boot)) -- cgit v1.2.3 From d495c46698bd5070f4268601436fc9bab21ce60f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:35 +0200 Subject: gnu: r-igraph: Update to 1.4.2. * gnu/packages/cran.scm (r-igraph): Update to 1.4.2. [propagated-inputs]: Add r-cpp11. --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 56d72eb01b..4d593aaaff 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33003,21 +33003,21 @@ model.") (define-public r-igraph (package (name "r-igraph") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (cran-uri "igraph" version)) (sha256 (base32 - "1waxa15ng4lqr07s68br81ihdnxy5dnx8iygyzkwnyz8dbs5i8h8")))) + "1raaih254dcd19d4sqmb8w8ih5plbvik11nsr9q68nm2n6nh0lvx")))) (build-system r-build-system) (native-inputs (list gfortran r-knitr)) (inputs (list gmp glpk libxml2 zlib)) (propagated-inputs - (list r-magrittr r-matrix r-pkgconfig r-rlang)) + (list r-cpp11 r-magrittr r-matrix r-pkgconfig r-rlang)) (home-page "https://igraph.org") (synopsis "Network analysis and visualization") (description -- cgit v1.2.3 From d2d6ea993e703e5a12736ba189036520c34a62da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:36 +0200 Subject: gnu: r-tune: Update to 1.1.1. * gnu/packages/cran.scm (r-tune): Update to 1.1.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4d593aaaff..83a5b0249c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33343,14 +33343,14 @@ for creating, simulating, or validating values for such parameters.") (define-public r-tune (package (name "r-tune") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "tune" version)) (sha256 (base32 - "1pp3pgxwpqihxfjwf9mb5rc0yv60q47n7z399z21zp4jbwryxymh")))) + "0kl8bpd1i5ir6lrx055rilvb7kg0iws5f4618956h3g8sif1lvmg")))) (properties `((upstream-name . "tune"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 648f92a434f9d9c42d7b01821f8714ee45f97964 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:36 +0200 Subject: gnu: r-workflowsets: Update to 1.0.1. * gnu/packages/cran.scm (r-workflowsets): Update to 1.0.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 83a5b0249c..ae7a830f1a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33388,14 +33388,14 @@ methods, and post-processing steps.") (define-public r-workflowsets (package (name "r-workflowsets") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "workflowsets" version)) (sha256 (base32 - "12wj0m6kqnjh8k5k14kqh40wf14gzyg5l3shhbpr2lvk87l9ssqq")))) + "1rv82lx1vmhjqlim7y5vpfsa7mb6msvkhiz17hxr5k9244ykmbhi")))) (properties `((upstream-name . "workflowsets"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 853fd0f2c3122c45ce47c21ed9105eb2a7243fab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:36 +0200 Subject: gnu: r-parsnip: Update to 1.1.0. * gnu/packages/cran.scm (r-parsnip): Update to 1.1.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ae7a830f1a..2671d09e2b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33667,14 +33667,14 @@ analysis using @code{dplyr}, @code{ggplot2}, and other Tidy tools.") (define-public r-parsnip (package (name "r-parsnip") - (version "1.0.4") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "parsnip" version)) (sha256 (base32 - "1305z2pamxxaqy0qylb8vq6ixs934kfc9h2si2fdy7q5wjpdjnjh")))) + "13bp44i8i99yiahdjikf0xidfgxd251nhbxsnsw0ax1lv24fpggc")))) (properties `((upstream-name . "parsnip"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 68355cf37b167fefb99c4a8f1eb5d5b0fb8d13d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:36 +0200 Subject: gnu: r-seqminer: Update to 8.9. * gnu/packages/cran.scm (r-seqminer): Update to 8.9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2671d09e2b..7dd1290db0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -34061,14 +34061,14 @@ designs. Broman et al. (2018) .") (define-public r-seqminer (package (name "r-seqminer") - (version "8.6") + (version "8.9") (source (origin (method url-fetch) (uri (cran-uri "seqminer" version)) (sha256 (base32 - "1fm76mam5hp5v0hj27ywna7vafrw7mnwph30fqdb17163rrhr1ca")))) + "1cnsy1cjz4rcm32hzcvr1d43y4m7sdkzim1mwsn3490mf3xmi3i1")))) (build-system r-build-system) (inputs (list zlib)) -- cgit v1.2.3 From ca6f22f63b7a339336a43f1eb152782a9d1189d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:36 +0200 Subject: gnu: r-stars: Update to 0.6-1. * gnu/packages/cran.scm (r-stars): Update to 0.6-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7dd1290db0..94920c3e9a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -35867,14 +35867,14 @@ light-weight geometry library used by @url{http://postgis.net/,PostGIS}.") (define-public r-stars (package (name "r-stars") - (version "0.6-0") + (version "0.6-1") (source (origin (method url-fetch) (uri (cran-uri "stars" version)) (sha256 (base32 - "0zwbsqp8bihcq5sjdw05pvbh4l9s68p0qw3ffkk0jphsipvy9za9")))) + "19q44bs2w12lyim8gzfpgxfkp2cdf29cav4cv74vzsxrv8xdny0z")))) (properties `((upstream-name . "stars"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 5507db7ee05105565c8d580756bba42562d317ab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:36 +0200 Subject: gnu: r-markdown: Update to 1.6. * gnu/packages/statistics.scm (r-markdown): Update to 1.6. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 628057a189..8ff5df615a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1523,13 +1523,13 @@ data derived from /etc/mime.types in UNIX-type systems.") (define-public r-markdown (package (name "r-markdown") - (version "1.5") + (version "1.6") (source (origin (method url-fetch) (uri (cran-uri "markdown" version)) (sha256 (base32 - "05lq5r698bk4qs2qklvri3rlbdss9w58n5y91yf3k6x5bzwh6580")))) + "1sjrynkg42g7s2czwmx4lzk92fssnd73cqj63djlpbk1h66qn8j6")))) (build-system r-build-system) ;; Skip check phase because the tests require the r-knitr package to be ;; installed. This prevents installation failures. Knitr normally -- cgit v1.2.3 From 7e80f058ca90f73dca6d0902084029022cf7e6f8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:36 +0200 Subject: gnu: r-git2r: Update to 0.32.0. * gnu/packages/statistics.scm (r-git2r): Update to 0.32.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8ff5df615a..430936e26b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2546,13 +2546,13 @@ functions make it easy to control additional request components.") (define-public r-git2r (package (name "r-git2r") - (version "0.31.0") + (version "0.32.0") (source (origin (method url-fetch) (uri (cran-uri "git2r" version)) (sha256 (base32 - "0vfn7kkkarha63vv3k8hi9y5snfsdpwdrbmych560126z9w95nzi")))) + "0wa6k1g7y0sx6s7map7mn579c1h07n185m163msmcjk81i62ap8v")))) (build-system r-build-system) (inputs (list libgit2 zlib)) -- cgit v1.2.3 From 303acb3a0b9b668acf21a84412f4377c3a037a2c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:36 +0200 Subject: gnu: r-segmented: Update to 1.6-4. * gnu/packages/statistics.scm (r-segmented): Update to 1.6-4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 430936e26b..f468ec9244 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3175,14 +3175,14 @@ statements.") (define-public r-segmented (package (name "r-segmented") - (version "1.6-3") + (version "1.6-4") (source (origin (method url-fetch) (uri (cran-uri "segmented" version)) (sha256 (base32 - "0x7k5ycbvnfqsygrcyaaxnl0060x6869b345xc697hhr9sfxb4ai")))) + "14ci6hd5xlrz22gvnvy2fzpnp50fbds3wpx4mf2fgi5i7sp0hb27")))) (build-system r-build-system) (propagated-inputs (list r-mass r-nlme)) (home-page "https://cran.r-project.org/web/packages/segmented") -- cgit v1.2.3 From 8159838e81c4214dc0fe34c7f73d3035063414ac Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:36 +0200 Subject: gnu: r-deoptimr: Update to 1.0-12. * gnu/packages/statistics.scm (r-deoptimr): Update to 1.0-12. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f468ec9244..5ba065a46c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5372,14 +5372,14 @@ data for species delimitation, nearest neighbor based noise detection.") (define-public r-deoptimr (package (name "r-deoptimr") - (version "1.0-11") + (version "1.0-12") (source (origin (method url-fetch) (uri (cran-uri "DEoptimR" version)) (sha256 (base32 - "0nqn12n5qlyk2zsgh57dvizy5z71xgqrhrcqj6lbzybm9c7v6x0q")))) + "0y9xc6lkadk3h1j22q7vnykm1xyhlbn24lkjqn8sdsmw660gjdk1")))) (properties `((upstream-name . "DEoptimR"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/DEoptimR") -- cgit v1.2.3 From eee0b6075acafbf443722188559466504f024e8b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:37 +0200 Subject: gnu: r-quantreg: Update to 5.95. * gnu/packages/statistics.scm (r-quantreg): Update to 5.95. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 5ba065a46c..57c7f0b5b1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5703,13 +5703,13 @@ using modular prediction and response module classes.") (define-public r-quantreg (package (name "r-quantreg") - (version "5.94") + (version "5.95") (source (origin (method url-fetch) (uri (cran-uri "quantreg" version)) (sha256 - (base32 "1h8p3gzaas8gdvyh13ir8xc92hiybmizb0yhnwk7gvbjp768bmaj")))) + (base32 "1k4n5armw4lfyy4q8llnrpgvcw7s5n8w9zfff9rr5ggbrqgah1ab")))) (build-system r-build-system) (arguments `(#:phases -- cgit v1.2.3 From 83fb491e4458137c09c082830e78eb7526bbd7ec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 17 Apr 2023 11:10:37 +0200 Subject: gnu: r-simr: Update to 1.0.7. * gnu/packages/statistics.scm (r-simr): Update to 1.0.7. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 57c7f0b5b1..138088b4b3 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -7244,13 +7244,13 @@ experiment via several parameterizations") (define-public r-simr (package (name "r-simr") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (cran-uri "simr" version)) (sha256 - (base32 "1q8ip54c5pc7pjf8127jpk56nr3f8rmwqdcrr84faj4lfbr27wqb")))) + (base32 "1rfnhyqvdazvar7r1ml71lskh1hdk3yfzv5jlcz18wzffscgkgmb")))) (properties `((upstream-name . "simr"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2b2068a083b8f5fa1436e25277b5373ab45f8bf0 Mon Sep 17 00:00:00 2001 From: Navid Afkhami Date: Sun, 16 Apr 2023 12:28:12 +0200 Subject: gnu: Add r-demultiplex2. * gnu/packages/bioinformatics.scm (r-demultiplex2): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/bioinformatics.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 99cc056f9f..2b36539f15 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9667,6 +9667,47 @@ includes software to ") (license license:cc0)))) +(define-public r-demultiplex2 + (let ((commit "e42bc8310c0ea035af100e6ccea59b46ad6385f5") + (revision "1")) + (package + (name "r-demultiplex2") + (version (git-version "1.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Gartner-Lab/deMULTIplex2") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15f3kshsdvm97w24ql9b1wjlfbabimdsam0482hg7jivlvpl8j9w")))) + (properties `((upstream-name . "deMULTIplex2"))) + (build-system r-build-system) + (propagated-inputs (list r-data-table + r-devtools + r-dplyr + r-ggextra + r-ggplot2 + r-gridextra + r-magrittr + r-mass + r-matrix + r-rcolorbrewer + r-shortread + r-stringdist + r-tidyr + r-uwot + r-viridis + r-xvector)) + (home-page "https://github.com/Gartner-Lab/deMULTIplex2") + (synopsis "Robust sample demultiplexing for scRNA-seq") + (description + "This package implements a bioinformatics algorithm for demultiplexing +multiplexed single cell datasets. It is built on a statistical model of tag +read counts derived from the physical mechanism of tag cross-contamination.") + (license license:cc0)))) + (define-public gdc-client (package (name "gdc-client") -- cgit v1.2.3 From b95cd3f969d709a3bf20cf5d176bb9b7c42e7dc8 Mon Sep 17 00:00:00 2001 From: Navid Afkhami Date: Sun, 16 Apr 2023 12:09:48 +0200 Subject: gnu: Add r-demuxmix. * gnu/packages/bioinformatics.scm (r-demuxmix): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/bioinformatics.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2b36539f15..b27e12a5b4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9708,6 +9708,37 @@ multiplexed single cell datasets. It is built on a statistical model of tag read counts derived from the physical mechanism of tag cross-contamination.") (license license:cc0)))) +(define-public r-demuxmix + (let ((commit "09a7918ca6e0cd23e6bbaed2b97388bc499e248e") + (revision "1")) + (package + (name "r-demuxmix") + (version (git-version "1.1.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/huklein/demuxmix") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03kfnns7m2447jsc3xplyv9qx8hvvdjmii7j837g3bb6smyxss96")))) + (properties `((upstream-name . "demuxmix"))) + (build-system r-build-system) + (propagated-inputs (list r-ggplot2 r-gridextra r-mass r-matrix)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/huklein/demuxmix") + (synopsis + "Demultiplexing oligo-barcoded scRNA-seq data using regression mixture models") + (description + "This package is used for demultiplexing single-cell sequencing +experiments of pooled cells. These cells are labeled with barcode +oligonucleotides. The package implements methods to fit regression mixture +models for a probabilistic classification of cells, including multiplet +detection. Demultiplexing error rates can be estimated, and methods for +quality control are provided.") + (license license:artistic2.0)))) + (define-public gdc-client (package (name "gdc-client") -- cgit v1.2.3 From a117510a8c9246f8e09577780ccaf3955f98d7ad Mon Sep 17 00:00:00 2001 From: Kyle Andrews Date: Fri, 14 Apr 2023 16:05:40 +0000 Subject: gnu: Add r-littler. * gnu/packages/cran.scm (r-littler): New variable. --- gnu/packages/cran.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 94920c3e9a..03c92e7ffd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6698,6 +6698,41 @@ functions from LINPACK.") ;; Any GPL version. (license (list license:gpl2+ license:gpl3+)))) +(define-public r-littler + (package + (name "r-littler") + (version "0.3.18") + (source (origin + (method url-fetch) + (uri (cran-uri "littler" version)) + (sha256 + (base32 + "1lp6a62g3yhzr4pv9kynibv7k9pd546w6hifs1aficyxbyg4dgqq")))) + (properties `((upstream-name . "littler"))) + (build-system r-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-executable + (lambda _ + (install-file "inst/bin/r" + (string-append #$output "/bin"))))))) + (inputs (list icu4c zlib)) + (native-inputs + (list r-simplermarkdown pkg-config)) + (home-page "https://github.com/eddelbuettel/littler") + (synopsis "R at the command-line via r") + (description + "This package provides a scripting and command-line front-end is provided +by r (aka littler) as a lightweight binary wrapper around the GNU R language +and environment for statistical computing and graphics. While R can be used +in batch mode, the r binary adds full support for both shebang-style scripting +(i.e. using a hash-mark-exclamation-path expression as the first line in +scripts) as well as command-line use in standard pipelines. In other words, r +provides the R language without the environment.") + (license license:gpl2+))) + (define-public r-fitdistrplus (package (name "r-fitdistrplus") -- cgit v1.2.3 From 89acc4d5c645cf8bdb8f35c490b50f168931bd12 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 17 Apr 2023 11:40:28 +0200 Subject: gnu: r-mixedpower: Update to b2b87068. * gnu/packages/statistics.scm (r-mixedpower): Update to commit b2b87068546327d8f592d141e5482e0478c1b2ee, remove patch. * gnu/packages/patches/r-mixedpower-r2power.patch: Remove file. * gnu/local.mk: Unregister it. --- gnu/local.mk | 1 - gnu/packages/patches/r-mixedpower-r2power.patch | 26 ------------------------- gnu/packages/statistics.scm | 11 +++++------ 3 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/r-mixedpower-r2power.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0849d32276..1241ab09c0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1817,7 +1817,6 @@ dist_patch_DATA = \ %D%/packages/patches/racket-zuo-bin-sh.patch \ %D%/packages/patches/remake-impure-dirs.patch \ %D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \ - %D%/packages/patches/r-mixedpower-r2power.patch \ %D%/packages/patches/rng-tools-revert-build-randstat.patch \ %D%/packages/patches/rocm-comgr-3.1.0-dependencies.patch \ %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \ diff --git a/gnu/packages/patches/r-mixedpower-r2power.patch b/gnu/packages/patches/r-mixedpower-r2power.patch deleted file mode 100644 index a3307ca7b5..0000000000 --- a/gnu/packages/patches/r-mixedpower-r2power.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e882fda905150649aa887c72731144330ca297b5 Mon Sep 17 00:00:00 2001 -From: Lars-Dominik Braun -Date: Fri, 28 Oct 2022 09:18:11 +0200 -Subject: [PATCH] Fix R2power with R>=4.2 - -The previous commit missed this if statement. ---- - R/meta_functions.R | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/R/meta_functions.R b/R/meta_functions.R -index a65f0c1..fb3feba 100644 ---- a/R/meta_functions.R -+++ b/R/meta_functions.R -@@ -172,7 +172,7 @@ R2power <- function(model, data, fixed_effects, simvar, - } # end if databased - - # 2. SESOI -- suppressWarnings(if (SESOI != F){ # supress warning generated by if statement if SESOI =! F -+ suppressWarnings(if (!is.logical(SESOI)){ - - # change beta coeficients to SESOI values - model@beta <- SESOI --- -2.37.4 - diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 138088b4b3..dcb0485992 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -7276,9 +7276,10 @@ models, using simulation. It was designed to work with models fit using the (license license:gpl2+))) (define-public r-mixedpower - ;; This commit contains fixes for R>=4.2. A newer release does not exist. - (let ((commit "6520195481bca3ce01862ef80a28c53b0a35d0f5") - (revision "1")) + ;; This commit contains fixes for R>=4.2 and contains new features. A + ;; newer release does not exist. + (let ((commit "b2b87068546327d8f592d141e5482e0478c1b2ee") + (revision "2")) (package (name "r-mixedpower") (version (git-version "2.0" revision commit)) @@ -7291,9 +7292,7 @@ models, using simulation. It was designed to work with models fit using the (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "114z9pvya2jg10y804ga41gq00r7zcw4a7c7234ybhmv3jqw78q1")) - (patches - (search-patches "r-mixedpower-r2power.patch")))) + (base32 "0pys66a6c1k2fp5qk9grhzg1q1d3q51rggcilmdssimkmcsm234z")))) (properties `((upstream-name . "mixedpower"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2d06dfc050114dba44e791d8decc8eaa705fee01 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 17 Apr 2023 13:30:10 +0200 Subject: gnu: emacs-wordgen: Fix build on 32-bit platforms. * gnu/packages/emacs-xyz.scm (emacs-wordgen)[arguments]<#:emacs>: Use EMACS-WIDE-INT on 32-bit platforms. --- gnu/packages/emacs-xyz.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cc827fb9d5..c1748e7f36 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24411,6 +24411,12 @@ It replaces the standard completions buffer with Ido prompt.") (sha256 (base32 "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash")))) (build-system emacs-build-system) + (arguments + (list + #:emacs (if (target-64bit?) + emacs-minimal + ;; Require wide-int support for 32-bit platform. + emacs-wide-int))) (home-page "https://github.com/Fanael/wordgen.el") (synopsis "Random word generator") (description "This package provides functions to generate random words -- cgit v1.2.3 From 095754ea88a546646cb91f3b4ea3e14120a98bec Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 28 Feb 2023 15:47:01 +0000 Subject: packages: Export guile-for-grafts. So this can be used in (guix self). * guix/packages.scm (guile-for-grafts): Export. Signed-off-by: Christopher Baines --- guix/packages.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/packages.scm b/guix/packages.scm index 2d33212f44..bce82ab3a3 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -183,6 +183,7 @@ package-closure default-guile + guile-for-grafts default-guile-derivation set-guile-for-build package-file -- cgit v1.2.3 From e5c33837cbee98d460d9ae09b463501de6f15d97 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 28 Feb 2023 15:47:02 +0000 Subject: self: Restructure accessing packages. Both for consistency (always use specification->package as defined in this module) and so that all the packages that are used can be accessed (which comes in useful when applying grafts). * guix/self.scm (%packages): New variable. (specification->package): Use %packages. (locale-data, translate-texi-manuals, info-manual, guix-command, compiled-guix): Use specification->package. Signed-off-by: Christopher Baines --- guix/self.scm | 97 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/guix/self.scm b/guix/self.scm index d1dcde34ac..74c953bd50 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -43,34 +43,42 @@ ;;; Dependency handling. ;;; -(define specification->package +(define %packages + (let ((ref (lambda (module variable) + (delay + (module-ref (resolve-interface + `(gnu packages ,module)) + variable))))) + `(("guile" . ,(ref 'guile 'guile-3.0-latest)) + ("guile-avahi" . ,(ref 'guile-xyz 'guile-avahi)) + ("guile-json" . ,(ref 'guile 'guile-json-4)) + ("guile-ssh" . ,(ref 'ssh 'guile-ssh)) + ("guile-git" . ,(ref 'guile 'guile-git)) + ("guile-semver" . ,(ref 'guile-xyz 'guile-semver)) + ("guile-lib" . ,(ref 'guile-xyz 'guile-lib)) + ("guile-sqlite3" . ,(ref 'guile 'guile-sqlite3)) + ("guile-zlib" . ,(ref 'guile 'guile-zlib)) + ("guile-lzlib" . ,(ref 'guile 'guile-lzlib)) + ("guile-zstd" . ,(ref 'guile 'guile-zstd)) + ("guile-gcrypt" . ,(ref 'gnupg 'guile-gcrypt)) + ("guile-gnutls" . ,(ref 'tls 'guile-gnutls)) + ("guix-daemon" . ,(ref 'package-management 'guix-daemon)) + ("disarchive" . ,(ref 'backup 'disarchive)) + ("guile-lzma" . ,(ref 'guile 'guile-lzma)) + ("gzip" . ,(ref 'compression 'gzip)) + ("bzip2" . ,(ref 'compression 'bzip2)) + ("xz" . ,(ref 'compression 'xz)) + ("po4a" . ,(ref 'gettext 'po4a)) + ("gettext-minimal" . ,(ref 'gettext 'gettext-minimal)) + ("gcc-toolchain" . ,(ref 'commencement 'gcc-toolchain)) + ("glibc-utf8-locales" . ,(ref 'base 'glibc-utf8-locales)) + ("graphviz" . ,(ref 'graphviz 'graphviz)) + ("texinfo" . ,(ref 'texinfo 'texinfo))))) + +(define (specification->package name) ;; Use our own variant of that procedure because that of (gnu packages) ;; would traverse all the .scm files, which is wasteful. - (let ((ref (lambda (module variable) - (module-ref (resolve-interface module) variable)))) - (match-lambda - ("guile" (ref '(gnu packages guile) 'guile-3.0-latest)) - ("guile-avahi" (ref '(gnu packages guile-xyz) 'guile-avahi)) - ("guile-json" (ref '(gnu packages guile) 'guile-json-4)) - ("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh)) - ("guile-git" (ref '(gnu packages guile) 'guile-git)) - ("guile-semver" (ref '(gnu packages guile-xyz) 'guile-semver)) - ("guile-lib" (ref '(gnu packages guile-xyz) 'guile-lib)) - ("guile-sqlite3" (ref '(gnu packages guile) 'guile-sqlite3)) - ("guile-zlib" (ref '(gnu packages guile) 'guile-zlib)) - ("guile-lzlib" (ref '(gnu packages guile) 'guile-lzlib)) - ("guile-zstd" (ref '(gnu packages guile) 'guile-zstd)) - ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt)) - ("guile-gnutls" (ref '(gnu packages tls) 'guile-gnutls)) - ("disarchive" (ref '(gnu packages backup) 'disarchive)) - ("guile-lzma" (ref '(gnu packages guile) 'guile-lzma)) - ("gzip" (ref '(gnu packages compression) 'gzip)) - ("bzip2" (ref '(gnu packages compression) 'bzip2)) - ("xz" (ref '(gnu packages compression) 'xz)) - ("po4a" (ref '(gnu packages gettext) 'po4a)) - ("gettext" (ref '(gnu packages gettext) 'gettext-minimal)) - ("gcc-toolchain" (ref '(gnu packages commencement) 'gcc-toolchain)) - (_ #f)))) ;no such package + (and=> (assoc-ref %packages name) force)) ;;; @@ -239,9 +247,8 @@ record with the new file name." #:optional (directory domain)) "Return the locale data from 'po/DIRECTORY' in SOURCE, corresponding to DOMAIN, a gettext domain." - (define gettext - (module-ref (resolve-interface '(gnu packages gettext)) - 'gettext-minimal)) + (define gettext-minimal + (specification->package "gettext-minimal")) (define build (with-imported-modules '((guix build utils)) @@ -257,7 +264,7 @@ DOMAIN, a gettext domain." (let ((gmo (string-append #$output "/" language "/LC_MESSAGES/" #$domain ".mo"))) (mkdir-p (dirname gmo)) - (invoke #+(file-append gettext "/bin/msgfmt") + (invoke #+(file-append gettext-minimal "/bin/msgfmt") "-c" "--statistics" "--verbose" "-o" gmo (string-append po-directory "/" language ".po")))) @@ -279,20 +286,19 @@ DOMAIN, a gettext domain." "Return the translated texinfo manuals built from SOURCE." (define po4a (specification->package "po4a")) - - (define gettext - (specification->package "gettext")) + + (define gettext-minimal + (specification->package "gettext-minimal")) (define glibc-utf8-locales - (module-ref (resolve-interface '(gnu packages base)) - 'glibc-utf8-locales)) + (specification->package "glibc-utf8-locales")) (define documentation (file-append* source "doc")) (define documentation-po (file-append* source "po/doc")) - + (define build (with-imported-modules '((guix build utils) (guix build po)) #~(begin @@ -364,7 +370,7 @@ a list of extra files, such as '(\"contributing\")." (setenv "GUIX_LOCPATH" #+(file-append glibc-utf8-locales "/lib/locale")) - (setenv "PATH" #+(file-append gettext "/bin")) + (setenv "PATH" #+(file-append gettext-minimal "/bin")) (setenv "LC_ALL" "en_US.UTF-8") (setlocale LC_ALL "en_US.UTF-8") @@ -393,16 +399,13 @@ a list of extra files, such as '(\"contributing\")." (define (info-manual source) "Return the Info manual built from SOURCE." (define texinfo - (module-ref (resolve-interface '(gnu packages texinfo)) - 'texinfo)) + (specification->package "texinfo")) (define graphviz - (module-ref (resolve-interface '(gnu packages graphviz)) - 'graphviz)) + (specification->package "graphviz")) (define glibc-utf8-locales - (module-ref (resolve-interface '(gnu packages base)) - 'glibc-utf8-locales)) + (specification->package "glibc-utf8-locales")) (define documentation (file-append* source "doc")) @@ -585,8 +588,7 @@ instead of 'C'." "Return the 'guix' command such that it adds MODULES and DEPENDENCIES in its load path." (define glibc-utf8-locales - (module-ref (resolve-interface '(gnu packages base)) - 'glibc-utf8-locales)) + (specification->package "glibc-utf8-locales")) (define module-directory ;; To minimize the number of 'stat' calls needed to locate a module, @@ -1029,10 +1031,7 @@ itself." ;; Include 'guix-daemon'. XXX: Here we inject an ;; older snapshot of guix-daemon, but that's a good ;; enough approximation for now. - #:daemon (module-ref (resolve-interface - '(gnu packages - package-management)) - 'guix-daemon) + #:daemon (specification->package "guix-daemon") #:info (info-manual source) #:miscellany (miscellaneous-files source) -- cgit v1.2.3 From 00b5c37e3422c8502fa3f52ef3acc6d3b08be463 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 17 Apr 2023 15:56:59 +0100 Subject: gnu: guix-build-coordinator: Update to 0-78.2efcd8b. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-78.2efcd8b. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index f9032d60c3..45fb03147f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1377,8 +1377,8 @@ environments.") "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) (define-public guix-build-coordinator - (let ((commit "7f6db4b55411f79ab5f2639318dc5871c1452f00") - (revision "77")) + (let ((commit "2efcd8b11954708f0b2f26ce6eb9d785e2f6aae4") + (revision "78")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1389,7 +1389,7 @@ environments.") (commit commit))) (sha256 (base32 - "07pi5yjgagv0xyz9f5cnfz1c06gzx1mpi17h3a1w5h6lp3kwqrv9")) + "1s7q3bn1cccbafd5b4dk0xn2r5qjabl7rclbwf7hfjj7csv8ag2i")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From d3ce8833043073e69f94352ceec3ed3466f1b0fe Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 16 Apr 2023 12:34:45 +0100 Subject: gnu: wfview: Update to 1.62. * gnu/packages/radio.scm (wfview): Update to 1.62. Use Gexp, shift order of components. [inputs]: Add hidapi, qtgamepad. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/radio.scm | 51 +++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 8192aefb0f..02509ea146 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2591,7 +2591,7 @@ software-defined radio receivers.") (define-public wfview (package (name "wfview") - (version "1.50") + (version "1.62") (source (origin (method git-fetch) @@ -2600,37 +2600,46 @@ software-defined radio receivers.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1djgn1z4hibzci53mrvskz47jfq6hk8lhhqckpa93pvsi9kadl4k")))) + (base32 "0rrj6h5k8plq4m6fd2yxargfhqcwkxv6bdp4rmgh6bs4prl4wvwd")))) (build-system qt-build-system) + (arguments + (list + #:tests? #f ; No test suite. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda _ + (substitute* "wfview.pro" + (("\\.\\./wfview/") + "../")) + (substitute* '("wfmain.cpp") + (("/usr/share") + (string-append #$output "/share"))))) + (replace 'configure + (lambda _ + (mkdir-p "build") + (chdir "build") + (invoke "qmake" + (string-append "PREFIX=" #$output) + "../wfview.pro")))))) + ;; XXX: During the build it complains on missing git and hostname commands + ;; but it successfully finishes the build. (inputs (list eigen + hidapi opus portaudio pulseaudio qcustomplot + ;; TODO: Needs to be renamed to qtgamepad-5 when version 6 is + ;; packed. + qtgamepad qtbase-5 qtmultimedia-5 + ;; TODO: Needs to be renamed to qtserialport-5. when version 6 is + ;; packed. qtserialport rtaudio)) - (arguments - `(#:tests? #f ; No test suite. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "wfview.pro" - (("\\.\\./wfview/") - "../")) - (substitute* '("wfmain.cpp") - (("/usr/share") - (string-append (assoc-ref outputs "out") "/share"))))) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p "build") - (chdir "build") - (invoke "qmake" - (string-append "PREFIX=" (assoc-ref outputs "out")) - "../wfview.pro")))))) (home-page "https://wfview.org/") (synopsis "Software to control Icom radios") (description -- cgit v1.2.3 From 50dd91bc30634c75c0001cfd38bbcc2fbbeb894e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 17 Apr 2023 17:35:50 +0200 Subject: gnu: gqrx: Update to 2.15.10. * gnu/packages/radio.scm (gqrx): Update to 2.15.10. --- gnu/packages/radio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 02509ea146..5999257433 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1098,7 +1098,7 @@ satellites.") (define-public gqrx (package (name "gqrx") - (version "2.15.9") + (version "2.15.10") (source (origin (method git-fetch) @@ -1107,7 +1107,7 @@ satellites.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1a70lmcidp5ccmpvlvpfk1g7pshyp8xq2k0kgxrplf8za5hns019")))) + (base32 "0c1s3y7w0gcav666mnkwkb60cczab0rkwdkaqicq1768fsgyhad3")))) (build-system qt-build-system) (native-inputs (list pkg-config)) -- cgit v1.2.3